[Cmake-commits] CMake branch, next, updated. v3.4.0-1458-g20f70b2

[Joe Snyder]

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  20f70b2dcaea62a60cf8fa30d1996ee32e7e3fb5 (commit)
       via  19745918026efa558514cfd6959dae0d7942bb2f (commit)
      from  d2c6fb212b40a79e8496b84fe109de36d8f8272e (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=20f70b2dcaea62a60cf8fa30d1996ee32e7e3fb5
commit 20f70b2dcaea62a60cf8fa30d1996ee32e7e3fb5
Merge: d2c6fb2 1974591
Author:     Joe Snyder <joe.snyder at kitware.com>
AuthorDate: Fri Nov 20 09:42:55 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 20 09:42:55 2015 -0500

    Merge topic 'expand_cobertura_search' into next
    
    19745918 CTest: Swap ENVIRONMENT tags in test properties


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19745918026efa558514cfd6959dae0d7942bb2f
commit 19745918026efa558514cfd6959dae0d7942bb2f
Author:     Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Fri Nov 20 09:40:26 2015 -0500
Commit:     Joseph Snyder <joe.snyder at kitware.com>
CommitDate: Fri Nov 20 09:40:26 2015 -0500

    CTest: Swap ENVIRONMENT tags in test properties
    
    Switch the placement of the two ENVIRONMENT tags in the properties
    of the Cobertura Test.  The first ordering allowed a sysyem COVFILE
    environment variable to be captured when it is not needed.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1a811f7..dd766ae 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2544,8 +2544,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   set_tests_properties(CTestCoberturaCoverage PROPERTIES
       PASS_REGULAR_EXPRESSION
       "Process file.*CoverageTest.java.*Total LOC:.*18.*Percentage Coverage: 72.22.*"
-      ENVIRONMENT COVFILE=
-      ENVIRONMENT COBERTURADIR=${CMake_BINARY_DIR}/Testing/CoberturaCoverage)
+      ENVIRONMENT COBERTURADIR=${CMake_BINARY_DIR}/Testing/CoberturaCoverage
+      ENVIRONMENT COVFILE=)
 
 
   # Adding a test case for JaCoCo Coverage

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

Summary of changes:
 Tests/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake