diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-02 05:27:45 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-02 05:27:45 +0000 |
| commit | 4184c42b2597193366da7a8ada8d3b7344be6f61 (patch) | |
| tree | ba91e1f36e39863bc6d1e5adcdf4954424a15590 /run-tests.sh | |
| parent | efc6792152a1b5fba1165a0ff41ccf74541ca134 (diff) | |
| parent | 0a84eaef04242650c8b75fd3826ac7d02a34e0bf (diff) | |
| download | abuild-4184c42b2597193366da7a8ada8d3b7344be6f61.tar.gz abuild-4184c42b2597193366da7a8ada8d3b7344be6f61.tar.bz2 abuild-4184c42b2597193366da7a8ada8d3b7344be6f61.tar.xz abuild-4184c42b2597193366da7a8ada8d3b7344be6f61.zip | |
Merge branch 'bashisms' into 'master'
POSIX me harder
See merge request adelie/abuild!3
Diffstat (limited to 'run-tests.sh')
| -rwxr-xr-x | run-tests.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/run-tests.sh b/run-tests.sh index ff99a49..b74627c 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -141,16 +141,17 @@ 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 fail $name + cd "$OLDPWD" return fi grep $pattern $name/APKBUILD 1>/dev/null expect_success $name - popd 1>/dev/null + cd "$OLDPWD" } @@ -163,10 +164,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 |