[Cmake-commits] CMake branch, next, updated. v3.3.0-1417-g2dc12b7

[Brad King]

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  2dc12b73833eabf125fa7f2613bf6822fe784468 (commit)
       via  64821e8a40cf1add0cf3fd99b0860378754c64cf (commit)
      from  31f11f68dc1ca8c537690aa429a5de601f3cbf5b (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=2dc12b73833eabf125fa7f2613bf6822fe784468
commit 2dc12b73833eabf125fa7f2613bf6822fe784468
Merge: 31f11f6 64821e8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 11:15:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 11:15:42 2015 -0400

    Merge topic 'ctest-add_subdirectory-crash' into next
    
    64821e8a ctest: fix add_subdirectory() crash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64821e8a40cf1add0cf3fd99b0860378754c64cf
commit 64821e8a40cf1add0cf3fd99b0860378754c64cf
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jul 24 14:23:13 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 27 11:14:51 2015 -0400

    ctest: fix add_subdirectory() crash
    
    The directory is at args[0], not args[1].  Introduced in commit
    v2.6.0~489 (... 5889 ... tests are not found in some cases when using
    add_subdirectory ..., 2008-01-18).

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 70b7f5c..2af09cb 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:


hooks/post-receive
-- 
CMake