Skip to content

Commit

Permalink
Move full-program test runner up one directory level
Browse files Browse the repository at this point in the history
This PR moves the full-program test runner code up one directory level so it is not mixed up with the actual test directories.  I was getting tired of hunting for it amid all the tests.
  • Loading branch information
chalcolith committed Aug 30, 2023
1 parent d48dc40 commit 732d50d
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ else()
add_subdirectory(src/ponyc)

add_subdirectory(test/libponyc)
add_subdirectory(test/runner)
add_subdirectory(test/libponyc-run)
add_subdirectory(test/libponyc-run/runner)
add_subdirectory(test/libponyrt)

add_subdirectory(benchmark/libponyc)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ endif

test-full-programs-release: all
@mkdir -p $(outDir)/runner-tests/release
$(SILENT)cd '$(outDir)' && $(buildDir)/test/libponyc-run/runner/runner --debugger='$(debuggercmd)' --timeout_s=120 --max_parallel=$(num_cores) --exclude=runner --ponyc=$(outDir)/ponyc --output=$(outDir)/runner-tests/release --test_lib=$(outDir)/test_lib $(srcDir)/test/libponyc-run
$(SILENT)cd '$(outDir)' && $(buildDir)/test/runner/runner --debugger='$(debuggercmd)' --timeout_s=120 --max_parallel=$(num_cores) --ponyc=$(outDir)/ponyc --output=$(outDir)/runner-tests/release --test_lib=$(outDir)/test_lib $(srcDir)/test/libponyc-run

test-full-programs-debug: all
@mkdir -p $(outDir)/runner-tests/debug
$(SILENT)cd '$(outDir)' && $(buildDir)/test/libponyc-run/runner/runner --debugger='$(debuggercmd)' --timeout_s=120 --max_parallel=$(num_cores) --exclude=runner --ponyc=$(outDir)/ponyc --debug --output=$(outDir)/runner-tests/debug --test_lib=$(outDir)/test_lib $(srcDir)/test/libponyc-run
$(SILENT)cd '$(outDir)' && $(buildDir)/test/runner/runner --debugger='$(debuggercmd)' --timeout_s=120 --max_parallel=$(num_cores) --ponyc=$(outDir)/ponyc --debug --output=$(outDir)/runner-tests/debug --test_lib=$(outDir)/test_lib $(srcDir)/test/libponyc-run

test-stdlib-release: all
$(SILENT)cd '$(outDir)' && PONYPATH=.:$(PONYPATH) ./ponyc -b stdlib-release --pic --checktree --verify $(cross_args) ../../packages/stdlib && echo Built `pwd`/stdlib-release && $(cross_runner) $(debuggercmd) ./stdlib-release --sequential
Expand Down
4 changes: 2 additions & 2 deletions make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ switch ($Command.ToLower())
}

if (-not (Test-Path $runOutDir)) { New-Item -ItemType Directory -Force -Path $runOutDir }
Write-Output "$buildDir\test\libponyc-run\runner\runner.exe --debug=$debugFlag --debugger=$debuggercmd --timeout_s=60 --max_parallel=1 --exclude=runner --debug=$debugFlag --test_lib=$outDir\test_lib --ponyc=$outDir\ponyc.exe --output=$runOutDir $srcDir\test\libponyc-run"
& $buildDir\test\libponyc-run\runner\runner.exe --debugger=$debuggercmd --timeout_s=60 --max_parallel=1 --exclude=runner --debug=$debugFlag --test_lib=$outDir\test_lib --ponyc=$outDir\ponyc.exe --output=$runOutDir $srcDir\test\libponyc-run
Write-Output "$buildDir\test\runner\runner.exe --debug=$debugFlag --debugger=$debuggercmd --timeout_s=60 --max_parallel=1 --debug=$debugFlag --test_lib=$outDir\test_lib --ponyc=$outDir\ponyc.exe --output=$runOutDir $srcDir\test\libponyc-run"
& $buildDir\test\runner\runner.exe --debugger=$debuggercmd --timeout_s=60 --max_parallel=1 --debug=$debugFlag --test_lib=$outDir\test_lib --ponyc=$outDir\ponyc.exe --output=$runOutDir $srcDir\test\libponyc-run
$err = $LastExitCode
if ($err -ne 0) { $failedTestSuites += "libponyc.run.tests.$runConfig" }
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 732d50d

Please sign in to comment.