Add support for --cc in tests

Add an opt-in --cc={compiler} which is threaded throughout
all compiler invocations.

Author: Noir01

gibbon-compiler/tests/TestRunner.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE LambdaCase #-}
 module TestRunner where
 
+import           Control.Applicative ((<|>), optional)
 import           Control.Monad
 import           Data.Maybe ( catMaybes )
 import           Data.Foldable
@@ -212,6 +213,9 @@ modeExeFlags Interp1 = error "Cannot compile in Interp1 mode."
 modeExeFlags Gibbon1 = ["--to-exe", "--packed", "--gibbon1"]
 modeExeFlags MPL = ["--mpl-exe"]
 
+ccFlags :: TestConfig -> [String]
+ccFlags tc = maybe [] (\cc -> ["--cc=" ++ cc]) (ccOverride tc)
+
 modeFileSuffix :: Mode -> String
 modeFileSuffix Colobus1 =  "_colobus1"
 modeFileSuffix Colobus2 =  "_colobus2"
@@ -347,6 +351,7 @@ data TestConfig = TestConfig
                               --   It's a global parameter i.e it affects ALL tests.
                               --   However, if a corresponding parameter is specified
                               --   for a particular test, that has higher precedence.
+    , ccOverride  :: Maybe String -- ^ If set, pass --cc=<value> to all gibbon invocations.
     , checkPerf   :: Bool     -- ^ Should we also run the performance tests ?
     , onlyPerf    :: Bool     -- ^ If true, only run the benchmarks.
     , recordBenchmarks :: Bool -- ^ If true, record the results of running fresh benchmarks. Used via BenchRunner.
@@ -361,6 +366,7 @@ defaultTestConfig = TestConfig
     , testSummaryFile = "gibbon-test-summary.txt"
     , tempdir     = "examples/build_tmp"
     , gRunModes   = []
+    , ccOverride  = Nothing
     , checkPerf   = False
     , onlyPerf    = False
     , recordBenchmarks = False
@@ -374,6 +380,7 @@ instance FromJSON TestConfig where
                                  o .:? "test-summary-file" .!= (testSummaryFile defaultTestConfig) <*>
                                  o .:? "tempdir"      .!= (tempdir defaultTestConfig)     <*>
                                  o .:? "run-modes"    .!= (gRunModes defaultTestConfig)   <*>
+                                 o .:? "cc"           .!= (ccOverride defaultTestConfig)  <*>
                                  o .:? "check-perf"   .!= (checkPerf defaultTestConfig)   <*>
                                  o .:? "only-perf"    .!= (onlyPerf defaultTestConfig)    <*>
                                  o .:? "run-benchmarks"   .!= (recordBenchmarks defaultTestConfig) <*>
@@ -402,6 +409,9 @@ configParser dtc = TestConfig
                    <*> option readM_modes (long "run-modes" <>
                                            help "Only run the tests in these modes" <>
                                            value (gRunModes dtc))
+                   <*> fmap (\mb -> mb <|> ccOverride dtc)
+                             (optional (strOption (long "cc" <>
+                                                   help "C compiler to use for all tests")))
                    <*> switch (long "check-perf" <>
                                help "Run performance tests." <>
                                showDefault)
@@ -529,7 +539,7 @@ runTest tc Test{name,dir,expectedResults,runModes,mb_anspath,test_flags} = do
             exepath  = replaceExtension basename ".exe"
             cmd = "gibbon"
             -- The order of (++) is important. The PATH to the test file must always be at the end.
-            cmd_flags = modeRunFlags mode ++ test_flags ++
+            cmd_flags = modeRunFlags mode ++ ccFlags tc ++ test_flags ++
                         [ "--cfile=" ++ cpath ,
                           "--exefile=" ++ exepath ,
                           compiler_dir </> dir </> name ]
@@ -602,7 +612,7 @@ doNTrials tc mode t@Test{name,dir,numTrials,sizeParam,moreIters,isMegaBench,benc
 
 
         -- The order of (++) is important. The PATH to the test file must always be at the end.
-        cmd_flags = modeExeFlags mode ++ test_flags ++
+        cmd_flags = modeExeFlags mode ++ ccFlags tc ++ test_flags ++
                       [ "--cfile=" ++ cpath ,
                         "--exefile=" ++ exepath ,
                         compiler_dir </> dir </> name ]