From: Matthias Braun <matze@braunis.de>
Date: Thu, 15 Jun 2017 22:50:57 +0000 (+0000)
Subject: UnitTests: Followup to 305519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcb4305b6f49f4f41bbd6e8c2e30c3f1a7f58121;p=llvm

UnitTests: Followup to 305519

We have to use ASSERT_XXX instead of EXPECT_XXX if the test cannot
continue in the failure case.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305522 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/unittests/MI/LiveIntervalTest.cpp b/unittests/MI/LiveIntervalTest.cpp
index 43dfa4a7978..01dce37d9c6 100644
--- a/unittests/MI/LiveIntervalTest.cpp
+++ b/unittests/MI/LiveIntervalTest.cpp
@@ -151,7 +151,7 @@ body: |
   std::unique_ptr<MIRParser> MIR;
   std::unique_ptr<Module> M = parseMIR(Context, PM, MIR, *TM, MIRString,
                                        "func");
-  EXPECT_TRUE(M);
+  ASSERT_TRUE(M);
 
   PM.add(new TestPass(T));
 
diff --git a/unittests/Target/AArch64/InstSizes.cpp b/unittests/Target/AArch64/InstSizes.cpp
index 32b91da0910..f5a6d4fa67d 100644
--- a/unittests/Target/AArch64/InstSizes.cpp
+++ b/unittests/Target/AArch64/InstSizes.cpp
@@ -21,7 +21,6 @@ std::unique_ptr<TargetMachine> createTargetMachine() {
 
   std::string Error;
   const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-  EXPECT_TRUE(TheTarget);
 
   return std::unique_ptr<TargetMachine>(
       TheTarget->createTargetMachine(TT, CPU, FS, TargetOptions(), None,
@@ -58,20 +57,20 @@ void runChecks(
   std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRString);
   std::unique_ptr<MIRParser> MParser =
       createMIRParser(std::move(MBuffer), Context);
-  EXPECT_TRUE(MParser);
+  ASSERT_TRUE(MParser);
 
   std::unique_ptr<Module> M = MParser->parseIRModule();
-  EXPECT_TRUE(M);
+  ASSERT_TRUE(M);
 
   M->setTargetTriple(TM->getTargetTriple().getTriple());
   M->setDataLayout(TM->createDataLayout());
 
   MachineModuleInfo MMI(TM);
   bool Res = MParser->parseMachineFunctions(*M, MMI);
-  EXPECT_FALSE(Res);
+  ASSERT_FALSE(Res);
 
   auto F = M->getFunction("sizes");
-  EXPECT_TRUE(F);
+  ASSERT_TRUE(F != nullptr);
   auto &MF = MMI.getOrCreateMachineFunction(*F);
 
   Checks(*II, MF);
@@ -81,6 +80,7 @@ void runChecks(
 
 TEST(InstSizes, STACKMAP) {
   std::unique_ptr<TargetMachine> TM = createTargetMachine();
+  ASSERT_TRUE(TM);
   std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
 
   runChecks(TM.get(), II.get(), "", "    STACKMAP 0, 16\n"