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 15b62be62df4829a76f8de62785e81934610c77a (commit)
via 3357c4c4d4f5a4d2cd7afd58774e78bcf94c4694 (commit)
from f8c44b8b438059eb936c9c59630aa8f2fc123869 (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=15b62be62df4829a76f8de62785e81934610c77a
commit 15b62be62df4829a76f8de62785e81934610c77a
Merge: f8c44b8 3357c4c
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Mar 18 15:24:04 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 18 15:24:04 2015 -0400
Merge topic 'file-globbing-directory-listing' into next
3357c4c4 fixup! file GLOB list directories handling
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3357c4c4d4f5a4d2cd7afd58774e78bcf94c4694
commit 3357c4c4d4f5a4d2cd7afd58774e78bcf94c4694
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Mar 18 20:22:14 2015 +0100
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Mar 18 20:22:14 2015 +0100
fixup! file GLOB list directories handling
Globbing test outputs should be sorted
before printout so listing order on different
platforms doesn't affect the tests.
diff --git a/Tests/RunCMake/file/GLOB-stderr.txt
b/Tests/RunCMake/file/GLOB-stderr.txt
index 41be050..c47dc40 100644
--- a/Tests/RunCMake/file/GLOB-stderr.txt
+++ b/Tests/RunCMake/file/GLOB-stderr.txt
@@ -1,6 +1,6 @@
-content: 6.
-.*/test/dir 1/non_empty_dir;.*/test/dir 1/empty_dir;.*/test/dir 1/dir 1
file;.*/test/dir 2/non_empty_dir;.*/test/dir 2/dir 2 file;.*/test/dir
2/empty_dir
-content: 6.
-.*/test/dir 1/non_empty_dir;.*/test/dir 1/empty_dir;.*/test/dir 1/dir 1
file;.*/test/dir 2/non_empty_dir;.*/test/dir 2/dir 2 file;.*/test/dir
2/empty_dir
-content: 2.
+content: 6[ ]
+.*/test/dir 1/dir 1 file;.*/test/dir 1/empty_dir;.*/test/dir
1/non_empty_dir;.*/test/dir 2/dir 2 file;.*/test/dir 2/empty_dir;.*/test/dir
2/non_empty_dir
+content: 6[ ]
+.*/test/dir 1/dir 1 file;.*/test/dir 1/empty_dir;.*/test/dir
1/non_empty_dir;.*/test/dir 2/dir 2 file;.*/test/dir 2/empty_dir;.*/test/dir
2/non_empty_dir
+content: 2[ ]
.*/test/dir 1/dir 1 file;.*/test/dir 2/dir 2 file
diff --git a/Tests/RunCMake/file/GLOB.cmake b/Tests/RunCMake/file/GLOB.cmake
index c524e42..3d577e3 100644
--- a/Tests/RunCMake/file/GLOB.cmake
+++ b/Tests/RunCMake/file/GLOB.cmake
@@ -12,14 +12,17 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test/dir
2/non_empty_dir/dir 2 subdir fi
file(GLOB CONTENT_LIST "${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB CONTENT_LIST LIST_DIRECTORIES true
"${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB CONTENT_LIST LIST_DIRECTORIES false
"${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
diff --git a/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion-stderr.txt
b/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion-stderr.txt
index d73c74f..f73aa83 100644
--- a/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion-stderr.txt
+++ b/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion-stderr.txt
@@ -1,15 +1,15 @@
.*Cyclic recursion detected while globbing for.*
.*/test/depth1/depth2/depth3.*
.*/test/depth1/depth2/depth3/recursion.*
-content: 4.
-.*/test/abc;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/file_symlink
+content: 4[ ]
+.*/test/abc;.*/test/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink
.*Cyclic recursion detected while globbing for.*
.*/test/depth1/depth2/depth3.*
.*/test/depth1/depth2/depth3/recursion.*
-content: 4.
-.*/test/abc;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/file_symlink
+content: 4[ ]
+.*/test/abc;.*/test/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink
.*Cyclic recursion detected while globbing for.*
.*/test/depth1/depth2/depth3.*
.*/test/depth1/depth2/depth3/recursion.*
-content: 11.
-.*/test/abc;.*/test/depth1;.*/test/depth1/depth2;.*/test/depth1/depth2/depth3;.*/test/depth1/depth2/depth3/recursion;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1;.*/test/depth1/depth2/depth3/recursion/depth1/depth2;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/file_symlink
+content: 11[ ]
+.*/test/abc;.*/test/depth1;.*/test/depth1/depth2;.*/test/depth1/depth2/depth3;.*/test/depth1/depth2/depth3/file_symlink;.*/test/depth1/depth2/depth3/recursion;.*/test/depth1/depth2/depth3/recursion/abc;.*/test/depth1/depth2/depth3/recursion/depth1;.*/test/depth1/depth2/depth3/recursion/depth1/depth2;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3;.*/test/depth1/depth2/depth3/recursion/depth1/depth2/depth3/file_symlink
diff --git a/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion.cmake
b/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion.cmake
index fb8be42..a8c6784 100644
--- a/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion.cmake
+++ b/Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion.cmake
@@ -7,14 +7,17 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${CMAKE_CURRENT_BINA
file(GLOB_RECURSE CONTENT_LIST FOLLOW_SYMLINKS
"${CMAKE_CURRENT_BINARY_DIR}/test/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB_RECURSE CONTENT_LIST LIST_DIRECTORIES false FOLLOW_SYMLINKS
"${CMAKE_CURRENT_BINARY_DIR}/test/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB_RECURSE CONTENT_LIST LIST_DIRECTORIES true FOLLOW_SYMLINKS
"${CMAKE_CURRENT_BINARY_DIR}/test/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
diff --git a/Tests/RunCMake/file/GLOB_RECURSE-stderr.txt
b/Tests/RunCMake/file/GLOB_RECURSE-stderr.txt
index dac7db6..5d48e47 100644
--- a/Tests/RunCMake/file/GLOB_RECURSE-stderr.txt
+++ b/Tests/RunCMake/file/GLOB_RECURSE-stderr.txt
@@ -1,6 +1,6 @@
-content: 4.
-.*/test/dir 1/non_empty_dir/dir 1 subdir file;.*/test/dir 1/dir 1
file;/home/domen/Dev/build/cmake/Tests/RunCMake/file/GLOB_RECURSE-build/test/dir
2/non_empty_dir/dir 2 subdir
file;/home/domen/Dev/build/cmake/Tests/RunCMake/file/GLOB_RECURSE-build/test/dir
2/dir 2 file
-content: 4.
-.*/test/dir 1/non_empty_dir/dir 1 subdir file;.*/test/dir 1/dir 1
file;/home/domen/Dev/build/cmake/Tests/RunCMake/file/GLOB_RECURSE-build/test/dir
2/non_empty_dir/dir 2 subdir
file;/home/domen/Dev/build/cmake/Tests/RunCMake/file/GLOB_RECURSE-build/test/dir
2/dir 2 file
-content: 8.
-.*/test/dir 1/non_empty_dir;.*/test/dir 1/non_empty_dir/dir 1 subdir
file;.*/test/dir 1/empty_dir;.*/test/dir 1/dir 1 file;.*/test/dir
2/non_empty_dir;.*/test/dir 2/non_empty_dir/dir 2 subdir file;.*/test/dir 2/dir
2 file;.*/test/dir 2/empty_dir
+content: 4[ ]
+.*/test/dir 1/dir 1 file;.*/test/dir 1/non_empty_dir/dir 1 subdir
file;.*/test/dir 2/dir 2 file;.*/test/dir 2/non_empty_dir/dir 2 subdir file
+content: 4[ ]
+.*/test/dir 1/dir 1 file;.*/test/dir 1/non_empty_dir/dir 1 subdir
file;.*/test/dir 2/dir 2 file;.*/test/dir 2/non_empty_dir/dir 2 subdir file
+content: 8[ ]
+.*/test/dir 1/dir 1 file;.*/test/dir 1/empty_dir;.*/test/dir
1/non_empty_dir;.*/test/dir 1/non_empty_dir/dir 1 subdir file;.*/test/dir 2/dir
2 file;.*/test/dir 2/empty_dir;.*/test/dir 2/non_empty_dir;.*/test/dir
2/non_empty_dir/dir 2 subdir file
diff --git a/Tests/RunCMake/file/GLOB_RECURSE.cmake
b/Tests/RunCMake/file/GLOB_RECURSE.cmake
index 530930f..6db377b 100644
--- a/Tests/RunCMake/file/GLOB_RECURSE.cmake
+++ b/Tests/RunCMake/file/GLOB_RECURSE.cmake
@@ -12,14 +12,17 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test/dir
2/non_empty_dir/dir 2 subdir fi
file(GLOB_RECURSE CONTENT_LIST "${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB_RECURSE CONTENT_LIST LIST_DIRECTORIES false
"${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
file(GLOB_RECURSE CONTENT_LIST LIST_DIRECTORIES true
"${CMAKE_CURRENT_BINARY_DIR}/test/*/*")
list(LENGTH CONTENT_LIST CONTENT_COUNT)
message("content: ${CONTENT_COUNT} ")
+list(SORT CONTENT_LIST)
message("${CONTENT_LIST}")
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/file/GLOB-stderr.txt | 10 +++++-----
Tests/RunCMake/file/GLOB.cmake | 3 +++
.../RunCMake/file/GLOB_RECURSE-cyclic-recursion-stderr.txt | 12 ++++++------
Tests/RunCMake/file/GLOB_RECURSE-cyclic-recursion.cmake | 3 +++
Tests/RunCMake/file/GLOB_RECURSE-stderr.txt | 12 ++++++------
Tests/RunCMake/file/GLOB_RECURSE.cmake | 3 +++
6 files changed, 26 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
