You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/04/20 17:24:35 UTC
svn commit: r1740158 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Wed Apr 20 15:24:35 2016
New Revision: 1740158
URL: http://svn.apache.org/viewvc?rev=1740158&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c: Set max_threads to 1
in an attempt to fix the Mac OS X buildbot which has been failing since
theses tests were added.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1740158&r1=1740157&r2=1740158&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Wed Apr 20 15:24:35 2016
@@ -452,7 +452,7 @@ test_option_merge_incoming_added_file_re
/* ========================================================================== */
-static int max_threads = 3;
+static int max_threads = 1;
static struct svn_test_descriptor_t test_funcs[] =
{