You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/09/19 00:50:58 UTC
mesos git commit: CMake: Synchronize Stout makefile and cmakefile.
Repository: mesos
Updated Branches:
refs/heads/master 2db8ac414 -> 9327d48ca
CMake: Synchronize Stout makefile and cmakefile.
Review: https://reviews.apache.org/r/38455
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9327d48c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9327d48c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9327d48c
Branch: refs/heads/master
Commit: 9327d48ca67bf2cfd93e0561437b38149339484e
Parents: 2db8ac4
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Sep 18 17:35:22 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Sep 18 18:50:45 2015 -0400
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/Makefile.am | 2 ++
3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9327d48c/3rdparty/libprocess/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/Makefile.am b/3rdparty/libprocess/3rdparty/stout/Makefile.am
index f95ed03..76e1674 100644
--- a/3rdparty/libprocess/3rdparty/stout/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/stout/Makefile.am
@@ -50,11 +50,13 @@ EXTRA_DIST = \
tests/protobuf_tests.pb.cc \
tests/protobuf_tests.pb.h \
tests/protobuf_tests.proto \
+ tests/recordio_tests.cpp \
tests/result_tests.cpp \
tests/set_tests.cpp \
tests/some_tests.cpp \
tests/strings_tests.cpp \
tests/subcommand_tests.cpp \
tests/svn_tests.cpp \
+ tests/try_tests.cpp \
tests/uuid_tests.cpp \
tests/version_tests.cpp
http://git-wip-us.apache.org/repos/asf/mesos/blob/9327d48c/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
index cf5fd5c..baa648a 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
@@ -55,13 +55,15 @@ if (NOT WIN32)
mac_tests.cpp
os_tests.cpp
path_tests.cpp
+ proc_tests.cpp
protobuf_tests.cpp
protobuf_tests.pb.cc
- os/sendfile_tests.cpp
- os/signals_tests.cpp
+ recordio_tests.cpp
subcommand_tests.cpp
svn_tests.cpp
- thread_tests.cpp
+ try_tests.cpp
+ os/sendfile_tests.cpp
+ os/signals_tests.cpp
)
endif (NOT WIN32)
@@ -89,4 +91,4 @@ add_dependencies(${STOUT_TESTS_TARGET} ${STOUT_TEST_DEPENDENCIES})
# ADD TEST TARGET (runs when you do, e.g., `make check`).
#########################################################
-add_test(NAME StoutTests COMMAND ./${STOUT_TESTS_TARGET})
\ No newline at end of file
+add_test(NAME StoutTests COMMAND ./${STOUT_TESTS_TARGET})