Skip to content

Commit

Permalink
Merge: tests: force a utf8 locale because gradle don't like pure ascii
Browse files Browse the repository at this point in the history
this should fix the CI tests when people with international names make PR.

ref: gradle/gradle#3117

Pull-Request: #2590
  • Loading branch information
privat committed Nov 29, 2017
2 parents f6ad839 + 08123cf commit 5365955
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions tests/sav/test_jvm.res
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Compilation des classes Java ...
Initialisation de la JVM ...
---------------------Test 1----------------------
From java, pushing premier
From java, pushing deuxi?me
From java, pushing troisi?me
From java, pushing deuxième
From java, pushing troisième
From java, popping premier
premier
From java, popping deuxi?me
From java, popping deuxième
deuxième
From java, popping troisi?me
From java, popping troisième
troisième
--------------------Test 2---------------------
true
Expand Down
8 changes: 4 additions & 4 deletions tests/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# This shell script compile, run and verify Nit program files

# Set lang do default to avoid failed tests because of locale
export LANG=C
export LC_ALL=C
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
export NIT_TESTING=true
# Use the pid as a collision prevention
export NIT_TESTING_ID=$$
Expand Down Expand Up @@ -708,7 +708,7 @@ END
if [ -f "$ff.write" ]; then
cat -- "$ff.write" >> "$ff.res"
elif [ -d "$ff.write" ]; then
LANG=C /bin/ls -F "$ff.write" >> "$ff.res"
/bin/ls -F "$ff.write" >> "$ff.res"
fi
cp -- "$ff.res" "$ff.res2"
cat -- "$ff.cmp.err" "$ff.err" "$ff.res2" > "$ff.res"
Expand Down Expand Up @@ -750,7 +750,7 @@ END
if [ -f "$fff.write" ]; then
cat -- "$fff.write" >> "$fff.res"
elif [ -d "$fff.write" ]; then
LANG=C /bin/ls -F -- "$fff.write" >> "$fff.res"
/bin/ls -F -- "$fff.write" >> "$fff.res"
fi
if [ -s "$fff.err" ]; then
cp -- "$fff.res" "$fff.res2"
Expand Down

0 comments on commit 5365955

Please sign in to comment.