diff options
author | Emanuele Torre <torreemanuele6@gmail.com> | 2023-12-11 20:45:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-11 20:45:14 +0100 |
commit | 507eb8283c45bc9241020f14febabe0ada6c5ec6 (patch) | |
tree | eac69b8de3f3861f9c0409c193f5fd3ad6684076 /tests | |
parent | 2ccab044fe148e88c0833b5585a038ae730b6e54 (diff) |
shtest: fix out-of-source tests
The locale test was using ./jq intead of $JQ.
I also removed the use of obsolete egrep instead of grep -E that
triggers warnings on GNU systems, and the use of deprecated head -1
instead of head -n1.
Also removed the unnecessary hiding of strptime/1 errors with
? // false.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/shtest | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/shtest b/tests/shtest index dd007d15..6ecadaa9 100755 --- a/tests/shtest +++ b/tests/shtest @@ -566,15 +566,18 @@ if ! $VALGRIND $Q $JQ -n -f "$JQTESTDIR/yes-main-program.jq" > $d/out 2>&1; then exit 1 fi -if ( ! $msys && ! $mingw ) && locale -a > /dev/null; then - locale=$(locale -a | egrep -v '^(C|LANG|POSIX|en)' | egrep -i 'utf8|utf-8' | head -1) - if [ -z "$locale" ]; then +if ! $msys && ! $mingw && locales=$(locale -a); then + { l=$(grep -Ev '^(C|LANG|POSIX|en)' | grep -Ei '\.utf-?8$' | head -n1) ;} \ +<<EOF +$locales +EOF + if [ -z "$l" ]; then echo "WARNING: Not testing localization" else - date=$(LC_ALL="$locale" date +"%a %d %b %Y at %H:%M:%S") - if ! LC_ALL="$locale" ./jq -nRe --arg date "$date" '$date|strptime("%a %d %b %Y at %H:%M:%S")? // false'; then + date=$(LC_ALL=$l date +'%a %d %b %Y at %H:%M:%S') + if ! LC_ALL=$l $JQ -nR --arg date "$date" '$date|strptime("%a %d %b %Y at %H:%M:%S")'; then echo "jq does not honor LC_ALL environment variable" - exit 1; + exit 1 fi fi fi |