From 320ec256f0e6821509acc164c114795b0e087be3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 2 Nov 2013 18:15:00 -0400 Subject: test: set LC_ALL instead of LANG --- test/aur-test.sh | 2 +- test/is_built-test.sh | 2 +- test/lib-blacklist-test.sh | 6 +++--- test/librechroot-test.sh | 4 ++-- test/librefetch-test.sh | 2 +- test/libremakepkg-test.sh | 2 +- test/librerelease-test.sh | 4 ++-- test/librestage-test.sh | 2 +- test/pkgbuild-check-nonfree-test.sh | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/aur-test.sh b/test/aur-test.sh index 8b175eb..8bcb5ef 100644 --- a/test/aur-test.sh +++ b/test/aur-test.sh @@ -13,7 +13,7 @@ after() { } it_displays_help() { - LANG=C aur -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C aur -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr diff --git a/test/is_built-test.sh b/test/is_built-test.sh index e76ffc0..af754dc 100644 --- a/test/is_built-test.sh +++ b/test/is_built-test.sh @@ -13,7 +13,7 @@ after() { } it_displays_help() { - LANG=C is_built -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C is_built -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr diff --git a/test/lib-blacklist-test.sh b/test/lib-blacklist-test.sh index be54b47..640ed77 100644 --- a/test/lib-blacklist-test.sh +++ b/test/lib-blacklist-test.sh @@ -110,7 +110,7 @@ it_downloads_the_blacklist_repeatedly() { } it_displays_help_and_fails_with_no_args() { - LANG=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] empty $tmpdir/stdout @@ -118,14 +118,14 @@ it_displays_help_and_fails_with_no_args() { } it_displays_help_when_given_h() { - LANG=C libreblacklist -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C libreblacklist -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ 'Usage: libreblacklist ' ]] empty $tmpdir/stderr } it_displays_help_when_given_h_cat() { - LANG=C libreblacklist -h cat >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C libreblacklist -h cat >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" == 'Usage: libreblacklist cat' ]] empty $tmpdir/stderr diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh index 8efba67..5ca1b37 100644 --- a/test/librechroot-test.sh +++ b/test/librechroot-test.sh @@ -42,7 +42,7 @@ it_respects_exit_status_if_out_isnt_a_tty() ( it_displays_help_as_normal_user() { rm -rf "$XDG_CONFIG_HOME" - LANG=C librechroot help >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C librechroot help >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr @@ -57,7 +57,7 @@ it_otherwise_fails_as_normal_user() { } it_displays_help_and_fails_with_0_args() { - LANG=C librechroot >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C librechroot >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] empty $tmpdir/stdout diff --git a/test/librefetch-test.sh b/test/librefetch-test.sh index 7408993..13ce80f 100644 --- a/test/librefetch-test.sh +++ b/test/librefetch-test.sh @@ -25,7 +25,7 @@ after() { } it_displays_help() { - LANG=C librefetch -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C librefetch -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr diff --git a/test/libremakepkg-test.sh b/test/libremakepkg-test.sh index bef1db8..e684f18 100644 --- a/test/libremakepkg-test.sh +++ b/test/libremakepkg-test.sh @@ -72,7 +72,7 @@ it_handles_PKGDEST_not_existing() { it_displays_help_as_normal_user() { rm -rf "$XDG_CONFIG_HOME" - LANG=C libremakepkg -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C libremakepkg -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] empty $tmpdir/stderr diff --git a/test/librerelease-test.sh b/test/librerelease-test.sh index ebbd504..c395bc6 100644 --- a/test/librerelease-test.sh +++ b/test/librerelease-test.sh @@ -26,7 +26,7 @@ after() { it_displays_usage_text() { rm -rf "$XDG_CONFIG_HOME" - LANG=C librerelease -h >"$tmpdir/stdout" 2>"$tmpdir/stderr" + LC_ALL=C librerelease -h >"$tmpdir/stdout" 2>"$tmpdir/stderr" [[ "$(sed 1q "$tmpdir/stdout")" =~ Usage:.* ]] empty "$tmpdir/stderr" @@ -40,7 +40,7 @@ it_lists_all_files() { "$WORKDIR/staging/repo1/file2" \ "$WORKDIR/staging/repo2/file with spaces" unset WORKDIR - LANG=C librerelease -l &>"$tmpdir/list" + LC_ALL=C librerelease -l &>"$tmpdir/list" cat > "$tmpdir/list-correct" < repo1 diff --git a/test/librestage-test.sh b/test/librestage-test.sh index 5c7487b..6728143 100644 --- a/test/librestage-test.sh +++ b/test/librestage-test.sh @@ -23,7 +23,7 @@ after() { it_displays_usage_text() { rm -rf "$XDG_CONFIG_HOME" - LANG=C librestage -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C librestage -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q "$tmpdir/stdout")" =~ Usage:.* ]] empty "$tmpdir/stderr" diff --git a/test/pkgbuild-check-nonfree-test.sh b/test/pkgbuild-check-nonfree-test.sh index b30204b..6463d64 100644 --- a/test/pkgbuild-check-nonfree-test.sh +++ b/test/pkgbuild-check-nonfree-test.sh @@ -27,7 +27,7 @@ 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 $pcn -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C $pcn -h >$tmpdir/stdout 2>$tmpdir/stderr stat=$? [[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]] -- cgit v1.2.3-54-g00ecf