about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2007-09-04T15·38+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2007-09-04T15·38+0000
commit9441550acb34cf35f6cd3859d3672adca79551d9 (patch)
tree9a6cc5ec0f3011841923a93d50035ae7ddbdf9d1 /tests
parent7b20c0ed4b3ef518c1f55bfbb2ece932539f35ea (diff)
* nix-push / generate-patches: bzip the manifest.
Diffstat (limited to 'tests')
-rw-r--r--tests/init.sh3
-rw-r--r--tests/nix-pull.sh2
-rw-r--r--tests/nix-push.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/init.sh b/tests/init.sh
index b5c62f408709..c45a617e9f75 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -27,6 +27,7 @@ ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-collect-garbage $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/
+ln -s $TOP/scripts/nix-push $NIX_BIN_DIR/
 ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/
 ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/
 ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/
@@ -57,7 +58,9 @@ for i in \
     $NIX_BIN_DIR/nix-collect-garbage \
     $NIX_BIN_DIR/nix-build \
     $NIX_BIN_DIR/nix-install-package \
+    $NIX_BIN_DIR/nix-push \
     $NIX_BIN_DIR/nix-pull \
+    $NIX_BIN_DIR/nix/readmanifest.pm \
     ; do
     sed < $i > $i.tmp \
         -e "s^$REAL_BIN_DIR^$NIX_BIN_DIR^" \
diff --git a/tests/nix-pull.sh b/tests/nix-pull.sh
index 5ef3e55cae51..d2309742d217 100644
--- a/tests/nix-pull.sh
+++ b/tests/nix-pull.sh
@@ -2,7 +2,7 @@ source common.sh
 
 pullCache () {
     echo "pulling cache..."
-    $PERL -w -I$TOP/scripts $TOP/scripts/nix-pull file://$TEST_ROOT/manifest
+    $NIX_BIN_DIR/nix-pull file://$TEST_ROOT/manifest
 }
 
 clearStore
diff --git a/tests/nix-push.sh b/tests/nix-push.sh
index 46f1edb4014b..a9a2f5f9c06a 100644
--- a/tests/nix-push.sh
+++ b/tests/nix-push.sh
@@ -7,5 +7,5 @@ echo "pushing $drvPath"
 
 mkdir $TEST_ROOT/cache
 
-$PERL -w -I$TOP/scripts $TOP/scripts/nix-push \
+$NIX_BIN_DIR/nix-push \
     --copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath