svn commit: r1295294 - in /incubator/mesos/trunk: src/Makefile.am third_party/Makefile.am third_party/libprocess/src/tests.cpp

[be...@apache.org]

Author: benh
Date: Wed Feb 29 21:37:40 2012
New Revision: 1295294

URL: http://svn.apache.org/viewvc?rev=1295294&view=rev
Log:
Fixes to get 'make dist/clean' working correctly (contributed by Charles Reiss).

Modified:
    incubator/mesos/trunk/src/Makefile.am
    incubator/mesos/trunk/third_party/Makefile.am
    incubator/mesos/trunk/third_party/libprocess/src/tests.cpp

Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1295294&r1=1295293&r2=1295294&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Wed Feb 29 21:37:40 2012
@@ -367,6 +367,7 @@ JAVA_EXAMPLES_SRC = $(srcdir)/examples/j
 	$(srcdir)/examples/java/TestFramework.java			\
 	$(srcdir)/examples/java/TestMultipleExecutorsFramework.java
 EXTRA_DIST += $(JAVA_EXAMPLES_SRC)
+CLEANFILES += $(EXAMPLES_JAR)
 
 if HAS_JAVA
 # Protocol buffers JAR.
@@ -665,6 +666,9 @@ if HAS_PYTHON
   mesos_tests_DEPENDENCIES += $(EXAMPLESCRIPTSPYTHON)
 endif
 
+EXTRA_DIST += examples/python/test_framework.py \
+	      examples/python/test_executor.py
+
 
 EXTERNALSCRIPTS =						\
   tests/external/LxcIsolation/HoldMoreMemThanRequested.sh	\

Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1295294&r1=1295293&r2=1295294&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Wed Feb 29 21:37:40 2012
@@ -24,6 +24,8 @@
 
 BUILT_SOURCES =
 
+SUBDIRS = libprocess
+
 # We need to add '--srcdir=.' needed because 'make distcheck' adds
 #  '--srcdir=...' when configuring.
 CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enable-shared=no --with-pic --srcdir=.
@@ -39,7 +41,6 @@ GTEST = $(GMOCK)/gtest
 LEVELDB = leveldb
 PROTOBUF = protobuf-$(PROTOBUF_VERSION)
 ZOOKEEPER = zookeeper-$(ZOOKEEPER_VERSION)
-LIBPROCESS = libprocess
 
 
 EXTRA_DIST = $(BOOST).tar.gz $(BOTO).zip				\
@@ -105,9 +106,7 @@ THIRD_PARTY_LIBS += $(ZOOKEEPER)/src/c/l
 endif
 
 all-local: $(THIRD_PARTY_LIBS)
-	@cd $(LIBPROCESS) && $(MAKE) $(AM_MAKEFLAGS) all
 
 clean-local:
-	@cd $(LIBPROCESS) && $(MAKE) $(AM_MAKEFLAGS) clean
 	rm -r -f $(CLEAN_EXTRACTED)
 	rm -f *-stamp

Modified: incubator/mesos/trunk/third_party/libprocess/src/tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/src/tests.cpp?rev=1295294&r1=1295293&r2=1295294&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/src/tests.cpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/src/tests.cpp Wed Feb 29 21:37:40 2012
@@ -586,27 +586,27 @@ TEST(libprocess, collect)
   Promise<int> promise3;
   Promise<int> promise4;
 
-  std::set<Future<int> > futures;
-  futures.insert(promise1.future());
-  futures.insert(promise2.future());
-  futures.insert(promise3.future());
-  futures.insert(promise4.future());
+  std::list<Future<int> > futures;
+  futures.push_back(promise1.future());
+  futures.push_back(promise2.future());
+  futures.push_back(promise3.future());
+  futures.push_back(promise4.future());
 
   promise1.set(1);
   promise2.set(2);
   promise3.set(3);
   promise4.set(4);
 
-  Future<std::set<int> > future = collect(futures);
+  Future<std::list<int> > future = collect(futures);
 
   EXPECT_TRUE(future.await());
   EXPECT_TRUE(future.isReady());
 
-  std::set<int> values;
-  values.insert(1);
-  values.insert(2);
-  values.insert(3);
-  values.insert(4);
+  std::list<int> values;
+  values.push_back(1);
+  values.push_back(2);
+  values.push_back(3);
+  values.push_back(4);
 
   EXPECT_EQ(values, future.get());
 }