gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes unit testing on Visual Studio.

Browse Source 
tmpnam() in VS prepends backslash in the path.
This commit is contained in:
Milo Yip 2014-06-20 16:08:58 +08:00
parent 23056abad1
commit 4d94a8057d
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
/bin/*
/build/*.exe
/build/gmake
/build/vs*/
/thirdparty/lib
/intermediate

4
test/unittest/encodedstreamtest.cpp
View File

@ -85,7 +85,7 @@ protected:
template <typename FileEncoding, typename MemoryEncoding> template <typename FileEncoding, typename MemoryEncoding>
void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) { void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) {
char filename[L_tmpnam]; char filename[L_tmpnam];
tmpnam(filename); TempFilename(filename);
FILE *fp = fopen(filename, "wb"); FILE *fp = fopen(filename, "wb");
char buffer[16]; char buffer[16];
@ -114,7 +114,7 @@ protected:
void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) { void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) {
char filename[L_tmpnam]; char filename[L_tmpnam];
tmpnam(filename); TempFilename(filename);
FILE *fp = fopen(filename, "wb"); FILE *fp = fopen(filename, "wb");
char buffer[16]; char buffer[16];

2
test/unittest/filestreamtest.cpp
View File

@ -70,7 +70,7 @@ TEST_F(FileStreamTest, FileReadStream) {
TEST_F(FileStreamTest, FileWriteStream) { TEST_F(FileStreamTest, FileWriteStream) {
char filename[L_tmpnam]; char filename[L_tmpnam];
tmpnam(filename); TempFilename(filename);
FILE *fp = fopen(filename, "wb"); FILE *fp = fopen(filename, "wb");
char buffer[65536]; char buffer[65536];

9
test/unittest/unittest.h
View File

@ -30,4 +30,13 @@ inline Ch* StrDup(const Ch* str) {
return buffer; return buffer;
} }
inline void TempFilename(char *filename) {
tmpnam(filename);
// For Visual Studio, tmpnam() adds a backslash in front. Remove it.
if (filename[0] == '\\')
for (int i = 0; filename[i] != '\0'; i++)
filename[i] = filename[i + 1];
}
#endif // UNITTEST_H_ #endif // UNITTEST_H_