diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-04-10 12:22:57 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-04-10 12:22:57 -0700 |
| commit | d5f324eef1699ab5177df1f848f49f1355a2d073 (patch) | |
| tree | 31c2fa8e192bac87602fb5a4b572152b1e231061 /tests/fips | |
| parent | f5751eef41594717893f21834cb1ba1c225886f5 (diff) | |
| download | nss-hg-d5f324eef1699ab5177df1f848f49f1355a2d073.tar.gz | |
backout bug 835919, backout bug 850905
Diffstat (limited to 'tests/fips')
| -rwxr-xr-x | tests/fips/fips.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/fips/fips.sh b/tests/fips/fips.sh index 39b49bb75..183d01516 100755 --- a/tests/fips/fips.sh +++ b/tests/fips/fips.sh @@ -223,22 +223,9 @@ fips_140() # is needed to copy files one by one. echo "mkdir ${MANGLEDIR}" mkdir ${MANGLEDIR} - # When building nss without softoken use the system installed softoken library located - # in SOFTOKEN_LIB_DIR. This variable will have been set by the nss package mainainer. - # Fedora, for example, installs it in /usr/lib${ARCH} but other platforms may place - # the libraries in a different location. for lib in `ls ${LIBDIR}`; do - # Only softoken is used in the mangling test - if [ ${lib} = ${DLL_PREFIX}softokn3.so ]; then - if [ ${NSS_BUILD_WITHOUT_SOFTOKEN} = "1" ]; then - # use the system installed softoken library - echo "cp ${SOFTOKEN_LIB_DIR}/${lib} ${MANGLEDIR}" - cp ${SOFTOKEN_LIB_DIR}/${lib} ${MANGLEDIR} - else - echo "cp ${LIBDIR}/${lib} ${MANGLEDIR}" - cp ${LIBDIR}/${lib} ${MANGLEDIR} - fi - fi + echo "cp ${LIBDIR}/${lib} ${MANGLEDIR}" + cp ${LIBDIR}/${lib} ${MANGLEDIR} done echo "$SCRIPTNAME: Detect mangled softoken--------------------------" |