diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-21T16·21+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-21T16·21+0200 |
| commit | 21ef1670b3cb592ae504cca4e412082746affcfe (patch) | |
| tree | 278d3c439a909b9bd7834cfb2d6464c7a95cbc04 | |
| parent | 7d14f5c3310f5380ca14391e79bd1fc214d5f5c9 (diff) | |
Fix test failures
| -rw-r--r-- | src/libstore/gc.cc | 2 | ||||
| -rw-r--r-- | src/libstore/store-api.cc | 1 | ||||
| -rw-r--r-- | tests/referrers.sh | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 13123838f3bf..1536dcb590e0 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -691,7 +691,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) string name = dirent->d_name; if (name == "." || name == "..") continue; Path path = settings.nixStore + "/" + name; - if (isValidPath(path)) + if (isStorePath(path) && isValidPath(path)) entries.push_back(path); else tryToDelete(state, path); diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 9870e36b5494..14932f9b0be7 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -17,6 +17,7 @@ bool isInStore(const Path & path) bool isStorePath(const Path & path) { return isInStore(path) + && path.size() >= settings.nixStore.size() + 1 + storePathHashLen && path.find('/', settings.nixStore.size() + 1) == Path::npos; } diff --git a/tests/referrers.sh b/tests/referrers.sh index 0a1c86e0ab19..5c1ef20cfeb4 100644 --- a/tests/referrers.sh +++ b/tests/referrers.sh @@ -4,7 +4,7 @@ clearStore max=500 -reference=$NIX_STORE_DIR/abcdef +reference=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa touch $reference (echo $reference && echo && echo 0) | nix-store --register-validity @@ -12,9 +12,9 @@ echo "making registration..." set +x for ((n = 0; n < $max; n++)); do - storePath=$NIX_STORE_DIR/$n + storePath=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-$n echo -n > $storePath - ref2=$NIX_STORE_DIR/$((n+1)) + ref2=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-$((n+1)) if test $((n+1)) = $max; then ref2=$reference fi @@ -30,7 +30,7 @@ echo "collecting garbage..." ln -sfn $reference "$NIX_STATE_DIR"/gcroots/ref nix-store --gc -if [ -n "$(type -p sqlite3)" -a "$(sqlite3 ./test-tmp/db/db.sqlite 'select count(*) from Refs')" -ne 0 ]; then +if [ -n "$(type -p sqlite3)" -a "$(sqlite3 $NIX_DB_DIR/db.sqlite 'select count(*) from Refs')" -ne 0 ]; then echo "referrers not cleaned up" exit 1 fi |