diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-04-09 22:37:08 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-04-09 22:37:08 -0700 |
| commit | f5751eef41594717893f21834cb1ba1c225886f5 (patch) | |
| tree | 5d4054f094dd6487440a4da612cbd8ace5e69a89 /tests/common | |
| parent | 05eb18708b148d874d8aa6dd9a0eb5a5bf25b50f (diff) | |
| download | nss-hg-f5751eef41594717893f21834cb1ba1c225886f5.tar.gz | |
Bug 835919 - Allow optionally building nss without softoken in the tree, r=rrelya
Diffstat (limited to 'tests/common')
| -rw-r--r-- | tests/common/init.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/common/init.sh b/tests/common/init.sh index b3d44b034..d625b7701 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -647,6 +647,14 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then ulimit -c unlimited fi + ################################################################# + # If we built nss without softoken use the system installed tool. + # Fedora, for example, uses /usr/lib${ARCH}/unsupported-tools but + # other platform may place the system installed tests somewhere else. + # The FREEBL_BINDIR environment variable will have been set by the + # package maintainer. + # + FREEBL_BINDIR = [ ${NSS_BUILD_WITHOUT_SOFTOKEN} = "1" ] && ${FREEBL_BINDIR} || ${BINDIR} SCRIPTNAME=$0 INIT_SOURCED=TRUE #whatever one does - NEVER export this one please fi |