Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar. r=glandium, a=jcristau
authorMike Shal <mshal@mozilla.com>
Tue, 20 Dec 2016 16:37:18 -0500
changeset 353674 998f11970867282c85b89385a08bc172ce5b02d2
parent 353673 e6d6e457c4f7aaae803a880b26bd0949fbc9fee2
child 353675 f273dcc18ec664cb58443c4d3bb02fd147aa4c6c
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, jcristau
bugs1320991
milestone52.0a2
Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar. r=glandium, a=jcristau The problem with the modules/libmar/tests/moz.build file when building --with-system-nspr and --with-system-nss is that the nss libraries don't exist in the tree, so they fail when trying to copy into the test directory. However, it turns out that the libraries copied into the test directory aren't even used when building with an in-tree copy, because the xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we use the dist/bin copies anyway for an in-tree build, we can stop copying them into the test directory and simultaneously fix the --with-system build. The DEFINES can also go away since this directory doesn't actually build anything. MozReview-Commit-ID: Bk2f28wc9ZJ
modules/libmar/tests/moz.build
--- a/modules/libmar/tests/moz.build
+++ b/modules/libmar/tests/moz.build
@@ -1,29 +1,12 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
-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'],
     ]