diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/fall-back.sh | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2ad5ad0d9148..19122cd9556e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,9 +21,8 @@ substitutes.sh: substitutes.nix substituter.nix substitutes2.sh: substitutes2.nix substituter.nix substituter2.nix fall-back.sh: fall-back.nix -#TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \ -# build-hook.sh substitutes.sh substitutes2.sh -TESTS = init.sh fall-back.sh +TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \ + build-hook.sh substitutes.sh substitutes2.sh XFAIL_TESTS = diff --git a/tests/fall-back.sh b/tests/fall-back.sh index a183e12f670c..e4a39421772b 100644 --- a/tests/fall-back.sh +++ b/tests/fall-back.sh @@ -2,11 +2,12 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate fall-back.nix) echo "store expr is $storeExpr" -# Register a non-existant successor. +# Register a non-existant successor (and a nox-existant substitute). suc=$NIX_STORE_DIR/deadbeafdeadbeafdeadbeafdeadbeaf-s.store +(echo $suc && echo $NIX_STORE_DIR/ffffffffffffffffffffffffffffffff.store && echo "/bla" && echo 0) | $TOP/src/nix-store/nix-store --substitute $TOP/src/nix-store/nix-store --successor $storeExpr $suc -outPath=$($TOP/src/nix-store/nix-store -qnfvvvvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qnf "$storeExpr") echo "output path is $outPath" |