From 5bf57ec062b446a45de60de639e974ce06f028cd Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 21 Jan 2022 13:41:32 -0500 Subject: [PATCH] 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. --- tests/kolainst/{ => data-shared}/libinsttest.sh | 0 tests/kolainst/{ => data-shared}/libtest-core.sh | 0 tests/kolainst/destructive/data | 2 +- tests/kolainst/nondestructive/data | 2 +- tests/kolainst/nondestructive/libtest-core.sh | 2 +- tests/libtest-core.sh | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename tests/kolainst/{ => data-shared}/libinsttest.sh (100%) rename tests/kolainst/{ => data-shared}/libtest-core.sh (100%) diff --git a/tests/kolainst/libinsttest.sh b/tests/kolainst/data-shared/libinsttest.sh similarity index 100% rename from tests/kolainst/libinsttest.sh rename to tests/kolainst/data-shared/libinsttest.sh diff --git a/tests/kolainst/libtest-core.sh b/tests/kolainst/data-shared/libtest-core.sh similarity index 100% rename from tests/kolainst/libtest-core.sh rename to 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