diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-04-25T10·45+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-04-25T10·45+0000 |
| commit | 03162f8f477fb7634edbf53ad4e9dfca433dd9d9 (patch) | |
| tree | 88aaf58b6111f8a0cb8422c97697605e1f3dc4de /tests | |
| parent | ef2d4a2da9c14c15985bdd27c02d2d30093a3e56 (diff) | |
* Unless --with-bzip2 is specified, use a copy of bzip2 in the
externals directory. This is in particular useful because though most systems have bzip2/bunzip2, they don't always have libbz2, which we need for bsdiff/bspatch.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/common.sh.in | 4 | ||||
| -rw-r--r-- | tests/init.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 0f55d6cf896e..07250ad6ede2 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -24,6 +24,10 @@ export NIX_BUILD_HOOK= export PERL=perl export TOP=$(pwd)/.. export aterm_bin=@aterm_bin@ +export bzip2_bin_test="@bzip2_bin_test@" +if test "${bzip2_bin_test:0:1}" != "/"; then + bzip2_bin_test=`pwd`/${bzip2_bin_test} +fi export dot=@dot@ export xmllint="@xmllint@" export xmlflags="@xmlflags@" diff --git a/tests/init.sh b/tests/init.sh index 11e0632a4842..d49d57cede25 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -24,6 +24,8 @@ ln -s $nixhash $NIX_BIN_DIR/ 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 $bzip2_bin_test/bzip2 $NIX_BIN_DIR/ +ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/ mkdir $NIX_BIN_DIR/nix ln -s $TOP/scripts/download-using-manifests.pl $NIX_BIN_DIR/nix/ ln -s $TOP/scripts/readmanifest.pm $NIX_BIN_DIR/nix/ |