diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-07-13 14:09:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-07-13 15:06:54 +0200 |
| commit | 420957e149256677046b2433135f53ab0dadab3c (patch) | |
| tree | f215fce3c54c33f43a3df9e9d08d1dbd58cb43e3 | |
| parent | e1153069bd0e3320227c997c32e657f7e652a212 (diff) | |
Move flakes tests to a subdirectory
| -rw-r--r-- | tests/flakes/flakes.sh (renamed from tests/flakes.sh) | 6 | ||||
| -rw-r--r-- | tests/flakes/run.sh (renamed from tests/flakes-run.sh) | 4 | ||||
| -rw-r--r-- | tests/local.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/flakes.sh b/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 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 \ |