diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/gc-concurrent.sh | 4 | ||||
| -rw-r--r-- | tests/init.sh | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 53ecfe1fb7d7..7c823a046a79 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,9 +36,10 @@ nix-pull.sh: dependencies.nix gc.sh: dependencies.nix gc-concurrent.sh: gc-concurrent.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 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-concurrent.sh XFAIL_TESTS = diff --git a/tests/gc-concurrent.sh b/tests/gc-concurrent.sh index d85c609825ee..c41475fb6ebd 100644 --- a/tests/gc-concurrent.sh +++ b/tests/gc-concurrent.sh @@ -1,6 +1,8 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate gc-concurrent.nix) outPath=$($TOP/src/nix-store/nix-store -q $storeExpr) +ls -l test-tmp/state/temproots + # Start a build in the background. $TOP/src/nix-store/nix-store -rvv "$storeExpr" & @@ -8,7 +10,7 @@ pid=$! # Run the garbage collector while the build is running. sleep 2 -$NIX_BIN_DIR/nix-collect-garbage +$NIX_BIN_DIR/nix-collect-garbage -vvvvv # Wait for the build to finish. echo waiting for pid $pid to finish... diff --git a/tests/init.sh b/tests/init.sh index e80a847c3a44..63cce81bd79d 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -26,6 +26,7 @@ ln -s $TOP/scripts/readmanifest.pm $NIX_BIN_DIR/nix/ mkdir -p "$NIX_LOCALSTATE_DIR"/nix/manifests mkdir -p "$NIX_LOCALSTATE_DIR"/nix/gcroots mkdir -p "$NIX_LOCALSTATE_DIR"/log/nix +mkdir -p "$NIX_LOCALSTATE_DIR"/temproots mkdir $NIX_DATA_DIR/nix cp -prd $TOP/corepkgs $NIX_DATA_DIR/nix/ |