[cogl/msvc-support-1.8] Rename conformance test projects

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

commit 9b38b621acb5a0585dc3559895e1cca1a28375f1
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 20 16:16:21 2011 +0800

    Rename conformance test projects
    
    Change test-conformance to test-conformance-cogl to not collide with the
    Clutter conformance test projects.

 build/win32/vs10/Makefile.am                       |    8 ++++----
 build/win32/vs10/cogl.sln                          |    2 +-
 build/win32/vs10/install.vcxproj                   |    2 +-
 ...sin => test-conformance-cogl.vcxproj.filtersin} |    0
 ...e.vcxprojin => test-conformance-cogl.vcxprojin} |    2 +-
 build/win32/vs9/Makefile.am                        |    4 ++--
 build/win32/vs9/cogl.sln                           |    2 +-
 ...nce.vcprojin => test-conformance-cogl.vcprojin} |    4 ++--
 tests/conform/Makefile.am                          |   20 ++++++++++----------
 9 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 7fbfe3d..f9bd29e 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -13,9 +13,9 @@ EXTRA_DIST = \
 	hello.vcxproj.filters	\
 	crate.vcxproj	\
 	crate.vcxproj.filters	\
-	test-conformance.vcxproj	\
-	test-conformance.vcxprojin	\
-	test-conformance.vcxproj.filters	\
-	test-conformance.vcxproj.filtersin	\
+	test-conformance-cogl.vcxproj	\
+	test-conformance-cogl.vcxprojin	\
+	test-conformance-cogl.vcxproj.filters	\
+	test-conformance-cogl.vcxproj.filtersin	\
 	install.vcxproj	\
 	README.txt
diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln
index 1883c79..2c1982e 100644
--- a/build/win32/vs10/cogl.sln
+++ b/build/win32/vs10/cogl.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crate", "crate.vcxproj", "{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index d6d4682..c41ec8f 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -90,7 +90,7 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="test-conformance.vcxproj">
+    <ProjectReference Include="test-conformance-cogl.vcxproj">
       <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/build/win32/vs10/test-conformance.vcxproj.filtersin b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/test-conformance.vcxproj.filtersin
rename to build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
diff --git a/build/win32/vs10/test-conformance.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin
similarity index 99%
rename from build/win32/vs10/test-conformance.vcxprojin
rename to build/win32/vs10/test-conformance-cogl.vcxprojin
index 83031d8..b7d91f2 100644
--- a/build/win32/vs10/test-conformance.vcxprojin
+++ b/build/win32/vs10/test-conformance-cogl.vcxprojin
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid>
-    <RootNamespace>testconformance</RootNamespace>
+    <RootNamespace>testconformancecogl</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 6e29c74..87827b6 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -5,8 +5,8 @@ EXTRA_DIST = \
 	cogl.vcprojin		\
 	cogl-pango.vcproj	\
 	cogl-pango.vcprojin	\
-	test-conformance.vcproj	\
-	test-conformance.vcprojin	\
+	test-conformance-cogl.vcproj	\
+	test-conformance-cogl.vcprojin	\
 	hello.vcproj	\
 	crate.vcproj	\
 	install.vcproj	\
diff --git a/build/win32/vs9/cogl.sln b/build/win32/vs9/cogl.sln
index cb835e9..02b3841 100644
--- a/build/win32/vs9/cogl.sln
+++ b/build/win32/vs9/cogl.sln
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crate", "crate.vcproj", "{D
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
 		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
diff --git a/build/win32/vs9/test-conformance.vcprojin b/build/win32/vs9/test-conformance-cogl.vcprojin
similarity index 98%
rename from build/win32/vs9/test-conformance.vcprojin
rename to build/win32/vs9/test-conformance-cogl.vcprojin
index 23110e3..6983027 100644
--- a/build/win32/vs9/test-conformance.vcprojin
+++ b/build/win32/vs9/test-conformance-cogl.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="test-conformance"
+	Name="test-conformance-cogl"
 	ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	RootNamespace="testconformance"
+	RootNamespace="testconformancecogl"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 8e04bf8..dbbe0e4 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -236,42 +236,42 @@ HTML_REPORTS = \
 EXTRA_DIST = test-launcher.sh.in run-tests.sh
 DISTCLEANFILES = test-launcher.sh .gitignore
 
-dist-hook: ../../build/win32/vs9/test-conformance.vcproj ../../build/win32/vs10/test-conformance.vcxproj ../../build/win32/vs10/test-conformance.vcxproj.filters
+dist-hook: ../../build/win32/vs9/test-conformance-cogl.vcproj ../../build/win32/vs10/test-conformance-cogl.vcxproj ../../build/win32/vs10/test-conformance-cogl.vcxproj.filters
 
-../../build/win32/vs9/test-conformance.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance.vcprojin
+../../build/win32/vs9/test-conformance-cogl.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '   <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
 			;; \
 		esac; \
 	done >testconformance.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance.vcprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin >$@
 	rm testconformance.sourcefiles
 	
-../../build/win32/vs10/test-conformance.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin
+../../build/win32/vs10/test-conformance-cogl.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
 			;; \
 		esac; \
 	done >testconformance.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin >$@
 	rm testconformance.vs10.sourcefiles
 	
-../../build/win32/vs10/test-conformance.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin
+../../build/win32/vs10/test-conformance-cogl.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
 			;; \
 		esac; \
 	done >testconformance.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin >$@
 	rm testconformance.vs10.sourcefiles.filters
 
 # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += ../../build/win32/vs9/test-conformance.vcproj	\
-		  ../../build/win32/vs10/test-conformance.vcxproj	\
-		  ../../build/win32/vs10/test-conformance.vcxproj.filters
+DISTCLEANFILES += ../../build/win32/vs9/test-conformance-cogl.vcproj	\
+		  ../../build/win32/vs10/test-conformance-cogl.vcxproj	\
+		  ../../build/win32/vs10/test-conformance-cogl.vcxproj.filters
 
 # we override the clean-generic target to clean up the wrappers so
 # we cannot use CLEANFILES