wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-10 04:43:53 +02:00
Code Activity

* Multiple and/or failing substitutes now work.

Browse source
This commit is contained in:
Eelco Dolstra 2004-06-24 13:40:38 +00:00
parent 8052aef486
commit ec32627621
4 changed files with 54 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/Makefile.am
View file

@ -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

6
tests/substitutes2.nix.in Normal file
View file

@ -0,0 +1,6 @@
derivation {
name = "substitutes-2";
system = "@system@";
builder = "@shell@";
args = ["-e" "-x" ./simple.builder.sh];
}

4
tests/substitutes2.sh
View file

@ -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