From owner-svn-ports-all@freebsd.org Fri Jun 30 15:24:18 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DA69D93D3C; Fri, 30 Jun 2017 15:24:18 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5BD71AF2; Fri, 30 Jun 2017 15:24:18 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5UFOHvQ075544; Fri, 30 Jun 2017 15:24:17 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5UFOHDd075543; Fri, 30 Jun 2017 15:24:17 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201706301524.v5UFOHDd075543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Fri, 30 Jun 2017 15:24:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444766 - head/databases/galera X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: head/databases/galera X-SVN-Commit-Revision: 444766 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2017 15:24:18 -0000 Author: vd Date: Fri Jun 30 15:24:17 2017 New Revision: 444766 URL: https://svnweb.freebsd.org/changeset/ports/444766 Log: databases/galera: Split compilation from tests run Previously tests were ran intermixed with compilation commands in parallel (scons -jN). Running tests in parallel produces some sporadic failures which would make the compilation fail. With this change, when compiling ("make" in the ports directory) "scons -j8 ... tests=0" is used to request compilation only. To run the tests do "make test" in the ports directory. It will run "scons ... tests=1" (without -jN) and will only run the tests. Modified: head/databases/galera/Makefile Modified: head/databases/galera/Makefile ============================================================================== --- head/databases/galera/Makefile Fri Jun 30 15:24:15 2017 (r444765) +++ head/databases/galera/Makefile Fri Jun 30 15:24:17 2017 (r444766) @@ -37,12 +37,15 @@ GH_ACCOUNT= codership GH_TAGNAME?= release_${DISTVERSION} LDFLAGS+= -lboost_program_options -lboost_system -MAKE_ARGS+= --config=force \ - deterministic_tests=1 \ - revno=${GH_TAGNAME} \ - system_asio=0 +MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0 USE_RC_SUBR= garb.sh + +# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly +# speaking) at the end of the "scons ..." command so that it overrides +# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove +# all *.passed files: find ./work -name *.passed -print -delete +TEST_TARGET= deterministic_tests=1 tests=1 PLIST_FILES= bin/garbd \ lib/libgalera.so \