From 43b9ccb7284601247c474215f342ef13966de85b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 12 Aug 2010 12:46:55 +0200 Subject: 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). --- tests/auto/selftests/expected_random.lightxml | 20 ------------------- tests/auto/selftests/expected_random.txt | 9 --------- tests/auto/selftests/expected_random.xml | 23 ---------------------- tests/auto/selftests/expected_random.xunitxml | 14 -------------- tests/auto/selftests/random/random.pro | 9 --------- tests/auto/selftests/random/tst_random.cpp | 28 --------------------------- tests/auto/selftests/selftests.pro | 2 +- tests/auto/selftests/selftests.qrc | 6 +----- tests/auto/selftests/tst_selftests.cpp | 5 ----- 9 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 tests/auto/selftests/expected_random.lightxml delete mode 100644 tests/auto/selftests/expected_random.txt delete mode 100644 tests/auto/selftests/expected_random.xml delete mode 100644 tests/auto/selftests/expected_random.xunitxml delete mode 100644 tests/auto/selftests/random/random.pro delete mode 100644 tests/auto/selftests/random/tst_random.cpp 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 @@ - - @INSERT_QT_VERSION_HERE@ - @INSERT_QT_VERSION_HERE@ - 325 - - - - - - - - - - - - - - - - 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 @@ - - - - @INSERT_QT_VERSION_HERE@ - @INSERT_QT_VERSION_HERE@ - 325 - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - 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 -#include - -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 @@ expected_multiexec.xml expected_multiexec.xunitxml expected_qexecstringlist.txt - expected_random.txt - expected_random.lightxml - expected_random.xml - expected_random.xunitxml expected_singleskip.lightxml expected_singleskip.txt expected_singleskip.xml @@ -138,5 +134,5 @@ expected_xunit.txt expected_xunit.xml expected_xunit.xunitxml - + 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" - -- cgit v0.12