svn commit: r346068 - branches/2014Q1/www/chromium

[Rene Ladan]

Author: rene
Date: Tue Feb 25 20:08:58 2014
New Revision: 346068
URL: http://svnweb.freebsd.org/changeset/ports/346068
QAT: https://qat.redports.org/buildarchive/r346068/

Log:
  MFH: r344585 to prepare for r346060
  
  - Move test-related targets to their own file, Makefile.tests
  - Remove a post-patch target already handled by files/
  
  Approved by:	portmgr (erwin)

Added:
  branches/2014Q1/www/chromium/Makefile.tests
     - copied unchanged from r344585, head/www/chromium/Makefile.tests
Modified:
  branches/2014Q1/www/chromium/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/chromium/Makefile
==============================================================================
--- branches/2014Q1/www/chromium/Makefile	Tue Feb 25 20:07:19 2014	(r346067)
+++ branches/2014Q1/www/chromium/Makefile	Tue Feb 25 20:08:58 2014	(r346068)
@@ -130,17 +130,7 @@ LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-TEST_TARGETS=	base_unittests \
-		crypto_unittests \
-		cacheinvalidation_unittests \
-		gpu_unittests \
-		sync_unit_tests \
-		media_unittests \
-		printing_unittests \
-		sql_unittests \
-		net_unittests \
-		content_unittests
-EXCLUDED_TESTS=	GpuDriverBugListTest.CurrentDriverBugListValidation
+.include "Makefile.tests"
 ALL_TARGET+=	${TEST_TARGETS}
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
 .endif
@@ -205,8 +195,6 @@ post-patch:
 		${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi
 	@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \
 		${WRKSRC}/chrome/chrome_tests_unit.gypi
-	@${REINPLACE_CMD} -e "s|linux|freebsd|" \
-		${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
 	@${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \
 		${WRKSRC}/chrome/browser/browser_resources.grd \
 		${WRKSRC}/chrome/app/theme/theme_resources.grd \
@@ -226,7 +214,7 @@ do-configure:
 test regression-test: build
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
-		./${t} --gtest_filter=-${EXCLUDED_TESTS}
+		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
 .endfor
 
 do-install:

Copied: branches/2014Q1/www/chromium/Makefile.tests (from r344585, head/www/chromium/Makefile.tests)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/Makefile.tests	Tue Feb 25 20:08:58 2014	(r346068, copy of r344585, head/www/chromium/Makefile.tests)
@@ -0,0 +1,23 @@
+$FreeBSD$
+
+TEST_TARGETS=	base_unittests \
+		crypto_unittests \
+		cacheinvalidation_unittests \
+		gpu_unittests \
+		sync_unit_tests \
+		printing_unittests \
+		sql_unittests \
+		content_unittests \
+		cc_unittests \
+		ui_unittests \
+		url_unittests \
+		compositor_unittests \
+		ipc_tests \
+		dbus_unittests \
+		net_unittests \
+		media_unittests
+# browser_tests: missing test file?
+# unit_tests: missing test file?
+# chromedriver_unittests: does not build
+# chromedriver_tests: does not build
+# telemetry_unittests: unknown ninja target