From e1e82671870076a73766e628f8755a1f7e0afe11 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 1 Jun 2013 11:56:57 -0600 Subject: reorganize the tests a bit --- test/pkgbuild-check-nonfree-test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 8a2e349..5ddd341 100644 --- a/test/pkgbuild-check-nonfree-test.sh +++ b/test/pkgbuild-check-nonfree-test.sh @@ -30,7 +30,7 @@ it_displays_usage_text() { } it_succeeds_for_free_depends() { - $pcn $pcn.PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -38,7 +38,7 @@ it_succeeds_for_free_depends() { } it_succeeds_for_nonfree_depend_with_replacement() { - $pcn $pcn.PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -46,7 +46,7 @@ it_succeeds_for_nonfree_depend_with_replacement() { } it_fails_with_15_for_nonfree_depend() { - $pcn $pcn.PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -58,7 +58,7 @@ it_fails_when_there_is_no_blacklist() { echo "BLACKLIST='http://phony'" >$XDG_CONFIG_HOME/libretools/libretools.conf rm $XDG_CACHE_HOME/libretools/blacklist.txt - $pcn $pcn.PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] -- cgit v1.2.3-54-g00ecf