diff options
| author | Max Rees <maxcrees@me.com> | 2019-07-20 21:35:10 -0400 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2019-08-14 01:31:51 -0500 |
| commit | c4061f459e5254867fb939d123ff02850be50585 (patch) | |
| tree | c73bf5e4a880893bde5ff02e1144aef32df477d8 | |
| parent | 4184c42b2597193366da7a8ada8d3b7344be6f61 (diff) | |
| download | abuild-c4061f459e5254867fb939d123ff02850be50585.tar.gz abuild-c4061f459e5254867fb939d123ff02850be50585.tar.bz2 abuild-c4061f459e5254867fb939d123ff02850be50585.tar.xz abuild-c4061f459e5254867fb939d123ff02850be50585.zip | |
tests: fix newapkbuild tests
* Do not use the -n option for newapkbuild_simple_test: since commit
a68354ebc50f60369ce465d0d59020cdf081bf22, this option is not allowed
when providing PKGNAME[-PKGVER] (i.e. not SRCURL) as the final
argument.
* Use newapkbuild from the working tree, not whatever is in $PATH.
| -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 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" |