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: [PATCH] Autogen: Test: Rename automoc_rerun test to mocRerun
---
Tests/QtAutogen/CMakeLists.txt | 14 +++++++-------
.../{automoc_rerun => mocRerun}/CMakeLists.txt | 4 ++--
.../{automoc_rerun => mocRerun}/input.txt | 0
.../QtAutogen/{automoc_rerun => mocRerun}/res1.qrc | 0
.../{automoc_rerun => mocRerun}/test1.cpp | 0
.../test1.h.in1 => mocRerun/test1a.h.in} | 0
.../test1.h.in2 => mocRerun/test1b.h.in} | 0
7 files changed, 9 insertions(+), 9 deletions(-)
rename Tests/QtAutogen/{automoc_rerun => mocRerun}/CMakeLists.txt (88%)
rename Tests/QtAutogen/{automoc_rerun => mocRerun}/input.txt (100%)
rename Tests/QtAutogen/{automoc_rerun => mocRerun}/res1.qrc (100%)
rename Tests/QtAutogen/{automoc_rerun => mocRerun}/test1.cpp (100%)
rename Tests/QtAutogen/{automoc_rerun/test1.h.in1 => mocRerun/test1a.h.in} (100%)
rename Tests/QtAutogen/{automoc_rerun/test1.h.in2 => mocRerun/test1b.h.in} (100%)
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 4b84486e6f..bf401660c8 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/mocRerun/CMakeLists.txt
similarity index 88%
rename from Tests/QtAutogen/automoc_rerun/CMakeLists.txt
rename to Tests/QtAutogen/mocRerun/CMakeLists.txt
index 92a682baf5..efe936ea51 100644
--- a/Tests/QtAutogen/automoc_rerun/CMakeLists.txt
+++ b/Tests/QtAutogen/mocRerun/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.7)
-project(automoc_rerun CXX)
+project(mocRerun CXX)
if (QT_TEST_VERSION STREQUAL 4)
find_package(Qt4 REQUIRED)
@@ -16,7 +16,7 @@ endif()
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
-configure_file(test1.h.in1 test1.h COPYONLY)
+configure_file(test1a.h.in test1.h COPYONLY)
add_executable(test1
${CMAKE_CURRENT_BINARY_DIR}/test1.h
diff --git a/Tests/QtAutogen/automoc_rerun/input.txt b/Tests/QtAutogen/mocRerun/input.txt
similarity index 100%
rename from Tests/QtAutogen/automoc_rerun/input.txt
rename to Tests/QtAutogen/mocRerun/input.txt
diff --git a/Tests/QtAutogen/automoc_rerun/res1.qrc b/Tests/QtAutogen/mocRerun/res1.qrc
similarity index 100%
rename from Tests/QtAutogen/automoc_rerun/res1.qrc
rename to Tests/QtAutogen/mocRerun/res1.qrc
diff --git a/Tests/QtAutogen/automoc_rerun/test1.cpp b/Tests/QtAutogen/mocRerun/test1.cpp
similarity index 100%
rename from Tests/QtAutogen/automoc_rerun/test1.cpp
rename to Tests/QtAutogen/mocRerun/test1.cpp
diff --git a/Tests/QtAutogen/automoc_rerun/test1.h.in1 b/Tests/QtAutogen/mocRerun/test1a.h.in
similarity index 100%
rename from Tests/QtAutogen/automoc_rerun/test1.h.in1
rename to Tests/QtAutogen/mocRerun/test1a.h.in
diff --git a/Tests/QtAutogen/automoc_rerun/test1.h.in2 b/Tests/QtAutogen/mocRerun/test1b.h.in
similarity index 100%
rename from Tests/QtAutogen/automoc_rerun/test1.h.in2
rename to Tests/QtAutogen/mocRerun/test1b.h.in
--
GitLab