clean up tests

tek · Jul 30, 2023 · 2ad1508 · 2ad1508
1 parent 6b401ad
commit 2ad1508
Show file tree

Hide file tree

Showing 30 changed files with 9 additions and 229 deletions.
diff --git a/test/auto-1/root/app/Main.hs b/test/auto-1/root/app/Main.hs
diff --git a/test/auto-1/root/flake.nix b/test/auto-1/root/flake.nix
diff --git a/test/auto-1/root/src/Root/Lib.hs b/test/auto-1/root/src/Root/Lib.hs
diff --git a/test/auto-1/test.nix b/test/auto-1/test.nix
diff --git a/test/auto-2/root/cabal.project b/test/auto-2/root/cabal.project
diff --git a/test/auto-2/root/flake.nix b/test/auto-2/root/flake.nix
diff --git a/test/auto-2/root/src/Root/Lib.hs b/test/auto-2/root/src/Root/Lib.hs
diff --git a/test/auto-2/test.nix b/test/auto-2/test.nix
diff --git a/test/auto-3/root/Main.hs b/test/auto-3/root/Main.hs
diff --git a/test/auto-3/root/Root/Lib.hs b/test/auto-3/root/Root/Lib.hs
diff --git a/test/auto-3/root/cabal.project b/test/auto-3/root/cabal.project
diff --git a/test/auto-3/root/flake.nix b/test/auto-3/root/flake.nix
diff --git a/test/auto-3/test.nix b/test/auto-3/test.nix
diff --git a/test/auto-4/root/Main.hs b/test/auto-4/root/Main.hs
diff --git a/test/auto-4/root/Root/Lib.hs b/test/auto-4/root/Root/Lib.hs
diff --git a/test/auto-4/root/flake.nix b/test/auto-4/root/flake.nix
diff --git a/test/auto-4/test.nix b/test/auto-4/test.nix
diff --git a/test/auto-5/root/app/Main.hs b/test/auto-5/root/app/Main.hs
diff --git a/test/auto-5/root/cabal.project b/test/auto-5/root/cabal.project
diff --git a/test/auto-2/root/app/Main.hs → test/basic/root/Main.hs b/test/auto-2/root/app/Main.hs → test/basic/root/Main.hs
diff --git a/test/auto-1/root/cabal.project → test/basic/root/cabal.project b/test/auto-1/root/cabal.project → test/basic/root/cabal.project
diff --git a/test/auto-5/root/flake.nix → test/basic/root/flake.nix b/test/auto-5/root/flake.nix → test/basic/root/flake.nix
@@ -10,10 +10,9 @@
       cabal.dependencies = ["aeson"];
       library.enable = true;
       library.dependencies = ["messagepack"];
-      executables.root = { enable = true; source-dirs = "app"; };
+      executables.root = { enable = true; source-dirs = "."; };
       test.enable = true;
     };
-    cabal.dependencies = ["base" "polysemy"];
-    envs.dev.ghc.compiler = "ghc90";
+    cabal.dependencies = ["base" "some"];
   };
 }
diff --git a/test/auto-5/root/lib/Root/Lib.hs → test/basic/root/lib/Root/Lib.hs b/test/auto-5/root/lib/Root/Lib.hs → test/basic/root/lib/Root/Lib.hs
@@ -1,6 +1,6 @@
 module Root.Lib where
 
-import Polysemy
+import Data.Some
 import Data.Aeson
 import Data.MessagePack
 

diff --git a/test/auto-5/root/test/Main.hs → test/basic/root/test/Main.hs b/test/auto-5/root/test/Main.hs → test/basic/root/test/Main.hs
diff --git a/test/auto-5/test.nix → test/basic/test.nix b/test/auto-5/test.nix → test/basic/test.nix
@@ -1,6 +1,6 @@
 { pkgs }:
 {
-  test = builtins.toFile "auto-5-test" ''
+  test = builtins.toFile "basic-test" ''
     cd ./root
     nix flake update
 
@@ -12,8 +12,7 @@
 
     check 'nix develop .#ghc94 -c ghc --version' 'The Glorious Glasgow Haskell Compilation System, version 9.4.5'
 
-    nix build .#ghc90-root
+    nix build .#ghc92-root
     check 'result/bin/root' 'string' 'Running the main package produced the wrong output'
-
   '';
 }
diff --git a/test/default.nix b/test/default.nix
@@ -5,15 +5,11 @@ let
   test = name: (import (./. + "/${name}/test.nix") { inherit pkgs; }).test;
 
   tests = {
+    basic = test "basic";
     deps = test "deps";
     ghci = test "ghci";
     packages = test "packages";
     hackage = test "hackage";
-    auto-1 = test "auto-1";
-    auto-2 = test "auto-2";
-    auto-3 = test "auto-3";
-    auto-4 = test "auto-4";
-    auto-5 = test "auto-5";
     cross = test "cross";
     service = test "service";
     postgres = test "postgres";

diff --git a/test/deps/test.nix b/test/deps/test.nix
@@ -20,8 +20,6 @@
       fail "Running the main package produced the wrong output:\n$output"
     fi
 
-    nix build .#ghc90-root
-
     nix run .#hls 2>/dev/null
   '';
 }
diff --git a/test/ghci/root/flake.nix b/test/ghci/root/flake.nix
@@ -13,7 +13,6 @@
       test.enable = true;
       test.env = "hix-ghci-test";
     };
-    compiler = "ghc90";
     envs.hix-ghci-test.services.test.enable = true;
     services.test = {
       nixos.services.nginx = {

diff --git a/test/overrides/root/flake.nix b/test/overrides/root/flake.nix
@@ -17,12 +17,13 @@
       };
     };
     compat.enable = false;
+    gen-overrides.enable = true;
     overrides = {self, pkgs, hackage, jailbreak, buildInputs, ...}: {
       aeson = hackage "2.1.2.1" "1f1f6h2r60ghz4p1ddi6wnq6z3i07j60sgm77hx2rvmncz4vizp0";
       extra = jailbreak;
       root1 = jailbreak self.root;
       root = buildInputs [pkgs.git];
     };
-    gen-overrides.enable = true;
+    output.extraPackages = ["root1"];
   });
 }
diff --git a/test/overrides/test.nix b/test/overrides/test.nix
@@ -59,6 +59,7 @@ in {
 
     check 'nix eval .#legacyPackages.${pkgs.system}.ghc.aeson.version' '"2.1.2.1"' 'aeson version wrong after gen-overrides'
 
+    nix build .#root1
     nix flake check
 
     sed -i 's/2\.1/5.8/' flake.nix