From 33efb52e022a815d88f79e31edd5209837cbee3c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Jul 2005 07:25:18 +0000 Subject: [PATCH] * Hack to get around the libtool wrapper script around nix-store not working when PATH is unset. --- tests/Makefile.am | 1 - tests/init.sh | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a1b824d0..13643b7f6 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 435fc3727..c3a7aac29 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