diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-07-25T07·25+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-07-25T07·25+0000 |
| commit | 33efb52e022a815d88f79e31edd5209837cbee3c (patch) | |
| tree | 80ebf0054baa8848f507f6ff90f9e438afdf5826 | |
| parent | 3fae65d4ccea78eeb0aef5acb4b613a0547a4c6d (diff) | |
* Hack to get around the libtool wrapper script around nix-store not
working when PATH is unset.
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/init.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a1b824d0c3f..13643b7f6b26 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -40,7 +40,6 @@ gc-concurrent.sh: gc-concurrent.nix gc-concurrent2.nix TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \ build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \ gc-concurrent.sh verify.sh nix-pull.sh -#TESTS = init.sh gc.sh XFAIL_TESTS = diff --git a/tests/init.sh b/tests/init.sh index 435fc37276aa..c3a7aac29f16 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -56,6 +56,11 @@ for i in \ chmod +x $i done +# Another ugly hack. +sed "s|^$|PATH=$PATH|" < $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh > tmp +chmod +x tmp +mv tmp $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh + # Initialise the database. $TOP/src/nix-store/nix-store --init |