summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2011-02-17 16:03:13 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2011-02-17 16:03:50 (GMT)
commit426833486c3d801ec4dbce96407ec6e1e6c525f8 (patch)
tree502cab38751f0e5fb3199ee89c005c797ed95530 /tests
parent00f689370ce97d557f8af4596c780f381aa66cb7 (diff)
downloadQt-426833486c3d801ec4dbce96407ec6e1e6c525f8.zip
Qt-426833486c3d801ec4dbce96407ec6e1e6c525f8.tar.gz
Qt-426833486c3d801ec4dbce96407ec6e1e6c525f8.tar.bz2
Autotest: be nicer to the subprocess and SIGTERM it
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
index 6ad991b..d0c9675 100644
--- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -151,7 +151,8 @@ void tst_QDBusMarshall::initTestCase()
void tst_QDBusMarshall::cleanupTestCase()
{
proc.close();
- proc.kill();
+ proc.terminate();
+ proc.waitForFinished(200);
}
void tst_QDBusMarshall::sendBasic_data()