aboutsummaryrefslogtreecommitdiff
path: root/llvm/unittests/Support/ProgramTest.cpp
diff options
context:
space:
mode:
authorKazu Hirata <kazu@google.com>2022-12-02 22:10:37 -0800
committerKazu Hirata <kazu@google.com>2022-12-02 22:10:37 -0800
commitb6a01caa64aaac2e5db8d7953a81cbe1a139b81f (patch)
tree1e03e63b8c985d3b1ca515ac811a87e31e6afef0 /llvm/unittests/Support/ProgramTest.cpp
parentb25362816d731ca2283b3b21ca7343a64c05d85c (diff)
downloadllvm-b6a01caa64aaac2e5db8d7953a81cbe1a139b81f.zip
llvm-b6a01caa64aaac2e5db8d7953a81cbe1a139b81f.tar.gz
llvm-b6a01caa64aaac2e5db8d7953a81cbe1a139b81f.tar.bz2
[llvm/unittests] Use std::nullopt instead of None (NFC)
This patch mechanically replaces None with std::nullopt where the compiler would warn if None were deprecated. The intent is to reduce the amount of manual work required in migrating from Optional to std::optional. This is part of an effort to migrate from llvm::Optional to std::optional: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'llvm/unittests/Support/ProgramTest.cpp')
-rw-r--r--llvm/unittests/Support/ProgramTest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/unittests/Support/ProgramTest.cpp b/llvm/unittests/Support/ProgramTest.cpp
index 54ad9be..2134b96 100644
--- a/llvm/unittests/Support/ProgramTest.cpp
+++ b/llvm/unittests/Support/ProgramTest.cpp
@@ -195,7 +195,7 @@ TEST_F(ProgramEnvTest, CreateProcessTrailingSlash) {
#else
StringRef nul("/dev/null");
#endif
- std::optional<StringRef> redirects[] = {nul, nul, None};
+ std::optional<StringRef> redirects[] = {nul, nul, std::nullopt};
int rc = ExecuteAndWait(my_exe, argv, getEnviron(), redirects,
/*secondsToWait=*/ 10, /*memoryLimit=*/ 0, &error,
&ExecutionFailed);
@@ -289,8 +289,8 @@ TEST(ProgramTest, TestExecuteNegative) {
{
std::string Error;
bool ExecutionFailed;
- int RetCode = ExecuteAndWait(Executable, argv, llvm::None, {}, 0, 0, &Error,
- &ExecutionFailed);
+ int RetCode = ExecuteAndWait(Executable, argv, std::nullopt, {}, 0, 0,
+ &Error, &ExecutionFailed);
ASSERT_LT(RetCode, 0) << "On error ExecuteAndWait should return 0 or "
"positive value indicating the result code";
ASSERT_TRUE(ExecutionFailed);
@@ -300,8 +300,8 @@ TEST(ProgramTest, TestExecuteNegative) {
{
std::string Error;
bool ExecutionFailed;
- ProcessInfo PI = ExecuteNoWait(Executable, argv, llvm::None, {}, 0, &Error,
- &ExecutionFailed);
+ ProcessInfo PI = ExecuteNoWait(Executable, argv, std::nullopt, {}, 0,
+ &Error, &ExecutionFailed);
ASSERT_EQ(PI.Pid, ProcessInfo::InvalidPid)
<< "On error ExecuteNoWait should return an invalid ProcessInfo";
ASSERT_TRUE(ExecutionFailed);