diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2023-02-22 17:31:35 -0700 |
|---|---|---|
| committer | Andrew Kaster <andrewdkaster@gmail.com> | 2023-02-24 00:02:25 -0700 |
| commit | 1b24fa582983d1ec8208bd731fa9ff6c9c027fb8 (patch) | |
| tree | 14c57f52eca35e3fb20d22b39cc619f297a04231 | |
| parent | 0fb6f87d49466330423ce3b8f2f7c30c2c41b46e (diff) | |
| download | serenity-1b24fa582983d1ec8208bd731fa9ff6c9c027fb8.zip | |
CI+Lagom: Use the same options for running test-wasm in ctest and CI
Make sure that we set SERENITY_SOURCE_DIR in ctest, and make sure to
pass the test root to the CI job.
More overhaul of test-js 'test root' finding is needed however.
| -rw-r--r-- | .github/workflows/libjs-test262.yml | 2 | ||||
| -rw-r--r-- | Meta/Lagom/CMakeLists.txt | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index e64b48badb..a470fe99f4 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -128,7 +128,7 @@ jobs: - name: Run test-wasm working-directory: libjs-test262/Build run: | - _deps/lagom-build/test-wasm --per-file > ../../libjs-website/wasm/data/per-file-master.json || true + _deps/lagom-build/test-wasm --per-file _deps/lagom-build/Userland/Libraries/LibWasm/Tests > ../../libjs-website/wasm/data/per-file-master.json || true jq -nc -f /dev/stdin <<-EOF --slurpfile previous ../../libjs-website/wasm/data/results.json --slurpfile details ../../libjs-website/wasm/data/per-file-master.json > wasm-new-results.json \$details[0] as \$details | \$previous[0] + [{ "commit_timestamp": $(git -C ../.. log -1 --format=%ct), diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index aaf8946d1b..09410c96c9 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -640,12 +640,14 @@ if (BUILD_LAGOM) ../../Tests/LibWasm/test-wasm.cpp ../../Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp) target_link_libraries(test-wasm LibCore LibTest LibWasm LibJS) - # FIXME: Don't require passing test-common.js path if you only want to pass a custom Test root path add_test( NAME WasmParser - COMMAND test-wasm --show-progress=false ${CMAKE_CURRENT_BINARY_DIR}/Userland/Libraries/LibWasm/Tests ${SERENITY_PROJECT_ROOT}/Userland/Libraries/LibJS/Tests/test-common.js + COMMAND test-wasm --show-progress=false ${CMAKE_CURRENT_BINARY_DIR}/Userland/Libraries/LibWasm/Tests + ) + set_tests_properties(WasmParser PROPERTIES + SKIP_RETURN_CODE 1 + ENVIRONMENT SERENITY_SOURCE_DIR=${SERENITY_PROJECT_ROOT} ) - set_tests_properties(WasmParser PROPERTIES SKIP_RETURN_CODE 1) # Tests that are not LibTest based # Shell |