Revert the addition of the test of QtTest's random feature.

It was added in commit 56396b4b2b66da3133aff1b3864c550ce892d233.

Even though we have a -seed argument to provide reproduceability, it's
only reproduceable if the PRNG algorithm is also kept. So we can't
autotest this when we don't control the algorithm (for example, it's
different from glibc to MSVC's runtime).

9 files changed, 2 insertions, 114 deletions

diff --git a/tests/auto/selftests/expected_random.lightxml b/tests/auto/selftests/expected_random.lightxml
deleted file mode 100644
index 15f56a1..0000000
--- a/tests/auto/selftests/expected_random.lightxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-    <RandomSeed>325</RandomSeed>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0"/>
-</TestFunction>
-<TestFunction name="testTwo">
-<Incident type="pass" file="" line="0"/>
-</TestFunction>
-<TestFunction name="testOne">
-<Incident type="pass" file="" line="0"/>
-</TestFunction>
-<TestFunction name="testThree">
-<Incident type="pass" file="" line="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0"/>
-</TestFunction>
diff --git a/tests/auto/selftests/expected_random.txt b/tests/auto/selftests/expected_random.txt
deleted file mode 100644
index 3f4c11d..0000000
--- a/tests/auto/selftests/expected_random.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-********* Start testing of tst_Random *********
-Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@, Random seed 325
-PASS   : tst_Random::initTestCase()
-PASS   : tst_Random::testTwo()
-PASS   : tst_Random::testOne()
-PASS   : tst_Random::testThree()
-PASS   : tst_Random::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped
-********* Finished testing of tst_Random *********
diff --git a/tests/auto/selftests/expected_random.xml b/tests/auto/selftests/expected_random.xml
deleted file mode 100644
index 3677287..0000000
--- a/tests/auto/selftests/expected_random.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<TestCase name="tst_Random">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-    <RandomSeed>325</RandomSeed>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-</TestFunction>
-<TestFunction name="testTwo">
-<Incident type="pass" file="" line="0" />
-</TestFunction>
-<TestFunction name="testOne">
-<Incident type="pass" file="" line="0" />
-</TestFunction>
-<TestFunction name="testThree">
-<Incident type="pass" file="" line="0" />
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-</TestFunction>
-</TestCase>
diff --git a/tests/auto/selftests/expected_random.xunitxml b/tests/auto/selftests/expected_random.xunitxml
deleted file mode 100644
index 262aa0a..0000000
--- a/tests/auto/selftests/expected_random.xunitxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" tests="5" name="tst_Random">
-  <properties>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
-    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
-    <property value="325" name="RandomSeed"/>
-  </properties>
-  <testcase result="pass" name="initTestCase"/>
-  <testcase result="pass" name="testTwo"/>
-  <testcase result="pass" name="testOne"/>
-  <testcase result="pass" name="testThree"/>
-  <testcase result="pass" name="cleanupTestCase"/>
-  <system-err/>
-</testsuite>
diff --git a/tests/auto/selftests/random/random.pro b/tests/auto/selftests/random/random.pro
deleted file mode 100644
index 19572ad..0000000
--- a/tests/auto/selftests/random/random.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_random.cpp
-QT = core
-
-mac:CONFIG -= app_bundle
-CONFIG -= debug_and_release_target
-
-
-TARGET = random
diff --git a/tests/auto/selftests/random/tst_random.cpp b/tests/auto/selftests/random/tst_random.cpp
deleted file mode 100644
index 1ee922e..0000000
--- a/tests/auto/selftests/random/tst_random.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <QtCore>
-#include <QtTest/QtTest>
-
-class tst_Random: public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testOne() const {}
-    void testTwo() const {}
-    void testThree() const {}
-};
-
-/*
-int main(int argc, char * argv[])
-{
-    int failures = 0;
-    tst_Random tst;
-    for (int i = 0; i != 10; i++) {
-        failures += QTest::qExec(&tst, argc, argv);
-    }
-    return failures;
-}
-*/
-QTEST_MAIN(tst_Random)
-
-#include "tst_random.moc"
-
diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/selftests/selftests.pro
index bfbd598..d854b5e 100644
--- a/tests/auto/selftests/selftests.pro
+++ b/tests/auto/selftests/selftests.pro
@@ -5,7 +5,7 @@ SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skipglobal skip \
           skipinit skipinitdata datetime singleskip assert waitwithoutgui differentexec \
           exceptionthrow qexecstringlist datatable commandlinedata\
           benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \
-                  benchliboptions xunit badxml longstring random
+          benchliboptions xunit badxml longstring
 
 INSTALLS =
 
diff --git a/tests/auto/selftests/selftests.qrc b/tests/auto/selftests/selftests.qrc
index ba7ca4f..f82722b 100644
--- a/tests/auto/selftests/selftests.qrc
+++ b/tests/auto/selftests/selftests.qrc
@@ -90,10 +90,6 @@
         <file>expected_multiexec.xml</file>
         <file>expected_multiexec.xunitxml</file>
         <file>expected_qexecstringlist.txt</file>
-        <file>expected_random.txt</file>
-        <file>expected_random.lightxml</file>
-        <file>expected_random.xml</file>
-        <file>expected_random.xunitxml</file>
         <file>expected_singleskip.lightxml</file>
         <file>expected_singleskip.txt</file>
         <file>expected_singleskip.xml</file>
@@ -138,5 +134,5 @@
         <file>expected_xunit.txt</file>
         <file>expected_xunit.xml</file>
         <file>expected_xunit.xunitxml</file>
-   </qresource>
+    </qresource>
 </RCC>
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 9fb7ce6..0818b4c 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -245,7 +245,6 @@ void tst_Selftests::runSubTest_data()
         << "xunit"
         << "longstring"
         << "badxml"
-        << "random"
     ;
 
     foreach (Logger const& logger, allLoggers()) {
@@ -274,9 +273,6 @@ void tst_Selftests::runSubTest_data()
             else if (subtest == "badxml") {
                 arguments << "-eventcounter";
             }
-            else if (subtest == "random") {
-                arguments << QString("-random -seed 325").split(' ');
-            }
 
             // These tests don't work right with loggers other than plain, usually because
             // they internally supply arguments to themselves.
@@ -636,4 +632,3 @@ void tst_Selftests::cleanupTestCase()
 QTEST_MAIN(tst_Selftests)
 
 #include "tst_selftests.moc"
-