nss: go back to 3.43 release

security/nss/tests/gtests/gtests.sh

@@ -23,7 +23,6 @@
 gtest_init()
 {
   cd "$(dirname "$1")"
-  pwd
   SOURCE_DIR="$PWD"/../..
   if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
       cd ../common
@@ -31,14 +30,11 @@ gtest_init()
   fi
 
   SCRIPTNAME=gtests.sh
-  . "${QADIR}"/common/certsetup.sh
 
   if [ -z "${CLEANUP}" ] ; then   # if nobody else is responsible for
     CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
   fi
 
-  mkdir -p "${GTESTDIR}"
-  cd "${GTESTDIR}"
 }
 
 ########################## gtest_start #############################
@@ -52,22 +48,20 @@ gtest_start()
       html_unknown "Skipping $i (not built)"
       continue
     fi
-    DIR="${GTESTDIR}/$i"
+    GTESTDIR="${HOSTDIR}/$i"
     html_head "$i"
-    if [ ! -d "$DIR" ]; then
-      mkdir -p "$DIR"
-      echo "${BINDIR}/certutil" -N -d "$DIR" --empty-password 2>&1
-      "${BINDIR}/certutil" -N -d "$DIR" --empty-password 2>&1
-
-      PROFILEDIR="$DIR" make_cert dummy p256 sign
+    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
-    pushd "$DIR"
-    GTESTREPORT="$DIR/report.xml"
-    PARSED_REPORT="$DIR/report.parsed"
+    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 "$DIR" -w --gtest_output=xml:"${GTESTREPORT}" \
-                              --gtest_filter="${GTESTFILTER:-*}"
+                 -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"
@@ -82,14 +76,14 @@ gtest_start()
         html_failed_ignore_core "$name"
       fi
     done
-    popd
   done
 }
 
 gtest_cleanup()
 {
   html "</TABLE><BR>"
-  . "${QADIR}"/common/cleanup.sh
+  cd "${QADIR}"
+  . common/cleanup.sh
 }
 
 ################## main #################################################