diff options
| author | Laurence Kedward <laurence.kedward@bristol.ac.uk> | 2020-12-07 11:08:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 11:08:17 +0000 |
| commit | ed6222b080d56c7768ec413bef631520a553ee42 (patch) | |
| tree | 087135218a9313bd4e9d7a813743075f43957798 /bootstrap/unit_test | |
| parent | 7f1611d55d3fd431401008121a3cdf93e7d3968d (diff) | |
| parent | 447b4b2a39d69a19ac1a4bcae22e30372a23c859 (diff) | |
| download | fpm-ed6222b080d56c7768ec413bef631520a553ee42.tar.gz fpm-ed6222b080d56c7768ec413bef631520a553ee42.zip | |
Merge branch 'master' into fix-window-run-test
Diffstat (limited to 'bootstrap/unit_test')
| -rw-r--r-- | bootstrap/unit_test/ModuleToCompileInfoTest.hs | 11 | ||||
| -rw-r--r-- | bootstrap/unit_test/ProgramToCompileInfoTest.hs | 11 | ||||
| -rw-r--r-- | bootstrap/unit_test/SubmoduleToCompileInfoTest.hs | 11 |
3 files changed, 21 insertions, 12 deletions
diff --git a/bootstrap/unit_test/ModuleToCompileInfoTest.hs b/bootstrap/unit_test/ModuleToCompileInfoTest.hs index 5a1f0a8..08cd67c 100644 --- a/bootstrap/unit_test/ModuleToCompileInfoTest.hs +++ b/bootstrap/unit_test/ModuleToCompileInfoTest.hs @@ -3,7 +3,8 @@ module ModuleToCompileInfoTest ) where -import BuildModel ( CompileTimeInfo(..) +import BuildModel ( AvailableModule(..) + , CompileTimeInfo(..) , Source(..) , constructCompileTimeInfo ) @@ -43,10 +44,12 @@ exampleModule = Module moduleSourceFileName' :: FilePath moduleSourceFileName' = "some" </> "file" </> "somewhere.f90" -availableModules :: [String] -availableModules = ["module1", "module3"] +availableModules :: [AvailableModule] +availableModules = [ AvailableModule {availableModuleName = "module1", availableModuleFile = "build_dir" </> "module1.mod"} + , AvailableModule {availableModuleName = "module3", availableModuleFile = "build_dir" </> "module3.mod"} + ] -doCompileTimeTransformation :: (Source, [String]) -> CompileTimeInfo +doCompileTimeTransformation :: (Source, [AvailableModule]) -> CompileTimeInfo doCompileTimeTransformation (programSource, otherSources) = constructCompileTimeInfo programSource otherSources "build_dir" diff --git a/bootstrap/unit_test/ProgramToCompileInfoTest.hs b/bootstrap/unit_test/ProgramToCompileInfoTest.hs index f17a3df..a9ad39b 100644 --- a/bootstrap/unit_test/ProgramToCompileInfoTest.hs +++ b/bootstrap/unit_test/ProgramToCompileInfoTest.hs @@ -3,7 +3,8 @@ module ProgramToCompileInfoTest ) where -import BuildModel ( CompileTimeInfo(..) +import BuildModel ( AvailableModule(..) + , CompileTimeInfo(..) , Source(..) , constructCompileTimeInfo ) @@ -42,10 +43,12 @@ exampleProgram = Program programSourceFileName' :: FilePath programSourceFileName' = "some" </> "file" </> "somewhere.f90" -availableModules :: [String] -availableModules = ["module1", "module3"] +availableModules :: [AvailableModule] +availableModules = [ AvailableModule {availableModuleName = "module1", availableModuleFile = "build_dir" </> "module1.mod"} + , AvailableModule {availableModuleName = "module3", availableModuleFile = "build_dir" </> "module3.mod"} + ] -doCompileTimeTransformation :: (Source, [String]) -> CompileTimeInfo +doCompileTimeTransformation :: (Source, [AvailableModule]) -> CompileTimeInfo doCompileTimeTransformation (programSource, otherSources) = constructCompileTimeInfo programSource otherSources "build_dir" diff --git a/bootstrap/unit_test/SubmoduleToCompileInfoTest.hs b/bootstrap/unit_test/SubmoduleToCompileInfoTest.hs index d5d3ad8..621b0d5 100644 --- a/bootstrap/unit_test/SubmoduleToCompileInfoTest.hs +++ b/bootstrap/unit_test/SubmoduleToCompileInfoTest.hs @@ -3,7 +3,8 @@ module SubmoduleToCompileInfoTest ) where -import BuildModel ( CompileTimeInfo(..) +import BuildModel ( AvailableModule(..) + , CompileTimeInfo(..) , Source(..) , constructCompileTimeInfo ) @@ -45,10 +46,12 @@ exampleSubmodule = Submodule submoduleSourceFileName' :: FilePath submoduleSourceFileName' = "some" </> "file" </> "somewhere.f90" -availableModules :: [String] -availableModules = ["module1", "module3"] +availableModules :: [AvailableModule] +availableModules = [ AvailableModule {availableModuleName = "module1", availableModuleFile = "build_dir" </> "module1.mod"} + , AvailableModule {availableModuleName = "module3", availableModuleFile = "build_dir" </> "module3.mod"} + ] -doCompileTimeTransformation :: (Source, [String]) -> CompileTimeInfo +doCompileTimeTransformation :: (Source, [AvailableModule]) -> CompileTimeInfo doCompileTimeTransformation (programSource, otherSources) = constructCompileTimeInfo programSource otherSources "build_dir" |