From b5b16cf826d468e79b4087500192a4a9e07c140f Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional@protonmail.com>
Date: Wed, 14 Oct 2020 09:24:55 -0500
Subject: Better organize example packages and bootstrap tests

---
 bootstrap/test                  |  1 -
 bootstrap/test/Spec.hs          | 41 +++++++++++++++++++++++++++++++++++++++++
 bootstrap/test/example_packages |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)
 delete mode 120000 bootstrap/test
 create mode 100644 bootstrap/test/Spec.hs
 create mode 120000 bootstrap/test/example_packages

(limited to 'bootstrap/test')

diff --git a/bootstrap/test b/bootstrap/test
deleted file mode 120000
index 419df4f..0000000
--- a/bootstrap/test
+++ /dev/null
@@ -1 +0,0 @@
-../test
\ No newline at end of file
diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs
new file mode 100644
index 0000000..6fb4006
--- /dev/null
+++ b/bootstrap/test/Spec.hs
@@ -0,0 +1,41 @@
+import           Development.Shake.FilePath     ( (</>) )
+import           Fpm                            ( Arguments(..)
+                                                , Command(..)
+                                                , start
+                                                )
+import           System.Directory               ( withCurrentDirectory )
+
+example_path = "test" </> "example_packages"
+
+main :: IO ()
+main = do
+  testHelloWorld
+  testHelloComplex
+  testHelloFpm
+  testCircular
+  testWithMakefile
+  testMakefileComplex
+
+testHelloWorld :: IO ()
+testHelloWorld =
+  withCurrentDirectory (example_path </> "hello_world") $ start $ Arguments (Run "") False ""
+
+testHelloComplex :: IO ()
+testHelloComplex =
+  withCurrentDirectory (example_path </> "hello_complex") $ start $ Arguments (Test "") False ""
+
+testHelloFpm :: IO ()
+testHelloFpm =
+    withCurrentDirectory (example_path </> "hello_fpm") $ start $ Arguments (Run "") False ""
+
+testCircular :: IO ()
+testCircular =
+    withCurrentDirectory (example_path </> "circular_example") $ start $ Arguments (Test "") False ""
+
+testWithMakefile :: IO ()
+testWithMakefile =
+    withCurrentDirectory (example_path </> "with_makefile") $ start $ Arguments (Build) False ""
+
+testMakefileComplex :: IO ()
+testMakefileComplex =
+    withCurrentDirectory (example_path </> "makefile_complex") $ start $ Arguments (Run "") False ""
diff --git a/bootstrap/test/example_packages b/bootstrap/test/example_packages
new file mode 120000
index 0000000..b7c12dc
--- /dev/null
+++ b/bootstrap/test/example_packages
@@ -0,0 +1 @@
+../../example_packages
\ No newline at end of file
-- 
cgit v1.2.3


From 03c9efc756568ce9c74fdb9dc9df216975e5cd69 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional@protonmail.com>
Date: Thu, 22 Oct 2020 16:43:58 -0500
Subject: Add test with submodule example project and fix .smod naming
 convention

---
 bootstrap/test/Spec.hs | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

(limited to 'bootstrap/test')

diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs
index 6fb4006..4e660e7 100644
--- a/bootstrap/test/Spec.hs
+++ b/bootstrap/test/Spec.hs
@@ -15,27 +15,53 @@ main = do
   testCircular
   testWithMakefile
   testMakefileComplex
+  testSubmodule
 
 testHelloWorld :: IO ()
 testHelloWorld =
-  withCurrentDirectory (example_path </> "hello_world") $ start $ Arguments (Run "") False ""
+  withCurrentDirectory (example_path </> "hello_world") $ start $ Arguments
+    (Run "")
+    False
+    ""
 
 testHelloComplex :: IO ()
 testHelloComplex =
-  withCurrentDirectory (example_path </> "hello_complex") $ start $ Arguments (Test "") False ""
+  withCurrentDirectory (example_path </> "hello_complex") $ start $ Arguments
+    (Test "")
+    False
+    ""
 
 testHelloFpm :: IO ()
 testHelloFpm =
-    withCurrentDirectory (example_path </> "hello_fpm") $ start $ Arguments (Run "") False ""
+  withCurrentDirectory (example_path </> "hello_fpm") $ start $ Arguments
+    (Run "")
+    False
+    ""
 
 testCircular :: IO ()
 testCircular =
-    withCurrentDirectory (example_path </> "circular_example") $ start $ Arguments (Test "") False ""
+  withCurrentDirectory (example_path </> "circular_example") $ start $ Arguments
+    (Test "")
+    False
+    ""
 
 testWithMakefile :: IO ()
 testWithMakefile =
-    withCurrentDirectory (example_path </> "with_makefile") $ start $ Arguments (Build) False ""
+  withCurrentDirectory (example_path </> "with_makefile") $ start $ Arguments
+    (Build)
+    False
+    ""
 
 testMakefileComplex :: IO ()
 testMakefileComplex =
-    withCurrentDirectory (example_path </> "makefile_complex") $ start $ Arguments (Run "") False ""
+  withCurrentDirectory (example_path </> "makefile_complex") $ start $ Arguments
+    (Run "")
+    False
+    ""
+
+testSubmodule :: IO ()
+testSubmodule =
+  withCurrentDirectory (example_path </> "submodules") $ start $ Arguments
+    (Build)
+    False
+    ""
-- 
cgit v1.2.3