#
#
# patch "Makefile.am"
#  from [fb784b732f988aa0da9c4f69b6a017aebedecd08]
#    to [484d862a08149b81c0133670d048e41e429c73ad]
# 
# patch "tests/importing_files_with_non-english_names/__driver__.lua"
#  from [6ef11dc2d3f1743eb29baa10b0fe9fd84fa8aa78]
#    to [8b4f652e4d0e33c136c29a891328a1f28fafba38]
#
============================================================
--- Makefile.am	fb784b732f988aa0da9c4f69b6a017aebedecd08
+++ Makefile.am	484d862a08149b81c0133670d048e41e429c73ad
@@ -512,6 +512,7 @@ run_%_tests: Makefile
 
 run_%_tests: Makefile
 	$(AM_V_GEN){ echo '#!/bin/sh';					  \
+	  echo 'export LANG=C';						  \
 	  echo 'PATH=$(top_builddir):$$PATH';				  \
 	  echo '$(top_builddir)/tester $(srcdir)/$*-testsuite.lua "$$@"'; \
 	  echo 'echo $$? > $*_tests.status';				  \
============================================================
--- tests/importing_files_with_non-english_names/__driver__.lua	6ef11dc2d3f1743eb29baa10b0fe9fd84fa8aa78
+++ tests/importing_files_with_non-english_names/__driver__.lua	8b4f652e4d0e33c136c29a891328a1f28fafba38
@@ -11,6 +11,12 @@ japanese_euc_jp = "\164\198\164\185\164\
 japanese_euc_jp = "\164\198\164\185\164\200"
                -- "\xA4\xC6\xA4\xB9\xA4\xC8"
 
+if ostype ~= "Darwin" and string.sub(ostype, 1, 6) ~= "CYGWIN" then
+	notOnlyUnicode = true
+else
+	notOnlyUnicode = false
+end
+
 if ostype == "Windows" or string.sub(ostype, 1, 6) == "CYGWIN" then
   funny_filename = "address@hidden"
 else
@@ -25,7 +31,7 @@ check(writefile("utf8/" .. japanese_utf8
 check(writefile("utf8/" .. european_utf8, ""))
 check(writefile("utf8/" .. japanese_utf8, ""))
 
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
 	check(writefile("8859-1/" .. european_8859_1, ""))
 	check(writefile("euc/" .. japanese_euc_jp, ""))
 end
@@ -65,7 +71,7 @@ commit()
 
 -- OS X expects data passed to the OS to be utf8, so these tests don't make
 -- sense.
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
 	-- now try iso-8859-1
 
 	set_env("LANG", "de_DE.iso-8859-1")
@@ -81,20 +87,20 @@ check(qgrep("spaces", "manifest"))
 rename("stdout", "manifest")
 check(qgrep("funny", "manifest"))
 check(qgrep("spaces", "manifest"))
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
   check(qgrep("8859-1/" .. european_utf8, "manifest"))
 end
 
 -- okay, clean up again
 
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
 	check(mtn("drop", "--bookkeep-only", "8859-1/" .. european_8859_1), 0, false, false)
 	commit()
 end
 
 -- now try euc
 
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
 	set_env("LANG", "ja_JP.euc-jp")
 	set_env("CHARSET", "euc-jp")
 	check(mtn("add", "euc/" .. japanese_euc_jp), 0, false, false)
@@ -108,6 +114,6 @@ check(qgrep("spaces", "manifest"))
 rename("stdout", "manifest")
 check(qgrep("funny", "manifest"))
 check(qgrep("spaces", "manifest"))
-if ostype ~= "Darwin" then
+if notOnlyUnicode then
 	check(qgrep("euc/" .. japanese_utf8, "manifest"))
 end