From 472ca7f2b90a1c4bf70fd0ce39f04ef51abb8ef5 Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Wed, 29 May 2013 14:02:12 -0400 Subject: [PATCH] Skip a currently malfunctioning mythsystem unit test. --- .../libmythbase/test/test_mythsystem/test_mythsystem.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.h b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.h index a43150a8f27..a2305a8a5e3 100644 --- a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.h +++ b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.h @@ -30,6 +30,12 @@ using namespace std; #include "mythcorecontext.h" #include "mythsystem.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +#define MSKIP(MSG) QSKIP(MSG, QTest::SkipSingle) +#else +#define MSKIP(MSG) QSKIP(MSG) +#endif + static DebugLogHandler *console_dbg(void) { return DebugLogHandler::Get("ConsoleLogHandler"); @@ -100,10 +106,10 @@ class TestMythSystem: public QObject // TODO kMSProcessEvents -- process events while waiting // TODO kMSInUi -- the parent is in the UI -#if 0 /* FIXME currently this blocks forever :( */ // kMSStdIn -- allow access to stdin void stdin_works(void) { + MSKIP("stdin_works -- currently blocks forever"); QTemporaryFile tempfile; tempfile.open(); QByteArray in = QString(__FUNCTION__).toLatin1(); @@ -116,7 +122,6 @@ class TestMythSystem: public QObject QByteArray out = tempfile.readAll(); QVERIFY(QString(out).contains(QString(in))); } -#endif // kMSStdOut -- allow access to stdout void stdout_works(void)