<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Indeed. Unfortunately I am running into problems now as ASSERT_TRUE appears to expand into something ending in "return;" in the error case which only works in void functions. Still looking around what the correct gtest idiom is.</div><div class=""><br class=""></div><div class="">- Matthias</div><br class=""><div><blockquote type="cite" class=""><div class="">On Jun 15, 2017, at 3:39 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">I think these should be ASSERT_TRUE, though - since EXPECT doesn't halt execution of the test, so it'll hit UB on the following line where the pointer is dereferenced, etc?</div><br class=""><div class="gmail_quote"><div dir="ltr" class="">On Thu, Jun 15, 2017 at 3:31 PM Matthias Braun via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: matze<br class="">
Date: Thu Jun 15 17:31:08 2017<br class="">
New Revision: 305519<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=305519&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=305519&view=rev</a><br class="">
Log:<br class="">
UnitTests: Replace some if(x)report_fatal_error() with EXPECT_TRUE(!x)<br class="">
<br class="">
Modified:<br class="">
llvm/trunk/unittests/MI/LiveIntervalTest.cpp<br class="">
llvm/trunk/unittests/Target/AArch64/InstSizes.cpp<br class="">
<br class="">
Modified: llvm/trunk/unittests/MI/LiveIntervalTest.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MI/LiveIntervalTest.cpp?rev=305519&r1=305518&r2=305519&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MI/LiveIntervalTest.cpp?rev=305519&r1=305518&r2=305519&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/unittests/MI/LiveIntervalTest.cpp (original)<br class="">
+++ llvm/trunk/unittests/MI/LiveIntervalTest.cpp Thu Jun 15 17:31:08 2017<br class="">
@@ -151,8 +151,7 @@ body: |<br class="">
std::unique_ptr<MIRParser> MIR;<br class="">
std::unique_ptr<Module> M = parseMIR(Context, PM, MIR, *TM, MIRString,<br class="">
"func");<br class="">
- if (!M)<br class="">
- report_fatal_error("Could not parse MIR code\n");<br class="">
+ EXPECT_TRUE(M);<br class="">
<br class="">
PM.add(new TestPass(T));<br class="">
<br class="">
<br class="">
Modified: llvm/trunk/unittests/Target/AArch64/InstSizes.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Target/AArch64/InstSizes.cpp?rev=305519&r1=305518&r2=305519&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Target/AArch64/InstSizes.cpp?rev=305519&r1=305518&r2=305519&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/unittests/Target/AArch64/InstSizes.cpp (original)<br class="">
+++ llvm/trunk/unittests/Target/AArch64/InstSizes.cpp Thu Jun 15 17:31:08 2017<br class="">
@@ -21,8 +21,7 @@ std::unique_ptr<TargetMachine> createTar<br class="">
<br class="">
std::string Error;<br class="">
const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);<br class="">
- if (!TheTarget)<br class="">
- report_fatal_error("Target not registered");<br class="">
+ EXPECT_TRUE(TheTarget);<br class="">
<br class="">
return std::unique_ptr<TargetMachine>(<br class="">
TheTarget->createTargetMachine(TT, CPU, FS, TargetOptions(), None,<br class="">
@@ -59,24 +58,20 @@ void runChecks(<br class="">
std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRString);<br class="">
std::unique_ptr<MIRParser> MParser =<br class="">
createMIRParser(std::move(MBuffer), Context);<br class="">
- if (!MParser)<br class="">
- report_fatal_error("Couldn't create MIR parser");<br class="">
+ EXPECT_TRUE(MParser);<br class="">
<br class="">
std::unique_ptr<Module> M = MParser->parseIRModule();<br class="">
- if (!M)<br class="">
- report_fatal_error("Couldn't parse module");<br class="">
+ EXPECT_TRUE(M);<br class="">
<br class="">
M->setTargetTriple(TM->getTargetTriple().getTriple());<br class="">
M->setDataLayout(TM->createDataLayout());<br class="">
<br class="">
MachineModuleInfo MMI(TM);<br class="">
bool Res = MParser->parseMachineFunctions(*M, MMI);<br class="">
- if (Res)<br class="">
- report_fatal_error("Couldn't parse MIR functions");<br class="">
+ EXPECT_FALSE(Res);<br class="">
<br class="">
auto F = M->getFunction("sizes");<br class="">
- if (!F)<br class="">
- report_fatal_error("Couldn't find intended function");<br class="">
+ EXPECT_TRUE(F);<br class="">
auto &MF = MMI.getOrCreateMachineFunction(*F);<br class="">
<br class="">
Checks(*II, MF);<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div>
</div></blockquote></div><br class=""></body></html>