Skip shell-for test when compiler is not the one we are testing

input-output-hk · Jun 14, 2021 · 813c606 · 813c606
1 parent cc3a20e
commit 813c606
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/test/default.nix b/test/default.nix
@@ -192,7 +192,7 @@ let
     index-state = callTest ./index-state { inherit compiler-nix-name; };
     lookup-sha256 = callTest ./lookup-sha256 { inherit compiler-nix-name; };
     # fully-static = callTest ./fully-static { inherit (pkgs) buildPackages; };
-    shell-for = callTest ./shell-for {};
+    shell-for = callTest ./shell-for { inherit compiler-nix-name; };
     cabal-22 = callTest ./cabal-22 { inherit util compiler-nix-name; };
     coverage = callTest ./coverage { inherit compiler-nix-name; };
     coverage-golden = callTest ./coverage-golden { inherit compiler-nix-name;};

diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc }:
+{ stdenv, lib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name }:
 
 with lib;
 
@@ -53,7 +53,8 @@ let
 in recurseIntoAttrs {
   # Does not work on ghcjs because it needs zlib.
   # Does not work on windows because it needs mintty.
-  meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows;
+  meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows
+    || compiler-nix-name != ((import ./pkgs.nix).pkgs null).compiler.nix-name;
   inherit env envPkga envDefault;
   run = stdenv.mkDerivation {
     name = "shell-for-test";