From 23faa9361d79d1d88754a1e1e5aa9f040b34545c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 26 Oct 2013 01:35:45 -0400 Subject: Merge pkgbuild-check-{nonfree,licenses}, add a summarize tool for it. This should fix a number of bugs in those two scripts, and the summarize script simplifies aur and libremakepkg:hooks-check.sh --- test/pkgbuild-check-nonfree-test.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'test/pkgbuild-check-nonfree-test.sh') diff --git a/test/pkgbuild-check-nonfree-test.sh b/test/pkgbuild-check-nonfree-test.sh index 80bfc47..b30204b 100644 --- a/test/pkgbuild-check-nonfree-test.sh +++ b/test/pkgbuild-check-nonfree-test.sh @@ -2,6 +2,7 @@ # avoid carpel tunnel pcn=pkgbuild-check-nonfree +psn=pkgbuild-summarize-nonfree describe $pcn @@ -50,12 +51,18 @@ it_succeeds_for_nonfree_depend_with_replacement() { [[ $stat == 0 ]] } -it_fails_with_15_for_nonfree_depend() { +it_fails_for_nonfree_depend() { $pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + [[ $stat != 0 ]] + empty $tmpdir/stdout + ! empty $tmpdir/stderr + + local pcn_stat=$stat + $psn $pcn_stat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + [[ $stat != 0 ]] empty $tmpdir/stdout ! empty $tmpdir/stderr - [[ $stat == 15 ]] } it_fails_when_there_is_no_blacklist() { -- cgit v1.2.2