From 2a86ecc4b9516222c4f74ba106d7c2275baa9ae2 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 15 Nov 2011 16:19:06 +0800 Subject: [PATCH] Update interactive/conformance .bat names Add a -clutter suffix to avoid confustion with others, such as COGL. --- tests/conform/Makefile.am | 2 +- tests/interactive/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 1cd6f2ef3..f18c69e74 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -128,7 +128,7 @@ stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c echo " GEN $$unit"; \ ( 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-clutter$(EXEEXT) -p $$i" ) > $$unit.bat ; \ + ( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) > $$unit-clutter.bat ; \ ( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) >> test-conformance.bat ; \ chmod +x $$unit$(SHEXT); \ chmod +x wrappers/$$unit$(SHEXT); \ diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 114622ad5..6c76cbd2c 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -73,7 +73,7 @@ SHEXT = $(EXEEXT) endif # For convenience, this provides a way to easily run individual unit tests: -wrappers: stamp-test-interactive ../../build/win32/test-interactive.bat +wrappers: stamp-test-interactive ../../build/win32/test-interactive-clutter.bat @true stamp-test-interactive: Makefile @wrapper=$(abs_builddir)/wrapper.sh ; \ @@ -96,8 +96,8 @@ stamp-test-interactive: Makefile done \ && echo timestamp > $(@F) -../../build/win32/test-interactive.bat: Makefile test-interactive$(EXEEXT) - echo " GEN test-interactive.bat" ; \ +../../build/win32/test-interactive-clutter.bat: Makefile test-interactive$(EXEEXT) + echo " GEN test-interactive-clutter.bat" ; \ for i in $(UNIT_TESTS); \ do \ case $$i in \ @@ -105,8 +105,8 @@ stamp-test-interactive: Makefile *.c) test_bin=$${i%*.c} \ ;; \ esac; \ - ( echo "test-interactive-clutter $$test_bin" ) > $$test_bin.bat ; \ - ( echo "test-interactive-clutter $$test_bin" ) >> test-interactive.bat ; \ + ( echo "test-interactive-clutter $$test_bin" ) > $$test_bin-clutter.bat ; \ + ( echo "test-interactive-clutter $$test_bin" ) >> test-interactive-clutter.bat ; \ done \ && cp *.bat $(top_srcdir)/build/win32/