4 files changed, 38 insertions, 26 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index cb07ba4a..b5726c9d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,15 @@
+2013-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* clos1way.awk: Don't use features of Posix shells, to allow this
+	test to work on Windows.
+
+	* beginfile2.sh: Leave one blank between the left quote and the
+	following slash.  Use non-absolute name for a non-existent file.
+	This is to avoid breakage on Windows due to MSYS transformation of
+	Posix style /foo/bar absolute file names.
+
+	* beginfile2.ok: Adapt to changes in beginfile2.sh.
+
 2013-05-30         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (profile4, profile5): New tests.
diff --git a/test/beginfile2.ok b/test/beginfile2.ok
index 2d872eae..fed71bb2 100644
--- a/test/beginfile2.ok
+++ b/test/beginfile2.ok
@@ -5,12 +5,12 @@ In BEGINFILE: beginfile2.in
 --Test 1b--
 In BEGIN
 In BEGINFILE: beginfile2.in
-In BEGINFILE: /file/does/not/exist
-gawk: cmd. line:3: fatal: cannot open file `/file/does/not/exist' for reading (No such file or directory)
+In BEGINFILE: file/does/not/exist
+gawk: cmd. line:3: fatal: cannot open file `file/does/not/exist' for reading (No such file or directory)
 --Test 2--
 In BEGINFILE: beginfile2.in
 In ENDFILE: beginfile2.in
-In BEGINFILE: /file/does/not/exist
+In BEGINFILE: file/does/not/exist
 --Test 3--
 In BEGINFILE: beginfile2.in
 In ENDFILE: beginfile2.in
@@ -47,12 +47,12 @@ In ENDFILE: beginfile2.sh
 beginfile2.in
 1 2
 --Test 9a--
-Skipping: 1:/file/does/not/exist
+Skipping: 1:file/does/not/exist
 In BEGINFILE: 2:beginfile2.in
 In Rule: beginfile2.in
 In ENDFILE: beginfile2.in
 --Test 9b--
-Skipping: 1:/file/does/not/exist
+Skipping: 1:file/does/not/exist
 Skipping: 2:beginfile2.in
 In ENDFILE: beginfile2.in
 --Test 10--
diff --git a/test/beginfile2.sh b/test/beginfile2.sh
index 69161200..dffaa88b 100755
--- a/test/beginfile2.sh
+++ b/test/beginfile2.sh
@@ -13,70 +13,70 @@ then
 fi
 
 echo "--Test 1a--"
-prog=`$AWK '/#TEST1#/, /#TEST2#/' $AWKPROG`
+prog=`$AWK ' /#TEST1#/, /#TEST2#/' $AWKPROG`
 $AWK "$prog" $AWKPROG
 echo "--Test 1b--"
-$AWK "$prog" $AWKPROG /file/does/not/exist
+$AWK "$prog" $AWKPROG file/does/not/exist
 
 echo "--Test 2--"
-prog=`$AWK '/#TEST2#/, /#TEST3#/' $AWKPROG`
-$AWK "$prog" $AWKPROG /file/does/not/exist
+prog=`$AWK ' /#TEST2#/, /#TEST3#/' $AWKPROG`
+$AWK "$prog" $AWKPROG file/does/not/exist
 
 echo "--Test 3--"
-prog=`$AWK '/#TEST3#/, /#TEST4#/' $AWKPROG`
+prog=`$AWK ' /#TEST3#/, /#TEST4#/' $AWKPROG`
 $AWK -vsrc=$SCRIPT "$prog" $AWKPROG
 
 echo "--Test 4--"
-prog=`$AWK '/#TEST4#/, /#TEST5#/' $AWKPROG`
+prog=`$AWK ' /#TEST4#/, /#TEST5#/' $AWKPROG`
 $AWK -vsrc=$SCRIPT "$prog" $AWKPROG
 
 echo "--Test 5--"
-prog=`$AWK '/#TEST5#/, /#TEST6#/' $AWKPROG`
+prog=`$AWK ' /#TEST5#/, /#TEST6#/' $AWKPROG`
 $AWK "$prog" $AWKPROG
 
 echo "--Test 6--"
-prog=`$AWK '/#TEST6#/, /#TEST7#/' $AWKPROG`
+prog=`$AWK ' /#TEST6#/, /#TEST7#/' $AWKPROG`
 $AWK "$prog" $AWKPROG
 
 echo "--Test 7--"
-prog=`$AWK '/#TEST7#/, /#TEST8#/' $AWKPROG`
+prog=`$AWK ' /#TEST7#/, /#TEST8#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 8--"
-prog=`$AWK '/#TEST8#/, /#TEST9#/' $AWKPROG`
+prog=`$AWK ' /#TEST8#/, /#TEST9#/' $AWKPROG`
 $AWK "$prog" $AWKPROG
 
 echo "--Test 9a--"
-prog=`$AWK '/#TEST9#/, /#TEST10#/' $AWKPROG`
-$AWK "$prog" /file/does/not/exist $AWKPROG
+prog=`$AWK ' /#TEST9#/, /#TEST10#/' $AWKPROG`
+$AWK "$prog" file/does/not/exist $AWKPROG
 echo "--Test 9b--"
-$AWK -vskip=1 "$prog" /file/does/not/exist $AWKPROG
+$AWK -vskip=1 "$prog" file/does/not/exist $AWKPROG
 
 echo "--Test 10--"
-prog=`$AWK '/#TEST10#/, /#TEST11#/' $AWKPROG`
+prog=`$AWK ' /#TEST10#/, /#TEST11#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 11--"
-prog=`$AWK '/#TEST11#/, /#TEST12#/' $AWKPROG`
+prog=`$AWK ' /#TEST11#/, /#TEST12#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 12--"
-prog=`$AWK '/#TEST12#/, /#TEST13#/' $AWKPROG`
+prog=`$AWK ' /#TEST12#/, /#TEST13#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 13--"
-prog=`$AWK '/#TEST13#/, /#TEST14#/' $AWKPROG`
+prog=`$AWK ' /#TEST13#/, /#TEST14#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 14--"
-prog=`$AWK '/#TEST14#/, /#TEST15#/' $AWKPROG`
+prog=`$AWK ' /#TEST14#/, /#TEST15#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 15--"
-prog=`$AWK '/#TEST15#/, /#TEST16#/' $AWKPROG`
+prog=`$AWK ' /#TEST15#/, /#TEST16#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
 echo "--Test 16--"
-prog=`$AWK '/#TEST16#/, /#TEST17#/' $AWKPROG`
+prog=`$AWK ' /#TEST16#/, /#TEST17#/' $AWKPROG`
 $AWK "$prog" $AWKPROG $SCRIPT
 
diff --git a/test/clos1way.awk b/test/clos1way.awk
index 5bc40684..c9dab09a 100644
--- a/test/clos1way.awk
+++ b/test/clos1way.awk
@@ -1,5 +1,5 @@
 BEGIN {
-	command = "LC_ALL=C sort"
+	command = "sort"
 
 	n = split("abcdefghijklmnopqrstuvwxyz", a, "")
 	for (i = n; i > 0; i--) {