diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-12-23 22:26:45 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2017-01-10 07:40:16 (GMT) |
| commit | adbf72280d1eb823402c4cc7f2c27ec0ef16062a (patch) | |
| tree | 5921ab2ea5c294311d4ec90837edb061862a7f8e /Tests/RunCMake/CPack/CPackTestHelpers.cmake | |
| parent | aff368bb8456694e2550e2f69451456728ab31eb (diff) | |
| download | CMake-adbf72280d1eb823402c4cc7f2c27ec0ef16062a.zip CMake-adbf72280d1eb823402c4cc7f2c27ec0ef16062a.tar.gz CMake-adbf72280d1eb823402c4cc7f2c27ec0ef16062a.tar.bz2 | |
CPack test additional std out/err regex file overloads
Added std out/std err expected regex file name
overloads for packaging type.
Diffstat (limited to 'Tests/RunCMake/CPack/CPackTestHelpers.cmake')
| -rw-r--r-- | Tests/RunCMake/CPack/CPackTestHelpers.cmake | 6 |
1 files changed, 5 insertions, 1 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") |