From 9520cb3a3da4b67db36242b5efe21ab5f0363ed8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 29 Sep 2018 19:51:47 -0400
Subject: test: pkgbuild-check-nonfree: Expand $pcn and $psn

---
 test/pkgbuild-check-nonfree-test.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/pkgbuild-check-nonfree-test.sh b/test/pkgbuild-check-nonfree-test.sh
index 56e0bf5..0d412e8 100644
--- a/test/pkgbuild-check-nonfree-test.sh
+++ b/test/pkgbuild-check-nonfree-test.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env roundup
 
-# avoid carpel tunnel
-pcn=pkgbuild-check-nonfree
-psn=pkgbuild-summarize-nonfree
-
-describe $pcn
+describe pkgbuild-check-nonfree
 . ./test-common.sh
 
 common_before() {
@@ -20,7 +16,7 @@ common_before() {
 it_displays_usage_text() {
 	# This test seems silly, but it makes sure that it is executable,
 	# syntactically correct,  and loading libraries works.
-	LC_ALL=C $pcn -h >$tmpdir/stdout 2>$tmpdir/stderr
+	LC_ALL=C pkgbuild-check-nonfree -h >$tmpdir/stdout 2>$tmpdir/stderr
 	status=$?
 
 	[[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]]
@@ -29,7 +25,7 @@ it_displays_usage_text() {
 }
 
 it_succeeds_for_free_depends() {
-	$pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
+	pkgbuild-check-nonfree pkgbuild-check-nonfree.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
 
 	empty $tmpdir/stdout
 	not empty $tmpdir/stderr
@@ -37,7 +33,7 @@ it_succeeds_for_free_depends() {
 }
 
 it_succeeds_for_nonfree_depend_with_replacement() {
-	$pcn $pcn.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
+	pkgbuild-check-nonfree pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
 
 	empty $tmpdir/stdout
 	not empty $tmpdir/stderr
@@ -45,14 +41,14 @@ it_succeeds_for_nonfree_depend_with_replacement() {
 }
 
 it_fails_for_nonfree_depend() {
-	$pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
+	pkgbuild-check-nonfree pkgbuild-check-nonfree.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
 	[[ $status != 0 ]]
 	empty $tmpdir/stdout
 	not empty $tmpdir/stderr
 
 	local pcn_stat=$status
 
-	$psn $pcn_stat >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
+	pkgbuild-summarize-nonfree $pcn_stat >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
 	[[ $status != 0 ]]
 	empty $tmpdir/stdout
 	not empty $tmpdir/stderr
@@ -63,7 +59,7 @@ it_fails_when_there_is_no_blacklist() {
 	echo "BLACKLIST='phony://example.com'" >$XDG_CONFIG_HOME/libretools/libretools.conf
 	rm $XDG_CACHE_HOME/libretools/blacklist.txt
 
-	$pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
+	pkgbuild-check-nonfree pkgbuild-check-nonfree.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$?
 
 	empty $tmpdir/stdout
 	not empty $tmpdir/stderr
-- 
cgit v1.2.2