Move git_cache out to a separate library

[pinch] / tests / lib / test-setup.sh

diff --git a/tests/lib/test-setup.sh b/tests/lib/test-setup.sh
index 35a4e7334dbbc52f1a71284e342ee53af061f1cf..4742ff02a354a4b667ea2abaf552aa5c5e00465f 100644 (file)
--- a/tests/lib/test-setup.sh
+++ b/tests/lib/test-setup.sh
@@ -8,6 +8,11 @@ export GIT_COMMITTER_EMAIL=auto@mati.on
 cache_dir=$(mktemp -d)
 export XDG_CACHE_HOME=$cache_dir
 
 cache_dir=$(mktemp -d)
 export XDG_CACHE_HOME=$cache_dir
 

+nix_store=$(mktemp -d)
+nix_state=$(mktemp -d)
+export NIX_STORE_DIR=$nix_store
+export NIX_STATE_DIR=$nix_state
+

 foo_setup() {
 
   repo_dir="`mktemp -d`"
 foo_setup() {
 
   repo_dir="`mktemp -d`"


@@ -23,6 +28,7 @@ foo_setup() {
   conf="`mktemp`"
   cat > "$conf" <<EOF
 [foo]
   conf="`mktemp`"
   cat > "$conf" <<EOF
 [foo]

+type = git

 git_repo = file://$repo
 git_ref = master
 EOF
 git_repo = file://$repo
 git_ref = master
 EOF


@@ -33,6 +39,8 @@ test_cleanup() {
   if [ "$repo_dir"  ];then rm -rf "$repo_dir";  fi
   if [ "$conf"      ];then rm     "$conf";      fi
   if [ "$cache_dir" ];then rm -rf "$cache_dir"; fi
   if [ "$repo_dir"  ];then rm -rf "$repo_dir";  fi
   if [ "$conf"      ];then rm     "$conf";      fi
   if [ "$cache_dir" ];then rm -rf "$cache_dir"; fi

+  if [ "$nix_store" ];then rm -rf "$nix_store"; fi
+  if [ "$nix_state" ];then rm -rf "$nix_state"; fi

 }
 
 trap test_cleanup EXIT INT TERM
 }
 
 trap test_cleanup EXIT INT TERM