Autogen: Tests: Separate StaticLibraryCycle test

Tests/QtAutogen/CMakeLists.txt

@@ -59,10 +59,6 @@ if(NON_ASCII_BDIR AND WIN32)
   set(ALLOW_WRAP_CPP FALSE)
 endif()
 
-# -- Test
-# Tests static library cycles
-add_subdirectory(staticLibraryCycle)
-
 # -- Test
 # Complex test case
 add_subdirectory(complex)

Tests/QtAutogen/CommonTests.cmake

@@ -29,3 +29,4 @@ if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
 endif()
 ADD_AUTOGEN_TEST(SameName sameName)
+ADD_AUTOGEN_TEST(StaticLibraryCycle slc)

Tests/QtAutogen/staticLibraryCycle/CMakeLists.txt → Tests/QtAutogen/StaticLibraryCycle/CMakeLists.txt

@@ -1,5 +1,8 @@
-# Test AUTOMOC and AUTORCC on source files with the same name
-# but in different subdirectories
+cmake_minimum_required(VERSION 3.10)
+project(StaticLibraryCycle)
+include("../AutogenTest.cmake")
+
+# Test AUTOMOC on cyclic static libraries
 
 set(CMAKE_AUTOMOC ON)
 

Tests/QtAutogen/StaticLibraryCycle/a.cpp

@@ -0,0 +1,12 @@
+#include "a.h"
+#include "b.h"
+
+bool A::recursed = false;
+
+A::A()
+{
+  if (!A::recursed) {
+    A::recursed = true;
+    B b;
+  }
+}

Tests/QtAutogen/staticLibraryCycle/a.h → Tests/QtAutogen/StaticLibraryCycle/a.h

@@ -6,6 +6,8 @@
 class A : public QObject
 {
   Q_OBJECT
+  static bool recursed;
+
 public:
   A();
 };

Tests/QtAutogen/staticLibraryCycle/a.cpp

@@ -1,7 +0,0 @@
-#include "a.h"
-#include "b.h"
-
-A::A()
-{
-  B b;
-}