[cpp-xmltooling] branch master updated: CPPXT-136 Rename Test and tell Makefile.am about it.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=ff14de0484c7817245a5b0b03002c2756ec63e47

The following commit(s) were added to refs/heads/master by this push:
       new  ff14de0   CPPXT-136 Rename Test and tell Makefile.am about it.
ff14de0 is described below

commit ff14de0484c7817245a5b0b03002c2756ec63e47
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Aug 17 17:04:40 2018 +0100

    CPPXT-136 Rename Test and tell Makefile.am about it.
    
    https://issues.shibboleth.net/jira/browse/CPPXT-136
---
 Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj         |  6 +++---
 Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj.filters | 10 +++++-----
 xmltoolingtest/{BadKeyKeyInfoTest.h => BadKeyInfoTest.h}    |  0
 xmltoolingtest/Makefile.am                                  |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
index 3d8cd80..bca9c74 100644
--- a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
+++ b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj
@@ -188,7 +188,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="BadKeyKeyInfoTest.cpp" />
+    <ClCompile Include="BadKeyInfoTest.cpp" />
     <ClCompile Include="CloneInputStreamTest.cpp" />
     <ClCompile Include="ComplexXMLObjectTest.cpp" />
     <ClCompile Include="DataSealerTest.cpp" />
@@ -574,7 +574,7 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Tools %(FileName)</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Tools %(FileName)</Message>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\xmltoolingtest\BadKeyKeyInfoTest.h">
+    <CustomBuild Include="..\..\..\xmltoolingtest\BadKeyInfoTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Custom Build Tools %(FileName)</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)"</Command>
@@ -602,4 +602,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj.filters b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj.filters
index ed5c91d..c2e230d 100644
--- a/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj.filters
+++ b/Projects/vc15/xmltoolingtest/xmltoolingtest.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Generated Code">
@@ -74,7 +74,7 @@
     <ClCompile Include="DirectoryWalkerTest.cpp">
       <Filter>Generated Code</Filter>
     </ClCompile>
-    <ClCompile Include="BadKeyKeyInfoTest.cpp">
+    <ClCompile Include="BadKeyInfoTest.cpp">
       <Filter>Generated Code</Filter>
     </ClCompile>
   </ItemGroup>
@@ -82,9 +82,6 @@
     <ClInclude Include="..\..\..\XMLToolingTest\XMLObjectBaseTestCase.h">
       <Filter>Unit Tests</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\xmltoolingtest\BadKeyKeyInfoTest.h">
-      <Filter>Unit Tests</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\XMLToolingTest\Makefile.am" />
@@ -153,5 +150,8 @@
     <CustomBuild Include="..\..\..\xmltoolingtest\DirectoryWalkerTest.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\..\xmltoolingtest\BadKeyInfoTest.h">
+      <Filter>Unit Tests</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/xmltoolingtest/BadKeyKeyInfoTest.h b/xmltoolingtest/BadKeyInfoTest.h
similarity index 100%
rename from xmltoolingtest/BadKeyKeyInfoTest.h
rename to xmltoolingtest/BadKeyInfoTest.h
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 3070d5a..f4ba52c 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -15,6 +15,7 @@ xmltoolingtest_LDADD += $(xerces_LIBS) $(log4shib_LIBS) $(log4cpp_LIBS)
 
 if BUILD_XMLSEC
 xmlsec_sources = \
+	BadKeyInfoTest.cpp \
 	DataSealerTest.cpp \
 	EncryptionTest.cpp \
 	FilesystemCredentialResolverTest.cpp \
@@ -29,6 +30,7 @@ xmlsec_sources = \
 endif
 
 xmltoolingtest_sources = \
+	CloneInputStreamTest.cpp \
 	ComplexXMLObjectTest.cpp \
 	DateTimeTest.cpp \
 	DirectoryWalkerTest.cpp \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.