From 5ecfc84bc620859a57c8364bda636cbca14c46e6 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 19 Jun 2018 00:46:45 -0400
Subject: Initial removal of bashisms

---
 run-tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'run-tests.sh')

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
-- 
cgit v1.2.3-60-g2f50


From 7e891ec6d79e1fb0052ec39849ea589e52c9ef9e Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sat, 20 Jul 2019 21:45:53 -0400
Subject: tests: cd "$OLDPWD" even on failure in newapkbuild_simple_test

---
 run-tests.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'run-tests.sh')

diff --git a/run-tests.sh b/run-tests.sh
index 9e757e8..b74627c 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -146,6 +146,7 @@ newapkbuild_simple_test() {
 	newapkbuild -n $name $@
 	if [ $? -ne 0 ]; then
 		fail $name
+		cd "$OLDPWD"
 		return
 	fi
 	grep $pattern $name/APKBUILD 1>/dev/null
-- 
cgit v1.2.3-60-g2f50