Merge pull request #220 from everythingfunctional/compiler_and_flags

Compiler and flags

1 files changed, 45 insertions, 29 deletions

diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs
index 4e660e7..dfa73df 100644
--- a/bootstrap/test/Spec.hs
+++ b/bootstrap/test/Spec.hs
@@ -1,6 +1,5 @@
 import           Development.Shake.FilePath     ( (</>) )
 import           Fpm                            ( Arguments(..)
-                                                , Command(..)
                                                 , start
                                                 )
 import           System.Directory               ( withCurrentDirectory )
@@ -19,49 +18,66 @@ main = do
 
 testHelloWorld :: IO ()
 testHelloWorld =
-  withCurrentDirectory (example_path </> "hello_world") $ start $ Arguments
-    (Run "")
-    False
-    ""
+  withCurrentDirectory (example_path </> "hello_world") $ start $ Run
+    { runRelease = False
+    , runCompiler = "gfortran"
+    , runFlags = []
+    , runTarget  = Nothing
+    , runArgs    = Nothing
+    }
 
 testHelloComplex :: IO ()
 testHelloComplex =
-  withCurrentDirectory (example_path </> "hello_complex") $ start $ Arguments
-    (Test "")
-    False
-    ""
+  withCurrentDirectory (example_path </> "hello_complex") $ start $ Test
+    { testRelease = False
+    , testCompiler = "gfortran"
+    , testFlags = []
+    , testTarget  = Nothing
+    , testArgs    = Nothing
+    }
 
 testHelloFpm :: IO ()
 testHelloFpm =
-  withCurrentDirectory (example_path </> "hello_fpm") $ start $ Arguments
-    (Run "")
-    False
-    ""
+  withCurrentDirectory (example_path </> "hello_fpm") $ start $ Run
+    { runRelease = False
+    , runCompiler = "gfortran"
+    , runFlags = []
+    , runTarget  = Nothing
+    , runArgs    = Nothing
+    }
 
 testCircular :: IO ()
 testCircular =
-  withCurrentDirectory (example_path </> "circular_example") $ start $ Arguments
-    (Test "")
-    False
-    ""
+  withCurrentDirectory (example_path </> "circular_example") $ start $ Test
+    { testRelease = False
+    , testCompiler = "gfortran"
+    , testFlags = []
+    , testTarget  = Nothing
+    , testArgs    = Nothing
+    }
 
 testWithMakefile :: IO ()
 testWithMakefile =
-  withCurrentDirectory (example_path </> "with_makefile") $ start $ Arguments
-    (Build)
-    False
-    ""
+  withCurrentDirectory (example_path </> "with_makefile") $ start $ Build
+    { buildRelease = False
+    , buildCompiler = "gfortran"
+    , buildFlags = []
+    }
 
 testMakefileComplex :: IO ()
 testMakefileComplex =
-  withCurrentDirectory (example_path </> "makefile_complex") $ start $ Arguments
-    (Run "")
-    False
-    ""
+  withCurrentDirectory (example_path </> "makefile_complex") $ start $ Run
+    { runRelease = False
+    , runCompiler = "gfortran"
+    , runFlags = []
+    , runTarget  = Nothing
+    , runArgs    = Nothing
+    }
 
 testSubmodule :: IO ()
 testSubmodule =
-  withCurrentDirectory (example_path </> "submodules") $ start $ Arguments
-    (Build)
-    False
-    ""
+  withCurrentDirectory (example_path </> "submodules") $ start $ Build
+    { buildRelease = False
+    , buildCompiler = "gfortran"
+    , buildFlags = []
+    }