diff options
| author | Tanya Lattner <tonic@nondot.org> | 2010-03-30 18:33:25 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2010-03-30 18:33:25 +0000 |
| commit | 9d8d8ba3847a067367daaa1d0df76381c2b61f18 (patch) | |
| tree | e838b4fbafcf9cb0fbbaf8055704698ec596e004 | |
| parent | 61d290633fb6ab18d4ecb763d037ce4965b76365 (diff) | |
| download | llvm-9d8d8ba3847a067367daaa1d0df76381c2b61f18.tar.gz | |
Merge 98701 from mainline.
Fix death tests in -Assert builds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_27@99906 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/ADT/APFloatTest.cpp | 2 | ||||
| -rw-r--r-- | unittests/ADT/APIntTest.cpp | 2 | ||||
| -rw-r--r-- | unittests/Support/LeakDetectorTest.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/unittests/ADT/APFloatTest.cpp b/unittests/ADT/APFloatTest.cpp index 571996013e36..964b04da473c 100644 --- a/unittests/ADT/APFloatTest.cpp +++ b/unittests/ADT/APFloatTest.cpp @@ -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 } diff --git a/unittests/ADT/APIntTest.cpp b/unittests/ADT/APIntTest.cpp index 0b13aa402ea1..d08e86abaa75 100644 --- a/unittests/ADT/APIntTest.cpp +++ b/unittests/ADT/APIntTest.cpp @@ -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 } diff --git a/unittests/Support/LeakDetectorTest.cpp b/unittests/Support/LeakDetectorTest.cpp index 85ef04676dcd..d198c7a8bda0 100644 --- a/unittests/Support/LeakDetectorTest.cpp +++ b/unittests/Support/LeakDetectorTest.cpp @@ -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 } |