diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-25T17·24+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-25T17·24+0000 |
| commit | 498f4915cc9dc461b18789288063759e0aded805 (patch) | |
| tree | da461d3bff1d24adea138245cddd7cd9e7f895c3 | |
| parent | 066da4ab852ebe4288536149824ea175dc36cad4 (diff) | |
* Re-enable all tests.
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/fallback.sh | 2 | ||||
| -rw-r--r-- | tests/substitutes.sh | 2 | ||||
| -rw-r--r-- | tests/substitutes2.sh | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9094d39f5041..6858259f3174 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,11 +34,9 @@ fallback.sh: fallback.nix nix-push.sh: dependencies.nix nix-pull.sh: dependencies.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 verify.sh \ -# nix-pull.sh - -TESTS = init.sh nix-push.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 verify.sh \ + nix-pull.sh XFAIL_TESTS = diff --git a/tests/fallback.sh b/tests/fallback.sh index 081e5695f400..ac4370c61be5 100644 --- a/tests/fallback.sh +++ b/tests/fallback.sh @@ -5,7 +5,7 @@ outPath=$($TOP/src/nix-store/nix-store -q --fallback "$storeExpr") echo "output path is $outPath" # Register a non-existant substitute -(echo $outPath && echo $TOP/no-such-program && echo 0) | $TOP/src/nix-store/nix-store --substitute +(echo $outPath && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute # Build the derivation $TOP/src/nix-store/nix-store -r --fallback "$storeExpr" diff --git a/tests/substitutes.sh b/tests/substitutes.sh index c0b61288a40b..061f5f32afcf 100644 --- a/tests/substitutes.sh +++ b/tests/substitutes.sh @@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvv "$storeExpr") echo "output path is $outPath" regSub() { - (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute + (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute } # Register a substitute for the output path. diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh index 56f2bab3745e..e48e12a8f4b7 100644 --- a/tests/substitutes2.sh +++ b/tests/substitutes2.sh @@ -7,7 +7,7 @@ outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr") echo "output path is $outPath" regSub() { - (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute + (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --substitute } # Register a substitute for the output path. |