[Cmake-commits] CMake branch, next, updated. v3.3.0-1312-g32094f9

[Ben Boeckel]

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  32094f9c7c7dcb1d893a31ce5256178770268be3 (commit)
       via  0bbc1a067740f9a7535196f7ca9f57e5b2d30996 (commit)
      from  3d0efdaf68b888d3c62a397dba72e437b1fed111 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32094f9c7c7dcb1d893a31ce5256178770268be3
commit 32094f9c7c7dcb1d893a31ce5256178770268be3
Merge: 3d0efda 0bbc1a0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jul 24 14:29:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 24 14:29:23 2015 -0400

    Merge topic 'ctest-add_subdirectory-crash' into next
    
    0bbc1a06 ctest: fix add_subdirectory() crash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bbc1a067740f9a7535196f7ca9f57e5b2d30996
commit 0bbc1a067740f9a7535196f7ca9f57e5b2d30996
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jul 24 14:23:13 2015 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jul 24 14:27:19 2015 -0400

    ctest: fix add_subdirectory() crash
    
    The directory is at args[0], not args[1]. Introduced in
    7c473d482824cb251db0213955b36f1d391120a1 (from 2008).

diff --git a/Help/release/dev/ctest-add_subdirectory-crash.rst b/Help/release/dev/ctest-add_subdirectory-crash.rst
new file mode 100644
index 0000000..880363f
--- /dev/null
+++ b/Help/release/dev/ctest-add_subdirectory-crash.rst
@@ -0,0 +1,5 @@
+ctest-add_subdirectory-crash
+----------------------------
+
+* Fix a crash using :command:`add_subdirectory` from ``CTestTestfile.cmake``
+  (via :prop_dir:`TEST_INCLUDE_FILE`).
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 5faf001..c8a0d27 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -176,7 +176,7 @@ bool cmCTestAddSubdirectoryCommand
   cmSystemTools::ChangeDirectory(cwd);
   std::string fname = cwd;
   fname += "/";
-  fname += args[1];
+  fname += args[0];
 
   if ( !cmSystemTools::FileExists(fname.c_str()) )
     {

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

Summary of changes:
 Help/release/dev/ctest-add_subdirectory-crash.rst |    5 +++++
 Source/CTest/cmCTestTestHandler.cxx               |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/ctest-add_subdirectory-crash.rst


hooks/post-receive
-- 
CMake