summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-01-31 08:57:19 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-01-31 08:57:19 +0000
commit2e0c21a8d56001dbf8117ecb1e8d8ec5e68915b1 (patch)
tree36c5c1cb5f0819d43f1083ff799735751df797f0
parent59cb9822c0ac347d58f1c37627a58fe14dce965d (diff)
parentc4061f459e5254867fb939d123ff02850be50585 (diff)
downloadabuild-2e0c21a8d56001dbf8117ecb1e8d8ec5e68915b1.tar.gz
abuild-2e0c21a8d56001dbf8117ecb1e8d8ec5e68915b1.tar.bz2
abuild-2e0c21a8d56001dbf8117ecb1e8d8ec5e68915b1.tar.xz
abuild-2e0c21a8d56001dbf8117ecb1e8d8ec5e68915b1.zip
Merge branch 'fix-test-suite' into 'master'
tests: fix newapkbuild tests See merge request adelie/abuild!2
-rwxr-xr-xrun-tests.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/run-tests.sh b/run-tests.sh
index b74627c..6cb8dc6 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,14 +1,14 @@
#!/bin/sh
#
# Test suite for abuild(1), newapkbuild(1), and friends
-#
+#
# Copyright (c) 2018, A. Wilcox <awilfox@adelielinux.org>
# Licensed under the GPL 2.0 only. No later version.
#
#####################################################################
# Ground rules:
-#
+#
# * Must be POSIX shell compatible (no bash / dash extensions)
# * Must test all common operations of newapkbuild
# (not necessarily every single kind of package, but common ones)
@@ -143,7 +143,7 @@ newapkbuild_simple_test() {
shift
cd "tests/newapkbuild"
[ -d $name ] && rm -r $name
- newapkbuild -n $name $@
+ ../../newapkbuild $@
if [ $? -ne 0 ]; then
fail $name
cd "$OLDPWD"
@@ -166,7 +166,7 @@ newapkbuild_simple_test simplever 'pkgver=1.0' simplever-1.0
newapkbuild_pkg_test() {
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
+ ../../newapkbuild "https://distfiles.adelielinux.org/source/newapkbuild-tests/$1-1.0.tar.xz" 1>/dev/null 2>/dev/null
cd "$OLDPWD"
if [ $? -ne 0 ]; then
fail "$1: newapkbuild failed"