From 23faa9361d79d1d88754a1e1e5aa9f040b34545c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
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-licenses-test.sh | 27 ---------------------------
 test/pkgbuild-check-nonfree-test.sh  | 11 +++++++++--
 2 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 test/pkgbuild-check-licenses-test.sh

(limited to 'test')

diff --git a/test/pkgbuild-check-licenses-test.sh b/test/pkgbuild-check-licenses-test.sh
deleted file mode 100644
index efb4875..0000000
--- a/test/pkgbuild-check-licenses-test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env roundup
-
-# avoid carpel tunnel
-pcl=pkgbuild-check-licenses
-
-describe $pcl
-
-. ./test-common.sh
-
-before() {
-	_before
-}
-
-after() {
-	_after
-}
-
-it_displays_usage_text() {
-	# This test seems silly, but it makes sure that it is executable,
-	# syntactically correct,  and loading libraries works.
-	LANG=C $pcl -h >$tmpdir/stdout 2>$tmpdir/stderr
-	stat=$?
-
-	[[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]]
-	empty $tmpdir/stderr
-	[[ $stat == 0 ]]
-}
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.3