From c2e23116277bcca1e347ff2e0cbd43c09f0cda6b Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 3 Feb 2016 21:41:12 +0000 Subject: [PATCH] Silence -Wsign-conversion issue in ProgramTest.cpp Unfortunately, ProgramInfo::ProcessId is signed on Unix and unsigned on Windows, breaking the standard fix of using '0U' in the gtest expectation. llvm-svn: 259704 --- llvm/include/llvm/Support/Program.h | 2 ++ llvm/unittests/Support/ProgramTest.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/llvm/include/llvm/Support/Program.h b/llvm/include/llvm/Support/Program.h index 727864d..a5e6cb5 100644 --- a/llvm/include/llvm/Support/Program.h +++ b/llvm/include/llvm/Support/Program.h @@ -44,6 +44,8 @@ struct ProcessInfo { #error "ProcessInfo is not defined for this platform!" #endif + static const ProcessId InvalidPid = 0; + /// The process identifier. ProcessId Pid; diff --git a/llvm/unittests/Support/ProgramTest.cpp b/llvm/unittests/Support/ProgramTest.cpp index 47a3dbb..deadaad 100644 --- a/llvm/unittests/Support/ProgramTest.cpp +++ b/llvm/unittests/Support/ProgramTest.cpp @@ -223,7 +223,7 @@ TEST_F(ProgramEnvTest, TestExecuteNoWait) { ProcessInfo PI1 = ExecuteNoWait(Executable, argv, getEnviron(), nullptr, 0, &Error, &ExecutionFailed); ASSERT_FALSE(ExecutionFailed) << Error; - ASSERT_NE(PI1.Pid, 0) << "Invalid process id"; + ASSERT_NE(PI1.Pid, ProcessInfo::InvalidPid) << "Invalid process id"; unsigned LoopCount = 0; @@ -242,7 +242,7 @@ TEST_F(ProgramEnvTest, TestExecuteNoWait) { ProcessInfo PI2 = ExecuteNoWait(Executable, argv, getEnviron(), nullptr, 0, &Error, &ExecutionFailed); ASSERT_FALSE(ExecutionFailed) << Error; - ASSERT_NE(PI2.Pid, 0) << "Invalid process id"; + ASSERT_NE(PI2.Pid, ProcessInfo::InvalidPid) << "Invalid process id"; // Test that Wait() with SecondsToWait=0 performs a non-blocking wait. In this // cse, LoopCount should be greater than 1 (more than one increment occurs). @@ -304,7 +304,7 @@ TEST(ProgramTest, TestExecuteNegative) { bool ExecutionFailed; ProcessInfo PI = ExecuteNoWait(Executable, argv, nullptr, nullptr, 0, &Error, &ExecutionFailed); - ASSERT_EQ(PI.Pid, 0) + ASSERT_EQ(PI.Pid, ProcessInfo::InvalidPid) << "On error ExecuteNoWait should return an invalid ProcessInfo"; ASSERT_TRUE(ExecutionFailed); ASSERT_FALSE(Error.empty()); -- 2.7.4