From 339efd6e4c371366f4541676644b624af51f8097 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Tue, 27 Oct 2020 17:20:01 -0500 Subject: Change bootstrap command line to be more like the Fortran version --- bootstrap/test/Spec.hs | 60 ++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 29 deletions(-) (limited to 'bootstrap/test') diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs index 4e660e7..c1f7108 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,52 @@ main = do testHelloWorld :: IO () testHelloWorld = - withCurrentDirectory (example_path "hello_world") $ start $ Arguments - (Run "") - False - "" + withCurrentDirectory (example_path "hello_world") $ start $ Run + { runRelease = False + , 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 + , 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 + , 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 + , 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 + } testMakefileComplex :: IO () testMakefileComplex = - withCurrentDirectory (example_path "makefile_complex") $ start $ Arguments - (Run "") - False - "" + withCurrentDirectory (example_path "makefile_complex") $ start $ Run + { runRelease = False + , runTarget = Nothing + , runArgs = Nothing + } testSubmodule :: IO () testSubmodule = - withCurrentDirectory (example_path "submodules") $ start $ Arguments - (Build) - False - "" + withCurrentDirectory (example_path "submodules") $ start $ Build + { buildRelease = False + } -- cgit v1.2.3