Improve test efficiency

seagreen · Nov 11, 2019 · 41b49f8 · 41b49f8
1 parent 7d718cd
commit 41b49f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/bowtie-js/test/Test.hs b/bowtie-js/test/Test.hs
@@ -13,15 +13,16 @@ import qualified Bowtie.Example
 import qualified Data.Text.IO as TIO
 
 main :: IO ()
-main =
+main = do
+  libFiles <- readDirectoryFiles "../example-lib"
   hspec do
     describe
       "well-typed-examples"
       (for_ Bowtie.Example.wellTyped runWellTyped)
 
     describe
       "applications"
-      testApps
+      (testApps libFiles)
 
 runWellTyped :: (FilePath, Text) -> Spec
 runWellTyped (name, src) =
@@ -37,11 +38,10 @@ runWellTyped (name, src) =
     let annotatedRes = res <> "\n\n/*\n" <> js <> "\n*/\n"
     TIO.writeFile ("test/well-typed-golden-files" </> name) annotatedRes
 
-testApps :: Spec
-testApps =
+testApps :: HashMap FilePath Text -> Spec
+testApps libFiles =
   it "lunar-lander" do
     appSource <- TIO.readFile "../example-app/lunar-lander.bowtie"
-    libFiles <- readDirectoryFiles "../example-lib" -- TODO: wasted work
     -- TODO: get rid of ..
     js <- case sourcesToCore libFiles ("../example-app/lunar-lander.bowtie", appSource) of
             Left e ->

diff --git a/bowtie/test/Test.hs b/bowtie/test/Test.hs
@@ -16,6 +16,7 @@ import qualified Text.Megaparsec as Mega
 
 main :: IO ()
 main = do
+  libFiles <- readDirectoryFiles "../example-lib"
   appExamples <- getAppExamples
   hspec do
     describe
@@ -37,12 +38,11 @@ main = do
     Bowtie.Surface.InferSpec.spec
 
     describe "example-app" $
-      for_ appExamples f
+      for_ appExamples (f libFiles)
   where
-    f :: FilePath -> Spec
-    f path =
+    f :: HashMap FilePath Text -> FilePath -> Spec
+    f libFiles path =
       it path do
-        libFiles <- readDirectoryFiles "../example-lib" -- TODO: wasted work
         appSource <- TIO.readFile path
         case Interpret.interpretProgram libFiles (path, appSource) of
           Left e ->