From 59f700e1cd6a10b9d3750d6545e5ab41c35e4ae3 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Fri, 18 Apr 2025 17:28:42 +0200 Subject: [PATCH] Revert "Fix node tests" This reverts commit ff050ed74ce1863fe0944a125beaa46443eeb42d. --- src/analyzer/CMakeLists.txt | 8 +------- src/analyzer/test.py | 9 --------- src/windows-emulator-test/CMakeLists.txt | 8 +------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/analyzer/CMakeLists.txt b/src/analyzer/CMakeLists.txt index 7e40d529..0cfffb61 100644 --- a/src/analyzer/CMakeLists.txt +++ b/src/analyzer/CMakeLists.txt @@ -32,12 +32,6 @@ set(ENV_PREFIX "%") set(ENV_SUFFIX "%") endif() -set(ANYLZER_TEST_ENVIRONMENT "default") - -if(CMAKE_SYSTEM_NAME MATCHES "Emscripten") - set(ANYLZER_TEST_ENVIRONMENT "node") -endif() - add_test(NAME analyzer-test - COMMAND "${PYTHON3_EXE}" "${CMAKE_CURRENT_LIST_DIR}/test.py" "${ANYLZER_TEST_ENVIRONMENT}" + COMMAND "${PYTHON3_EXE}" "${CMAKE_CURRENT_LIST_DIR}/test.py" WORKING_DIRECTORY "$") diff --git a/src/analyzer/test.py b/src/analyzer/test.py index 671c54e0..fd907dc4 100644 --- a/src/analyzer/test.py +++ b/src/analyzer/test.py @@ -1,5 +1,4 @@ import os -import sys import subprocess emulator_root = os.getenv('EMULATOR_ROOT') @@ -8,12 +7,7 @@ virtual_sample = 'C:/analysis-sample.exe' application = 'analyzer' -is_node = len(sys.argv) > 1 and sys.argv == "node" - def make_app(app): - if is_node: - return app + ".js" - if os.name == 'nt': return app + ".exe" @@ -27,9 +21,6 @@ command = [ virtual_sample ] -if is_node: - command = ["node"] + command - result = subprocess.run(command, cwd=os.getcwd()) exit(result.returncode) diff --git a/src/windows-emulator-test/CMakeLists.txt b/src/windows-emulator-test/CMakeLists.txt index 91ed881d..8bea4b26 100644 --- a/src/windows-emulator-test/CMakeLists.txt +++ b/src/windows-emulator-test/CMakeLists.txt @@ -20,14 +20,8 @@ if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) add_dependencies(windows-emulator-test test-sample) endif() -set(TEST_COMMAND "./windows-emulator-test") - -if(CMAKE_SYSTEM_NAME MATCHES "Emscripten") - set(TEST_COMMAND node "./windows-emulator-test.js") -endif() - add_test(NAME windows-emulator-test - COMMAND "${PYTHON3_EXE}" "${PROJECT_SOURCE_DIR}/deps/gtest-parallel/gtest_parallel.py" ${TEST_COMMAND} + COMMAND "${PYTHON3_EXE}" "${PROJECT_SOURCE_DIR}/deps/gtest-parallel/gtest_parallel.py" ./windows-emulator-test WORKING_DIRECTORY "$") momo_targets_set_folder("tests" windows-emulator-test)