From 53a69c7dd47f693efec85e031b89251dd7bdef2f Mon Sep 17 00:00:00 2001
From: Domen Vrankar <domen.vrankar@gmail.com>
Date: Sat, 26 Nov 2016 18:57:46 +0100
Subject: [PATCH] Tests: CPack move tests to separate dir

For greater transparency tests
are moved to a subfolder with
each test having its own dir.
---
 Tests/RunCMake/CPack/CMakeLists.txt                             | 2 +-
 .../COMPONENTS_EMPTY_DIR/test.cmake}                            | 0
 .../CPack/{CUSTOM_NAMES.cmake => tests/CUSTOM_NAMES/test.cmake} | 0
 .../CPack/{DEBUGINFO.cmake => tests/DEBUGINFO/test.cmake}       | 0
 .../CPack/{DEB_EXTRA.cmake => tests/DEB_EXTRA/test.cmake}       | 0
 .../DEB_GENERATE_SHLIBS/test.cmake}                             | 0
 .../DEB_GENERATE_SHLIBS_LDCONFIG/test.cmake}                    | 0
 .../CPack/{DEPENDENCIES.cmake => tests/DEPENDENCIES/test.cmake} | 0
 .../CPack/{EMPTY_DIR.cmake => tests/EMPTY_DIR/test.cmake}       | 0
 .../{INSTALL_SCRIPTS.cmake => tests/INSTALL_SCRIPTS/test.cmake} | 0
 .../{LONG_FILENAMES.cmake => tests/LONG_FILENAMES/test.cmake}   | 0
 .../{MAIN_COMPONENT.cmake => tests/MAIN_COMPONENT/test.cmake}   | 0
 .../RunCMake/CPack/{MINIMAL.cmake => tests/MINIMAL/test.cmake}  | 0
 .../PACKAGE_CHECKSUM/test.cmake}                                | 0
 .../PARTIALLY_RELOCATABLE_WARNING/test.cmake}                   | 0
 .../PER_COMPONENT_FIELDS/test.cmake}                            | 0
 .../CPack/{RPM_DIST.cmake => tests/RPM_DIST/test.cmake}         | 0
 .../CPack/{RPM_SUGGESTS.cmake => tests/RPM_SUGGESTS/test.cmake} | 0
 .../SINGLE_DEBUGINFO/test.cmake}                                | 0
 .../{SOURCE_PACKAGE.cmake => tests/SOURCE_PACKAGE/test.cmake}   | 0
 20 files changed, 1 insertion(+), 1 deletion(-)
 rename Tests/RunCMake/CPack/{COMPONENTS_EMPTY_DIR.cmake => tests/COMPONENTS_EMPTY_DIR/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{CUSTOM_NAMES.cmake => tests/CUSTOM_NAMES/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{DEBUGINFO.cmake => tests/DEBUGINFO/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{DEB_EXTRA.cmake => tests/DEB_EXTRA/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{DEB_GENERATE_SHLIBS.cmake => tests/DEB_GENERATE_SHLIBS/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{DEB_GENERATE_SHLIBS_LDCONFIG.cmake => tests/DEB_GENERATE_SHLIBS_LDCONFIG/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{DEPENDENCIES.cmake => tests/DEPENDENCIES/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{EMPTY_DIR.cmake => tests/EMPTY_DIR/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{INSTALL_SCRIPTS.cmake => tests/INSTALL_SCRIPTS/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{LONG_FILENAMES.cmake => tests/LONG_FILENAMES/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{MAIN_COMPONENT.cmake => tests/MAIN_COMPONENT/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{MINIMAL.cmake => tests/MINIMAL/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{PACKAGE_CHECKSUM.cmake => tests/PACKAGE_CHECKSUM/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{PARTIALLY_RELOCATABLE_WARNING.cmake => tests/PARTIALLY_RELOCATABLE_WARNING/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{PER_COMPONENT_FIELDS.cmake => tests/PER_COMPONENT_FIELDS/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{RPM_DIST.cmake => tests/RPM_DIST/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{RPM_SUGGESTS.cmake => tests/RPM_SUGGESTS/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{SINGLE_DEBUGINFO.cmake => tests/SINGLE_DEBUGINFO/test.cmake} (100%)
 rename Tests/RunCMake/CPack/{SOURCE_PACKAGE.cmake => tests/SOURCE_PACKAGE/test.cmake} (100%)

diff --git a/Tests/RunCMake/CPack/CMakeLists.txt b/Tests/RunCMake/CPack/CMakeLists.txt
index 409245ea7c..c4d9d5da72 100644
--- a/Tests/RunCMake/CPack/CMakeLists.txt
+++ b/Tests/RunCMake/CPack/CMakeLists.txt
@@ -5,7 +5,7 @@ project(${RunCMake_TEST} CXX)
 # set default test name (can be overwritten in test.cmake or specifics.cmake)
 string(TOLOWER "${RunCMake_TEST_FILE_PREFIX}" CPACK_PACKAGE_NAME)
 
-include(${RunCMake_TEST_FILE_PREFIX}.cmake)
+include(tests/${RunCMake_TEST_FILE_PREFIX}/test.cmake)
 
 # include test generator specifics
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GENERATOR_TYPE}/${RunCMake_TEST_FILE_PREFIX}-specifics.cmake")
diff --git a/Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake b/Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
rename to Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake
diff --git a/Tests/RunCMake/CPack/CUSTOM_NAMES.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/CUSTOM_NAMES.cmake
rename to Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/DEBUGINFO.cmake
rename to Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
diff --git a/Tests/RunCMake/CPack/DEB_EXTRA.cmake b/Tests/RunCMake/CPack/tests/DEB_EXTRA/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/DEB_EXTRA.cmake
rename to Tests/RunCMake/CPack/tests/DEB_EXTRA/test.cmake
diff --git a/Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake
rename to Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/test.cmake
diff --git a/Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake
rename to Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/test.cmake
diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/DEPENDENCIES.cmake
rename to Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake
diff --git a/Tests/RunCMake/CPack/EMPTY_DIR.cmake b/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/EMPTY_DIR.cmake
rename to Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake
diff --git a/Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake
rename to Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
diff --git a/Tests/RunCMake/CPack/LONG_FILENAMES.cmake b/Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/LONG_FILENAMES.cmake
rename to Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake
diff --git a/Tests/RunCMake/CPack/MAIN_COMPONENT.cmake b/Tests/RunCMake/CPack/tests/MAIN_COMPONENT/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/MAIN_COMPONENT.cmake
rename to Tests/RunCMake/CPack/tests/MAIN_COMPONENT/test.cmake
diff --git a/Tests/RunCMake/CPack/MINIMAL.cmake b/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/MINIMAL.cmake
rename to Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
diff --git a/Tests/RunCMake/CPack/PACKAGE_CHECKSUM.cmake b/Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/PACKAGE_CHECKSUM.cmake
rename to Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/test.cmake
diff --git a/Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake b/Tests/RunCMake/CPack/tests/PARTIALLY_RELOCATABLE_WARNING/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake
rename to Tests/RunCMake/CPack/tests/PARTIALLY_RELOCATABLE_WARNING/test.cmake
diff --git a/Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake b/Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake
rename to Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake
diff --git a/Tests/RunCMake/CPack/RPM_DIST.cmake b/Tests/RunCMake/CPack/tests/RPM_DIST/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/RPM_DIST.cmake
rename to Tests/RunCMake/CPack/tests/RPM_DIST/test.cmake
diff --git a/Tests/RunCMake/CPack/RPM_SUGGESTS.cmake b/Tests/RunCMake/CPack/tests/RPM_SUGGESTS/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/RPM_SUGGESTS.cmake
rename to Tests/RunCMake/CPack/tests/RPM_SUGGESTS/test.cmake
diff --git a/Tests/RunCMake/CPack/SINGLE_DEBUGINFO.cmake b/Tests/RunCMake/CPack/tests/SINGLE_DEBUGINFO/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/SINGLE_DEBUGINFO.cmake
rename to Tests/RunCMake/CPack/tests/SINGLE_DEBUGINFO/test.cmake
diff --git a/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake b/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/test.cmake
similarity index 100%
rename from Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
rename to Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/test.cmake