mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 02:17:34 +00:00
test-js: Remove run-tests.sh
The shell script is no longer necessary -- simply run "test-js" from inside Serenity, or $SERENITY_ROOT/Build/Meta/Lagom/test-js from the host.
This commit is contained in:
parent
26acc8ba88
commit
cf537311e4
3 changed files with 14 additions and 21 deletions
|
@ -43,7 +43,7 @@ script:
|
||||||
- cmake .. -DBUILD_LAGOM=1
|
- cmake .. -DBUILD_LAGOM=1
|
||||||
- make
|
- make
|
||||||
- CTEST_OUTPUT_ON_FAILURE=1 make test
|
- CTEST_OUTPUT_ON_FAILURE=1 make test
|
||||||
- cd "$SERENITY_ROOT"/Libraries/LibJS/Tests
|
- cd Meta/Lagom
|
||||||
- ./run-tests.sh
|
- ./test-js
|
||||||
- cd "$SERENITY_ROOT"/Toolchain/Cache
|
- cd "$SERENITY_ROOT"/Toolchain/Cache
|
||||||
- du -ch * || true
|
- du -ch * || true
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [ "$(uname)" = "SerenityOS" ]; then
|
|
||||||
js_program=/bin/test-js
|
|
||||||
test_root=/home/anon/js-tests
|
|
||||||
else
|
|
||||||
[ -z "$js_program" ] && js_program="$SERENITY_ROOT/Build/Meta/Lagom/test-js"
|
|
||||||
test_root="$SERENITY_ROOT/Libraries/LibJS/Tests"
|
|
||||||
|
|
||||||
# Enable back traces if sanitizers are enabled
|
|
||||||
export UBSAN_OPTIONS=print_stacktrace=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
$js_program "$test_root"
|
|
||||||
|
|
||||||
exit $!
|
|
|
@ -515,9 +515,18 @@ void TestRunner::print_test_results() const
|
||||||
printf("Time: %-.3fs\n\n", m_end_time - m_start_time);
|
printf("Time: %-.3fs\n\n", m_end_time - m_start_time);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int, char**)
|
||||||
{
|
{
|
||||||
ASSERT(argc == 2);
|
#ifdef __serenity__
|
||||||
TestRunner(argv[1]).run();
|
TestRunner("/home/anon/js-tests").run();
|
||||||
|
#else
|
||||||
|
char* serenity_root = getenv("SERENITY_ROOT");
|
||||||
|
if (!serenity_root) {
|
||||||
|
printf("test-js requires the SERENITY_ROOT environment variable to be set");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
TestRunner(String::format("%s/Libraries/LibJS/Tests", serenity_root)).run();
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue