diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-26 00:45:03 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-26 00:46:43 (GMT) |
| commit | 3ca156558dad24f5ac0f9d0e35a558c5b8052c81 (patch) | |
| tree | 628a85f008c99142117cd28d41fb11795d352fbd /tests/auto/selftests/tst_selftests.cpp | |
| parent | 97a05106707896c65d6fc0b563e9fd7ae9a0637d (diff) | |
| parent | 312c0d24443a5703fbb747911e039525e8567bbb (diff) | |
| download | Qt-3ca156558dad24f5ac0f9d0e35a558c5b8052c81.zip Qt-3ca156558dad24f5ac0f9d0e35a558c5b8052c81.tar.gz Qt-3ca156558dad24f5ac0f9d0e35a558c5b8052c81.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/selftests/tst_selftests.cpp
Diffstat (limited to 'tests/auto/selftests/tst_selftests.cpp')
| -rw-r--r-- | tests/auto/selftests/tst_selftests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index fcfc625..aa1048b 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -198,7 +198,7 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) { QProcess proc; proc.setEnvironment(QStringList("")); - proc.start(subdir + "/tst_" + subdir, arguments); + proc.start(subdir + "/" + subdir, arguments); QVERIFY2(proc.waitForFinished(), qPrintable(proc.errorString())); const QByteArray out(proc.readAllStandardOutput()); @@ -329,7 +329,7 @@ void tst_Selftests::checkXML() const QProcess proc; proc.setEnvironment(QStringList("")); - proc.start(subdir + "/tst_" + subdir, arguments); + proc.start(subdir + "/" + subdir, arguments); QVERIFY(proc.waitForFinished()); QByteArray out(proc.readAllStandardOutput()); @@ -367,7 +367,7 @@ void tst_Selftests::checkXunitxml() const QProcess proc; proc.setEnvironment(QStringList("")); - proc.start(subdir + "/tst_" + subdir, arguments); + proc.start(subdir + "/" + subdir, arguments); QVERIFY(proc.waitForFinished()); QByteArray out(proc.readAllStandardOutput()); |