Consolidate output folders of bench and testsuite

This commit is contained in:
Mamy André-Ratsimbazafy 2020-08-22 23:00:05 +02:00
parent eee0f4f0fc
commit 442c3f6cf6
No known key found for this signature in database
GPG Key ID: 7B88AD1FE79492E1
1 changed files with 6 additions and 2 deletions

View File

@ -91,7 +91,10 @@ proc test(flags, path: string, commandFile = false) =
if existsEnv"CC": if existsEnv"CC":
cc = " --cc:" & getEnv"CC" cc = " --cc:" & getEnv"CC"
let command = "nim " & lang & cc & " " & flags & " --verbosity:0 --outdir:build -r --hints:off --warnings:off " & path let command = "nim " & lang & cc & " " & flags &
" --verbosity:0 --outdir:build/testsuite -r --hints:off --warnings:off " &
" --nimcache:nimcache/" & path & " " &
path
if not commandFile: if not commandFile:
echo "\n==============================================================================================" echo "\n=============================================================================================="
@ -112,7 +115,8 @@ proc runBench(benchName: string, compiler = "", useAsm = true) =
if not useAsm: if not useAsm:
cc &= " -d:ConstantineASM=false" cc &= " -d:ConstantineASM=false"
exec "nim c " & cc & exec "nim c " & cc &
" -d:danger --verbosity:0 -o:build/" & benchName & "_" & compiler & " -d:danger --verbosity:0 -o:build/bench/" & benchName & "_" & compiler & "_" & (if useAsm: "useASM" else: "noASM") &
" --nimcache:nimcache/" & benchName & "_" & compiler & "_" & (if useAsm: "useASM" else: "noASM") &
" -r --hints:off --warnings:off benchmarks/" & benchName & ".nim" " -r --hints:off --warnings:off benchmarks/" & benchName & ".nim"
# Tasks # Tasks