You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/01/31 06:08:05 UTC
svn commit: r1440851 - in /incubator/mesos/trunk/third_party/libprocess:
Makefile.am src/statistics_tests.cpp src/tests.cpp src/tests/
src/tests/statistics_tests.cpp src/tests/tests.cpp
Author: benh
Date: Thu Jan 31 05:08:05 2013
New Revision: 1440851
URL: http://svn.apache.org/viewvc?rev=1440851&view=rev
Log:
Moved libprocess tests into a subdirectory.
From: Ben Mahler <be...@gmail.com>
Review: https://reviews.apache.org/r/8792
Added:
incubator/mesos/trunk/third_party/libprocess/src/tests/
incubator/mesos/trunk/third_party/libprocess/src/tests/statistics_tests.cpp
- copied, changed from r1440850, incubator/mesos/trunk/third_party/libprocess/src/statistics_tests.cpp
incubator/mesos/trunk/third_party/libprocess/src/tests/tests.cpp
- copied, changed from r1440850, incubator/mesos/trunk/third_party/libprocess/src/tests.cpp
Removed:
incubator/mesos/trunk/third_party/libprocess/src/statistics_tests.cpp
incubator/mesos/trunk/third_party/libprocess/src/tests.cpp
Modified:
incubator/mesos/trunk/third_party/libprocess/Makefile.am
Modified: incubator/mesos/trunk/third_party/libprocess/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/Makefile.am?rev=1440851&r1=1440850&r2=1440851&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/Makefile.am Thu Jan 31 05:08:05 2013
@@ -99,9 +99,9 @@ libprocess_la_SOURCES += $(top_srcdir)/i
# Tests.
check_PROGRAMS = tests
-tests_SOURCES = src/tests.cpp src/statistics_tests.cpp
-tests_CPPFLAGS = -I$(GTEST)/include -I$(GMOCK)/include \
- $(libprocess_la_CPPFLAGS)
+tests_SOURCES = src/tests/tests.cpp src/tests/statistics_tests.cpp
+tests_CPPFLAGS = -I$(top_srcdir)/src -I$(GTEST)/include \
+ -I$(GMOCK)/include $(libprocess_la_CPPFLAGS)
tests_LDADD = third_party/libgmock.la libprocess.la
# TODO(benh): Fix shared builds (tests need libglog, libev, etc).
Copied: incubator/mesos/trunk/third_party/libprocess/src/tests/statistics_tests.cpp (from r1440850, incubator/mesos/trunk/third_party/libprocess/src/statistics_tests.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/src/tests/statistics_tests.cpp?p2=incubator/mesos/trunk/third_party/libprocess/src/tests/statistics_tests.cpp&p1=incubator/mesos/trunk/third_party/libprocess/src/statistics_tests.cpp&r1=1440850&r2=1440851&rev=1440851&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/src/tests/tests.cpp (from r1440850, incubator/mesos/trunk/third_party/libprocess/src/tests.cpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/src/tests/tests.cpp?p2=incubator/mesos/trunk/third_party/libprocess/src/tests/tests.cpp&p1=incubator/mesos/trunk/third_party/libprocess/src/tests.cpp&r1=1440850&r2=1440851&rev=1440851&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/src/tests.cpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/src/tests/tests.cpp Thu Jan 31 05:08:05 2013
@@ -291,7 +291,7 @@ TEST(Process, dispatch)
future = dispatch(pid, &DispatchProcess::func1, true);
EXPECT_TRUE(future.get());
-
+
future = dispatch(pid, &DispatchProcess::func2, true);
EXPECT_TRUE(future.get());
@@ -366,7 +366,7 @@ TEST(Process, defer1)
EXPECT_TRUE(future.get());
}
- // only take const &!
+ // Only take const &!
terminate(pid);
wait(pid);
@@ -600,46 +600,6 @@ TEST(Process, delegate)
}
-// class TerminateProcess : public Process<TerminateProcess>
-// {
-// public:
-// TerminateProcess(Latch* _latch) : latch(_latch) {}
-
-// protected:
-// virtual void operator () ()
-// {
-// latch->await();
-// receive();
-// EXPECT_EQ(TERMINATE, name());
-// }
-
-// private:
-// Latch* latch;
-// };
-
-
-// TEST(Process, terminate)
-// {
-// ASSERT_TRUE(GTEST_IS_THREADSAFE);
-
-// Latch latch;
-
-// TerminateProcess process(&latch);
-
-// spawn(&process);
-
-// post(process.self(), "one");
-// post(process.self(), "two");
-// post(process.self(), "three");
-
-// terminate(process.self());
-
-// latch.trigger();
-
-// wait(process.self());
-// }
-
-
class TimeoutProcess : public Process<TimeoutProcess>
{
public:
@@ -898,37 +858,6 @@ TEST(Process, settle)
}
-// #define ENUMERATE1(item) item##1
-// #define ENUMERATE2(item) ENUMERATE1(item), item##2
-// #define ENUMERATE3(item) ENUMERATE2(item), item##3
-// #define ENUMERATE4(item) ENUMERATE3(item), item##4
-// #define ENUMERATE5(item) ENUMERATE4(item), item##5
-// #define ENUMERATE6(item) ENUMERATE5(item), item##6
-// #define ENUMERATE(item, n) ENUMERATE##n(item)
-
-// #define GenerateVoidDispatch(n) \
-// template <typename T, \
-// ENUM(typename P, n), \
-// ENUM(typename A, n)> \
-// void dispatch(const PID<T>& pid, \
-// void (T::*method)(ENUM(P, n)), \
-// ENUM(A, a, n)) \
-// { \
-// std::tr1::function<void(T*)> thunk = \
-// std::tr1::bind(method, std::tr1::placeholders::_1, ENUM(a, 5)); \
-// \
-// std::tr1::function<void(ProcessBase*)>* dispatcher = \
-// new std::tr1::function<void(ProcessBase*)>( \
-// std::tr1::bind(&internal::vdispatcher<T>, \
-// std::tr1::placeholders::_1, \
-// thunk)); \
-// \
-// internal::dispatch(pid, dispatcher); \
-// }
-
-// }
-
-
TEST(Process, pid)
{
ASSERT_TRUE(GTEST_IS_THREADSAFE);
@@ -936,9 +865,6 @@ TEST(Process, pid)
TimeoutProcess process;
PID<TimeoutProcess> pid = process;
-
-// foo(process, &TimeoutProcess::timeout);
- // dispatch(process, &TimeoutProcess::timeout);
}
@@ -983,7 +909,7 @@ TEST(Process, listener)
dispatch(PID<Listener1>(process), &Listener1::event1);
dispatch(PID<Listener2>(process), &Listener2::event2);
-
+
terminate(process, false);
wait(process);
}