From 95b295971ddf8197db88246a220e23bd41d018dc Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Sun, 20 Mar 2022 11:55:50 -0700 Subject: [PATCH] Everywhere: Move tests to /home/anon/Tests --- Base/etc/SystemServer.ini | 2 +- Base/home/anon/{tests => Tests}/run-tests-and-shutdown.sh | 0 Documentation/RunningTests.md | 6 +++--- Meta/lint-shell-scripts.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename Base/home/anon/{tests => Tests}/run-tests-and-shutdown.sh (100%) diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini index 948943bae6..9707329ac6 100644 --- a/Base/etc/SystemServer.ini +++ b/Base/etc/SystemServer.ini @@ -154,7 +154,7 @@ KeepAlive=false User=anon [TestRunner@ttyS0] -Executable=/home/anon/tests/run-tests-and-shutdown.sh +Executable=/home/anon/Tests/run-tests-and-shutdown.sh StdIO=/dev/ttyS0 Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/bin:/usr/bin:/usr/local/bin User=anon diff --git a/Base/home/anon/tests/run-tests-and-shutdown.sh b/Base/home/anon/Tests/run-tests-and-shutdown.sh similarity index 100% rename from Base/home/anon/tests/run-tests-and-shutdown.sh rename to Base/home/anon/Tests/run-tests-and-shutdown.sh diff --git a/Documentation/RunningTests.md b/Documentation/RunningTests.md index 9702985ef8..4a7ae8f90d 100644 --- a/Documentation/RunningTests.md +++ b/Documentation/RunningTests.md @@ -69,7 +69,7 @@ Tests built for the SerenityOS target get installed either into `/usr/Tests` or some system tests are installed into `/bin` for historical reasons. The easiest way to run all of the known tests in the system is to use the `run-tests-and-shutdown.sh` script that gets -installed into `/home/anon/tests`. When running in CI, the environment variable `$DO_SHUTDOWN_AFTER_TESTS` is set, which +installed into `/home/anon/Tests`. When running in CI, the environment variable `$DO_SHUTDOWN_AFTER_TESTS` is set, which will run `shutdown -n` after running all the tests. For completeness, a basic on-target test run will need the SerenityOS image built and run via QEMU. @@ -84,7 +84,7 @@ ninja install && ninja image && ninja run In the initial terminal, one can easily run the test runner script: ``` -courage ~ $ ./tests/run-tests-and-shutdown.sh +courage ~ $ ./Tests/run-tests-and-shutdown.sh === Running Tests on SerenityOS === ... ``` @@ -96,7 +96,7 @@ The system server entry looks as below: ```ini [TestRunner@ttyS0] -Executable=/home/anon/tests/run-tests-and-shutdown.sh +Executable=/home/anon/Tests/run-tests-and-shutdown.sh StdIO=/dev/ttyS0 Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/usr/local/bin:/usr/bin:/bin User=anon diff --git a/Meta/lint-shell-scripts.sh b/Meta/lint-shell-scripts.sh index 0d7f0b8e60..b59409f598 100755 --- a/Meta/lint-shell-scripts.sh +++ b/Meta/lint-shell-scripts.sh @@ -11,7 +11,7 @@ if [ "$#" -eq "0" ]; then '*.sh' \ ':!:Ports' \ ':!:Userland/Shell/Tests' \ - ':!:Base/home/anon/tests' \ + ':!:Base/home/anon/Tests' \ ':!:Base/root/generate_manpages.sh' ) else