From 7abcafcfeacad587ccf1a7e58334958e25cef5b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 13 Jul 2022 20:49:07 +0200
Subject: [PATCH] Move the 'nix bundle' tests

Note: these were previously not actually called.
---
 tests/{flake-bundler.sh => flakes/bundle.sh} | 9 ++-------
 tests/local.mk                               | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename tests/{flake-bundler.sh => flakes/bundle.sh} (84%)

diff --git a/tests/flake-bundler.sh b/tests/flakes/bundle.sh
similarity index 84%
rename from tests/flake-bundler.sh
rename to tests/flakes/bundle.sh
index 9496b8f92..67bbb05ac 100644
--- a/tests/flake-bundler.sh
+++ b/tests/flakes/bundle.sh
@@ -1,9 +1,6 @@
 source common.sh
 
-clearStore
-rm -rf $TEST_HOME/.cache $TEST_HOME/.config $TEST_HOME/.local
-
-cp ./simple.nix ./simple.builder.sh ./config.nix $TEST_HOME
+cp ../simple.nix ../simple.builder.sh ../config.nix $TEST_HOME
 
 cd $TEST_HOME
 
@@ -25,6 +22,7 @@ cat <<EOF > flake.nix
     };
 }
 EOF
+
 nix build .#
 nix bundle --bundler .# .#
 nix bundle --bundler .#bundlers.$system.default .#packages.$system.default
@@ -32,6 +30,3 @@ nix bundle --bundler .#bundlers.$system.simple  .#packages.$system.default
 
 nix bundle --bundler .#bundlers.$system.default .#apps.$system.default
 nix bundle --bundler .#bundlers.$system.simple  .#apps.$system.default
-
-clearStore
-
diff --git a/tests/local.mk b/tests/local.mk
index 1540a1c8c..23eb92039 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -5,6 +5,7 @@ nix_tests = \
   flakes/circular.sh \
   flakes/init.sh \
   flakes/follow-paths.sh \
+  flakes/bundle.sh \
   ca/gc.sh \
   gc.sh \
   remote-store.sh \