diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2012-10-16 12:37:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 15:29:15 +0200 |
| commit | 782cae4104ececc05e2864f788ea8a0539c0cbf0 (patch) | |
| tree | 61cef7ffab6175fe1fe175d690596bb7f428ccc1 /tests/auto/corelib/kernel | |
| parent | d81cf44a6b8c465353c9d4fed10fdf1f876c85cb (diff) | |
Test: remove QSKIP in tst_QCoreApplication::argc
Instead omit the whole test when Q_OS_WIN is defined since
the test is invalid on this platform.
Change-Id: Idb77df96b0c2a223cddbfffb4e24c6d1f5d33dfb
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/corelib/kernel')
| -rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index f662a8835a..dce7219ed9 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -53,7 +53,9 @@ private slots: void sendEventsOnProcessEvents(); // this must be the first test void getSetCheck(); void qAppName(); +#ifndef Q_OS_WIN void argc(); +#endif void postEvent(); void removePostedEvents(); #ifndef QT_NO_THREAD @@ -125,11 +127,11 @@ void tst_QCoreApplication::qAppName() QCOMPARE(QCoreApplication::applicationName(), QString::fromLatin1("tst_qcoreapplication")); } +// "QCoreApplication::arguments() always parses arguments from actual command line on Windows +// making this test invalid." +#ifndef Q_OS_WIN void tst_QCoreApplication::argc() { -#ifdef Q_OS_WIN - QSKIP("QCoreApplication::arguments() always parses arguments from actual command line in Windows, making this test invalid."); -#endif { int argc = 1; char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; @@ -166,6 +168,7 @@ void tst_QCoreApplication::argc() QCOMPARE(app.arguments().count(), 1); } } +#endif class EventGenerator : public QObject { |