[llvm][unittests] Fix LLVM-Unit :: Support/./SupportTests/ProgramEnvTest.TestExecuteAndWaitStatistics on Solaris

[ro]

Summary

The new LLVM-Unit :: Support/./SupportTests/ProgramEnvTest.TestExecuteAndWaitStatistics test currently FAILs on Solaris:

[ RUN      ] ProgramEnvTest.TestExecuteAndWaitStatistics
/vol/llvm/src/llvm-project/local/llvm/unittests/Support/ProgramTest.cpp:360: Failure
Expected: (ProcStat->PeakMemory) > (0U), actual: 0 vs 0
[  FAILED  ] ProgramEnvTest.TestExecuteAndWaitStatistics (22 ms)

According to llvm/lib/Support/Unix/Program.inc (llvm::sys::Wait), PeakMemory
corresponds to struct rusage.ru_maxrss.

However, Solaris getrusage(3C) documents

NOTES
       The ru_maxrss, ru_ixrss, ru_idrss, and ru_isrss members of  the  rusage
       structure are set to 0 in this implementation.

To deal with this, this patch changes to test to allow for PeakMemory == 0.

Tested on amd64-pc-solaris2.11. Ok for master?

[sepavloff]

llvm/unittests/Support/ProgramTest.cpp

360

PeakMemory is uint64_t, so the check condition is always true. It may cause compiler warnings.

I would propose to remove this check at all.

[ro]

Remove ProcStat->PeakMemory check: pointless now.

[ro]

llvm/unittests/Support/ProgramTest.cpp

360

On Solaris (and the BSDs where getrusage originated), it's
long instead, thus no warning.

But I agree: the check is pretty pointless now.

[sepavloff]

LGTM

I would also make commit title a bit shorter, for example [llvm][unittests] Fix ProgramEnvTest.TestExecuteAndWaitStatistics on Solaris.

[ro]

In D83661#2149163, @sepavloff wrote:

I would also make commit title a bit shorter, for example [llvm][unittests] Fix ProgramEnvTest.TestExecuteAndWaitStatistics on Solaris.

Sure, fine with me. It were nice if lit would generate unique and reasonably short test names out of the box :-)

llvm/unittests/Support/ProgramTest.cpp

TEST_F(ProgramEnvTest, TestExecuteAndWaitStatistics) {
 
   std::string Error;
   bool ExecutionFailed;
   Optional<ProcessStatistics> ProcStat;
   int RetCode = ExecuteAndWait(Executable, argv, getEnviron(), {}, 0, 0, &Error,
                                &ExecutionFailed, &ProcStat);
   ASSERT_EQ(0, RetCode);
   ASSERT_TRUE(ProcStat);
-  ASSERT_GT(ProcStat->PeakMemory, 0U);
+  ASSERT_GE(ProcStat->PeakMemory, 0U);
   ASSERT_GE(ProcStat->UserTime, std::chrono::microseconds(0));
   ASSERT_GE(ProcStat->TotalTime, ProcStat->UserTime);
 }
 
 } // end anonymous namespace