diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26 18:28:12 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26 18:28:12 -0400 |
| commit | 67c6f3eded7dcb7c79243ed41f177c960f2b6aad (patch) | |
| tree | 792842e32598a9201fcee341469799e936da9dfa /tests | |
| parent | 50395b71a90314abfcc39d8343dbaa8e9aa199a6 (diff) | |
nix-push: Support generating a manifest again
This makes all the tests succeed. Woohoo!
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/binary-patching.sh | 9 | ||||
| -rw-r--r-- | tests/install-package.sh | 2 | ||||
| -rw-r--r-- | tests/nix-channel.sh | 2 | ||||
| -rw-r--r-- | tests/nix-pull.sh | 2 | ||||
| -rw-r--r-- | tests/nix-push.sh | 4 |
5 files changed, 12 insertions, 7 deletions
diff --git a/tests/binary-patching.sh b/tests/binary-patching.sh index 8c52c2f14..188be109a 100644 --- a/tests/binary-patching.sh +++ b/tests/binary-patching.sh @@ -7,14 +7,17 @@ mkdir -p $TEST_ROOT/cache2 $TEST_ROOT/patches RESULT=$TEST_ROOT/result # Build version 1 and 2 of the "foo" package. -nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest1 \ +nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 \ $(nix-build -o $RESULT binary-patching.nix --arg version 1) +mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest1 out2=$(nix-build -o $RESULT binary-patching.nix --arg version 2) -nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest2 $out2 +nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 $out2 +mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest2 out3=$(nix-build -o $RESULT binary-patching.nix --arg version 3) -nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest3 $out3 +nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 $out3 +mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest3 rm $RESULT diff --git a/tests/install-package.sh b/tests/install-package.sh index b818eda12..653dfee4c 100644 --- a/tests/install-package.sh +++ b/tests/install-package.sh @@ -9,7 +9,7 @@ clearStore clearProfiles cat > $TEST_ROOT/foo.nixpkg <<EOF -NIXPKG1 file://$TEST_ROOT/manifest simple $system $drvPath $outPath +NIXPKG1 file://$TEST_ROOT/cache/MANIFEST simple $system $drvPath $outPath EOF nix-install-package --non-interactive -p $profiles/test $TEST_ROOT/foo.nixpkg diff --git a/tests/nix-channel.sh b/tests/nix-channel.sh index eb1d57295..a25d56bec 100644 --- a/tests/nix-channel.sh +++ b/tests/nix-channel.sh @@ -19,7 +19,7 @@ nix-channel --remove xyzzy # Create a channel. rm -rf $TEST_ROOT/foo mkdir -p $TEST_ROOT/foo -nix-push --copy $TEST_ROOT/foo $TEST_ROOT/foo/MANIFEST $(nix-store -r $(nix-instantiate dependencies.nix)) +nix-push --dest $TEST_ROOT/foo --manifest --bzip2 $(nix-store -r $(nix-instantiate dependencies.nix)) rm -rf $TEST_ROOT/nixexprs mkdir -p $TEST_ROOT/nixexprs cp config.nix dependencies.nix dependencies.builder*.sh $TEST_ROOT/nixexprs/ diff --git a/tests/nix-pull.sh b/tests/nix-pull.sh index 9a89676cb..79e7ae26b 100644 --- a/tests/nix-pull.sh +++ b/tests/nix-pull.sh @@ -2,7 +2,7 @@ source common.sh pullCache () { echo "pulling cache..." - nix-pull file://$TEST_ROOT/manifest + nix-pull file://$TEST_ROOT/cache/MANIFEST } clearStore diff --git a/tests/nix-push.sh b/tests/nix-push.sh index 69f05141a..8ea59516c 100644 --- a/tests/nix-push.sh +++ b/tests/nix-push.sh @@ -1,5 +1,7 @@ source common.sh +clearStore + drvPath=$(nix-instantiate dependencies.nix) outPath=$(nix-store -r $drvPath) @@ -7,4 +9,4 @@ echo "pushing $drvPath" mkdir -p $TEST_ROOT/cache -nix-push --copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath +nix-push --dest $TEST_ROOT/cache --manifest $drvPath --bzip2 |