diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-01 11:56:57 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-05 19:53:57 -0600 |
| commit | e1e82671870076a73766e628f8755a1f7e0afe11 (patch) | |
| tree | c38bf676bb34d73de5af3891e3648a5e6f15e62c | |
| parent | 47722999c8cb00e6f0be036aa8b620fcd0ca861c (diff) | |
reorganize the tests a bit
| -rw-r--r-- | test/lib-blacklist-test.sh (renamed from test/libreblacklist-test.sh) | 0 | ||||
| -rw-r--r-- | test/lib-messages-test.sh (renamed from test/libremessages-test.sh) | 0 | ||||
| -rw-r--r-- | test/pkgbuild-check-nonfree-test.sh | 8 | ||||
| -rw-r--r-- | test/pkgbuild-check-nonfree.d/PKGBUILD.free (renamed from test/pkgbuild-check-nonfree.PKGBUILD.free) | 0 | ||||
| -rw-r--r-- | test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree (renamed from test/pkgbuild-check-nonfree.PKGBUILD.nonfree) | 0 | ||||
| -rw-r--r-- | test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement (renamed from test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/test/libreblacklist-test.sh b/test/lib-blacklist-test.sh index 94f5b27..94f5b27 100644 --- a/test/libreblacklist-test.sh +++ b/test/lib-blacklist-test.sh diff --git a/test/libremessages-test.sh b/test/lib-messages-test.sh index 22aad47..22aad47 100644 --- a/test/libremessages-test.sh +++ b/test/lib-messages-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)" ]] diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.free b/test/pkgbuild-check-nonfree.d/PKGBUILD.free index 4b8f0dd..4b8f0dd 100644 --- a/test/pkgbuild-check-nonfree.PKGBUILD.free +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.free diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree index 3a7afa4..3a7afa4 100644 --- a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement index 7855bdc..7855bdc 100644 --- a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement |