diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-11-29 17:54:52 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-11-29 17:54:52 +0000 |
| commit | 86cfbd0ce0c270d196500fc7ff12a4a238cf18fa (patch) | |
| tree | 44f7678d2fd16f4f2a4a8a3d4e5c748b28be9823 | |
| parent | - Add more OPTIONS and missing html static files (diff) | |
www/firefox: unbreak TEST=on build
Notes
Notes:
svn path=/head/; revision=427388
| -rw-r--r-- | www/firefox/Makefile | 3 | ||||
| -rw-r--r-- | www/firefox/files/patch-bug1320991 | 24 |
2 files changed, 24 insertions, 3 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2cee0e7a8661..e31ae4045986 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -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} diff --git a/www/firefox/files/patch-bug1320991 b/www/firefox/files/patch-bug1320991 new file mode 100644 index 000000000000..cb93f8c0d451 --- /dev/null +++ b/www/firefox/files/patch-bug1320991 @@ -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'], + ] |