From 9485ec31ea3b4ad9f2b31c350cd24f2fa6ec5484 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Mar 2009 16:35:35 +0000 Subject: [PATCH] * Better cleanup after tests. --- tests/common.sh.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/common.sh.in b/tests/common.sh.in index 08faeea71..37dce260f 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -58,6 +58,11 @@ readLink() { ls -l "$1" | sed 's/.*->\ //' } +clearProfiles() { + profiles="$NIX_STATE_DIR"/profiles + rm -f $profiles/* +} + clearStore() { echo "clearing store..." chmod -R +w "$NIX_STORE_DIR" @@ -66,11 +71,9 @@ clearStore() { rm -rf "$NIX_DB_DIR" mkdir "$NIX_DB_DIR" $nixstore --init -} - -clearProfiles() { - profiles="$NIX_STATE_DIR"/profiles - rm -f $profiles/* + clearProfiles + rm -f "$NIX_STATE_DIR"/gcroots/auto/* + rm -f "$NIX_STATE_DIR"/gcroots/ref } clearManifests() {