From: Daniel Karbach Date: Thu, 24 Nov 2016 10:29:37 +0000 (+0100) Subject: make stderr visible in standalone test X-Git-Url: http://git.localhorst.tv/?p=blank.git;a=commitdiff_plain;h=7bd3601fafbecae415bd96fc24404b21338cd7a4 make stderr visible in standalone test --- diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp index 6ad5f77..d008ec8 100644 --- a/tst/integration/StandaloneTest.cpp +++ b/tst/integration/StandaloneTest.cpp @@ -20,11 +20,22 @@ void StandaloneTest::tearDown() { void StandaloneTest::testStartup() { TestInstance standalone({ "--no-vsync" }); standalone.AssertRunning(); - standalone.AssertOutputLine("chunk preloading complete"); - standalone.Terminate(); + try { + standalone.AssertOutputLine("chunk preloading complete"); + standalone.Terminate(); + } catch (...) { + try { + standalone.Terminate(); + } catch (...) { } + std::string output; + standalone.ExhaustError(output); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "process stderr", + std::string(""), output); + CPPUNIT_FAIL("exception in runtime"); + } standalone.AssertExitStatus(0); - // can't do that because AL blurts out nonsense - //standalone.AssertNoError(); + standalone.AssertNoError(); } }