Commit d6db52d9 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge 98701 from mainline. 

Fix death tests in -Assert builds.

llvm-svn: 99906
parent 2db982c4

llvm/unittests/ADT/APFloatTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ TEST(APFloatTest, makeNaN) { 
}



#ifdef GTEST_HAS_DEATH_TEST

#ifndef NDEBUG

TEST(APFloatTest, SemanticsDeath) {

  EXPECT_DEATH(APFloat(APFloat::IEEEsingle, 0.0f).convertToDouble(), "Float semantics are not IEEEdouble");

  EXPECT_DEATH(APFloat(APFloat::IEEEdouble, 0.0 ).convertToFloat(),  "Float semantics are not IEEEsingle");
@@ -573,5 +574,6 @@ TEST(APFloatTest, StringHexadecimalExponentDeath) { 
  EXPECT_DEATH(APFloat(APFloat::IEEEdouble, "-0x1.1p-"), "Exponent has no digits");

}

#endif

#endif



}

llvm/unittests/ADT/APIntTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ TEST(APIntTest, Log2) { 
}



#ifdef GTEST_HAS_DEATH_TEST

#ifndef NDEBUG

TEST(APIntTest, StringDeath) {

  EXPECT_DEATH(APInt(0, "", 0), "Bitwidth too small");

  EXPECT_DEATH(APInt(32, "", 0), "Invalid string length");
@@ -340,5 +341,6 @@ TEST(APIntTest, StringDeath) { 
  EXPECT_DEATH(APInt(32, "1L", 10), "Invalid character in digit string");

}

#endif

#endif



}

llvm/unittests/Support/LeakDetectorTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ using namespace llvm; 
namespace {



#ifdef GTEST_HAS_DEATH_TEST

#ifndef NDEBUG

TEST(LeakDetector, Death1) {

  LeakDetector::addGarbageObject((void*) 1);

  LeakDetector::addGarbageObject((void*) 2);
@@ -25,5 +26,6 @@ TEST(LeakDetector, Death1) { 
               "Cache != o && \"Object already in set!\"");

}

#endif

#endif



}