diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10 21:32:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10 21:32:34 +0000 |
| commit | 8af7d766f0244d5b15d89ab2d2d66b0d63e8f576 (patch) | |
| tree | 3346cb494de0bf35403d812efd8b757595cd44d6 /tests/install-package.sh | |
| parent | cd6d02c366af43bccdd2ef345193e4fdeca78a13 (diff) | |
* Refactoring: remove unnecessary variables from the tests.
Diffstat (limited to 'tests/install-package.sh')
| -rw-r--r-- | tests/install-package.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/install-package.sh b/tests/install-package.sh index 89d1d71f3..b818eda12 100644 --- a/tests/install-package.sh +++ b/tests/install-package.sh @@ -2,8 +2,8 @@ source common.sh # Note: this test expects to be run *after* nix-push.sh. -drvPath=$($nixinstantiate ./dependencies.nix) -outPath=$($nixstore -q $drvPath) +drvPath=$(nix-instantiate ./dependencies.nix) +outPath=$(nix-store -q $drvPath) clearStore clearProfiles @@ -12,10 +12,10 @@ cat > $TEST_ROOT/foo.nixpkg <<EOF NIXPKG1 file://$TEST_ROOT/manifest simple $system $drvPath $outPath EOF -$NIX_BIN_DIR/nix-install-package --non-interactive -p $profiles/test $TEST_ROOT/foo.nixpkg -test "$($nixenv -p $profiles/test -q '*' | wc -l)" -eq 1 +nix-install-package --non-interactive -p $profiles/test $TEST_ROOT/foo.nixpkg +test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1 clearProfiles -$NIX_BIN_DIR/nix-install-package --non-interactive -p $profiles/test --url file://$TEST_ROOT/foo.nixpkg -test "$($nixenv -p $profiles/test -q '*' | wc -l)" -eq 1 +nix-install-package --non-interactive -p $profiles/test --url file://$TEST_ROOT/foo.nixpkg +test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1 |