Remove deprecated built-in spectests

Author: tolauwae

.github/workflows/test.yml

@@ -1,42 +1,32 @@
-name: WASM Spectests
-on: [push, pull_request]
+name: Tests
+on: [ push, pull_request ]
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true  # Cancel in-flight jobs for the same branch or PR
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true  # Cancel in-flight jobs for the same branch or PR
 
 jobs:
-    test:
-        name: Run official testsuite
-        runs-on: ubuntu-latest
-        if: github.event.pull_request.draft == false
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                submodules: recursive
-
-            - uses: actions/setup-python@v4
-              with:
-                python-version: "3.x"
-
-            - name: Build warduino cli
-              run: cmake . -D BUILD_EMULATOR=ON ; cmake --build .
-
-            - name: Build WABT  # Build latest version
-              run: |
-                git clone --recursive https://github.com/WebAssembly/wabt
-                cd wabt
-                git submodule update --init
-                mkdir build; cd build
-                cmake ..
-                cmake --build .
-
-            - name: Verify wat2wasm
-              run: ./wabt/build/wat2wasm --version
-
-            - name: Install Python dependencies
-              run: pip install -r requirements.txt
-
-            - name: Clone and run tests
-              run: ./tests/integration/run_spec_tests.py --compiler "./wabt/build/wat2wasm" --interpreter "./wdcli" --ignore "./tests/integration/ignore.txt"
+  unit:
+    name: Run VM unit tests
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Create build folder
+        run: mkdir build-unit-tests
+
+      - name: Build unit tests
+        run: cmake .. -D BUILD_UNITTEST=ON ; cmake --build .
+        working-directory: build-unit-tests
+
+      - name: Run unit tests
+        run: ctest -VV
+        working-directory: build-unit-tests
 

.github/workflows/unittest.yml

@@ -52,11 +52,6 @@ if (BUILD_EMULATOR)
             src/Edward/proxy_supervisor.cpp
             src/Edward/RFC.cpp)
 
-    set(TEST_FRAMEWORK
-            tests/integration/wasm_tests.cpp
-            tests/integration/assertion.cpp
-            tests/integration/sexpr-parser/src/sexpr.c)
-
     add_definitions(-DINFO=0)
     add_definitions(-DDEBUG=0)
     add_definitions(-DTRACE=0)
@@ -71,7 +66,7 @@ if (BUILD_EMULATOR)
     endif (CMAKE_COMPILER_IS_GNUCXX)
 
     # WARDuino CLI
-    add_executable(wdcli platforms/CLI-Emulator/main.cpp ${SOURCE_FILES} ${TEST_FRAMEWORK})
+    add_executable(wdcli platforms/CLI-Emulator/main.cpp ${SOURCE_FILES})
     target_link_libraries(wdcli PRIVATE Threads::Threads)
     target_include_directories(wdcli PRIVATE ${EXTERNAL_LIB_HEADERS} "${PROJECT_BINARY_DIR}/include")
 endif (BUILD_EMULATOR)
@@ -119,7 +114,7 @@ if(BUILD_UNITTEST)
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
     FetchContent_MakeAvailable(googletest)
 
-    set(PATH_TO_UNIT_TEST ${PROJECT_SOURCE_DIR}/tests/vm_unit_tests)
+    set(PATH_TO_UNIT_TEST ${PROJECT_SOURCE_DIR}/tests/unit)
 
     file(GLOB TEST_SRC_FILES ${PATH_TO_UNIT_TEST}/*.cpp)
 

CMakeLists.txt

@@ -13,7 +13,6 @@
 
 #include "../../src/Debug/debugger.h"
 #include "../../src/Utils/macros.h"
-#include "../../tests/integration/wasm_tests.h"
 #include "warduino/config.h"
 
 // Constants
@@ -40,15 +39,6 @@ void print_help() {
     fprintf(stdout,
             "    --loop         Let the runtime loop infinitely on exceptions "
             "(default: false)\n");
-    fprintf(stdout,
-            "    --test         Run in test mode with .wast file with module "
-            "as argument\n");
-    fprintf(stdout,
-            "    --asserts      Name of file containing asserts to run against "
-            "loaded module\n");
-    fprintf(stdout,
-            "    --watcompiler  Command to compile Wat files to Wasm "
-            "binaries (default: wat2wasm)\n");
     fprintf(stdout,
             "    --no-debug     Run without debug thread"
             "(default: false)\n");
@@ -264,7 +254,6 @@ int main(int argc, const char *argv[]) {
     ARGV_SHIFT();  // Skip command name
 
     bool return_exception = true;
-    bool run_tests = false;
     bool no_debug = false;
     bool no_socket = false;
     const char *socket = "8192";
@@ -277,9 +266,6 @@ int main(int argc, const char *argv[]) {
     const char *fname = nullptr;
     std::vector<StackValue> arguments = std::vector<StackValue>();
 
-    const char *asserts_file = nullptr;
-    const char *watcompiler = "wat2wasm";
-
     if (argc > 0 && argv[0][0] != '-') {
         ARGV_GET(file_name);
 
@@ -304,13 +290,6 @@ int main(int argc, const char *argv[]) {
             return 0;
         } else if (!strcmp("--loop", arg)) {
             return_exception = false;
-        } else if (!strcmp("--test", arg)) {
-            run_tests = true;
-            ARGV_GET(file_name);
-        } else if (!strcmp("--asserts", arg)) {
-            ARGV_GET(asserts_file);
-        } else if (!strcmp("--watcompiler", arg)) {
-            ARGV_GET(watcompiler);
         } else if (!strcmp("--no-debug", arg)) {
             no_debug = true;
         } else if (!strcmp("--no-socket", arg)) {
@@ -358,11 +337,6 @@ int main(int argc, const char *argv[]) {
         return 1;
     }
 
-    if (run_tests) {
-        dbg_info("=== STARTING SPEC TESTS ===\n");
-        return run_wasm_test(*wac, file_name, asserts_file, watcompiler);
-    }
-
     if (initiallyPaused) {
         wac->program_state = WARDUINOpause;
     }