diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 5c36929d838..4f661acdc37 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -440,6 +440,7 @@ if (BUILD_TESTING) LibDiff LibDNS LibGC + LibJS LibRegex LibTest LibTextCodec @@ -467,22 +468,6 @@ if (BUILD_TESTING) add_serenity_subdirectory("Tests/${dir}") endforeach() - # JavaScriptTestRunner + LibTest tests - # test-js - add_executable(test-js - ../../Tests/LibJS/test-js.cpp - ../../Libraries/LibTest/JavaScriptTestRunnerMain.cpp) - target_link_libraries(test-js AK LibCore LibFileSystem LibTest LibJS LibGC) - add_test( - NAME JS - COMMAND test-js --show-progress=false - ) - set_tests_properties(JS PROPERTIES ENVIRONMENT LADYBIRD_SOURCE_DIR=${SERENITY_PROJECT_ROOT}) - - # Extra tests from Tests/LibJS - lagom_test(../../Tests/LibJS/test-invalid-unicode-js.cpp LIBS LibJS) - lagom_test(../../Tests/LibJS/test-value-js.cpp LIBS LibJS) - # test-wasm add_executable(test-wasm ../../Tests/LibWasm/test-wasm.cpp diff --git a/Tests/LibJS/CMakeLists.txt b/Tests/LibJS/CMakeLists.txt index 82e93e6ee24..70e6ddab944 100644 --- a/Tests/LibJS/CMakeLists.txt +++ b/Tests/LibJS/CMakeLists.txt @@ -1,13 +1,5 @@ -serenity_testjs_test(test-js.cpp test-js LIBS LibUnicode) +serenity_testjs_test(test-js.cpp test-js LIBS LibGC) +set_tests_properties(test-js PROPERTIES ENVIRONMENT LADYBIRD_SOURCE_DIR=${SERENITY_PROJECT_ROOT}) serenity_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS LibUnicode) - serenity_test(test-value-js.cpp LibJS LIBS LibJS LibUnicode) - -add_executable(test262-runner test262-runner.cpp) -target_link_libraries(test262-runner PRIVATE LibJS LibCore LibUnicode) -serenity_set_implicit_links(test262-runner) - -add_executable(test-test262 test-test262.cpp) -target_link_libraries(test-test262 PRIVATE LibMain LibCore LibFileSystem) -serenity_set_implicit_links(test-test262)