Expand libexpr tests

The test failure is suspicious!

Author: Ericson2314

tests/unit/libexpr/data/derivation/advanced-attributes-structured-attrs-defaults.drv

@@ -0,0 +1 @@
+Derive([("dev","/nix/store/qa4x1j13bs80hnambfs4jymzs1d9qph2-hello-dev","",""),("out","/nix/store/yb2qjkr036x3p7c78bfwc911ll4qxznv-hello","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"builder\":\"/bin/bash\",\"name\":\"hello\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}"),("dev","/nix/store/qa4x1j13bs80hnambfs4jymzs1d9qph2-hello-dev"),("out","/nix/store/yb2qjkr036x3p7c78bfwc911ll4qxznv-hello")])

tests/unit/libexpr/data/derivation/advanced-attributes-structured-attrs-defaults.nix

@@ -0,0 +1,8 @@
+derivation {
+  name = "hello";
+  system = "my-system";
+  builder = "/bin/bash";
+  args = [ "-c" "echo hello > $out" ];
+  outputs = [ "out" "dev" ];
+  __structuredAttrs = true;
+}

tests/unit/libexpr/data/derivation/advanced-attributes-structured-attrs.drv

@@ -0,0 +1 @@
+Derive([("bin","/nix/store/7vm54kg0cgpqgsxjfw237s8a0mx6hs10-hello-again-bin","",""),("dev","/nix/store/j296xiyy4d869fswncni5m2x3qgkxahl-hello-again-dev","",""),("out","/nix/store/apjy8vlc7kc9wfrswvk2dsply969xg0p-hello-again","","")],[("/nix/store/4xm4wccqsvagz9gjksn24s7rip2fdy7v-foo.drv",["out"]),("/nix/store/plsq5jbr5nhgqwcgb2qxw7jchc09dnl8-bar.drv",["out"])],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"impureEnvVars\":[\"UNICORN\"],\"name\":\"hello-again\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar\"],\"disallowedRequisites\":[\"/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo\"],\"allowedRequisites\":[\"/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo\"]}},\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/nix/store/7vm54kg0cgpqgsxjfw237s8a0mx6hs10-hello-again-bin"),("dev","/nix/store/j296xiyy4d869fswncni5m2x3qgkxahl-hello-again-dev"),("out","/nix/store/apjy8vlc7kc9wfrswvk2dsply969xg0p-hello-again")])

tests/unit/libexpr/data/derivation/advanced-attributes-structured-attrs.nix

@@ -18,11 +18,28 @@ derivation {
   name = "hello-again";
   builder = "/bin/bash";
   args = [ "-c" "echo hello > $out" ];
-  outputs = [ "out" "dev" ];
+  __sandboxProfile = "sandcastle";
+  __noChroot = true;
+  __impureHostDeps = ["/usr/bin/ditto"];
+  impureEnvVars = ["UNICORN"];
+  __darwinAllowLocalNetworking = true;
+  outputs = [ "out" "bin" "dev" ];
+  __structuredAttrs = true;
   outputChecks = {
     out = {
-      allowedReferences = [];
+      allowedReferences = [foo];
+      allowedRequisites = [foo];
+    };
+    bin = {
+      disallowedReferences = [bar];
+      disallowedRequisites = [bar];
+    };
+    dev = {
+      maxSize = 789;
+      maxClosureSize = 5909;
     };
   };
-  # TODO add some others
+  requiredSystemFeatures = ["rainbow" "uid-range"];
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 }

tests/unit/libexpr/derivation.cc

@@ -17,47 +17,34 @@ class DerivationTest : public CharacterizationTest, public LibExprTest
     }
 };
 
-// TODO: Move this to macro
-TEST_F(DerivationTest, Derivation_advancedAttributes)
-{
-    writeTest(
-        "advanced-attributes.drv",
-        [&]() -> std::string {
-            Value v = eval(readFile(goldenMaster("advanced-attributes.nix")));
-            Symbol s = state.symbols.create("drvPath");
-            auto attr = v.attrs()->get(s);
-            state.forceValueDeep(*attr->value);
-
-            auto path = std::string_view(attr->value->c_str());
-            auto storePath = store->parseStorePath(path);
-
-            // TODO: Could probably also just use store->getFSAccessor()->...
-            auto drv = store->readDerivation(storePath);
-            return drv.unparse(*store, false);
-        },
-        [](const auto & file) { return readFile(file); },
-        [](const auto & file, const auto & got) { return writeFile(file, got); });
-};
-
-TEST_F(DerivationTest, Derivation_advancedAttributes_defaults)
-{
-    writeTest(
-        "advanced-attributes-defaults.drv",
-        [&]() -> std::string {
-            Value v = eval(readFile(goldenMaster("advanced-attributes-defaults.nix")));
-            Symbol s = state.symbols.create("drvPath");
-            auto attr = v.attrs()->get(s);
-            state.forceValueDeep(*attr->value);
+#define EXPR_DRV_TEST(NAME, STEM)                                                               \
+    TEST_F(DerivationTest, Derivation_##NAME)                                                   \
+    {                                                                                           \
+        writeTest(                                                                              \
+            STEM ".drv",                                                                        \
+            [&]() -> Derivation {                                                               \
+                Value v = eval(readFile(goldenMaster(STEM ".nix")));                            \
+                Symbol s = state.symbols.create("drvPath");                                     \
+                auto attr = v.attrs() -> get(s);                                                \
+                state.forceValueDeep(*attr->value);                                             \
+                NixStringContext context;                                                       \
+                auto storePath = state.coerceToStorePath(attr->pos, *attr->value, context, ""); \
+                                                                                                \
+                return store->readDerivation(storePath);                                        \
+            },                                                                                  \
+            [&](const auto & file) {                                                            \
+                auto s = readFile(file);                                                        \
+                return parseDerivation(*store, std::move(s), STEM);                             \
+            },                                                                                  \
+            [&](const auto & file, const auto & got) {                                          \
+                auto s = got.unparse(*store, false);                                            \
+                return writeFile(file, std::move(s));                                           \
+            });                                                                                 \
+    }
 
-            auto path = std::string_view(attr->value->c_str());
-            auto storePath = store->parseStorePath(path);
+EXPR_DRV_TEST(advancedAttributes, "advanced-attributes");
+EXPR_DRV_TEST(advancedAttributes_defaults, "advanced-attributes-defaults");
+EXPR_DRV_TEST(advancedAttributes_structuredAttrs, "advanced-attributes-structured-attrs");
+EXPR_DRV_TEST(advancedAttributes_structuredAttrs_defaults, "advanced-attributes-structured-attrs-defaults");
 
-            // TODO: Could probably also just use store->getFSAccessor()->...
-            auto drv = store->readDerivation(storePath);
-            return drv.unparse(*store, false);
-        },
-        [](const auto & file) { return readFile(file); },
-        [](const auto & file, const auto & got) { return writeFile(file, got); });
-};
-
-};
+}