From adbf72280d1eb823402c4cc7f2c27ec0ef16062a Mon Sep 17 00:00:00 2001
From: Domen Vrankar <domen.vrankar@gmail.com>
Date: Fri, 23 Dec 2016 23:26:45 +0100
Subject: CPack test additional std out/err regex file overloads

Added std out/std err expected regex file name
overloads for packaging type.
---
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |  6 +++++-
 Tests/RunCMake/CPack/README.txt             | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

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
-- 
cgit v0.12