lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Fix broken GC test.

Browse source
This commit is contained in:
Eelco Dolstra 2005-02-15 09:39:12 +00:00
parent 8992fce3da
commit 0083562f75
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/Makefile.am
View file

@ -9,6 +9,7 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \
NIX_LOG_DIR=$(TEST_ROOT)/var/log/nix \ NIX_LOG_DIR=$(TEST_ROOT)/var/log/nix \
NIX_STATE_DIR=$(TEST_ROOT)/var/nix \ NIX_STATE_DIR=$(TEST_ROOT)/var/nix \
NIX_DB_DIR=$(TEST_ROOT)/db \ NIX_DB_DIR=$(TEST_ROOT)/db \
NIX_CONF_DIR=$(TEST_ROOT)/etc \
NIX_BIN_DIR=$(TEST_ROOT)/bin \ NIX_BIN_DIR=$(TEST_ROOT)/bin \
NIX_LIBEXEC_DIR=$(TEST_ROOT)/bin \ NIX_LIBEXEC_DIR=$(TEST_ROOT)/bin \
REAL_BIN_DIR=$(bindir) \ REAL_BIN_DIR=$(bindir) \
@ -39,7 +40,7 @@ gc-concurrent.sh: gc-concurrent.nix gc-concurrent2.nix
TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.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 \ build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \
gc-concurrent.sh verify.sh nix-pull.sh gc-concurrent.sh verify.sh nix-pull.sh
#TESTS = init.sh nix-push.sh nix-pull.sh #TESTS = init.sh gc.sh
XFAIL_TESTS = XFAIL_TESTS =

7
tests/init.sh
View file

@ -13,6 +13,7 @@ mkdir "$NIX_LOCALSTATE_DIR"
mkdir -p "$NIX_LOG_DIR" mkdir -p "$NIX_LOG_DIR"
mkdir "$NIX_STATE_DIR" mkdir "$NIX_STATE_DIR"
mkdir "$NIX_DB_DIR" mkdir "$NIX_DB_DIR"
mkdir "$NIX_CONF_DIR"
mkdir $NIX_BIN_DIR mkdir $NIX_BIN_DIR
ln -s $TOP/src/nix-store/nix-store $NIX_BIN_DIR/ ln -s $TOP/src/nix-store/nix-store $NIX_BIN_DIR/
@ -28,6 +29,12 @@ mkdir -p "$NIX_STATE_DIR"/manifests
mkdir -p "$NIX_STATE_DIR"/gcroots mkdir -p "$NIX_STATE_DIR"/gcroots
mkdir -p "$NIX_STATE_DIR"/temproots mkdir -p "$NIX_STATE_DIR"/temproots
cat > "$NIX_CONF_DIR"/nix.conf <<EOF
gc-keep-outputs = false
gc-keep-derivations = false
env-keep-derivations = false
EOF
mkdir $NIX_DATA_DIR/nix mkdir $NIX_DATA_DIR/nix
cp -prd $TOP/corepkgs $NIX_DATA_DIR/nix/ cp -prd $TOP/corepkgs $NIX_DATA_DIR/nix/
# Bah, script has the prefix hard-coded. This is really messy stuff # Bah, script has the prefix hard-coded. This is really messy stuff