From cf537311e490ac0e1f9709a26b9cf2bf5aa6377d Mon Sep 17 00:00:00 2001
From: Matthew Olsson <matthewcolsson@gmail.com>
Date: Sat, 4 Jul 2020 11:50:24 -0700
Subject: [PATCH] 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.
---
 .travis.yml                        |  4 ++--
 Libraries/LibJS/Tests/run-tests.sh | 16 ----------------
 Userland/test-js.cpp               | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100755 Libraries/LibJS/Tests/run-tests.sh

diff --git a/.travis.yml b/.travis.yml
index 816b4d9bf8..1cc89b2ec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ script:
 - cmake .. -DBUILD_LAGOM=1
 - make
 - CTEST_OUTPUT_ON_FAILURE=1 make test
-- cd "$SERENITY_ROOT"/Libraries/LibJS/Tests
-- ./run-tests.sh
+- cd Meta/Lagom
+- ./test-js
 - cd "$SERENITY_ROOT"/Toolchain/Cache
 - du -ch * || true
diff --git a/Libraries/LibJS/Tests/run-tests.sh b/Libraries/LibJS/Tests/run-tests.sh
deleted file mode 100755
index b2b8442968..0000000000
--- a/Libraries/LibJS/Tests/run-tests.sh
+++ /dev/null
@@ -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 $!
diff --git a/Userland/test-js.cpp b/Userland/test-js.cpp
index aff348a07c..c9f6c86e2f 100644
--- a/Userland/test-js.cpp
+++ b/Userland/test-js.cpp
@@ -515,9 +515,18 @@ void TestRunner::print_test_results() const
     printf("Time:        %-.3fs\n\n", m_end_time - m_start_time);
 }
 
-int main(int argc, char** argv)
+int main(int, char**)
 {
-    ASSERT(argc == 2);
-    TestRunner(argv[1]).run();
+#ifdef __serenity__
+    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;
 }