Add experimental macOS CI runner failure stuff.

Author: Tom Seddon

Makefile.osx.mak

@@ -50,8 +50,8 @@ github_ci_macos_homebrew_ffmpeg:
 .PHONY:_github_ci_macos_release
 _github_ci_macos_release: export PYTHONUNBUFFERED=1
 _github_ci_macos_release:
-	-$(PYTHON3) "./etc/release/release.py" --verbose $(TARGET_ARGS) --timestamp=$(shell $(PYTHON3) "./etc/release/release2.py" print-timestamp) --gh-release $(shell $(PYTHON3) "./etc/release/release2.py" print-suffix) --ctest-jobs=1 --ctest-output-on-failure
-	./build/_Rel.f.osx/src/beeb/tests/test_beeb -T "standard.*"
+	-$(PYTHON3) "./etc/release/release.py" --verbose $(TARGET_ARGS) --timestamp=$(shell $(PYTHON3) "./etc/release/release2.py" print-timestamp) --gh-release $(shell $(PYTHON3) "./etc/release/release2.py" print-suffix) --ctest-output-on-failure --ctest-timeout 90
+	./build/_Rel.f.osx/src/beeb/tests/test_beeb  --verbose -T "standard.*"
 
 .PHONY:github_ci_macos_x64
 github_ci_macos_x64:

src/beeb/tests/CMakeLists.txt

@@ -44,7 +44,7 @@ b2_target_boilerplate(test_beeb SANITIZERS)
 
 function(add_test_beeb_category category)
   add_test(NAME beeb/test_beeb_${category}
-    COMMAND $<TARGET_FILE:test_beeb> -T "${category}.*")
+    COMMAND $<TARGET_FILE:test_beeb> --verbose -T "${category}.*")
 endfunction()
 
 add_test_beeb_category(standard)

src/beeb/tests/test_beeb.cpp

@@ -1811,6 +1811,7 @@ class VideoNuLATest : public Test {
 //////////////////////////////////////////////////////////////////////////
 
 struct Options {
+    bool verbose = false;
     std::vector<std::string> test_name_strs;
     std::vector<std::regex> test_name_regexes;
     bool list = false;
@@ -1828,6 +1829,7 @@ static Options GetOptions(int argc, char *argv[]) {
 
     std::vector<std::string> test_name_patterns;
 
+    p.AddOption('v', "verbose").SetIfPresent(&options.verbose).Help("be more verbose");
     p.AddOption('t', "test").Meta("TEST").AddArgToList(&options.test_name_strs).Help("run test(s) matching TEST, a case-insensitive string");
     p.AddOption('T', "test-pattern").Meta("TEST").AddArgToList(&test_name_patterns).Help("run test(s) matching TEST, a case-insensitive glob pattern");
     p.AddOption('l', "list").SetIfPresent(&options.list).Help("list all test names");
@@ -1857,12 +1859,19 @@ static Options GetOptions(int argc, char *argv[]) {
             }
         }
 
+        if (options.verbose) {
+            printf("Regex: %s\n", test_name_regex_str.c_str());
+        }
+
+        std::regex re;
         try {
-            options.test_name_regexes.push_back(std::regex(test_name_regex_str, std::regex_constants::icase | std::regex_constants::extended));
+            re = std::regex(std::regex(test_name_regex_str, std::regex_constants::icase | std::regex_constants::extended));
         } catch (const std::regex_error &e) {
             fprintf(stderr, "FATAL: error in regex: %s\nFATAL: %s\n", test_name_regex_str.c_str(), e.what());
             exit(1);
         }
+
+        options.test_name_regexes.push_back(std::move(re));
     }
 
     return options;