summaryrefslogtreecommitdiffstats
path: root/testSystemTools.cxx
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2018-01-23 18:07:33 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-24 19:11:06 (GMT)
commit7a75657084c518a39b192c7ee1568588944677af (patch)
treee425d65299f889b6e5d71be8c21bf3d236cdde85 /testSystemTools.cxx
parent86399e49398cc9e8028e280eee3e89992ab3fd11 (diff)
downloadCMake-7a75657084c518a39b192c7ee1568588944677af.zip
CMake-7a75657084c518a39b192c7ee1568588944677af.tar.gz
CMake-7a75657084c518a39b192c7ee1568588944677af.tar.bz2
KWSys 2018-01-23 (0579db1c)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 3e807fd6 cmake: specify source file extensions Brad King (1): 38855ca1 Set CMP0042 explicitly with CMake 3.0 and above Chuck Atkins (1): 4ca97fc6 SystemTools: Disable getpwnam for static linux builds Hans Johnson (1): 7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code Sankhesh Jhaveri (1): 20c458d0 Set CMP0022 policy to new to provide link interface definitions Sean McBride (1): c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes luz.paz (1): 4b67f965 Remove superfluous double whitespace in appropriate places
Diffstat (limited to 'testSystemTools.cxx')
-rw-r--r--testSystemTools.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/testSystemTools.cxx b/testSystemTools.cxx
index a6af9cc..f1321e5 100644
--- a/testSystemTools.cxx
+++ b/testSystemTools.cxx
@@ -52,7 +52,7 @@ static const char* toUnixPaths[][2] = {
{ "\\\\usr\\local\\bin\\passwd", "//usr/local/bin/passwd" },
{ "\\\\usr\\lo cal\\bin\\pa sswd", "//usr/lo cal/bin/pa sswd" },
{ "\\\\usr\\lo\\ cal\\bin\\pa\\ sswd", "//usr/lo\\ cal/bin/pa\\ sswd" },
- { 0, 0 }
+ { KWSYS_NULLPTR, KWSYS_NULLPTR }
};
static bool CheckConvertToUnixSlashes(std::string const& input,
@@ -68,10 +68,11 @@ static bool CheckConvertToUnixSlashes(std::string const& input,
return true;
}
-static const char* checkEscapeChars[][4] = { { "1 foo 2 bar 2", "12", "\\",
- "\\1 foo \\2 bar \\2" },
- { " {} ", "{}", "#", " #{#} " },
- { 0, 0, 0, 0 } };
+static const char* checkEscapeChars[][4] = {
+ { "1 foo 2 bar 2", "12", "\\", "\\1 foo \\2 bar \\2" },
+ { " {} ", "{}", "#", " #{#} " },
+ { KWSYS_NULLPTR, KWSYS_NULLPTR, KWSYS_NULLPTR, KWSYS_NULLPTR }
+};
static bool CheckEscapeChars(std::string const& input,
const char* chars_to_escape, char escape_char,
@@ -159,7 +160,7 @@ static bool CheckFileOperations()
res = false;
}
// calling with 0 pointer should return false
- if (kwsys::SystemTools::MakeDirectory(0)) {
+ if (kwsys::SystemTools::MakeDirectory(KWSYS_NULLPTR)) {
std::cerr << "Problem with MakeDirectory(0)" << std::endl;
res = false;
}
@@ -217,11 +218,11 @@ static bool CheckFileOperations()
}
// calling with 0 pointer should return false
- if (kwsys::SystemTools::FileExists(0)) {
+ if (kwsys::SystemTools::FileExists(KWSYS_NULLPTR)) {
std::cerr << "Problem with FileExists(0)" << std::endl;
res = false;
}
- if (kwsys::SystemTools::FileExists(0, true)) {
+ if (kwsys::SystemTools::FileExists(KWSYS_NULLPTR, true)) {
std::cerr << "Problem with FileExists(0) as file" << std::endl;
res = false;
}