Fix ClangCL and MinGW builds in CI

eliaskosunen · Jan 7, 2024 · b5bb60f · b5bb60f
1 parent c83764c
commit b5bb60f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -142,6 +142,6 @@ jobs:
           mkdir build
           cd build
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
-            -DSCN_DISABLE_TOP_PROJECT=ON -DSCN_PEDANTIC=ON -DSCN_WERROR=OFF -DSCN_TESTS=ON ..
+            -DSCN_DISABLE_TOP_PROJECT=ON -DSCN_PEDANTIC=ON -DSCN_TESTS=ON -DSCN_EXAMPLES=ON ..
           cmake --build . --parallel -- -k 0
           ctest --output-on-failure
diff --git a/include/scn/detail/args.h b/include/scn/detail/args.h
@@ -197,7 +197,6 @@ namespace scn {
                 SCN_EXPECT(arg && pctx && ctx);
 
                 using context_type = Context;
-                using char_type = typename context_type::char_type;
                 using parse_context_type =
                     typename context_type::parse_context_type;
                 using scanner_type =
@@ -210,6 +209,7 @@ namespace scn {
                 auto& ctx_ref = *static_cast<context_type*>(ctx);
 
                 SCN_TRY_ERR(_, s.parse(pctx_ref));
+                SCN_UNUSED(_);
                 SCN_TRY_ERR(it, s.scan(arg_ref, ctx_ref));
                 ctx_ref.advance_to(SCN_MOVE(it));
 

diff --git a/include/scn/detail/scanner_range.h b/include/scn/detail/scanner_range.h
@@ -360,6 +360,7 @@ namespace scn {
             SCN_TRY(it, detail::scan_str(ctx.range(), this->m_opening_bracket));
             ctx.advance_to(it);
             SCN_TRY(_, scan_for_each(value, ctx));
+            SCN_UNUSED(_);
             return detail::scan_str(ctx.range(), this->m_closing_bracket);
         }
 

diff --git a/src/scn/impl/reader/regex_reader.h b/src/scn/impl/reader/regex_reader.h
@@ -96,7 +96,7 @@ namespace scn {
             return result;
         }
 #elif SCN_REGEX_BACKEND == SCN_REGEX_BACKEND_RE2
-        auto make_regex_flags(detail::regex_flags flags)
+        inline auto make_regex_flags(detail::regex_flags flags)
             -> std::pair<RE2::Options, std::string_view>
         {
             RE2::Options opt{RE2::Quiet};
@@ -235,7 +235,9 @@ namespace scn {
                     "Failed to parse regular expression");
             }
 
-            auto new_input = input;
+            auto new_input = detail::make_string_view_from_pointers(
+                detail::to_address(input.begin()),
+                detail::to_address(input.end()));
             bool found = re2::RE2::Consume(&new_input, re);
             if (!found) {
                 return unexpected_scan_error(scan_error::invalid_scanned_value,
@@ -419,7 +421,9 @@ namespace scn {
                               [](auto& val) { return re2::RE2::Arg{&val}; });
             ranges::transform(match_args, match_argptrs.begin(),
                               [](auto& arg) { return &arg; });
-            auto new_input = input;
+            auto new_input = detail::make_string_view_from_pointers(
+                detail::to_address(input.begin()),
+                detail::to_address(input.end()));
             bool found = re2::RE2::ConsumeN(
                 &new_input, re, match_argptrs.data(), match_argptrs.size());
             if (!found) {

diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
@@ -107,7 +107,11 @@ add_custom_target(scn_examples_test_prepare ALL
 find_package(Python3 COMPONENTS Interpreter)
 if (Python3_FOUND)
     add_test(NAME scn_stdin_test COMMAND ${Python3_EXECUTABLE} "${CMAKE_BINARY_DIR}/tests/unittests/stdin_test_runner.py")
-    add_test(NAME scn_examples_test COMMAND ${Python3_EXECUTABLE} "${CMAKE_BINARY_DIR}/examples_test_runner.py")
+    if (SCN_EXAMPLES)
+        add_test(NAME scn_examples_test COMMAND ${Python3_EXECUTABLE} "${CMAKE_BINARY_DIR}/examples_test_runner.py")
+    else()
+        message(STATUS "scn_examples_test disabled, because SCN_EXAMPLES is OFF")
+    endif()
 else ()
     message(WARNING "python3 not found, scn_stdin_test and scn_examples_test not added to CTest")
 endif ()
diff --git a/tests/unittests/examples_test_runner.py b/tests/unittests/examples_test_runner.py
@@ -11,7 +11,7 @@ def find_file(pattern, path):
         for name in files:
             if fnmatch.fnmatch(name, pattern):
                 return os.path.join(root, name)
-    return None
+    raise RuntimeError(f"Couldn't find pattern '{pattern}' in {path}")
 
 
 script_dir = os.path.abspath(os.path.dirname(__file__))