summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2011-11-15 17:35:24 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2011-11-15 17:35:24 +0800
commit6bab6ca15f1d3e7f5125cc2fa228ea800a12b79f (patch)
tree3832aea3fa0d67f2ee604420e00736dc4f5d241e
parented9ea21d132ab0065300166070efc9ba412ba715 (diff)
downloadclutter-msvc-support-1.8.tar.gz
Update interactive/conformance .bat namesmsvc-support-1.8
Add a -clutter suffix to avoid confustion with others, such as COGL.
-rw-r--r--tests/conform/Makefile.am4
-rw-r--r--tests/interactive/Makefile.am10
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 01f3e4af1..6289a2ffc 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -127,8 +127,8 @@ 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" ) >> test-conformance.bat ; \
+ ( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) > $$unit-clutter.bat ; \
+ ( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) >> test-conformance-clutter.bat ; \
chmod +x $$unit$(SHEXT); \
chmod +x wrappers/$$unit$(SHEXT); \
echo "/$$unit$(SHEXT)" >> .gitignore; \
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index e66978a98..45741da77 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -72,7 +72,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 test-interactive$(EXEEXT)
@wrapper=$(abs_builddir)/wrapper.sh ; \
@@ -93,8 +93,8 @@ stamp-test-interactive: Makefile test-interactive$(EXEEXT)
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 \
@@ -102,8 +102,8 @@ stamp-test-interactive: Makefile test-interactive$(EXEEXT)
*.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/