summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDomen Vrankar <domen.vrankar@gmail.com>2016-11-26 17:57:46 (GMT)
committerDomen Vrankar <domen.vrankar@gmail.com>2016-11-27 22:20:34 (GMT)
commit53a69c7dd47f693efec85e031b89251dd7bdef2f (patch)
tree53acaab2bb7329e5a1cfa5c8dc1f35ba9c8be71f
parent70b52a7113664b8b74b231d62ff798952d29ae1f (diff)
downloadCMake-53a69c7dd47f693efec85e031b89251dd7bdef2f.zip
CMake-53a69c7dd47f693efec85e031b89251dd7bdef2f.tar.gz
CMake-53a69c7dd47f693efec85e031b89251dd7bdef2f.tar.bz2
Tests: CPack move tests to separate dir
For greater transparency tests are moved to a subfolder with each test having its own dir.
-rw-r--r--Tests/RunCMake/CPack/CMakeLists.txt2
-rw-r--r--Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake (renamed from Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake (renamed from Tests/RunCMake/CPack/CUSTOM_NAMES.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake (renamed from Tests/RunCMake/CPack/DEBUGINFO.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/DEB_EXTRA/test.cmake (renamed from Tests/RunCMake/CPack/DEB_EXTRA.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/test.cmake (renamed from Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/test.cmake (renamed from Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake (renamed from Tests/RunCMake/CPack/DEPENDENCIES.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake (renamed from Tests/RunCMake/CPack/EMPTY_DIR.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake (renamed from Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake (renamed from Tests/RunCMake/CPack/LONG_FILENAMES.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/MAIN_COMPONENT/test.cmake (renamed from Tests/RunCMake/CPack/MAIN_COMPONENT.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/MINIMAL/test.cmake (renamed from Tests/RunCMake/CPack/MINIMAL.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/PACKAGE_CHECKSUM/test.cmake (renamed from Tests/RunCMake/CPack/PACKAGE_CHECKSUM.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/PARTIALLY_RELOCATABLE_WARNING/test.cmake (renamed from Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake (renamed from Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/RPM_DIST/test.cmake (renamed from Tests/RunCMake/CPack/RPM_DIST.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/RPM_SUGGESTS/test.cmake (renamed from Tests/RunCMake/CPack/RPM_SUGGESTS.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/SINGLE_DEBUGINFO/test.cmake (renamed from Tests/RunCMake/CPack/SINGLE_DEBUGINFO.cmake)0
-rw-r--r--Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/test.cmake (renamed from Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake)0
20 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/CPack/CMakeLists.txt b/Tests/RunCMake/CPack/CMakeLists.txt
index 409245e..c4d9d5d 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
index 9cd91af..9cd91af 100644
--- a/Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
+++ b/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
index 115864f..115864f 100644
--- a/Tests/RunCMake/CPack/CUSTOM_NAMES.cmake
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake b/Tests/RunCMake/CPack/tests/DEBUGINFO/test.cmake
index 70b3cb3..70b3cb3 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/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
index 754561d..754561d 100644
--- a/Tests/RunCMake/CPack/DEB_EXTRA.cmake
+++ b/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
index fa0bc35..fa0bc35 100644
--- a/Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake
+++ b/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
index 2fc9e23..2fc9e23 100644
--- a/Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake
+++ b/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
index 4499a7a..4499a7a 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/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
index 7bec17d..7bec17d 100644
--- a/Tests/RunCMake/CPack/EMPTY_DIR.cmake
+++ b/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
index 9b3e856..9b3e856 100644
--- a/Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake
+++ b/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
index 3370a50..3370a50 100644
--- a/Tests/RunCMake/CPack/LONG_FILENAMES.cmake
+++ b/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
index f2c4451..f2c4451 100644
--- a/Tests/RunCMake/CPack/MAIN_COMPONENT.cmake
+++ b/Tests/RunCMake/CPack/tests/MAIN_COMPONENT/test.cmake
diff --git a/Tests/RunCMake/CPack/MINIMAL.cmake b/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
index 83ed0f2..83ed0f2 100644
--- a/Tests/RunCMake/CPack/MINIMAL.cmake
+++ b/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
index 0838063..0838063 100644
--- a/Tests/RunCMake/CPack/PACKAGE_CHECKSUM.cmake
+++ b/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
index 31e729b..31e729b 100644
--- a/Tests/RunCMake/CPack/PARTIALLY_RELOCATABLE_WARNING.cmake
+++ b/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
index 703c1b7..703c1b7 100644
--- a/Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake
+++ b/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
index 6bdd2c0..6bdd2c0 100644
--- a/Tests/RunCMake/CPack/RPM_DIST.cmake
+++ b/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
index dc90ae8..dc90ae8 100644
--- a/Tests/RunCMake/CPack/RPM_SUGGESTS.cmake
+++ b/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
index 60e9038..60e9038 100644
--- a/Tests/RunCMake/CPack/SINGLE_DEBUGINFO.cmake
+++ b/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
index 359b98f..359b98f 100644
--- a/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
+++ b/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/test.cmake