diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-12-31 08:53:39 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-31 17:13:06 +0000 |
commit | f485b2809061e68e3e2b1e7243060a744a2b1cf8 (patch) | |
tree | b007a02e7dd132d017620146d648500061e9bfab /test/suite-clopts.sh | |
parent | fad9b76e32430ff977c4742d9094cee91b43aa0b (diff) |
Test suite: Make sure we have a usable locale before we run iconv.
Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359
Reviewed-on: https://code.wireshark.org/review/6181
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'test/suite-clopts.sh')
-rwxr-xr-x | test/suite-clopts.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh index eedffa4f93..71b88800a8 100755 --- a/test/suite-clopts.sh +++ b/test/suite-clopts.sh @@ -296,8 +296,13 @@ test_dump_glossary_utf8() { return fi + SAVE_LANG=$LANG + LANG=en_US.UTF-8 + export LANG $TSHARK -G $1 | iconv -f UTF-8 > /dev/null 2> ./testout.txt RETURNVALUE=$? + LANG=$SAVE_LANG + export LANG if [ ! $RETURNVALUE -eq $EXIT_OK ]; then if [ -s ./testout.txt ]; then test_step_output_print ./testout.txt |