ZOOKEEPER-1893. automake: use serial-tests option (michim via camille)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1666768 13f79535-47bb-0310-9956-ffa450edef68
zuai · Mar 15, 2015 · 11187e1 · 11187e1
1 parent 125d3b4
commit 11187e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -48,6 +48,8 @@ BUGFIXES:
   (Michi Mutsuzaki via rakeshr)
 
   ZOOKEEPER-2137 Make testPortChange() less flaky (Hongchao Deng via michim)
+
+  ZOOKEEPER-1893. automake: use serial-tests option (michim via camille)
 
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  

diff --git a/src/c/Makefile.am b/src/c/Makefile.am
@@ -1,6 +1,7 @@
 # need this for Doxygen integration
 include $(top_srcdir)/aminclude.am
 
+AUTOMAKE_OPTIONS = serial-tests
 AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated
 AM_CFLAGS = -Wall -Werror -Wdeclaration-after-statement
 AM_CXXFLAGS = -Wall $(USEIPV6)