lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move flakes tests to a subdirectory

Browse source
This commit is contained in:
Eelco Dolstra 2022-07-13 14:09:35 +02:00
parent e1153069bd
commit 420957e149
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/flakes.sh → tests/flakes/flakes.sh
View file

@ -1,4 +1,4 @@
source common.sh source ../common.sh
if [[ -z $(type -p git) ]]; then if [[ -z $(type -p git) ]]; then
echo "Git not installed; skipping flake tests" echo "Git not installed; skipping flake tests"
@ -66,7 +66,7 @@ cat > $flake1Dir/flake.nix <<EOF
} }
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 add flake.nix simple.nix simple.builder.sh config.nix
git -C $flake1Dir commit -m 'Initial' git -C $flake1Dir commit -m 'Initial'
@ -298,7 +298,7 @@ cat > $flake3Dir/flake.nix <<EOF
} }
EOF EOF
cp ./config.nix $flake3Dir cp ../config.nix $flake3Dir
git -C $flake3Dir add flake.nix config.nix git -C $flake3Dir add flake.nix config.nix
git -C $flake3Dir commit -m 'Add nonFlakeInputs' git -C $flake3Dir commit -m 'Add nonFlakeInputs'

4
tests/flakes-run.sh → tests/flakes/run.sh
View file

@ -1,8 +1,8 @@
source common.sh source ../common.sh
clearStore clearStore
rm -rf $TEST_HOME/.cache $TEST_HOME/.config $TEST_HOME/.local 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 cd $TEST_HOME
cat <<EOF > flake.nix cat <<EOF > flake.nix

4
tests/local.mk
View file

@ -1,6 +1,6 @@
nix_tests = \ nix_tests = \
flakes.sh \ flakes/flakes.sh \
flakes-run.sh \ flakes/run.sh \
ca/gc.sh \ ca/gc.sh \
gc.sh \ gc.sh \
remote-store.sh \ remote-store.sh \