support passing extra args to the test suite’s C compiler interface

diff --git a/rtest/gvtest.py b/rtest/gvtest.py
index 391aca17c97b3030aff522d89dc36e6eb87d2608..fd41c38a24fbad90747949ecf2ff30e3c6565702 100644 (file)
--- a/rtest/gvtest.py
+++ b/rtest/gvtest.py
@@ -7,8 +7,8 @@ import subprocess
 import tempfile
 from typing import List, Optional, Tuple
 
-def compile_c(src: Path, link: List[str] = [], dst: Optional[Path] = None) \
-  -> Path:
+def compile_c(src: Path, cflags: List[str] = [], link: List[str] = [],
+              dst: Optional[Path] = None) -> Path:
     '''
     compile a C program
     '''
@@ -22,14 +22,14 @@ def compile_c(src: Path, link: List[str] = [], dst: Optional[Path] = None) \
         rtflag = '-MDd' if os.environ.get('configuration') == 'Debug' else '-MD'
 
         # construct an invocation of MSVC
-        args = ['cl', src, '-Fe:', dst, '-nologo', rtflag]
+        args = ['cl', src, '-Fe:', dst, '-nologo', rtflag] + cflags
         if len(link) > 0:
             args += ['-link'] + [f'{l}.lib' for l in link]
 
     else:
         # construct an invocation of the default C compiler
         cc = os.environ.get('CC', 'cc')
-        args = [cc, '-std=c99', src, '-o', dst]
+        args = [cc, '-std=c99', src, '-o', dst] + cflags
         if len(link) > 0:
             args += [f'-l{l}' for l in link]
 
@@ -42,8 +42,8 @@ def compile_c(src: Path, link: List[str] = [], dst: Optional[Path] = None) \
 
     return dst
 
-def run_c(src: Path, args: [str] = [], input: str = '', link: List[str] = []) \
-  -> Tuple[int, str, str]:
+def run_c(src: Path, args: [str] = [], input: str = '', cflags: List[str] = [],
+          link: List[str] = []) -> Tuple[int, str, str]:
     '''
     compile and run a C program
     '''
@@ -55,7 +55,7 @@ def run_c(src: Path, args: [str] = [], input: str = '', link: List[str] = []) \
         exe = Path(tmp) / 'a.exe'
 
         # compile the program
-        compile_c(src, link, exe)
+        compile_c(src, cflags, link, exe)
 
         # run it
         p = subprocess.run([exe] + args, input=input, stdout=subprocess.PIPE,

diff --git a/rtest/test_examples.py b/rtest/test_examples.py
index 5aaa2cf73ebe0f433d70530c92492a49f9395ee6..642f5084e6d82139ddd7173b7bc2629a0c1ec867 100644 (file)
--- a/rtest/test_examples.py
+++ b/rtest/test_examples.py
@@ -35,7 +35,7 @@ def test_compile_example(src):
     # run the example
     args = ['-Kneato'] if src in ['demo.c', 'dot.c'] else [];
 
-    ret, _, _ = run_c(filepath, args, 'graph {a -- b}', libs)
+    ret, out, err = run_c(filepath, args, 'graph {a -- b}', link=libs)
 
     print(f'returncode: {ret} = 0x{ret:08x}')
     if ret != 0: