Bug 1242565 - refactor gtests, r=mt
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Tue, 03 May 2016 15:13:36 +0200
changeset 12143 830d52622b911a1f3410095637c948fa430b58c4
parent 12142 5b1295e846379cd8935e01136264fcd945bf0368
child 12144 ab1c7ce973412b21d1f7c5a13210daeb9c8a6bce
push id1196
push userfranziskuskiefer@gmail.com
push dateTue, 03 May 2016 13:20:42 +0000
reviewersmt
bugs1242565
Bug 1242565 - refactor gtests, r=mt
.travis.yml
circle.yml
external_tests/common/gtest.mk
external_tests/common/gtests.cc
external_tests/der_gtest/der_gtest.cc
external_tests/der_gtest/manifest.mn
external_tests/manifest.mn
external_tests/pk11_gtest/manifest.mn
external_tests/pk11_gtest/pk11_gtest.cc
external_tests/util_gtest/manifest.mn
external_tests/util_gtest/util_gtest.cc
tests/all.sh
tests/common/init.sh
tests/der_gtests/der_gtests.sh
tests/gtests/gtests.sh
tests/pk11_gtests/pk11_gtests.sh
tests/util_gtests/util_gtests.sh
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,17 +59,17 @@ install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; brew install llvm38; fi
 
 before_script:
   - hg clone https://hg.mozilla.org/projects/nspr ../nspr
 
 script:
   - if [ -n "$CLANG_FORMAT" ]; then automation/travis/validate-formatting.sh lib/ssl; exit $?; fi
   - make nss_build_all
-  - cd tests; NSS_TESTS="ssl_gtests pk11_gtests der_gtests util_gtests" NSS_CYCLES=standard ./all.sh
+  - cd tests; NSS_TESTS="ssl_gtests gtests" NSS_CYCLES=standard ./all.sh
 
 notifications:
   irc:
     channels:
       - "irc.mozilla.org:6697/#nssbot"
     nick: travisci
     on_success: change
     on_failure: always
--- a/circle.yml
+++ b/circle.yml
@@ -1,18 +1,18 @@
 checkout:
     post:
         - cd ..; hg clone https://hg.mozilla.org/projects/nspr
 
 test:
     override:
         - make nss_build_all
-        - cd tests; NSS_TESTS="ssl_gtests pk11_gtests der_gtests util_gtests" NSS_CYCLES=standard ./all.sh
+        - cd tests; NSS_TESTS="ssl_gtests gtests" NSS_CYCLES=standard ./all.sh
         - BUILD_OPT=1 make nss_build_all
-        - cd tests; BUILD_OPT=1 NSS_TESTS="ssl_gtests pk11_gtests der_gtests util_gtests" NSS_CYCLES=standard ./all.sh
+        - cd tests; BUILD_OPT=1 NSS_TESTS="ssl_gtests gtests" NSS_CYCLES=standard ./all.sh
 
 machine:
     environment:
         { USE_64: 1,
           NSS_ENABLE_TLS_1_3: 1,
         }
     hosts:
 
--- a/external_tests/common/gtest.mk
+++ b/external_tests/common/gtest.mk
@@ -1,15 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include ../../cmd/platlibs.mk
+include $(CORE_DEPTH)/cmd/platlibs.mk
 
 MKPROG = $(CCC)
 MKSHLIB	= $(CCC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
 
 # gtests pick up errors with signed/unsigned comparisons on some platforms
 # even though we disabled -Wsign-compare.
 # This catches that by enabling the warning.
 # Only add -Wsign-compare if -Werror is enabled, lest we add it on the wrong
new file mode 100644
--- /dev/null
+++ b/external_tests/common/gtests.cc
@@ -0,0 +1,20 @@
+#include "nspr.h"
+#include "nss.h"
+#include "ssl.h"
+
+#include <cstdlib>
+
+#define GTEST_HAS_RTTI 0
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+
+  NSS_NoDB_Init(nullptr);
+  NSS_SetDomesticPolicy();
+  int rv = RUN_ALL_TESTS();
+
+  NSS_Shutdown();
+
+  return rv;
+}
deleted file mode 100644
--- a/external_tests/der_gtest/der_gtest.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "nspr.h"
-#include "nss.h"
-#include "ssl.h"
-
-#include <cstdlib>
-
-#define GTEST_HAS_RTTI 0
-#include "gtest/gtest.h"
-
-int main(int argc, char **argv) {
-  // Start the tests
-  ::testing::InitGoogleTest(&argc, argv);
-
-  NSS_NoDB_Init(nullptr);
-  NSS_SetDomesticPolicy();
-  int rv = RUN_ALL_TESTS();
-
-  NSS_Shutdown();
-
-  return rv;
-}
--- a/external_tests/der_gtest/manifest.mn
+++ b/external_tests/der_gtest/manifest.mn
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
       der_getint_unittest.cc \
-      der_gtest.cc \
+      ../common/gtests.cc \
       $(NULL)
 
 INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
             -I$(CORE_DEPTH)/external_tests/common
 
 REQUIRES = nspr nss libdbm gtest
 
 PROGRAM = der_gtest
--- a/external_tests/manifest.mn
+++ b/external_tests/manifest.mn
@@ -2,13 +2,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ..
 DEPTH      = ..
 
 DIRS = \
 	google_test \
-        der_gtest \
+	der_gtest \
 	util_gtest \
-        pk11_gtest \
-        ssl_gtest \
+	pk11_gtest \
+	ssl_gtest \
 	$(NULL)
--- a/external_tests/pk11_gtest/manifest.mn
+++ b/external_tests/pk11_gtest/manifest.mn
@@ -6,17 +6,17 @@ CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
       pk11_chacha20poly1305_unittest.cc \
       pk11_pbkdf2_unittest.cc \
       pk11_prf_unittest.cc \
       pk11_rsapss_unittest.cc \
-      pk11_gtest.cc \
+      ../common/gtests.cc \
       $(NULL)
 
 INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
             -I$(CORE_DEPTH)/external_tests/common
 
 REQUIRES = nspr nss libdbm gtest
 
 PROGRAM = pk11_gtest
deleted file mode 100644
--- a/external_tests/pk11_gtest/pk11_gtest.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "nspr.h"
-#include "nss.h"
-#include "ssl.h"
-
-#include <cstdlib>
-
-#define GTEST_HAS_RTTI 0
-#include "gtest/gtest.h"
-
-int main(int argc, char **argv) {
-  // Start the tests
-  ::testing::InitGoogleTest(&argc, argv);
-
-  NSS_NoDB_Init(nullptr);
-  NSS_SetDomesticPolicy();
-  int rv = RUN_ALL_TESTS();
-
-  NSS_Shutdown();
-
-  return rv;
-}
--- a/external_tests/util_gtest/manifest.mn
+++ b/external_tests/util_gtest/manifest.mn
@@ -2,17 +2,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
-	util_gtest.cc \
+	../common/gtests.cc \
 	util_utf8_unittest.cc \
 	$(NULL)
 
 INCLUDES += \
 	-I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
 	-I$(CORE_DEPTH)/external_tests/common \
 	$(NULL)
 
deleted file mode 100644
--- a/external_tests/util_gtest/util_gtest.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#define GTEST_HAS_RTTI 0
-#include "gtest/gtest.h"
-
-int main(int argc, char **argv) {
-  // Start the tests
-  ::testing::InitGoogleTest(&argc, argv);
-
-  return RUN_ALL_TESTS();
-}
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -31,18 +31,17 @@
 #   ocsp.sh      - OCSP testing
 #   merge.sh     - tests merging old and new shareable databases
 #   pkits.sh     - NIST/PKITS tests
 #   chains.sh    - PKIX cert chains tests
 #   dbupgrade.sh - upgrade databases to new shareable version (used
 #                  only in upgrade test cycle)
 #   memleak.sh   - memory leak testing (optional)
 #   ssl_gtests.sh- Gtest based unit tests for ssl
-#   pk11_gtests.sh- Gtest based unit tests for PKCS#11
-#   der_gtests.sh- Gtest
+#   gtests.sh    - Gtest based unit tests for everything else
 #
 # NSS testing is now devided to 4 cycles:
 # ---------------------------------------
 #   standard     - run test suites with defaults settings
 #   pkix         - run test suites with PKIX enabled
 #   upgradedb    - upgrade existing certificate databases to shareable
 #                  format (creates them if doesn't exist yet) and run
 #                  test suites with those databases
@@ -157,17 +156,17 @@ run_cycle_pkix()
     HOSTDIR="${HOSTDIR}/pkix"
     mkdir -p "${HOSTDIR}"
     init_directories
 
     NSS_ENABLE_PKIX_VERIFY="1"
     export NSS_ENABLE_PKIX_VERIFY
 
     TESTS="${ALL_TESTS}"
-    TESTS_SKIP="cipher dbtests sdr crmf smime merge multinit util_gtests"
+    TESTS_SKIP="cipher dbtests sdr crmf smime merge multinit"
 
     echo "${NSS_SSL_TESTS}" | grep "_" > /dev/null
     RET=$?
     NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/bypass//g" -e "s/fips//g" -e "s/_//g"`
     [ ${RET} -eq 0 ] && NSS_SSL_TESTS="${NSS_SSL_TESTS} bypass_bypass"
 
     run_tests
 }
@@ -203,17 +202,17 @@ run_cycle_upgrade_db()
 
     run_tests
 
     NSS_DEFAULT_DB_TYPE="sql"
     export NSS_DEFAULT_DB_TYPE
 
     # run the subset of tests with the upgraded database
     TESTS="${ALL_TESTS}"
-    TESTS_SKIP="cipher libpkix cert dbtests sdr ocsp pkits chains ssl_gtests pk11_gtests der_gtests util_gtests"
+    TESTS_SKIP="cipher libpkix cert dbtests sdr ocsp pkits chains"
 
     echo "${NSS_SSL_TESTS}" | grep "_" > /dev/null
     RET=$?
     NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/bypass//g" -e "s/fips//g" -e "s/_//g"`
     [ ${RET} -eq 0 ] && NSS_SSL_TESTS="${NSS_SSL_TESTS} bypass_bypass"
     NSS_SSL_RUN=`echo "${NSS_SSL_RUN}" | sed -e "s/cov//g" -e "s/auth//g"`
 
     run_tests
@@ -234,17 +233,17 @@ run_cycle_shared_db()
     mkdir -p "${HOSTDIR}"
     init_directories
 
     NSS_DEFAULT_DB_TYPE="sql"
     export NSS_DEFAULT_DB_TYPE
 
     # run the tests for native sharedb support
     TESTS="${ALL_TESTS}"
-    TESTS_SKIP="cipher libpkix dbupgrade sdr ocsp pkits ssl_gtests pk11_gtests der_gtests util_gtests"
+    TESTS_SKIP="cipher libpkix dbupgrade sdr ocsp pkits"
 
     echo "${NSS_SSL_TESTS}" | grep "_" > /dev/null
     RET=$?
     NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/bypass//g" -e "s/fips//g" -e "s/_//g"`
     [ ${RET} -eq 0 ] && NSS_SSL_TESTS="${NSS_SSL_TESTS} bypass_bypass"
     NSS_SSL_RUN=`echo "${NSS_SSL_RUN}" | sed -e "s/cov//g" -e "s/auth//g"`
 
     run_tests
@@ -275,17 +274,17 @@ run_cycles()
     done
 }
 
 ############################## main code ###############################
 
 cycles="standard pkix upgradedb sharedb"
 CYCLES=${NSS_CYCLES:-$cycles}
 
-tests="cipher lowhash libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains ec ssl_gtests pk11_gtests der_gtests util_gtests"
+tests="cipher lowhash libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains ec gtests ssl_gtests"
 TESTS=${NSS_TESTS:-$tests}
 
 ALL_TESTS=${TESTS}
 
 nss_ssl_tests="crl bypass_normal normal_bypass fips_normal normal_fips iopr policy"
 NSS_SSL_TESTS="${NSS_SSL_TESTS:-$nss_ssl_tests}"
 
 nss_ssl_run="cov auth stapling stress"
--- a/tests/common/init.sh
+++ b/tests/common/init.sh
@@ -76,19 +76,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
         IOPR_CADIR=${HOSTDIR}/CA_iopr
         IOPR_SSL_SERVERDIR=${HOSTDIR}/server_ssl_iopr
         IOPR_SSL_CLIENTDIR=${HOSTDIR}/client_ssl_iopr
         IOPR_OCSP_CLIENTDIR=${HOSTDIR}/client_ocsp_iopr
 
         CERT_EXTENSIONS_DIR=${HOSTDIR}/cert_extensions
         STAPLINGDIR=${HOSTDIR}/stapling
         SSLGTESTDIR=${HOSTDIR}/ssl_gtests
-        PK11GTESTDIR=${HOSTDIR}/pk11_gtests
-        DERGTESTDIR=${HOSTDIR}/der_gtests
-        UTILGTESTDIR=${HOSTDIR}/util_gtests
+        GTESTDIR=${HOSTDIR}/gtests
 
         PWFILE=${HOSTDIR}/tests.pw
         NOISE_FILE=${HOSTDIR}/tests_noise
         CORELIST_FILE=${HOSTDIR}/clist
 
         FIPSPWFILE=${HOSTDIR}/tests.fipspw
         FIPSBADPWFILE=${HOSTDIR}/tests.fipsbadpw
         FIPSP12PWFILE=${HOSTDIR}/tests.fipsp12pw
@@ -542,19 +540,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
     R_BOBDIR=../bobdir
     R_DAVEDIR=../dave
     R_EVEDIR=../eve
     R_EXT_SERVERDIR=../ext_server
     R_EXT_CLIENTDIR=../ext_client
     R_CERT_EXT=../cert_extensions
     R_STAPLINGDIR=../stapling
     R_SSLGTESTDIR=../ssl_gtests
-    R_PK11GTESTDIR=../pk11_gtests
-    R_DERGTESTDIR=../der_gtests
-    R_UTILGTESTDIR=../util_gtests
+    R_GTESTDIR=../gtests
 
     #
     # profiles are either paths or domains depending on the setting of
     # MULTIACCESS_DBM
     #
     P_R_CADIR=${R_CADIR}
     P_R_ALICEDIR=${R_ALICEDIR}
     P_R_BOBDIR=${R_BOBDIR}
deleted file mode 100755
--- a/tests/der_gtests/der_gtests.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/bash
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-########################################################################
-#
-# tests/der_gtests/der_gtests.sh
-#
-# Script to drive the DER unit gtests
-#
-# needs to work on all Unix and Windows platforms
-#
-# special strings
-# ---------------
-#   FIXME ... known problems, search for this string
-#   NOTE .... unexpected behavior
-#
-########################################################################
-
-############################## der_gtest_init ##########################
-# local shell function to initialize this script
-########################################################################
-der_gtest_init()
-{
-  SCRIPTNAME=der_gtest.sh      # sourced - $0 would point to all.sh
-
-  if [ -z "${CLEANUP}" ] ; then     # if nobody else is responsible for
-      CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
-  fi
-  if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
-      cd ../common
-      . ./init.sh
-  fi
-
-  SCRIPTNAME=der_gtest.sh
-  html_head DER Gtests
-
-  if [ ! -d "${DERGTESTDIR}" ]; then
-    mkdir -p "${DERGTESTDIR}"
-  fi
-
-  cd "${DERGTESTDIR}"
-}
-
-########################## der_gtest_start #########################
-# Local function to actually start the test
-####################################################################
-der_gtest_start()
-{
-  if [ ! -f ${BINDIR}/der_gtest ]; then
-    html_unknown "Skipping der_gtest (not built)"
-    return
-  fi
-
-  # Temporarily disable asserts for PKCS#11 slot leakage (Bug 1168425)
-  unset NSS_STRICT_SHUTDOWN
-  DERGTESTREPORT="${DERGTESTDIR}/report.xml"
-  ${BINDIR}/der_gtest -d "${DERGTESTDIR}" --gtest_output=xml:"${DERGTESTREPORT}"
-  html_msg $? 0 "der_gtest run successfully"
-  sed -f ${COMMON}/parsegtestreport.sed "${DERGTESTREPORT}" | \
-  while read result name; do
-    if [ "$result" = "notrun" ]; then
-      echo "$name" SKIPPED
-    elif [ "$result" = "run" ]; then
-      html_passed "$name" > /dev/null
-    else
-      html_failed "$name"
-    fi
-  done
-}
-
-der_gtest_cleanup()
-{
-  cd ${QADIR}
-  . common/cleanup.sh
-}
-
-################## main #################################################
-cd "$(dirname "$0")"
-der_gtest_init
-der_gtest_start
-der_gtest_cleanup
new file mode 100755
--- /dev/null
+++ b/tests/gtests/gtests.sh
@@ -0,0 +1,79 @@
+#! /bin/bash
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+########################################################################
+#
+# similar to all.sh this file runs drives gtests.
+#
+# needs to work on all Unix and Windows platforms
+#
+# special strings
+# ---------------
+#   FIXME ... known problems, search for this string
+#   NOTE .... unexpected behavior
+#
+########################################################################
+
+############################## gtest_init ##############################
+# local shell function to initialize this script
+########################################################################
+gtest_init()
+{
+  cd "$(dirname "$1")"
+  if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
+      cd common
+      . ./init.sh
+  fi
+
+  SCRIPTNAME=gtests.sh
+
+  if [ -z "${CLEANUP}" ] ; then   # if nobody else is responsible for
+    CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
+  fi
+}
+
+########################## gtest_start #############################
+# Local function to actually start the test
+####################################################################
+gtest_start()
+{
+  echo "gtests: ${GTESTS}"
+  for i in ${GTESTS}; do
+    GTESTDIR="${HOSTDIR}/$i"
+    html_head "$i"
+    if [ ! -d "$GTESTDIR" ]; then
+      mkdir -p "$GTESTDIR"
+    fi
+    cd "$GTESTDIR"
+    GTESTREPORT="$GTESTDIR/report.xml"
+    ${BINDIR}/$i -d "$GTESTDIR" --gtest_output=xml:"${GTESTREPORT}"
+    echo "test output dir: ${GTESTREPORT}"
+    html_msg $? 0 "$i run successfully"
+    sed -f ${COMMON}/parsegtestreport.sed "${GTESTREPORT}" | \
+    while read result name; do
+      if [ "$result" = "notrun" ]; then
+        echo "$name" SKIPPED
+      elif [ "$result" = "run" ]; then
+        html_passed "$name" > /dev/null
+      else
+        html_failed "$name"
+      fi
+    done
+  done
+}
+
+gtest_cleanup()
+{
+  html "</TABLE><BR>"
+  cd ${QADIR}
+  . common/cleanup.sh
+}
+
+################## main #################################################
+GTESTS="der_gtest pk11_gtest util_gtest"
+gtest_init $0
+gtest_start
+gtest_cleanup
deleted file mode 100755
--- a/tests/pk11_gtests/pk11_gtests.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/bash
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-########################################################################
-#
-# tests/pk11_gtests/pk11_gtests.sh
-#
-# Script to drive the PKCS#11 gtest unit tests
-#
-# needs to work on all Unix and Windows platforms
-#
-# special strings
-# ---------------
-#   FIXME ... known problems, search for this string
-#   NOTE .... unexpected behavior
-#
-########################################################################
-
-############################## pk11_gtest_init ##########################
-# local shell function to initialize this script
-########################################################################
-pk11_gtest_init()
-{
-  SCRIPTNAME=pk11_gtest.sh      # sourced - $0 would point to all.sh
-
-  if [ -z "${CLEANUP}" ] ; then     # if nobody else is responsible for
-      CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
-  fi
-  if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
-      cd ../common
-      . ./init.sh
-  fi
-
-  SCRIPTNAME=pk11_gtest.sh
-  html_head PKCS\#11 Gtests
-
-  if [ ! -d "${PK11GTESTDIR}" ]; then
-    mkdir -p "${PK11GTESTDIR}"
-  fi
-
-  cd "${PK11GTESTDIR}"
-}
-
-########################## pk11_gtest_start #########################
-# Local function to actually start the test
-####################################################################
-pk11_gtest_start()
-{
-  if [ ! -f ${BINDIR}/pk11_gtest ]; then
-    html_unknown "Skipping pk11_gtest (not built)"
-    return
-  fi
-
-  # Temporarily disable asserts for PKCS#11 slot leakage (Bug 1168425)
-  unset NSS_STRICT_SHUTDOWN
-  PK11GTESTREPORT="${PK11GTESTDIR}/report.xml"
-  ${BINDIR}/pk11_gtest -d "${PK11GTESTDIR}" --gtest_output=xml:"${PK11GTESTREPORT}"
-  html_msg $? 0 "pk11_gtest run successfully"
-  sed -f ${COMMON}/parsegtestreport.sed "${PK11GTESTREPORT}" | \
-  while read result name; do
-    if [ "$result" = "notrun" ]; then
-      echo "$name" SKIPPED
-    elif [ "$result" = "run" ]; then
-      html_passed "$name" > /dev/null
-    else
-      html_failed "$name"
-    fi
-  done
-}
-
-pk11_gtest_cleanup()
-{
-  cd ${QADIR}
-  . common/cleanup.sh
-}
-
-################## main #################################################
-cd "$(dirname "$0")"
-pk11_gtest_init
-pk11_gtest_start
-pk11_gtest_cleanup
deleted file mode 100755
--- a/tests/util_gtests/util_gtests.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/bash
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-########################################################################
-#
-# tests/util_gtests/util_gtests.sh
-#
-# Script to drive the libnssutil gtest unit tests
-#
-# needs to work on all Unix and Windows platforms
-#
-# special strings
-# ---------------
-#   FIXME ... known problems, search for this string
-#   NOTE .... unexpected behavior
-#
-########################################################################
-
-############################## util_gtest_init ##########################
-# local shell function to initialize this script
-########################################################################
-util_gtest_init()
-{
-  SCRIPTNAME=util_gtest.sh      # sourced - $0 would point to all.sh
-
-  if [ -z "${CLEANUP}" ] ; then     # if nobody else is responsible for
-      CLEANUP="${SCRIPTNAME}"       # cleaning this script will do it
-  fi
-  if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
-      cd ../common
-      . ./init.sh
-  fi
-
-  SCRIPTNAME=util_gtest.sh
-  html_head libnssutil Gtests
-
-  if [ ! -d "${UTILGTESTDIR}" ]; then
-    mkdir -p "${UTILGTESTDIR}"
-  fi
-
-  cd "${UTILGTESTDIR}"
-}
-
-########################## util_gtest_start #########################
-# Local function to actually start the test
-####################################################################
-util_gtest_start()
-{
-  if [ ! -f ${BINDIR}/util_gtest ]; then
-    html_unknown "Skipping util_gtest (not built)"
-    return
-  fi
-
-  UTILGTESTREPORT="${UTILGTESTDIR}/report.xml"
-  ${BINDIR}/util_gtest -d "${UTILGTESTDIR}" --gtest_output=xml:"${UTILGTESTREPORT}"
-  html_msg $? 0 "util_gtest run successfully"
-  sed -f ${COMMON}/parsegtestreport.sed "${UTILGTESTREPORT}" | \
-  while read result name; do
-    if [ "$result" = "notrun" ]; then
-      echo "$name" SKIPPED
-    elif [ "$result" = "run" ]; then
-      html_passed "$name" > /dev/null
-    else
-      html_failed "$name"
-    fi
-  done
-}
-
-util_gtest_cleanup()
-{
-  cd ${QADIR}
-  . common/cleanup.sh
-}
-
-################## main #################################################
-cd "$(dirname "$0")"
-util_gtest_init
-util_gtest_start
-util_gtest_cleanup