make stderr visible in standalone test

[blank.git] / tst / integration / StandaloneTest.cpp

diff --git a/tst/integration/StandaloneTest.cpp b/tst/integration/StandaloneTest.cpp
index 2e1b67d68c0d1010bbdeb02c34f167153753ee8d..d008ec806ac1a99321463c02a015a851762ba6f3 100644 (file)
--- a/tst/integration/StandaloneTest.cpp
+++ b/tst/integration/StandaloneTest.cpp
@@ -18,13 +18,24 @@ void StandaloneTest::tearDown() {
 
 
 void StandaloneTest::testStartup() {
-       TestInstance standalone({ });
+       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();
 }
 
 }