1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid redundant tests

Browse Source 
tryRun() already implies tryLink() and tryCompile(), so there is no
point in executing the stages separately ...

Change-Id: Id7321efaca474e8c5db2bc246ac26323d8a99e58
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2012-05-02 11:34:05 +02:00 committed by Qt by Nokia
parent 03fa5dfa27
commit 98c7afb8d6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
View File

@ -1825,13 +1825,9 @@ void tst_QSharedPointer::invalidConstructs()
QFETCH(QString, code); QFETCH(QString, code);
static bool sane = true; static bool sane = true;
if (code.isEmpty()) { if (code.isEmpty()) {
static const char snippet[] = "QSharedPointer<Data> baseptr; QSharedPointer<DerivedData> ptr;"; if (!test.tryRun("")
if (!test.tryCompile("")
|| !test.tryRun("")
|| !test.tryRunFail("exit(1);") || !test.tryRunFail("exit(1);")
|| !test.tryCompile(snippet) || !test.tryRun("QSharedPointer<Data> baseptr; QSharedPointer<DerivedData> ptr;")) {
|| !test.tryLink(snippet)
|| !test.tryRun(snippet)) {
sane = false; sane = false;
qWarning("Sanity checking failed\nCode:\n%s\n", qWarning("Sanity checking failed\nCode:\n%s\n",
qPrintable(test.errorReport())); qPrintable(test.errorReport()));