Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Nov 2016 17:54:52 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427388 - in head/www/firefox: . files
Message-ID:  <201611291754.uATHsqs0073847@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Nov 29 17:54:52 2016
New Revision: 427388
URL: https://svnweb.freebsd.org/changeset/ports/427388

Log:
  www/firefox: unbreak TEST=on build

Added:
  head/www/firefox/files/patch-bug1320991   (contents, props changed)
Modified:
  head/www/firefox/Makefile   (contents, props changed)

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Tue Nov 29 17:14:45 2016	(r427387)
+++ head/www/firefox/Makefile	Tue Nov 29 17:54:52 2016	(r427388)
@@ -57,9 +57,6 @@ OPTIONS_DEFAULT_i386=	RUST
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
-TEST_BROKEN=		No rule to make target '../../../dist/bin/libnspr4.so', needed by \
-			'../../../_tests/xpcshell/modules/libmar/tests/unit/libnspr4.so'
-
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}

Added: head/www/firefox/files/patch-bug1320991
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox/files/patch-bug1320991	Tue Nov 29 17:54:52 2016	(r427388)
@@ -0,0 +1,24 @@
+--- modules/libmar/tests/moz.build.orig	2016-10-31 20:15:26 UTC
++++ modules/libmar/tests/moz.build
+@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh
+ DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX']
+ 
+ if CONFIG['OS_TARGET'] != 'Android':
+-    nss_files = ['nss3']
+-    if not CONFIG['MOZ_FOLD_LIBS']:
+-        nss_files.extend([
+-            'nssutil3',
+-            'plc4',
+-            'nspr4',
+-            'plds4',
+-        ])
+-    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
+-        ['!/dist/bin/%s%s%s' % (
+-            CONFIG['DLL_PREFIX'],
+-            name,
+-            CONFIG['DLL_SUFFIX'],
+-        ) for name in nss_files]
+-    )
+     TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [
+         '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'],
+     ]



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