Merge pull request cpputest#816 from basvodde/master

Fixed a failed test on clang++3.7.

Author: basvodde

include/CppUTest/TestTestingFixture.h

@@ -100,16 +100,19 @@ class TestTestingFixture
         return genTest_->hasFailed();
     }
 
-
     void assertPrintContains(const SimpleString& contains)
     {
-        assertPrintContains(output_, contains);
+        assertPrintContains(getOutput(), contains);
+    }
+
+    const SimpleString& getOutput()
+    {
+        return output_->getOutput();
     }
 
-    static void assertPrintContains(StringBufferTestOutput* output,
-            const SimpleString& contains)
+    static void assertPrintContains(const SimpleString& output, const SimpleString& contains)
     {
-        STRCMP_CONTAINS(contains.asCharString(), output->getOutput().asCharString());
+        STRCMP_CONTAINS(contains.asCharString(), output.asCharString());
 
     }
 

tests/UtestTest.cpp

@@ -189,7 +189,10 @@ TEST(UtestShell, TestDefaultCrashMethodInSeparateProcessTest)
     fixture.setTestFunction(UtestShell::crash);
     fixture.registry_->setRunTestsInSeperateProcess();
     fixture.runAllTests();
-    fixture.assertPrintContains("Failed in separate process - killed by signal 11");
+    fixture.assertPrintContains("Failed in separate process - killed by signal");
+
+    /* Signal 11 usually happens, but with clang3.7 on Linux, it produced signal 4 */
+    CHECK(fixture.getOutput().contains("signal 11") || fixture.getOutput().contains("signal 4"));
 }
 
 #endif