From 1aa605bc038f35c1cedcc8fbc5d9cb457522c629 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrewdkaster@gmail.com>
Date: Sun, 28 Feb 2021 15:06:42 -0700
Subject: [PATCH] Meta: Run test-js and test-compress as CTest executables

Reduces the number of steps in the Actions workflow this way :^)
---
 .github/workflows/cmake.yml | 10 +---------
 Meta/Lagom/CMakeLists.txt   | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index fdf04ee579..6ea81ee69f 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -177,15 +177,7 @@ jobs:
     - name: Run CMake tests
       working-directory: ${{ github.workspace }}/Meta/Lagom/Build
       run: CTEST_OUTPUT_ON_FAILURE=1 ninja test || ${{ matrix.allow-test-failure }}
-      timeout-minutes: 2
-      if: ${{ matrix.with-fuzzers == 'NO_FUZZ' }}
-    - name: Run JS tests
-      working-directory: ${{ github.workspace }}/Meta/Lagom/Build
-      if: ${{ matrix.with-fuzzers == 'NO_FUZZ' }}
-      run: DISABLE_DBG_OUTPUT=1 ./test-js || ${{ matrix.allow-test-failure }}
-    - name: Run LibCompress tests
-      working-directory: ${{ github.workspace }}/Meta/Lagom/Build
-      run: ./test-compress
+      timeout-minutes: 4
       if: ${{ matrix.with-fuzzers == 'NO_FUZZ' }}
 
   notify_irc:
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index cd1f2e892e..d1329fc61d 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -121,6 +121,11 @@ if (BUILD_LAGOM)
         target_link_libraries(test-js_lagom Lagom)
         target_link_libraries(test-js_lagom stdc++)
         target_link_libraries(test-js_lagom pthread)
+        add_test(
+            NAME JS
+            COMMAND test-js_lagom --show-progress=false
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
 
         add_executable(test-crypto_lagom ../../Userland/Utilities/test-crypto.cpp)
         set_target_properties(test-crypto_lagom PROPERTIES OUTPUT_NAME test-crypto)
@@ -136,6 +141,11 @@ if (BUILD_LAGOM)
         set_target_properties(test-compress_lagom PROPERTIES OUTPUT_NAME test-compress)
         target_link_libraries(test-compress_lagom Lagom)
         target_link_libraries(test-compress_lagom stdc++)
+        add_test(
+            NAME Compress
+            COMMAND test-compress_lagom
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
 
         add_executable(disasm_lagom ../../Userland/Utilities/disasm.cpp)
         set_target_properties(disasm_lagom PROPERTIES OUTPUT_NAME disasm)