summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-05-03 09:53:34 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-03 10:33:27 (GMT)
commit383f57dd2669b71fd14cf9b6b56213423a3d2d01 (patch)
treecd69a597b86916599734f1c29c3ea8bf5236c0db
parent7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58 (diff)
downloadQt-383f57dd2669b71fd14cf9b6b56213423a3d2d01.zip
Qt-383f57dd2669b71fd14cf9b6b56213423a3d2d01.tar.gz
Qt-383f57dd2669b71fd14cf9b6b56213423a3d2d01.tar.bz2
Fix the tst_QPluginLoader::loadCorruptElf on 64 bit
The error message do not match Reviewed-by: Arvid Ephraim Picciani
-rw-r--r--tests/auto/qpluginloader/tst_qpluginloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
index 591ef5e..76c2f6e 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -370,15 +370,15 @@ if (sizeof(void*) == 8) {
QPluginLoader lib1(SRCDIR "elftest/corrupt1.elf64.so");
QCOMPARE(lib1.load(), false);
- QVERIFY(lib1.errorString().contains("not an ELF object"));
+ QVERIFY(lib1.errorString().contains("not a valid Qt plugin"));
QPluginLoader lib2(SRCDIR "elftest/corrupt2.elf64.so");
QCOMPARE(lib2.load(), false);
- QVERIFY(lib2.errorString().contains("invalid"));
+ QVERIFY(lib2.errorString().contains("not a valid Qt plugin"));
QPluginLoader lib3(SRCDIR "elftest/corrupt3.elf64.so");
QCOMPARE(lib3.load(), false);
- QVERIFY(lib3.errorString().contains("invalid"));
+ QVERIFY(lib3.errorString().contains("not a valid Qt plugin"));
} else if (sizeof(void*) == 4) {
QPluginLoader libW(SRCDIR "elftest/corrupt3.elf64.so");
QCOMPARE(libW.load(), false);