You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/04/30 04:52:28 UTC
svn commit: r1477456 - in /incubator/mesos/trunk/third_party/libprocess:
configure.ac third_party/Makefile.am
Author: bmahler
Date: Tue Apr 30 02:52:28 2013
New Revision: 1477456
URL: http://svn.apache.org/r1477456
Log:
Added proc_tests.cpp to the libprocess third party tests.
Review: https://reviews.apache.org/r/10810
Modified:
incubator/mesos/trunk/third_party/libprocess/configure.ac
incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
Modified: incubator/mesos/trunk/third_party/libprocess/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/configure.ac?rev=1477456&r1=1477455&r2=1477456&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/configure.ac (original)
+++ incubator/mesos/trunk/third_party/libprocess/configure.ac Tue Apr 30 02:52:28 2013
@@ -102,12 +102,17 @@ fi
AM_CONDITIONAL([HAS_GPERFTOOLS], [test "x$gperftools" = "xyes"])
# Added for clock_gettime() call in stout/stopwatch.hpp.
+# We also only want to use stout/proc.hpp on linux.
case "${target_os}" in
linux*)
LIBS="$LIBS -lrt"
+ OS_NAME=linux
;;
*)
;;
esac
+# Used for conditionally including source files.
+AM_CONDITIONAL([OS_LINUX], [test "x$OS_NAME" = "xlinux"])
+
AC_OUTPUT
Modified: incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am?rev=1477456&r1=1477455&r2=1477456&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am Tue Apr 30 02:52:28 2013
@@ -129,6 +129,10 @@ stout_tests_SOURCES = \
$(STOUT)/tests/strings_tests.cpp \
$(STOUT)/tests/uuid_tests.cpp
+if OS_LINUX
+ stout_tests_SOURCES += $(STOUT)/tests/proc_tests.cpp
+endif
+
stout_tests_CPPFLAGS = \
-I$(srcdir)/$(STOUT)/include \
-I$(BOOST) \