update doctest and run CTest in parallel

odygrd · Jun 4, 2023 · 525b0e0 · 525b0e0
1 parent 85ce7ca
commit 525b0e0
Show file tree

Hide file tree

Showing 7 changed files with 302 additions and 217 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -61,14 +61,6 @@ jobs:
             ctest_options: -T memcheck
             install: sudo apt install valgrind
 
-            # Build and with QUILL_X86ARCH
-          - cxx: g++-12
-            build_type: Release
-            std: 23
-            os: ubuntu-22.04
-            with_tests: ON
-            cmake_options: -DCMAKE_CXX_FLAGS:STRING="-DQUILL_X86ARCH -march=native"
-
             # Build and test sanitizers
           - cxx: clang++-12
             build_type: Release
@@ -112,6 +104,8 @@ jobs:
 
       - name: Test
         working-directory: ${{runner.workspace}}/build
-        run: ctest --build-config ${{matrix.build_type}} ${{matrix.ctest_options}} --output-on-failure
+        run: |
+          threads=`nproc`
+          ctest --build-config ${{matrix.build_type}} ${{matrix.ctest_options}} --parallel $threads --output-on-failure
         env:
           CTEST_OUTPUT_ON_FAILURE: True
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -45,4 +45,6 @@ jobs:
 
     - name: Test
       working-directory: ${{runner.workspace}}/build
-      run: ctest --build-config ${{matrix.build_type}} --output-on-failure
+      run: |
+        threads=`sysctl -n hw.logicalcpu`
+        ctest --build-config ${{matrix.build_type}} --parallel $threads --output-on-failure
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -73,4 +73,6 @@ jobs:
 
       - name: Test
         working-directory: ${{runner.workspace}}/build
-        run: ctest --build-config ${{matrix.build_type}} --output-on-failure
+        run: |
+          $threads = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
+          ctest --build-config ${{matrix.build_type}} --parallel $threads --output-on-failure
diff --git a/quill/test/BoundedQueueTest.cpp b/quill/test/BoundedQueueTest.cpp
@@ -82,7 +82,7 @@ TEST_CASE("bounded_queue_integer_overflow")
 }
 #endif
 
-TEST_CASE("read_write_multithreaded_plain_ints")
+TEST_CASE("bounded_queue_read_write_multithreaded_plain_ints")
 {
   BoundedQueue buffer{131'072};
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ TEST_CASE("bounded_queue_integer_overflow") @@
     }
     #endif
-    TEST_CASE("read_write_multithreaded_plain_ints")
+    TEST_CASE("bounded_queue_read_write_multithreaded_plain_ints")
     {
       BoundedQueue buffer{131'072};
@@ Expand Down @@