[clutter/msvc-support] Update test wrapper batch generation

[Chun-wei Fan <fanchunwei src gnome org>]

commit 4db5a264e73e18980f6e517dae0c84a132de22a0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 19 15:06:52 2011 +0800

    Update test wrapper batch generation
    
    Put the full command to call the interactive and conform test programs
    in the "big" script that calls all the various tests, instead of calling
    the individual .bat files.
    
    The individual .bat files are still generated as before.

 tests/conform/Makefile.am     |    2 +-
 tests/interactive/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 82f0b33..c9545d0 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -123,11 +123,11 @@ stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
 		( echo "#!/bin/sh" ; echo "$(abs_builddir)/test-launcher.sh '$$i' \"\$$ \"" ) > $$unit$(SHEXT) ; \
 		( echo "#!/bin/sh" ; echo "exec $(abs_builddir)/test-conformance$(EXEEXT) -p $$i \"\$$ \"" ) > wrappers/$$unit$(SHEXT) ; \
 		( echo "test-conformance$(EXEEXT) -p $$i" ) > $$unit.bat ; \
+		( echo "test-conformance$(EXEEXT) -p $$i" ) >> test-conformance.bat ; \
 		chmod +x $$unit$(SHEXT); \
 		chmod +x wrappers/$$unit$(SHEXT); \
 		echo "/$$unit$(SHEXT)" >> .gitignore; \
 	done \
-	&& ls *.bat > test-conformance.bat	\
 	&& cp *.bat $(top_srcdir)/build/win32/	\
 	&& echo timestamp > $(@F)
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index c3c58cd..d691e07 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -102,8 +102,8 @@ stamp-test-interactive: Makefile test-interactive$(EXEEXT)
 			;; \
 		esac; \
 		( echo "test-interactive $$test_bin" ) > $$test_bin.bat ; \
+		( echo "test-interactive $$test_bin" ) >> test-interactive.bat ; \
 	done \
-	&& ls *.bat > test-interactive.bat	\
 	&& cp *.bat $(top_srcdir)/build/win32/
 
 clean-wrappers: