mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Silence some MSVC specific warnings in tests.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-07-31 20:55:23 +09:00
parent 5ad69a81dc
commit 88947e7a48
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/main.cpp
View File

@ -17,7 +17,7 @@ int main(int argc, char* argv[])
// Create the event manager and test controller
CppUnit::TestResult controller;
// Add a listener that colllects test result
// Add a listener that collects test result
CppUnit::TestResultCollector result;
controller.addListener(&result);
@ -39,12 +39,20 @@ int main(int argc, char* argv[])
CppUnit::CompilerOutputter outputter(&result, std::cerr);
outputter.write();
#if defined(_MSC_VER) && _MSC_VER > 1500
char *xml = NULL;
::_dupenv_s(&xml, NULL, "CPPUNIT_XML");
#else
char *xml = ::getenv("CPPUNIT_XML");
#endif
if(xml && !::strcmp(xml, "1")) {
std::ofstream xmlfileout("cpptestresults.xml");
CppUnit::XmlOutputter xmlout(&result, xmlfileout);
xmlout.write();
}
#if defined(_MSC_VER) && _MSC_VER > 1500
::free(xml);
#endif
}
catch(std::invalid_argument &e){
std::cerr << std::endl

6
tests/utils.h
View File

@ -33,7 +33,11 @@ inline string copyFile(const string &filename, const string &ext)
GetTempPathA(sizeof(testFileName), testFileName);
GetTempFileNameA(testFileName, "tag", 0, testFileName);
DeleteFileA(testFileName);
# if defined(_MSC_VER) && _MSC_VER > 1500
strcat_s(testFileName, ext.c_str());
# else
strcat(testFileName, ext.c_str());
# endif
#else
snprintf(testFileName, sizeof(testFileName), "/%s/taglib-test-XXXXXX%s", P_tmpdir, ext.c_str());
static_cast<void>(mkstemps(testFileName, 6));
@ -74,7 +78,7 @@ inline bool fileEqual(const string &filename1, const string &filename2)
if(n1 == 0) break;
if(memcmp(buf1, buf2, n1) != 0) return false;
if(memcmp(buf1, buf2, static_cast<size_t>(n1)) != 0) return false;
}
return stream1.good() == stream2.good();