Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jun 2017 15:24:17 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444766 - head/databases/galera
Message-ID:  <201706301524.v5UFOHDd075543@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706301524.v5UFOHDd075543>