From 420957e149256677046b2433135f53ab0dadab3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 13 Jul 2022 14:09:35 +0200
Subject: [PATCH] Move flakes tests to a subdirectory

---
 tests/{ => flakes}/flakes.sh           | 6 +++---
 tests/{flakes-run.sh => flakes/run.sh} | 4 ++--
 tests/local.mk                         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{ => flakes}/flakes.sh (99%)
 rename tests/{flakes-run.sh => flakes/run.sh} (92%)

diff --git a/tests/flakes.sh b/tests/flakes/flakes.sh
similarity index 99%
rename from tests/flakes.sh
rename to tests/flakes/flakes.sh
index 6574cabf1..b14c79358 100644
--- a/tests/flakes.sh
+++ b/tests/flakes/flakes.sh
@@ -1,4 +1,4 @@
-source common.sh
+source ../common.sh
 
 if [[ -z $(type -p git) ]]; then
     echo "Git not installed; skipping flake tests"
@@ -66,7 +66,7 @@ cat > $flake1Dir/flake.nix <<EOF
 }
 EOF
 
-cp ./simple.nix ./simple.builder.sh ./config.nix $flake1Dir/
+cp ../simple.nix ../simple.builder.sh ../config.nix $flake1Dir/
 git -C $flake1Dir add flake.nix simple.nix simple.builder.sh config.nix
 git -C $flake1Dir commit -m 'Initial'
 
@@ -298,7 +298,7 @@ cat > $flake3Dir/flake.nix <<EOF
 }
 EOF
 
-cp ./config.nix $flake3Dir
+cp ../config.nix $flake3Dir
 
 git -C $flake3Dir add flake.nix config.nix
 git -C $flake3Dir commit -m 'Add nonFlakeInputs'
diff --git a/tests/flakes-run.sh b/tests/flakes/run.sh
similarity index 92%
rename from tests/flakes-run.sh
rename to tests/flakes/run.sh
index 88fc3e628..9fa51d1c7 100644
--- a/tests/flakes-run.sh
+++ b/tests/flakes/run.sh
@@ -1,8 +1,8 @@
-source common.sh
+source ../common.sh
 
 clearStore
 rm -rf $TEST_HOME/.cache $TEST_HOME/.config $TEST_HOME/.local
-cp ./shell-hello.nix ./config.nix $TEST_HOME
+cp ../shell-hello.nix ../config.nix $TEST_HOME
 cd $TEST_HOME
 
 cat <<EOF > flake.nix
diff --git a/tests/local.mk b/tests/local.mk
index ae15c70f9..021aae35e 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,6 +1,6 @@
 nix_tests = \
-  flakes.sh \
-  flakes-run.sh \
+  flakes/flakes.sh \
+  flakes/run.sh \
   ca/gc.sh \
   gc.sh \
   remote-store.sh \