From 89780663b3f64eddf7dda2b5565935b73d92c146 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Thu, 2 Mar 2017 17:13:41 +0100
Subject: Autogen: Test: Rename automoc_rerun test to mocRerun

---
 Tests/QtAutogen/CMakeLists.txt               | 14 +++++++-------
 Tests/QtAutogen/automoc_rerun/CMakeLists.txt | 27 ---------------------------
 Tests/QtAutogen/automoc_rerun/input.txt      |  1 -
 Tests/QtAutogen/automoc_rerun/res1.qrc       |  5 -----
 Tests/QtAutogen/automoc_rerun/test1.cpp      |  5 -----
 Tests/QtAutogen/automoc_rerun/test1.h.in1    |  8 --------
 Tests/QtAutogen/automoc_rerun/test1.h.in2    |  7 -------
 Tests/QtAutogen/mocRerun/CMakeLists.txt      | 27 +++++++++++++++++++++++++++
 Tests/QtAutogen/mocRerun/input.txt           |  1 +
 Tests/QtAutogen/mocRerun/res1.qrc            |  5 +++++
 Tests/QtAutogen/mocRerun/test1.cpp           |  5 +++++
 Tests/QtAutogen/mocRerun/test1a.h.in         |  8 ++++++++
 Tests/QtAutogen/mocRerun/test1b.h.in         |  7 +++++++
 13 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 Tests/QtAutogen/automoc_rerun/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/automoc_rerun/input.txt
 delete mode 100644 Tests/QtAutogen/automoc_rerun/res1.qrc
 delete mode 100644 Tests/QtAutogen/automoc_rerun/test1.cpp
 delete mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in1
 delete mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in2
 create mode 100644 Tests/QtAutogen/mocRerun/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/mocRerun/input.txt
 create mode 100644 Tests/QtAutogen/mocRerun/res1.qrc
 create mode 100644 Tests/QtAutogen/mocRerun/test1.cpp
 create mode 100644 Tests/QtAutogen/mocRerun/test1a.h.in
 create mode 100644 Tests/QtAutogen/mocRerun/test1b.h.in

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 4b84486..bf40166 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -119,26 +119,26 @@ endif()
 # -- Test
 # Ensure a repeated build succeeds when a header containing a QObject changes
 try_compile(MOC_RERUN
-  "${CMAKE_CURRENT_BINARY_DIR}/automoc_rerun"
-  "${CMAKE_CURRENT_SOURCE_DIR}/automoc_rerun"
-  automoc_rerun
+  "${CMAKE_CURRENT_BINARY_DIR}/mocRerun"
+  "${CMAKE_CURRENT_SOURCE_DIR}/mocRerun"
+  mocRerun
   CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
               "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
               "-DCMAKE_PREFIX_PATH=${Qt_PREFIX_DIR}"
   OUTPUT_VARIABLE output
 )
 if (NOT MOC_RERUN)
-  message(SEND_ERROR "Initial build of automoc_rerun failed. Output: ${output}")
+  message(SEND_ERROR "Initial build of mocRerun failed. Output: ${output}")
 endif()
 
-configure_file(automoc_rerun/test1.h.in2 automoc_rerun/test1.h COPYONLY)
+configure_file(mocRerun/test1b.h.in mocRerun/test1.h COPYONLY)
 
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/automoc_rerun"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mocRerun"
   RESULT_VARIABLE automoc_rerun_result
   )
 if (automoc_rerun_result)
-  message(SEND_ERROR "Second build of automoc_rerun failed.")
+  message(SEND_ERROR "Second build of mocRerun failed.")
 endif()
 
 # -- Test
diff --git a/Tests/QtAutogen/automoc_rerun/CMakeLists.txt b/Tests/QtAutogen/automoc_rerun/CMakeLists.txt
deleted file mode 100644
index 92a682b..0000000
--- a/Tests/QtAutogen/automoc_rerun/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-project(automoc_rerun CXX)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-  set(QT_CORE_TARGET Qt4::QtCore)
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-
-  find_package(Qt5Core REQUIRED)
-  set(QT_CORE_TARGET Qt5::Core)
-endif()
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-configure_file(test1.h.in1 test1.h COPYONLY)
-
-add_executable(test1
-  ${CMAKE_CURRENT_BINARY_DIR}/test1.h
-  test1.cpp
-  res1.qrc
-  )
-target_include_directories(test1 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(test1 ${QT_CORE_TARGET})
diff --git a/Tests/QtAutogen/automoc_rerun/input.txt b/Tests/QtAutogen/automoc_rerun/input.txt
deleted file mode 100644
index da62762..0000000
--- a/Tests/QtAutogen/automoc_rerun/input.txt
+++ /dev/null
@@ -1 +0,0 @@
-Res1 input.
diff --git a/Tests/QtAutogen/automoc_rerun/res1.qrc b/Tests/QtAutogen/automoc_rerun/res1.qrc
deleted file mode 100644
index fb804b5..0000000
--- a/Tests/QtAutogen/automoc_rerun/res1.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>input.txt</file>
-    </qresource>
-</RCC>
diff --git a/Tests/QtAutogen/automoc_rerun/test1.cpp b/Tests/QtAutogen/automoc_rerun/test1.cpp
deleted file mode 100644
index 4316a91..0000000
--- a/Tests/QtAutogen/automoc_rerun/test1.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "test1.h"
-int main()
-{
-  return 0;
-}
diff --git a/Tests/QtAutogen/automoc_rerun/test1.h.in1 b/Tests/QtAutogen/automoc_rerun/test1.h.in1
deleted file mode 100644
index fee2c09..0000000
--- a/Tests/QtAutogen/automoc_rerun/test1.h.in1
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <QObject>
-class test1 : public QObject
-{
-  Q_OBJECT
- public slots:
-   void onTst1() {}
-   void onTst2() {}
-};
diff --git a/Tests/QtAutogen/automoc_rerun/test1.h.in2 b/Tests/QtAutogen/automoc_rerun/test1.h.in2
deleted file mode 100644
index 6531d10..0000000
--- a/Tests/QtAutogen/automoc_rerun/test1.h.in2
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <QObject>
-class test1 : public QObject
-{
-  Q_OBJECT
- public slots:
-   void onTst1() {}
-};
diff --git a/Tests/QtAutogen/mocRerun/CMakeLists.txt b/Tests/QtAutogen/mocRerun/CMakeLists.txt
new file mode 100644
index 0000000..efe936e
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.7)
+project(mocRerun CXX)
+
+if (QT_TEST_VERSION STREQUAL 4)
+  find_package(Qt4 REQUIRED)
+  set(QT_CORE_TARGET Qt4::QtCore)
+else()
+  if (NOT QT_TEST_VERSION STREQUAL 5)
+    message(SEND_ERROR "Invalid Qt version specified.")
+  endif()
+
+  find_package(Qt5Core REQUIRED)
+  set(QT_CORE_TARGET Qt5::Core)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+configure_file(test1a.h.in test1.h COPYONLY)
+
+add_executable(test1
+  ${CMAKE_CURRENT_BINARY_DIR}/test1.h
+  test1.cpp
+  res1.qrc
+  )
+target_include_directories(test1 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test1 ${QT_CORE_TARGET})
diff --git a/Tests/QtAutogen/mocRerun/input.txt b/Tests/QtAutogen/mocRerun/input.txt
new file mode 100644
index 0000000..da62762
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/input.txt
@@ -0,0 +1 @@
+Res1 input.
diff --git a/Tests/QtAutogen/mocRerun/res1.qrc b/Tests/QtAutogen/mocRerun/res1.qrc
new file mode 100644
index 0000000..fb804b5
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/res1.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>input.txt</file>
+    </qresource>
+</RCC>
diff --git a/Tests/QtAutogen/mocRerun/test1.cpp b/Tests/QtAutogen/mocRerun/test1.cpp
new file mode 100644
index 0000000..4316a91
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/test1.cpp
@@ -0,0 +1,5 @@
+#include "test1.h"
+int main()
+{
+  return 0;
+}
diff --git a/Tests/QtAutogen/mocRerun/test1a.h.in b/Tests/QtAutogen/mocRerun/test1a.h.in
new file mode 100644
index 0000000..fee2c09
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/test1a.h.in
@@ -0,0 +1,8 @@
+#include <QObject>
+class test1 : public QObject
+{
+  Q_OBJECT
+ public slots:
+   void onTst1() {}
+   void onTst2() {}
+};
diff --git a/Tests/QtAutogen/mocRerun/test1b.h.in b/Tests/QtAutogen/mocRerun/test1b.h.in
new file mode 100644
index 0000000..6531d10
--- /dev/null
+++ b/Tests/QtAutogen/mocRerun/test1b.h.in
@@ -0,0 +1,7 @@
+#include <QObject>
+class test1 : public QObject
+{
+  Q_OBJECT
+ public slots:
+   void onTst1() {}
+};
-- 
cgit v0.12