Build and test in more configurations (jeremy-rifkin#57)

flagarde · Jul 27, 2023 · 2776b5e · 2776b5e
1 parent 0a6d1f2
commit 2776b5e
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,13 +28,31 @@ jobs:
             -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h \
             -DASSERT_BUILD_BASIC_TEST=On
            make -j
+  build-macos:
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [g++-13, clang++]
+        target: [Debug, Release]
+    steps:
+    - uses: actions/checkout@v2
+    - name: build
+      run: |
+           mkdir -p build
+           cd build
+           cmake .. \
+            -DCMAKE_BUILD_TYPE=${{matrix.target}} \
+            -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
+            -DASSERT_BUILD_BASIC_TEST=On
+           make -j
   build-windows:
     runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
         compiler: [cl, clang++]
-        target: [Debug]
+        target: [Debug, Release]
     steps:
     - uses: actions/checkout@v2
     - name: Enable Developer Command Prompt
@@ -48,3 +66,24 @@ jobs:
             -DCMAKE_CXX_COMPILER=${{matrix.compiler}} `
             -DASSERT_BUILD_BASIC_TEST=On
            msbuild .\libassert.sln
+  build-mingw:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [g++]
+        target: [Debug, Release]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Enable Developer Command Prompt
+      uses: ilammy/[email protected]
+    - name: build
+      run: |
+           mkdir -p build
+           cd build
+           cmake .. `
+            -DCMAKE_BUILD_TYPE=${{matrix.target}} `
+            -DCMAKE_CXX_COMPILER=${{matrix.compiler}} `
+            -DASSERT_BUILD_BASIC_TEST=On `
+            "-GUnix Makefiles"
+           make -j
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -30,7 +30,36 @@ jobs:
             -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
             -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h \
             -DASSERT_BUILD_TESTS=On
-           make -j VERBOSE=1
+           make -j
+    - name: test
+      working-directory: build
+      run: |
+           CTEST_OUTPUT_ON_FAILURE=1 make test
+  test-macos:
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [g++-13, clang++]
+        target: [Debug]
+        exclude:
+          - compiler: clang++ # Disabled due to #15 TODO TODO TODO
+            target: Debug
+    steps:
+    - uses: actions/checkout@v2
+    - name: dependencies
+      run: |
+           python3 -m pip install git+https://github.com/jeffkaufman/icdiff.git
+    - name: build
+      run: |
+           mkdir -p build
+           cd build
+           cmake .. \
+            -DCMAKE_BUILD_TYPE=${{matrix.target}} \
+            -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
+            -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h \
+            -DASSERT_BUILD_TESTS=On
+           make -j
     - name: test
       working-directory: build
       run: |
@@ -59,3 +88,29 @@ jobs:
       working-directory: build
       run: |
            ctest -C ${{matrix.target}} --output-on-failure
+  test-mingw:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [g++]
+        target: [Debug]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Enable Developer Command Prompt
+      uses: ilammy/[email protected]
+    - name: build
+      run: |
+           mkdir -p build
+           cd build
+           cmake .. `
+            -DCMAKE_BUILD_TYPE=${{matrix.target}} `
+            -DCMAKE_CXX_COMPILER=${{matrix.compiler}} `
+            -DASSERT_BUILD_TESTS=On `
+            "-GUnix Makefiles"
+           make -j
+    - name: test
+      working-directory: build
+      run: |
+           $env:CTEST_OUTPUT_ON_FAILURE=1
+           make test
diff --git a/include/assert.hpp b/include/assert.hpp
@@ -1252,12 +1252,15 @@ using libassert::ASSERTION;
 #define LIBASSERT_STATIC_DATA(name, type, expr_str, ...) \
                                 /* extra string here because of extra comma from map, also serves as terminator */ \
                                 /* LIBASSERT_STRINGIFY LIBASSERT_VA_ARGS because msvc */ \
+                                /* Trailing return type here to work around a gcc <= 9.2 bug */ \
+                                /* Oddly only affecting builds under -DNDEBUG https://godbolt.org/z/5Treozc4q */ \
+                                using libassert_params_t = libassert::detail::assert_static_parameters; \
                                 /* NOLINTNEXTLINE(*-avoid-c-arrays) */ \
-                                const libassert::detail::assert_static_parameters* libassert_params = []() { \
+                                const libassert_params_t* libassert_params = []() -> const libassert_params_t* { \
                                   static constexpr const char* const libassert_arg_strings[] = { \
                                     LIBASSERT_MAP(LIBASSERT_STRINGIFY LIBASSERT_VA_ARGS(__VA_ARGS__)) "" \
                                   }; \
-                                  static constexpr libassert::detail::assert_static_parameters _libassert_params = { \
+                                  static constexpr libassert_params_t _libassert_params = { \
                                     name LIBASSERT_COMMA \
                                     type LIBASSERT_COMMA \
                                     expr_str LIBASSERT_COMMA \

diff --git a/tests/demo/demo.cpp b/tests/demo/demo.cpp
@@ -1,7 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS // for fopen
 
-#include "assert.hpp"
-
 #include <array>
 #include <algorithm>
 #include <fstream>
@@ -13,6 +11,8 @@
 #include <string_view>
 #include <string>
 
+#include "assert.hpp"
+
 #define ESC "\033["
 #define RED ESC "1;31m"
 #define GREEN ESC "1;32m"

diff --git a/tests/integration/integration.cpp b/tests/integration/integration.cpp
@@ -1,5 +1,3 @@
-#include "assert.hpp"
-
 #include <algorithm>
 #include <array>
 #include <fstream>
@@ -11,6 +9,8 @@
 #include <string_view>
 #include <string>
 
+#include "assert.hpp"
+
 using namespace std::literals;
 
 void test_path_differentiation();

diff --git a/tests/pyutils/utils.py b/tests/pyutils/utils.py
@@ -378,4 +378,5 @@ def test_critical_difference(): # self test cases
 """.strip()
     assert(critical_difference(a, b, max_line_diff))
 
-test_critical_difference()
+if __name__ == "main":
+    test_critical_difference()
diff --git a/tests/unit/disambiguation.cpp b/tests/unit/disambiguation.cpp
@@ -1,10 +1,10 @@
-#include "assert.hpp"
-
 #include <iostream>
 #include <string_view>
 #include <string>
 #include <tuple>
 
+#include "assert.hpp"
+
 #define ESC "\033["
 #define RED ESC "1;31m"
 #define GREEN ESC "1;32m"

diff --git a/tests/unit/test_public_utilities.cpp b/tests/unit/test_public_utilities.cpp
@@ -1,9 +1,9 @@
-#include "assert.hpp"
-
 #include <map>
 #include <string>
 #include <utility>
 
+#include "assert.hpp"
+
 using namespace libassert::utility;
 
 int main() {

diff --git a/tests/unit/test_type_prettier.cpp b/tests/unit/test_type_prettier.cpp
@@ -1,7 +1,7 @@
-#include "assert.hpp"
-
 #include <iostream>
 
+#include "assert.hpp"
+
 int main() {
     bool success = true;
     auto test = [&success](const std::string& type, const std::string& expected) {

diff --git a/tests/unit/tokens_and_highlighting.cpp b/tests/unit/tokens_and_highlighting.cpp
@@ -1,8 +1,8 @@
-#include "assert.hpp"
-
 #include <fstream>
 #include <iostream>
 
+#include "assert.hpp"
+
 namespace libassert::detail {
     [[nodiscard]] std::string highlight(const std::string& expression);
 }