From c7013eea5925ff296df06081e7accc057b03c980 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 29 Aug 2011 09:24:37 +1000 Subject: [PATCH] test: removed obsolete tst_maketestselftest::tests_auto_pro This test attempted to ensure that tests/auto/auto.pro would only refer to other .pro files, attempting to guarantee that the set of all tests could be cleanly broken up. The purpose of this was to enable CI optimizations (e.g. running the autotests for different modules on different machines in parallel). This test is invalidated by pending commits which rearrange the autotests, and we never made use of this property for optimization anyway, so drop this part of the test. Change-Id: I23e712fb8ec1dbe7ac65fe66015e1f060f3dcd41 Reviewed-on: http://codereview.qt.nokia.com/3681 Reviewed-by: Qt Sanity Bot Reviewed-by: Jo Asplin --- .../maketestselftest/tst_maketestselftest.cpp | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index 07c68ac7ec..59dd43cb40 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -58,8 +58,6 @@ class tst_MakeTestSelfTest: public QObject Q_OBJECT private slots: - void tests_auto_pro(); - void tests_pro_files(); void tests_pro_files_data(); @@ -78,30 +76,6 @@ bool looks_like_testcase(QString const&,QString*); bool looks_like_subdirs(QString const&); QStringList find_test_class(QString const&); -/* - Verify that auto.pro only contains other .pro files (and not directories). - We enforce this so that we can process every .pro file other than auto.pro - independently and get all the tests. - If tests were allowed to appear directly in auto.pro, we'd have the problem - that we need to somehow run these tests from auto.pro while preventing - recursion into the other .pro files. -*/ -void tst_MakeTestSelfTest::tests_auto_pro() -{ - QStringList subdirsList = find_subdirs(SRCDIR "/../auto.pro", Flat); - if (QTest::currentTestFailed()) { - return; - } - - foreach (QString const& subdir, subdirsList) { - QVERIFY2(subdir.endsWith(".pro"), qPrintable(QString( - "auto.pro contains a subdir `%1'.\n" - "auto.pro must _only_ contain other .pro files, not actual subdirs.\n" - "Please move `%1' into some other .pro file referenced by auto.pro." - ).arg(subdir))); - } -} - /* Verify that all tests are listed somewhere in one of the autotest .pro files */ void tst_MakeTestSelfTest::tests_pro_files() {