diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-06-24T13·40+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-06-24T13·40+0000 |
| commit | ec326276217ad5b7761327da567f79bb5cc17f32 (patch) | |
| tree | cc0d9216ae50d5b6d44f33db391628af8809097c /tests | |
| parent | 8052aef4866e236ef0bb5d5675bbae330abb9b9b (diff) | |
* Multiple and/or failing substitutes now work.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/substitutes2.nix.in | 6 | ||||
| -rw-r--r-- | tests/substitutes2.sh | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index dad3f8791368..a420334147fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,11 +18,10 @@ locking.sh: locking.nix parallel.sh: parallel.nix build-hook.sh: build-hook.nix substitutes.sh: substitutes.nix substituter.nix -substitutes2.sh: substitutes.nix substituter.nix substituter2.nix +substitutes2.sh: substitutes2.nix substituter.nix substituter2.nix -#TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \ -# build-hook.sh substitutes.sh substitutes2.sh -TESTS = init.sh substitutes2.sh +TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \ + build-hook.sh substitutes.sh substitutes2.sh XFAIL_TESTS = @@ -35,4 +34,4 @@ EXTRA_DIST = $(TESTS) \ parallel.nix.in parallel.builder.sh \ build-hook.nix.in build-hook.hook.sh \ substitutes.nix.in substituter.nix.in substituter.builder.sh \ - substituter2.nix.in substituter2.builder.sh + substitutes2.nix.in substituter2.nix.in substituter2.builder.sh diff --git a/tests/substitutes2.nix.in b/tests/substitutes2.nix.in new file mode 100644 index 000000000000..8ade1ba11674 --- /dev/null +++ b/tests/substitutes2.nix.in @@ -0,0 +1,6 @@ +derivation { + name = "substitutes-2"; + system = "@system@"; + builder = "@shell@"; + args = ["-e" "-x" ./simple.builder.sh]; +} \ No newline at end of file diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh index 33bae3238fb8..76ff74b3ed29 100644 --- a/tests/substitutes2.sh +++ b/tests/substitutes2.sh @@ -1,5 +1,5 @@ # Instantiate. -storeExpr=$($TOP/src/nix-instantiate/nix-instantiate substitutes.nix) +storeExpr=$($TOP/src/nix-instantiate/nix-instantiate substitutes2.nix) echo "store expr is $storeExpr" # Find the output path. @@ -19,7 +19,7 @@ regSub() { } # Register a fake successor, and a substitute for it. -suc=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-s.store +suc=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab-s.store regSub $suc $subExpr $TOP/src/nix-store/nix-store --successor $storeExpr $suc |