Autogen: Sort tests

Tests/Qt4Autogen/CMakeLists.txt

@@ -6,4 +6,4 @@ include("../QtAutogen/TestMacros.cmake")
 ADD_AUTOGEN_TEST(DefinesTest)
 
 # Common tests
-include("../QtAutogen/CommonTests.cmake")
+include("../QtAutogen/Tests.cmake")

Tests/Qt5Autogen/CMakeLists.txt

@@ -3,4 +3,4 @@ set(QT_TEST_VERSION 5)
 include("../QtAutogen/TestMacros.cmake")
 
 # Common tests
-include("../QtAutogen/CommonTests.cmake")
+include("../QtAutogen/Tests.cmake")

Tests/QtAutogen/CommonTests.cmake → Tests/QtAutogen/Tests.cmake

-# Autogen tests common for Qt4 and Qt5
+# Qt4 and Qt5 tests
+ADD_AUTOGEN_TEST(AutogenOriginDependsOff autogenOriginDependsOff)
+ADD_AUTOGEN_TEST(AutogenOriginDependsOn)
+ADD_AUTOGEN_TEST(AutogenTargetDepends)
 ADD_AUTOGEN_TEST(Complex QtAutogen)
+ADD_AUTOGEN_TEST(GlobalAutogenTarget)
 ADD_AUTOGEN_TEST(LowMinimumVersion lowMinimumVersion)
 ADD_AUTOGEN_TEST(MocOnly mocOnly)
 ADD_AUTOGEN_TEST(MocOptions mocOptions)
-ADD_AUTOGEN_TEST(UicOnly uicOnly)
-ADD_AUTOGEN_TEST(RccOnly rccOnly)
-ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
-ADD_AUTOGEN_TEST(RccOffMocLibrary)
-ADD_AUTOGEN_TEST(GlobalAutogenTarget)
-if(QT_TEST_ALLOW_QT_MACROS)
-  ADD_AUTOGEN_TEST(MocSkipSource)
-endif()
-ADD_AUTOGEN_TEST(UicSkipSource)
-ADD_AUTOGEN_TEST(RccSkipSource)
-if(QT_TEST_VERSION GREATER 4)
-  ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
-endif()
-ADD_AUTOGEN_TEST(AutogenOriginDependsOff autogenOriginDependsOff)
-ADD_AUTOGEN_TEST(AutogenOriginDependsOn)
-ADD_AUTOGEN_TEST(AutogenTargetDepends)
-if(QT_TEST_ALLOW_QT_MACROS)
-  ADD_AUTOGEN_TEST(MocIncludeStrict mocIncludeStrict)
-  ADD_AUTOGEN_TEST(MocIncludeRelaxed mocIncludeRelaxed)
-endif()
-if(QT_TEST_ALLOW_QT_MACROS)
-  ADD_AUTOGEN_TEST(MocCMP0071)
-endif()
-if(QT_TEST_VERSION GREATER 4)
-  ADD_AUTOGEN_TEST(MocOsMacros)
-endif()
-ADD_AUTOGEN_TEST(UicInclude uicInclude)
-ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
 ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
-if(APPLE AND (QT_TEST_VERSION GREATER 4))
-  ADD_AUTOGEN_TEST(MacOsFW)
-endif()
 ADD_AUTOGEN_TEST(Parallel parallel)
 ADD_AUTOGEN_TEST(Parallel1 parallel1)
 ADD_AUTOGEN_TEST(Parallel2 parallel2)
 ADD_AUTOGEN_TEST(Parallel3 parallel3)
 ADD_AUTOGEN_TEST(Parallel4 parallel4)
 ADD_AUTOGEN_TEST(ParallelAUTO parallelAUTO)
+ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
+ADD_AUTOGEN_TEST(RccOffMocLibrary)
+ADD_AUTOGEN_TEST(RccOnly rccOnly)
+ADD_AUTOGEN_TEST(RccSkipSource)
+ADD_AUTOGEN_TEST(RerunMocBasic)
+ADD_AUTOGEN_TEST(RerunRccConfigChange)
+ADD_AUTOGEN_TEST(RerunRccDepends)
 ADD_AUTOGEN_TEST(SameName sameName)
 ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
-# Rerun tests
-ADD_AUTOGEN_TEST(RerunMocBasic)
+ADD_AUTOGEN_TEST(UicInclude uicInclude)
+ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
+ADD_AUTOGEN_TEST(UicOnly uicOnly)
+ADD_AUTOGEN_TEST(UicSkipSource)
+
+if(QT_TEST_ALLOW_QT_MACROS)
+  ADD_AUTOGEN_TEST(MocCMP0071)
+  ADD_AUTOGEN_TEST(MocIncludeRelaxed mocIncludeRelaxed)
+  ADD_AUTOGEN_TEST(MocIncludeStrict mocIncludeStrict)
+  ADD_AUTOGEN_TEST(MocSkipSource)
+endif()
+
+# Qt5 only tests
 if(QT_TEST_VERSION GREATER 4)
+  ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
+  ADD_AUTOGEN_TEST(MocOsMacros)
   ADD_AUTOGEN_TEST(RerunMocPlugin)
+  if(APPLE)
+    ADD_AUTOGEN_TEST(MacOsFW)
+  endif()
 endif()
-ADD_AUTOGEN_TEST(RerunRccDepends)
-ADD_AUTOGEN_TEST(RerunRccConfigChange)