tests.stdenv: deduplicate

1 files changed, 36 insertions, 75 deletions

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 01f0e0fe8b8..2af4bcdfb73 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -12,63 +12,12 @@ let
   bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
   pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; };
   bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
-in
-
-{
-  test-env-attrset = bootStdenv.mkDerivation {
-    name = "test-env-attrset";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    dontPatch = true;
-    dontFixup = true;
-    env = {
-      string = "testing-string";
-    };
-
-    installPhase = ''
-      declare -p string
-      echo "env.string = $string"
-      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-      touch $out
-    '';
-  };
 
-  test-structured-env-attrset = bootStdenv.mkDerivation {
-    name = "test-structured-env-attrset";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    dontPatch = true;
-    dontFixup = true;
-    __structuredAttrs = true;
-    env = {
-      string = "testing-string";
-    };
-
-    installPhase = ''
-      declare -p string
-      echo "env.string = $string"
-      [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-      touch $out
-    '';
-  };
 
-  test-cc-wrapper-substitutions = bootStdenv.cc.overrideAttrs (previousAttrs: {
-    name = "test-cc-wrapper-substitutions";
+  ccWrapperSubstitutionsTest = { name, stdenv', extraAttrs ? { } }:
 
-    postFixup = previousAttrs.postFixup + ''
-      declare -p wrapperName
-      echo "env.wrapperName = $wrapperName"
-      [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
-      touch $out
-    '';
-  });
-
-  structuredAttrsByDefault = lib.recurseIntoAttrs {
-
-    test-cc-wrapper-substitutions = bootStdenvStructuredAttrsByDefault.cc.overrideAttrs (previousAttrs: {
-      name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";
+    stdenv'.cc.overrideAttrs (previousAttrs: ({
+      inherit name;
 
       postFixup = previousAttrs.postFixup + ''
         declare -p wrapperName
@@ -76,32 +25,44 @@ in
         [[ $wrapperName == "CC_WRAPPER" ]] || (echo "wrapperName was not CC_WRAPPER" && false)
         declare -p suffixSalt
         echo "env.suffixSalt = $suffixSalt"
-        [[ $suffixSalt == "${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" ]] || (echo "wrapperName was not ${bootStdenvStructuredAttrsByDefault.cc.suffixSalt}" && false)
+        [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "wrapperName was not ${stdenv'.cc.suffixSalt}" && false)
 
         grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted"
         grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false)
 
         touch $out
       '';
-    });
-
-    test-structured-env-attrset = bootStdenvStructuredAttrsByDefault.mkDerivation {
-      name = "test-structured-env-attrset-structuredAttrsByDefault";
-      dontUnpack = true;
-      dontConfigure = true;
-      dontBuild = true;
-      dontPatch = true;
-      dontFixup = true;
-      env = {
-        string = "testing-string";
-      };
-
-      installPhase = ''
-        declare -p string
-        echo "env.string = $string"
-        [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
-        touch $out
-      '';
-    };
+    } // extraAttrs));
+
+  testEnvAttrset = { name, stdenv', extraAttrs ? { } }:
+    stdenv'.mkDerivation
+      ({
+        inherit name;
+        env = {
+          string = "testing-string";
+        };
+
+        passAsFile = [ "buildCommand" ];
+        buildCommand = ''
+          declare -p string
+          echo "env.string = $string"
+          [[ $string == "testing-string" ]] || (echo "string was not testing-string" && false)
+          touch $out
+        '';
+      } // extraAttrs);
+
+in
+
+{
+  test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; };
+
+  test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset"; stdenv' = bootStdenv; extraAttrs = { __structuredAttrs = true; }; };
+
+  test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions"; stdenv' = bootStdenv; };
+
+  structuredAttrsByDefault = lib.recurseIntoAttrs {
+    test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { name = "test-cc-wrapper-substitutions-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
+
+    test-structured-env-attrset = testEnvAttrset { name = "test-structured-env-attrset-structuredAttrsByDefault"; stdenv' = bootStdenvStructuredAttrsByDefault; };
   };
 }