diff options
Diffstat (limited to 'run-tests.sh')
| -rwxr-xr-x | run-tests.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run-tests.sh b/run-tests.sh index ff99a49..9e757e8 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -141,7 +141,7 @@ newapkbuild_simple_test() { shift pattern=$1 shift - pushd "tests/newapkbuild" 1>/dev/null + cd "tests/newapkbuild" [ -d $name ] && rm -r $name newapkbuild -n $name $@ if [ $? -ne 0 ]; then @@ -150,7 +150,7 @@ newapkbuild_simple_test() { fi grep $pattern $name/APKBUILD 1>/dev/null expect_success $name - popd 1>/dev/null + cd "$OLDPWD" } @@ -163,10 +163,10 @@ newapkbuild_simple_test simplever 'pkgver=1.0' simplever-1.0 # $1 - test name (test-autoconf-pkg, etc) # $2 - the invocation expected ("./configure", "cmake", etc) newapkbuild_pkg_test() { - pushd "tests/newapkbuild" 1>/dev/null + cd "tests/newapkbuild" [ -d $1 ] && rm -r $1 newapkbuild "https://distfiles.adelielinux.org/source/newapkbuild-tests/$1-1.0.tar.xz" 1>/dev/null 2>/dev/null - popd 1>/dev/null + cd "$OLDPWD" if [ $? -ne 0 ]; then fail "$1: newapkbuild failed" else |