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.

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 66004f8..4f6f38e 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<uint> *data = qt_meta_data_tst_Suite();
     // content:
     *data << 1 // revision
@@ -796,7 +798,7 @@ tst_Suite::tst_Suite()
         ;
 
     QVector<char> *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());
         }
     }