Clean up tests

Suppress error messages which we were expecting because it causes the QA
scripts to report a QA failure.

security/nss/tests/fips/fips.sh

@@ -173,17 +173,19 @@ fips_140_1()
 
   echo "$SCRIPTNAME: Detect mangled database --------------------------"
   SOFTOKEN=${DIST}/${OBJDIR}/lib/${DLL_PREFIX}softokn3.${DLL_SUFFIX}
-  cp ${DIST}/${OBJDIR}/lib/libsoftokn3.so ${TMP}/libsoftokn3.sav
+  echo "cp ${SOFTOKEN} ${TMP}/softokn3.sav"
   cp ${SOFTOKEN} ${TMP}/softokn3.sav
   echo "mangling ${SOFTOKEN}"
   echo "mangle -i ${SOFTOKEN} -o 60000 -b 5"
   mangle -i ${SOFTOKEN} -o 60000 -b 5 2>&1
-  diff ${SOFTOKEN} ${TMP}/libsoftokn3.sav 2>&1
   echo "dbtest -r  -d ${P_R_FIPSDIR} "
-  dbtest -r  -d ${P_R_FIPSDIR}  2>&1
+# suppress the expected failure message
+  dbtest -r  -d ${P_R_FIPSDIR}  > ${TMP}/dbtest 2>&1
   html_msg $? 46 "Init NSS with a corrupted library (dbtest -r)"
-  cp ${TMP}/libsoftokn3.sav ${SOFTOKEN}
-  rm ${TMP}/libsoftokn3.sav
+  echo "cp ${TMP}/softokn3.sav ${SOFTOKEN}"
+  cp ${TMP}/softokn3.sav ${SOFTOKEN}
+  echor "rm ${TMP}/softokn3.sav"
+  rm ${TMP}/softokn3.sav
 }
 
 ############################## fips_cleanup ############################