Add overload to 'print' void* correctly

include/internal/catch_tostring.hpp

@@ -79,6 +79,19 @@ namespace Detail {
         }
     };
 
+    // For display purposes only.
+    // Anything implicitly convertible to void* ends up here
+    inline std::string rawMemoryToString(void* p)
+    {
+        std::ostringstream oss;
+#ifdef _MSC_VER
+        oss << "0x" << p;
+#else
+        oss << p;
+#endif
+        return oss.str();
+    }
+
     // For display purposes only.
     // Does not consider endian-ness
     template<typename T>

scripts/validateVSTests.py

@@ -498,7 +498,9 @@ def approveXml( baseName, args ):
 		f = open( rawResultsPath, 'r' )
 		for line in f:
 			xml += line
+		f.close()
 		#xml = xml.replace("<hex digits>", "&lt;hex digits&gt;")
+		os.remove( rawResultsPath )
 
 		otherResultsTestParser = re.compile( r'(.*\\)(.*\..pp)' )
 		hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
@@ -743,6 +745,8 @@ def approveMsTest( baseName, filter ):
 			if line.startswith("Results file:") or line.startswith("Results File:"):
 				trxFile = line[13:].strip()
 				parseTrxFile(baseName, trxFile)
+		f.close()
+		os.remove( rawResultsPath )
 
 # Standard console reporter
 approve( "console.std", ["~_"] )