diff options
| author | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
| commit | 2721e9f56f92f5bd630dcbb0104fc56159cb28d4 (patch) | |
| tree | f46ac1a8807b81cc54d176e8fb72915aa057f0ac /tests/secure-drv-outputs.sh | |
| parent | bffe35acedafcd7c7237cb1415798362bff8a180 (diff) | |
| parent | a6a3f3a8c26fdd6900880c13e924e6879d6c714c (diff) | |
Merge from trunk
Diffstat (limited to 'tests/secure-drv-outputs.sh')
| -rw-r--r-- | tests/secure-drv-outputs.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/secure-drv-outputs.sh b/tests/secure-drv-outputs.sh index 25dd6bfc01fe..3cb889996763 100644 --- a/tests/secure-drv-outputs.sh +++ b/tests/secure-drv-outputs.sh @@ -10,11 +10,11 @@ clearManifests startDaemon # Determine the output path of the "good" derivation. -goodOut=$($nixstore -q $($nixinstantiate ./secure-drv-outputs.nix -A good)) +goodOut=$(nix-store -q $(nix-instantiate ./secure-drv-outputs.nix -A good)) # Instantiate the "bad" derivation. -badDrv=$($nixinstantiate ./secure-drv-outputs.nix -A bad) -badOut=$($nixstore -q $badDrv) +badDrv=$(nix-instantiate ./secure-drv-outputs.nix -A bad) +badOut=$(nix-store -q $badDrv) # Rewrite the bad derivation to produce the output path of the good # derivation. @@ -23,12 +23,12 @@ sed -e "s|$badOut|$goodOut|g" < $badDrv > $TEST_ROOT/bad.drv # Add the manipulated derivation to the store and build it. This # should fail. -if badDrv2=$($nixstore --add $TEST_ROOT/bad.drv); then - $nixstore -r "$badDrv2" +if badDrv2=$(nix-store --add $TEST_ROOT/bad.drv); then + nix-store -r "$badDrv2" fi # Now build the good derivation. -goodOut2=$($nixbuild ./secure-drv-outputs.nix -A good) +goodOut2=$(nix-build ./secure-drv-outputs.nix -A good) test "$goodOut" = "$goodOut2" if ! test -e "$goodOut"/good; then |