Use a matrix for nightly valgrind (Take 2)

.github/workflows/nightly.yml

@@ -173,7 +173,7 @@ jobs:
           cache-key: linux-x86_64-valgrind-full-${{ env.CACHE_KEY_HASH }}
 
       - name: Valgrind Checks
-        run: python3 ./src/scripts/ci_build.py --make-tool=ninja --cc=${{ matrix.compiler }} --extra-cxxflags="${{ matrix.cxxflags }}" valgrind-full
+        run: python3 ./src/scripts/ci_build.py --make-tool=make --cc=${{ matrix.compiler }} --custom-optimization-flags="${{ matrix.cxxflags }}" valgrind-full
 
   hybrid_tls_interop:
     name: "PQ/T TLS 1.3"

src/scripts/ci_build.py

@@ -128,7 +128,7 @@ def build_targets(target, target_os):
 
 def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache,
                     root_dir, build_dir, test_results_dir, pkcs11_lib, use_gdb,
-                    disable_werror, extra_cxxflags, disabled_tests):
+                    disable_werror, extra_cxxflags, custom_optimization_flags, disabled_tests):
 
     """
     Return the configure.py flags as well as make/test running prefixes
@@ -198,6 +198,11 @@ def sanitize_kv(some_string):
     if target_cpu is not None:
         flags += ['--cpu=%s' % (target_cpu)]
 
+    if custom_optimization_flags:
+        flags += ['--no-optimizations']
+        for flag in custom_optimization_flags:
+            flags += ['--extra-cxxflags=%s' % (flag)]
+
     for flag in extra_cxxflags:
         flags += ['--extra-cxxflags=%s' % (flag)]
 
@@ -607,6 +612,8 @@ def parse_args(args):
 
     parser.add_option('--extra-cxxflags', metavar='FLAGS', default=[], action='append',
                       help='Specify extra build flags')
+    parser.add_option('--custom-optimization-flags', metavar='FLAGS', default=[], action='append',
+                      help='Specify custom optimization flags (disables all default optimizations)')
 
     parser.add_option('--disabled-tests', metavar='DISABLED_TESTS', default=[], action='append',
                       help='Comma separated list of tests that should not be run')
@@ -778,7 +785,7 @@ def main(args=None):
             target, options.os, options.cpu, options.cc, options.cc_bin,
             options.compiler_cache, root_dir, build_dir, options.test_results_dir,
             options.pkcs11_lib, options.use_gdb, options.disable_werror,
-            options.extra_cxxflags, options.disabled_tests)
+            options.extra_cxxflags, options.custom_optimization_flags, options.disabled_tests)
 
         make_tool, make_opts = validate_make_tool(options.make_tool, options.build_jobs)