aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-22 16:49:59 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-22 14:53:28 +0000
commitfe0a111c18e96168eb944f6d5bf20d067129b495 (patch)
tree94c80f736f7892ebea730e290dcd6c39d8eba95b
parentf697752bd50575f7f7f837047f5a45896f19826c (diff)
Fix build.
"stdout" is not a good name for a variable. Change-Id: I37ebd3d9f3d7e6e75d4601f1f5cf1f66ddfe1706 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 7bf59f487..9e467b8f1 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1602,20 +1602,20 @@ void TestBlackbox::java()
QVERIFY2(process.waitForStarted(), qPrintable(process.errorString()));
QVERIFY2(process.waitForFinished(), qPrintable(process.errorString()));
QVERIFY2(process.exitCode() == 0, process.readAllStandardError().constData());
- QByteArray stdout = process.readAllStandardOutput();
- QVERIFY2(stdout.contains("Driving!"), stdout.constData());
- QVERIFY2(stdout.contains("Flying!"), stdout.constData());
- QVERIFY2(stdout.contains("Flying (this is a space ship)!"), stdout.constData());
- QVERIFY2(stdout.contains("Sailing!"), stdout.constData());
- QVERIFY2(stdout.contains("Native code performing complex internal combustion process (0x"),
- stdout.constData());
+ QByteArray stdOut = process.readAllStandardOutput();
+ QVERIFY2(stdOut.contains("Driving!"), stdOut.constData());
+ QVERIFY2(stdOut.contains("Flying!"), stdOut.constData());
+ QVERIFY2(stdOut.contains("Flying (this is a space ship)!"), stdOut.constData());
+ QVERIFY2(stdOut.contains("Sailing!"), stdOut.constData());
+ QVERIFY2(stdOut.contains("Native code performing complex internal combustion process (0x"),
+ stdOut.constData());
process.start("unzip", QStringList() << "-p" << "jar_file.jar");
QVERIFY2(process.waitForStarted(), qPrintable(process.errorString()));
QVERIFY2(process.waitForFinished(), qPrintable(process.errorString()));
- stdout = process.readAllStandardOutput();
- QVERIFY2(stdout.contains("Class-Path: car_jar.jar random_stuff.jar"), stdout.constData());
- QVERIFY2(stdout.contains("Main-Class: Vehicles"), stdout.constData());
+ stdOut = process.readAllStandardOutput();
+ QVERIFY2(stdOut.contains("Class-Path: car_jar.jar random_stuff.jar"), stdOut.constData());
+ QVERIFY2(stdOut.contains("Main-Class: Vehicles"), stdOut.constData());
}
void TestBlackbox::jsExtensionsFile()