diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-09-29 18:56:35 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-10-01 17:35:14 -0400 |
commit | 4c1366f389d8691a82db120e54a213747e0b4647 (patch) | |
tree | 15eed14e74ebf9e327dff67b9dba53e09836fa7f /test | |
parent | 84a73785021d83078ed722942cc7aac377deb13b (diff) |
test: Normalize on "status" instead of "stat" "ret" or "r" for storing exit codes
The name "status" was chosen because BATS initializes status=0; if we
switch from Roundup to BATS, our common setup won't need set it
anymore.
Accomplish this with:
$ sed -ri -e 's/\$(stat|ret|r)\b/$status/g' -e 's/\b(stat|ret|r)=/status=/g' test/*.sh
$ sed -ri '/^\s*(local\s+)?status=0$/d' test/*-test.sh
Diffstat (limited to 'test')
-rw-r--r-- | test/aur-test.sh | 4 | ||||
-rw-r--r-- | test/gitget-test.sh | 8 | ||||
-rw-r--r-- | test/is_built-test.sh | 12 | ||||
-rwxr-xr-x | test/lib-blacklist-test.sh | 20 | ||||
-rw-r--r-- | test/lib-messages-test.sh | 9 | ||||
-rw-r--r-- | test/librechroot-test.sh | 25 | ||||
-rw-r--r-- | test/libredbdiff-test.sh | 4 | ||||
-rw-r--r-- | test/librefetch-test.sh | 4 | ||||
-rw-r--r-- | test/librelib-test.sh | 15 | ||||
-rw-r--r-- | test/libremakepkg-test.sh | 20 | ||||
-rw-r--r-- | test/librerelease-test.sh | 4 | ||||
-rw-r--r-- | test/librestage-test.sh | 8 | ||||
-rw-r--r-- | test/librexgettext-test.sh | 16 | ||||
-rw-r--r-- | test/pkgbuild-check-nonfree-test.sh | 26 | ||||
-rwxr-xr-x | test/test-common.sh | 2 |
15 files changed, 85 insertions, 92 deletions
diff --git a/test/aur-test.sh b/test/aur-test.sh index 47f6d87..fbb3266 100644 --- a/test/aur-test.sh +++ b/test/aur-test.sh @@ -11,9 +11,9 @@ it_displays_help() { } it_fails_with_0_args() { - aur >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + aur >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } diff --git a/test/gitget-test.sh b/test/gitget-test.sh index a5e9f2c..1630fdb 100644 --- a/test/gitget-test.sh +++ b/test/gitget-test.sh @@ -11,9 +11,9 @@ it_displays_help() { } it_fails_with_0_args() { - gitget >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + gitget >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -32,8 +32,8 @@ it_forces_url_for_bare() { cd dst.git [[ "$(git config --get remote.origin.url)" == "$tmpdir/src" ]] cd .. - gitget bare "file://$PWD/src" dst.git || r=$? - [[ $r != 0 ]] + gitget bare "file://$PWD/src" dst.git || status=$? + [[ $status != 0 ]] gitget -f bare "file://$PWD/src" dst.git cd dst.git [[ "$(git config --get remote.origin.url)" == "file://$tmpdir/src" ]] diff --git a/test/is_built-test.sh b/test/is_built-test.sh index 147bdaa..66f92bf 100644 --- a/test/is_built-test.sh +++ b/test/is_built-test.sh @@ -11,9 +11,9 @@ it_displays_help() { } it_fails_with_0_args() { - is_built >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + is_built >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat -gt 1 ]] + [[ $status -gt 1 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -26,18 +26,18 @@ it_succeeds_with_1_arg() { } it_returns_1_for_non_existent_package() { - is_built phony-ne-package 100 >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + is_built phony-ne-package 100 >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat == 1 ]] + [[ $status == 1 ]] empty $tmpdir/stdout empty $tmpdir/stderr } it_returns_1_for_future_packages() { # If emacs ever goes rapid release, we might need to change this :P - is_built emacs 100 >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + is_built emacs 100 >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat == 1 ]] + [[ $status == 1 ]] empty $tmpdir/stdout empty $tmpdir/stderr } diff --git a/test/lib-blacklist-test.sh b/test/lib-blacklist-test.sh index 7b88b72..742f1c2 100755 --- a/test/lib-blacklist-test.sh +++ b/test/lib-blacklist-test.sh @@ -54,9 +54,9 @@ it_fails_update_with_no_blacklist_or_network() { mkdir -p $XDG_CONFIG_HOME/libretools echo "BLACKLIST='phony://example.com'" >$XDG_CONFIG_HOME/libretools/libretools.conf - libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -65,9 +65,9 @@ it_fails_cat_with_no_blacklist_or_network() { mkdir -p $XDG_CONFIG_HOME/libretools echo "BLACKLIST='phony://example.com'" >$XDG_CONFIG_HOME/libretools/libretools.conf - libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -76,9 +76,9 @@ it_fails_update_when_BLACKLIST_is_unset() { mkdir -p $XDG_CONFIG_HOME/libretools echo "BLACKLIST=" >$XDG_CONFIG_HOME/libretools/libretools.conf - libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -88,9 +88,9 @@ it_fails_cat_when_syntax_error_in_conf() { # there is a stray single quote in there printf "BLACKLIST='%q\n" "${_blacklist_url}" >$XDG_CONFIG_HOME/libretools/libretools.conf - libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -115,9 +115,9 @@ it_downloads_the_blacklist_repeatedly() { } it_displays_help_and_fails_with_no_args() { - LC_ALL=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout [[ "$(sed 1q $tmpdir/stderr)" =~ 'Usage: libreblacklist ' ]] } diff --git a/test/lib-messages-test.sh b/test/lib-messages-test.sh index 3068a98..d5cde09 100644 --- a/test/lib-messages-test.sh +++ b/test/lib-messages-test.sh @@ -33,9 +33,8 @@ it_can_be_called_without_including() { } it_fails_with_msg_and_no_args() { - ret=0 - libremessages msg || ret=$? - [[ $ret != 0 ]] + libremessages msg || status=$? + [[ $status != 0 ]] } it_allows_subheadings_to_flag() { @@ -55,9 +54,9 @@ it_allows_subheadings_to_flag() { } it_is_quiet_on_stdout_on_errs() { - LC_ALL=C bash -euE -c '. libremessages; setup_traps; false' >"$tmpdir/stdout" 2>"$tmpdir/stderr" || stat=$? + LC_ALL=C bash -euE -c '. libremessages; setup_traps; false' >"$tmpdir/stdout" 2>"$tmpdir/stderr" || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty "$tmpdir/stdout" grep '==> ERROR:' "$tmpdir/stderr" } diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh index 93e7833..31f9237 100644 --- a/test/librechroot-test.sh +++ b/test/librechroot-test.sh @@ -24,10 +24,9 @@ it_respects_exit_status_if_out_isnt_a_tty() ( require network sudo || return 0 set -o pipefail libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty - r=0 - { testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || r=$? + { testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || status=$? - [[ $r == 3 ]] + [[ $status == 3 ]] ) it_creates_ca_certificates() { @@ -102,17 +101,17 @@ it_displays_help_as_normal_user() { } it_otherwise_fails_as_normal_user() { - librechroot -l "$roundup_test_name" run true >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librechroot -l "$roundup_test_name" run true >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } it_displays_help_and_fails_with_0_args() { - LC_ALL=C librechroot -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C librechroot -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout [[ "$(sed -n 2p $tmpdir/stderr)" =~ Usage:.* ]] } @@ -131,9 +130,9 @@ it_obeys_the_n_flag() { # requires sudo so we know it's not failing because it needs root it_fails_for_unknown_commands() { require sudo || return 0 - testsudo librechroot phony >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + testsudo librechroot phony >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -141,17 +140,17 @@ it_fails_for_unknown_commands() { # requires sudo so we know it's not failing because it needs root it_fails_for_unknown_flags() { require sudo || return 0 - testsudo librechroot -q >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + testsudo librechroot -q >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } it_fails_when_syncing_a_copy_with_itself() { require sudo || return 0 - testsudo timeout 5 librechroot -l root sync || stat=$? - case $stat in + testsudo timeout 5 librechroot -l root sync || status=$? + case $status in 0|124|137) # success|timeout+TERM|timeout+KILL false;; *) diff --git a/test/libredbdiff-test.sh b/test/libredbdiff-test.sh index fe73074..222e667 100644 --- a/test/libredbdiff-test.sh +++ b/test/libredbdiff-test.sh @@ -41,9 +41,9 @@ it_handles_packages_with_multiple_provides_implicit() { it_fails_on_bad_repo_args() { cd libredbdiff.d/statedir - libredbdiff -n bogus >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libredbdiff -n bogus >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } diff --git a/test/librefetch-test.sh b/test/librefetch-test.sh index f3864f1..4052ce1 100644 --- a/test/librefetch-test.sh +++ b/test/librefetch-test.sh @@ -54,9 +54,9 @@ it_fails_with_bad_flags() { cd "$tmpdir" mv PKGBUILD{-mksource,} - librefetch --bogus-flag libre://"$srcball" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librefetch --bogus-flag libre://"$srcball" >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr not test -e $tmpdir/srcdest/$srcball diff --git a/test/librelib-test.sh b/test/librelib-test.sh index 72cbfd2..ebaf7b2 100644 --- a/test/librelib-test.sh +++ b/test/librelib-test.sh @@ -4,21 +4,19 @@ describe librelib . ./test-common.sh it_displays_help_and_fails_with_0_args() { - ret=0 - librelib >$tmpdir/stdout 2>$tmpdir/stderr || ret=$? + librelib >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout [[ "$(sed 1q $tmpdir/stderr)" =~ Usage:.* ]] - [[ $ret != 0 ]] + [[ $status != 0 ]] } it_fails_with_2_args() { - ret=0 - librelib a b >$tmpdir/stdout 2>$tmpdir/stderr || ret=$? + librelib a b >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout not empty $tmpdir/stderr - [[ $ret != 0 ]] + [[ $status != 0 ]] } it_displays_usage_text() { @@ -57,10 +55,9 @@ it_finds_conf() { } it_fails_to_find_phony() { - ret=0 - librelib phony >$tmpdir/stdout 2>$tmpdir/stderr || ret=$? + librelib phony >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout not empty $tmpdir/stderr - [[ $ret != 0 ]] + [[ $status != 0 ]] } diff --git a/test/libremakepkg-test.sh b/test/libremakepkg-test.sh index 0482638..58adcca 100644 --- a/test/libremakepkg-test.sh +++ b/test/libremakepkg-test.sh @@ -72,10 +72,10 @@ it_cleans_the_chroot_before_building() { libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty cd "$tmpdir/1" - testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; } + testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { status=$?; tail "$tmpdir/out"|cat -v; return $status; } cd "$tmpdir/2" - testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; } + testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { status=$?; tail "$tmpdir/out"|cat -v; return $status; } testsudo librechroot -l "$roundup_test_name" run libretools-testpkg1 'first time, pass' # This next line is actually a separate test, but it fits in well with this test, and chroot tests are slow.. @@ -83,7 +83,7 @@ it_cleans_the_chroot_before_building() { not testsudo librechroot -l "$roundup_test_name" run test -e /var/cache/pacman/pkg/libretools-testpkg1-1.0-1-any.pkg.tar.?z cd "$tmpdir/3" - testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; } + testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { status=$?; tail "$tmpdir/out"|cat -v; return $status; } not testsudo librechroot -l "$roundup_test_name" run libretools-testpkg1 'second time, fail' } @@ -110,11 +110,10 @@ it_otherwise_fails_as_normal_user() { # I do this to give it a chance of passing cp libremakepkg.d/PKGBUILD-hello "$tmpdir/PKGBUILD" cd "$tmpdir" - local stat=0 - libremakepkg >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + libremakepkg >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -123,15 +122,14 @@ it_fails_if_a_hook_fails() { require network sudo || return 0 cp libremakepkg.d/PKGBUILD-hello "$tmpdir/PKGBUILD" cd "$tmpdir" - local stat=0 sed -i 's/^BLACKLIST=.*/&-bogus/' "$XDG_CONFIG_HOME"/libretools/libretools.conf trap 'sed -i s/-bogus// "$XDG_CONFIG_HOME"/libretools/libretools.conf' RETURN libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty - testsudo libremakepkg -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + testsudo libremakepkg -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] tail -n1 $tmpdir/stderr | grep -qF '==> ERROR: Failure(s) in check_pkgbuild: check_pkgbuild_nonfree' } @@ -152,8 +150,8 @@ it_detects_distcc_files() { # now throw a wrench in it testsudo librechroot -l "$roundup_test_name" run touch /bin/distcc-tool # and make sure that the engine broke - testsudo libremakepkg -l "$roundup_test_name" || stat=$? - [[ $stat != 0 ]] + testsudo libremakepkg -l "$roundup_test_name" || status=$? + [[ $status != 0 ]] not [[ -f $(echo libretools-hello-1.0-1-any.pkg.tar.?z) ]] } diff --git a/test/librerelease-test.sh b/test/librerelease-test.sh index 6e2b42d..86da995 100644 --- a/test/librerelease-test.sh +++ b/test/librerelease-test.sh @@ -60,9 +60,9 @@ it_fails_if_gpgkey_not_set() { "$WORKDIR/staging/repo2/file with spaces" \ "$WORKDIR/staging/repo2/sub/subfolder" unset WORKDIR - LC_ALL=C librerelease -l >"$tmpdir/stdout" 2>"$tmpdir/stderr" || stat=$? + LC_ALL=C librerelease -l >"$tmpdir/stdout" 2>"$tmpdir/stderr" || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty "$tmpdir/stdout" grep GPGKEY "$tmpdir/stderr" } diff --git a/test/librestage-test.sh b/test/librestage-test.sh index 1ae815e..97e7df5 100644 --- a/test/librestage-test.sh +++ b/test/librestage-test.sh @@ -29,17 +29,17 @@ it_displays_usage_text() { } it_fails_with_0_args() { - librestage >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librestage >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty "$tmpdir/stdout" not empty "$tmpdir/stderr" } it_fails_with_invalid_args() { - librestage -q >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librestage -q >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty "$tmpdir/stdout" not empty "$tmpdir/stderr" } diff --git a/test/librexgettext-test.sh b/test/librexgettext-test.sh index f9a0031..d4c8028 100644 --- a/test/librexgettext-test.sh +++ b/test/librexgettext-test.sh @@ -11,9 +11,9 @@ it_displays_help() { } it_fails_with_0_args() { - librexgettext >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librexgettext >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -29,24 +29,24 @@ it_handles_zero_flags() { passcase; } it_handles_librefetch_flags() { passcase; } it_fails_on_missing_final_flag_description() { - librexgettext librexgettext.d/$roundup_test_name.sh > /dev/null 2>$tmpdir/stderr || stat=$? + librexgettext librexgettext.d/$roundup_test_name.sh > /dev/null 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] [[ "$(sed 1q $tmpdir/stderr)" = "librexgettext.d/$roundup_test_name.sh:4:"* ]] } it_fails_on_subshell_flag_descriptions() { - librexgettext librexgettext.d/$roundup_test_name.sh > /dev/null 2>$tmpdir/stderr || stat=$? + librexgettext librexgettext.d/$roundup_test_name.sh > /dev/null 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] [[ "$(sed 1q $tmpdir/stderr)" = "librexgettext.d/$roundup_test_name.sh:4-6:"* ]] } it_doesnt_keep_failing() { - librexgettext some_file_that_doesnt_exist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librexgettext some_file_that_doesnt_exist >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout [[ "$(wc -l <$tmpdir/stderr)" == 1 ]] } diff --git a/test/pkgbuild-check-nonfree-test.sh b/test/pkgbuild-check-nonfree-test.sh index e6679ed..56e0bf5 100644 --- a/test/pkgbuild-check-nonfree-test.sh +++ b/test/pkgbuild-check-nonfree-test.sh @@ -21,39 +21,39 @@ 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 - stat=$? + status=$? [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr - [[ $stat == 0 ]] + [[ $status == 0 ]] } it_succeeds_for_free_depends() { - $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout not empty $tmpdir/stderr - [[ $stat == 0 ]] + [[ $status == 0 ]] } it_succeeds_for_nonfree_depend_with_replacement() { - $pcn $pcn.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout not empty $tmpdir/stderr - [[ $stat == 0 ]] + [[ $status == 0 ]] } it_fails_for_nonfree_depend() { - $pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? - [[ $stat != 0 ]] + $pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || status=$? + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr - local pcn_stat=$stat + local pcn_stat=$status - $psn $pcn_stat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? - [[ $stat != 0 ]] + $psn $pcn_stat >$tmpdir/stdout 2>$tmpdir/stderr || status=$? + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -63,9 +63,9 @@ 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 || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || status=$? empty $tmpdir/stdout not empty $tmpdir/stderr - [[ $stat != 0 ]] && [[ $stat != 15 ]] + [[ $status != 0 ]] && [[ $status != 15 ]] } diff --git a/test/test-common.sh b/test/test-common.sh index 2adab60..30356d3 100755 --- a/test/test-common.sh +++ b/test/test-common.sh @@ -26,7 +26,7 @@ before() { tmpdir="$(mktemp -d --tmpdir "test-${roundup_desc//\//-}.${roundup_test_name}.XXXXXXXXXXXX")" chmod 755 "$tmpdir" - stat=0 + status=0 export HOME="$tmpdir/home" export GNUPGHOME="$HOME/.gnupg" |