[Cmake-commits] CMake branch, next, updated. v3.7.1-1928-gf14f487

[Domen Vrankar]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f14f4875429bcc4445ec06328f42d3243bd36892 (commit)
       via  adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit)
       via  aff368bb8456694e2550e2f69451456728ab31eb (commit)
      from  8dc707a2ffd830f95271275808b645a372e7cebd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f14f4875429bcc4445ec06328f42d3243bd36892
commit f14f4875429bcc4445ec06328f42d3243bd36892
Merge: 8dc707a adbf722
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:41:09 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 02:41:09 2017 -0500

    Merge topic 'cpack-test-extra-std-out-err-file-overloads' into next
    
    adbf7228 CPack test additional std out/err regex file overloads
    aff368bb CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adbf72280d1eb823402c4cc7f2c27ec0ef16062a
commit adbf72280d1eb823402c4cc7f2c27ec0ef16062a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Dec 23 23:26:45 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:40:16 2017 +0100

    CPack test additional std out/err regex file overloads
    
    Added std out/std err expected regex file name
    overloads for packaging type.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 89da610..f883c69 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,7 +60,11 @@ function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source PACK
       )
 
     foreach(o out err)
-      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
+      elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
+      elseif(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
       elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index f51d254..7c98f69 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,8 +155,18 @@ VerifyResult.cmake script also automatically prints out standard output and
 standard error from CPack execution phase that is compared with
 '<test_name>/<generator_name>-stdout.txt' regular expression and
 and '<test_name>/<generator_name>-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and in
-      such case subtest file is preferred.
+NOTE: For subtests generator name can also be suffixed with subtest name and/or
+      packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
+      preferences of which file will be used are as follows:
+        - generator name + packaging type + subtest name
+        - generator name + packaging type
+        - generator name + subtest name
+        - generator name
+        - default generator
+      File name format: '<generator_name>-<packaging_type>-<subtest_name>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
+      File name format: '<generator_name>-<packaging_type>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
       File name format: '<generator_name>-<subtest_name>-std<type>.txt' where
                         <type> can either be 'out' or 'err'.
 NOTE: If none of the comparison files are present then the default generator
@@ -223,3 +233,4 @@ To add a new generator we must
 - if needed add 'default_expected_std<type>.txt' files where <type> is either
   'out' or 'err' which will contain default expected output of package
   generation regular expression.
+- add generator to list of other CPack generators in RunCMake/CMakeLists.txt

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                   |    2 +-
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |    6 +++++-
 Tests/RunCMake/CPack/README.txt             |   15 +++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake