Bug 1496124 - Populate public values for imported private keys, r=mt

1 files changed, 13 insertions, 10 deletions

diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh
index 583ecec62..1731de0eb 100755
--- a/tests/gtests/gtests.sh
+++ b/tests/gtests/gtests.sh
@@ -23,6 +23,7 @@
 gtest_init()
 {
   cd "$(dirname "$1")"
+  SOURCE_DIR="$PWD"/../..
   if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
       cd ../common
       . ./init.sh
@@ -33,6 +34,7 @@ gtest_init()
   if [ -z "${CLEANUP}" ] ; then   # if nobody else is responsible for
     CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
   fi
+
 }
 
 ########################## gtest_start #############################
@@ -42,7 +44,7 @@ gtest_start()
 {
   echo "gtests: ${GTESTS}"
   for i in ${GTESTS}; do
-    if [ ! -f ${BINDIR}/$i ]; then
+    if [ ! -f "${BINDIR}/$i" ]; then
       html_unknown "Skipping $i (not built)"
       continue
     fi
@@ -50,20 +52,22 @@ gtest_start()
     html_head "$i"
     if [ ! -d "$GTESTDIR" ]; then
       mkdir -p "$GTESTDIR"
+      echo "${BINDIR}/certutil" -N -d "$GTESTDIR" --empty-password 2>&1
+      "${BINDIR}/certutil" -N -d "$GTESTDIR" --empty-password 2>&1
     fi
     cd "$GTESTDIR"
     GTESTREPORT="$GTESTDIR/report.xml"
     PARSED_REPORT="$GTESTDIR/report.parsed"
     echo "executing $i"
-    ${BINDIR}/$i "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
-                 -d "$GTESTDIR" --gtest_output=xml:"${GTESTREPORT}" \
-                                --gtest_filter="${GTESTFILTER-*}"
+    "${BINDIR}/$i" "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
+                 -d "$GTESTDIR" -w --gtest_output=xml:"${GTESTREPORT}" \
+                                   --gtest_filter="${GTESTFILTER:-*}"
     html_msg $? 0 "$i run successfully"
     echo "test output dir: ${GTESTREPORT}"
     echo "executing sed to parse the xml report"
-    sed -f ${COMMON}/parsegtestreport.sed "${GTESTREPORT}" > "${PARSED_REPORT}"
+    sed -f "${COMMON}/parsegtestreport.sed" "$GTESTREPORT" > "$PARSED_REPORT"
     echo "processing the parsed report"
-    cat "${PARSED_REPORT}" | while read result name; do
+    cat "$PARSED_REPORT" | while read result name; do
       if [ "$result" = "notrun" ]; then
         echo "$name" SKIPPED
       elif [ "$result" = "run" ]; then
@@ -78,13 +82,12 @@ gtest_start()
 gtest_cleanup()
 {
   html "</TABLE><BR>"
-  cd ${QADIR}
+  cd "${QADIR}"
   . common/cleanup.sh
 }
 
 ################## main #################################################
-GTESTS="prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest"
-SOURCE_DIR="$PWD"/../..
-gtest_init $0
+GTESTS="${GTESTS:-prng_gtest certhigh_gtest certdb_gtest der_gtest pk11_gtest util_gtest freebl_gtest softoken_gtest sysinit_gtest blake2b_gtest}"
+gtest_init "$0"
 gtest_start
 gtest_cleanup