diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2022-01-21 13:41:32 -0500 |
|---|---|---|
| committer | Jonathan Lebon <jonathan@jlebon.com> | 2022-01-25 16:44:39 -0500 |
| commit | 5bf57ec062b446a45de60de639e974ce06f028cd (patch) | |
| tree | 4272b84d69b7c9858ce2af09f2979e88d4da810b | |
| parent | baf838de229a7934e4ee0cf27a10a54d6aac28fd (diff) | |
| download | ostree-5bf57ec062b446a45de60de639e974ce06f028cd.tar.gz | |
tests/kolainst: Avoid recursive symlinks
`kola` now follows symlinks when archiving an external test's `data/`
dir. So the recursive `data` symlink we have here breaks it.
Let's just move the shared files in its own directory and update the
symlinks.
| -rw-r--r-- | tests/kolainst/data-shared/libinsttest.sh (renamed from tests/kolainst/libinsttest.sh) | 0 | ||||
| -rw-r--r-- | tests/kolainst/data-shared/libtest-core.sh (renamed from tests/kolainst/libtest-core.sh) | 0 | ||||
| l--------- | tests/kolainst/destructive/data | 2 | ||||
| l--------- | tests/kolainst/nondestructive/data | 2 | ||||
| l--------- | tests/kolainst/nondestructive/libtest-core.sh | 2 | ||||
| l--------- | tests/libtest-core.sh | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/tests/kolainst/libinsttest.sh b/tests/kolainst/data-shared/libinsttest.sh index 927dc5e1..927dc5e1 100644 --- a/tests/kolainst/libinsttest.sh +++ b/tests/kolainst/data-shared/libinsttest.sh diff --git a/tests/kolainst/libtest-core.sh b/tests/kolainst/data-shared/libtest-core.sh index d10aac1c..d10aac1c 100644 --- a/tests/kolainst/libtest-core.sh +++ b/tests/kolainst/data-shared/libtest-core.sh diff --git a/tests/kolainst/destructive/data b/tests/kolainst/destructive/data index a96aa0ea..8bd12e74 120000 --- a/tests/kolainst/destructive/data +++ b/tests/kolainst/destructive/data @@ -1 +1 @@ -..
\ No newline at end of file +../data-shared
\ No newline at end of file diff --git a/tests/kolainst/nondestructive/data b/tests/kolainst/nondestructive/data index a96aa0ea..8bd12e74 120000 --- a/tests/kolainst/nondestructive/data +++ b/tests/kolainst/nondestructive/data @@ -1 +1 @@ -..
\ No newline at end of file +../data-shared
\ No newline at end of file diff --git a/tests/kolainst/nondestructive/libtest-core.sh b/tests/kolainst/nondestructive/libtest-core.sh index d26203e2..bd5f8277 120000 --- a/tests/kolainst/nondestructive/libtest-core.sh +++ b/tests/kolainst/nondestructive/libtest-core.sh @@ -1 +1 @@ -../libtest-core.sh
\ No newline at end of file +../data-shared/libtest-core.sh
\ No newline at end of file diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh index 3c181880..9bb1d3f1 120000 --- a/tests/libtest-core.sh +++ b/tests/libtest-core.sh @@ -1 +1 @@ -kolainst/libtest-core.sh
\ No newline at end of file +kolainst/data-shared/libtest-core.sh
\ No newline at end of file |