From 56b349951a70f3ab95e334e41e37f017e91cf481 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 6 Aug 2009 11:04:23 +1000 Subject: Cleaned up test naming and platform-specific tests. When an autotest fails to compile, there's no way to determine which testcase(s) have been prevented from running. Our results parsing tools have been guessing, under the assumption that a directory called `qdogwalker' always contains a testcase named `tst_qdogwalker'. That wasn't true for all our tests, so let's make it true. Also changed the platform-specific tests so that qmake will simply skip those tests on unsupported platforms, instead of wasting time compiling a useless QTEST_NOOP_MAIN test. --- tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/auto/qscriptjstestsuite') diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 66004f86d6..4f6f38ec5e 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -785,6 +785,8 @@ tst_Suite::tst_Suite() addFileExclusion("regress-322135-04.js", "takes forever"); addFileExclusion("ecma_3/RegExp/regress-375715-04.js", "bug"); + static const char klass[] = "tst_QScriptJsTestSuite"; + QVector *data = qt_meta_data_tst_Suite(); // content: *data << 1 // revision @@ -796,7 +798,7 @@ tst_Suite::tst_Suite() ; QVector *stringdata = qt_meta_stringdata_tst_Suite(); - appendCString(stringdata, "tst_Suite"); + appendCString(stringdata, klass); appendCString(stringdata, ""); // don't execute any tests on slow machines @@ -814,11 +816,12 @@ tst_Suite::tst_Suite() // slot: signature, parameters, type, tag, flags QString data_slot = QString::fromLatin1("%0/%1_data()") .arg(testSuiteDir.dirName()).arg(ssdi.fileName()); - *data << stringdata->size() << 10 << 10 << 10 << 0x08; + static const int nullbyte = sizeof(klass); + *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08; appendCString(stringdata, data_slot.toLatin1()); QString slot = QString::fromLatin1("%0/%1()") .arg(testSuiteDir.dirName()).arg(ssdi.fileName()); - *data << stringdata->size() << 10 << 10 << 10 << 0x08; + *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08; appendCString(stringdata, slot.toLatin1()); } } -- cgit v1.2.3