Fix some locale-related issues causing travis-ci tests to fail.

pennmush · Jul 26, 2018 · 7553bdc · 7553bdc
1 parent 4101e83
commit 7553bdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: c
 compiler: gcc
 before_install:
-  - locale
+  - sudo localedef -f ISO-8859-1 -i en_US en_US.ISO88591
 before_script:
   - ./configure
   - yes "" | make update

diff --git a/test/alltests.sh.in b/test/alltests.sh.in
@@ -1,7 +1,15 @@
 #!/bin/sh
 
+CTYPE=$(locale -a | grep en_US.iso8859 | head -1)
+
+if [ -z "${CTYPE}" ]; then
+    echo "Unable to find an en_US.iso8859 locale. Some tests will fail."
+    CTYPE=C
+fi
+
+
 export LC_COLLATE=C
-export LC_CTYPE=en_US.iso88591
+export LC_CTYPE=${CTYPE}
 
 exec @PERL@ runtest.pl $@ test*.pl