diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/.git/config rap_patch/.git/config
@@ -9,3 +9,4 @@
[branch "master"]
remote = origin
merge = refs/heads/master
+ vscode-merge-base = origin/master
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/CMakeLists.txt rap_patch/test/unittest/CMakeLists.txt
@@ -82,9 +82,9 @@
if(NOT MSVC)
# Not running SIMD.* unit test cases for Valgrind
- add_test(NAME valgrind_unittest
- COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+ # add_test(NAME valgrind_unittest
+ # COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
+ # WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_test(NAME symbol_check
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/encodedstreamtest.cpp rap_patch/test/unittest/encodedstreamtest.cpp
# 标准库里的宏长度20,路径替换后变长了导致部分会被丢弃,故将原来标准库里的宏直接替换为固定长度
@@ -163,7 +163,7 @@
void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) {
// Test FileWriteStream
{
- char filename[L_tmpnam];
+ char filename[128];
FILE* fp = TempFile(filename);
char buffer[16];
FileWriteStream os(fp, buffer, sizeof(buffer));
@@ -196,7 +196,7 @@
void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) {
// Test FileWriteStream
{
- char filename[L_tmpnam];
+ char filename[128];
FILE* fp = TempFile(filename);
char buffer[16];
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/filestreamtest.cpp rap_patch/test/unittest/filestreamtest.cpp
@@ -130,7 +130,7 @@
}
TEST_F(FileStreamTest, FileWriteStream) {
- char filename[L_tmpnam];
+ char filename[128];
FILE* fp = TempFile(filename);
char buffer[65536];
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/ostreamwrappertest.cpp rap_patch/test/unittest/ostreamwrappertest.cpp
@@ -63,7 +63,7 @@
template <typename FileStreamType>
static void TestFileStream() {
- char filename[L_tmpnam];
+ char filename[128];
FILE* fp = TempFile(filename);
fclose(fp);
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/prettywritertest.cpp rap_patch/test/unittest/prettywritertest.cpp
@@ -165,7 +165,7 @@
// For covering FileWriteStream::PutN()
TEST(PrettyWriter, FileWriteStream) {
- char filename[L_tmpnam];
+ char filename[128];
FILE* fp = TempFile(filename);
ASSERT_TRUE(fp!=NULL);
char buffer[16];
# 路径变更
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/test/unittest/unittest.h rap_patch/test/unittest/unittest.h
@@ -88,7 +88,7 @@
return fopen(filename, "wb");
#else
- strcpy(filename, "/tmp/fileXXXXXX");
+ strcpy(filename, "/data/local/tmp/fileXXXXXX");
int fd = mkstemp(filename);
return fdopen(fd, "w");
#endif
diff -Nura rapidjson-6089180ecb704cb2b136777798fa1be303618975/travis-doxygen.sh rap_patch/travis-doxygen.sh
@@ -46,7 +46,7 @@
# install doxygen binary distribution
doxygen_install()
{
- cd ${TMPDIR-/tmp}
+ cd ${TMPDIR-/data/local/tmp}
curl ${DOXYGEN_URL} -o doxygen.tar.gz
tar zxvf doxygen.tar.gz
mkdir doxygen_build
@@ -54,7 +54,7 @@
cmake ../doxygen-Release_${DOXYGEN_VER}/
make
- export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH"
+ export PATH="${TMPDIR-/data/local/tmp}/doxygen_build/bin:$PATH"
cd ../../
}