From 11dbb13e0833e3a1707bda2a6d2613fc04ef279c Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 23 May 2019 15:59:11 +0200 Subject: [PATCH] distro/tests: support test-distro.sh exec from any directory --- distro/tests/test-distro.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/distro/tests/test-distro.sh b/distro/tests/test-distro.sh index 8d20ed0a1..ddfcba400 100755 --- a/distro/tests/test-distro.sh +++ b/distro/tests/test-distro.sh @@ -3,17 +3,21 @@ # ./test-distro.sh {devel|latest} {distro} # Example usage: ./test-distro.sh devel debian9 +pkgtestdir="$(dirname ${0})" +repofile="$pkgtestdir/repos.yaml" + distro=$2 repo=$1 # Select repos -echo -e 'repos:\n - knot-resolver-latest' > repos.yaml # latest is needed for knot +# TODO: enable knot-dns-devel +echo -e 'repos:\n - knot-resolver-latest' > $repofile # latest is needed for knot case "$repo" in devel) - echo -e ' - knot-resolver-devel' >> repos.yaml + echo -e ' - knot-resolver-devel' >> $repofile ;; testing) - echo -e 'repos:\n - knot-resolver-testing' > repos.yaml + echo -e 'repos:\n - knot-resolver-testing' > $repofile ;; latest) ;; @@ -23,9 +27,10 @@ case "$repo" in ;; esac -cd "$distro" +pushd "$pkgtestdir/$distro" vagrant destroy -f &>/dev/null vagrant up ret=$? vagrant destroy -f &>/dev/null +popd exit $ret -- 2.47.2