diff options
Diffstat (limited to 'tests/auto/corelib/io/qprocess')
-rw-r--r-- | tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro index 48fd2d0b69..8f77e46f74 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro @@ -2,6 +2,6 @@ SOURCES = main.cpp CONFIG -= qt app_bundle CONFIG += console -win32:!win32-g++*:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS- +win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS- DESTDIR = ./ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 37f224ff28..f5aa2c2412 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -943,7 +943,7 @@ void tst_QProcess::hardExit() void tst_QProcess::softExit() { QProcess proc; - + QCOMPARE(proc.processId(), 0); proc.start("testSoftExit/testSoftExit"); QVERIFY(proc.waitForStarted(10000)); @@ -951,6 +951,8 @@ void tst_QProcess::softExit() QVERIFY(proc.waitForReadyRead(10000)); #endif + QVERIFY(proc.processId() > 0); + proc.terminate(); QVERIFY(proc.waitForFinished(10000)); |