Eliminate stale pkcs11 certificate handler implementations.

run_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO: Get these tests running in a cross-platform fashion from the src_test
 # stanza of the entd ebuild.
 
 USERNAME="user@google.com"
 ALLOW_DIRTY_EXIT=1
+PKCS11_TEST=1
 grep "Chromium OS" /etc/lsb-release
 if [ $? == 0 ]; then
   CHROMEOS=1
   ENTD="/usr/sbin/entd"
 else
   CHROMEOS=0
   ENTD="../../scripts/run_32bit.sh out/i686-pc-linux-gnu/entd --"
 fi
 
 # If non-zero, print test output on failure
@@ skipping 16 matching lines @@
   # Test by running entd with some command line options and grepping the
   # output for an expected pattern.
   local args="$1"
   local pattern="$2"
   local name="$3"
 
   if [ -z "$name" ]; then
     name=$args
   fi
 
+  local expected_result="$4"
+
+  if [ -z "$expected_result" ]; then
+    expected_result=0
+  fi
+
+
   if [ ${args:0:2} != "--" ]; then
     # allow callers to just pass the name of the js file if that's all they need
     args="--policy=test_data/$args"
   fi
 
   local cmd="$ENTD --username=$USERNAME $args"
   if [ ! -z "$ALLOW_DIRTY_EXIT" ]; then
     cmd="$cmd --allow-dirty-exit"
   fi
 
-  local out=$($cmd 2>&1)
+  if [ ! -z "$PKCS11_TEST" ]; then
+    cmd="$cmd --pkcs11=test"
+  fi
+
+  local out
+  out=$($cmd 2>&1)
   local code=$?
 
   TESTS=$(($TESTS +1))
 
-  if [ $code != 0 ]; then
+  if [ $code != $expected_result ]; then
     logfail "$name: exited with $code"
     return
   fi
 
   grep -q "$pattern" <(echo $out)
   if [ $? != 0 ]; then
     logfail "$name: pattern not found: '$pattern'"
     if [ ! -z "$VERBOSE" ]; then
       echo
       echo $cmd
       echo
       echo "=== OUTPUT START"
       echo $out
       echo "=== OUTPUT END"
       echo
     fi
   else
     logpass "$name"
   fi
 }
 
 # Basic tests.
 greptest "hello-world.js" 'hello world'
-greptest "bad-onload.js" 'throw "expected exception"'
+greptest "bad-onload.js" 'throw "expected exception"' '' 1
 greptest "print-username.js" "username: $USERNAME"
-greptest "throw-exception.js" 'throw "goodbye world"'
+greptest "throw-exception.js" 'throw "goodbye world"' '' 1
 greptest "syslog.js" "entd.syslog.error"
 greptest "simple-hostname.js" "LOOKS OK"
 greptest "simple-onunload.js" "LOOKS OK"
 
 # Basic tests with longer command lines.
 greptest "--policy=test_data/print-manifest.js \
   --manifest=test_data/simple-manifest.json" '{"foo":1,"bar":2}' \
   "print-manifest.js"
 greptest "--policy=test_data/simple-utility.js \
   --utility=test_data/simple-utility.js" 'utility is set' "simple-utility.js"
 greptest "--extension-path=test_data/Extensions" '{"foo":1,"bar":2}'
 
 # Http tests.
 greptest "http-good.js" "HTTP COMPLETE"
 greptest "http-badhost.js" "HTTP ERROR: Couldn't resolve"
 greptest "http-badport.js" "LOOKS OK"
-greptest "http-evilhost.js" "Invalid hostname"
-greptest "http-badrequest.js" "First argument must be a Request object"
+greptest "http-evilhost.js" "Invalid hostname" '' 1
+greptest "http-badrequest.js" "First argument must be a Request object" '' 1
 greptest "http-redirect.js" "HTTP COMPLETE"
 
 # Pkcs11 tests.
 greptest 'pkcs11.js '\
 '--allow-file-io' \
 '{"slot1":{"label":"slot1","keyIdentifier":"key1",'\
-'"certificate":{"subject":"Content"}},'\
+'"certificate":{"subject":"Test"}},'\
 '"slot2":{"label":"slot2","keyIdentifier":"key2",'\
-'"certificate":{"subject":"Content"}}}' \
+'"certificate":{"subject":"Test"}}}' \
 "pkcs11.js"
 greptest 'pkcs11-cert.js '\
 '--allow-file-io' \
-'{"slot1":{"label":"slot1","certificate":{"subject":"Content"}}}' \
+'{"slot1":{"label":"slot1","certificate":{"subject":"Test"}}}' \
 "pkcs11-cert.js"
+greptest "pkcs11-remove.js" "Slot1: undefined"
+
+PKCS11_TEST=
 greptest 'pkcs11-openssl.js '\
 '--pkcs11=openssl --allow-file-io' \
 'Subject:/C=US/ST=California/L=Mountain View/O=Google Inc/OU=ChromeOS' \
 "pkcs11-openssl.js"
-greptest "pkcs11-remove.js" "Slot1: undefined"
 
 # Pkcs11 opencryptoki tests (requires a TPM (or emulator), so chromeos only)
 if [ "$CHROMEOS" == 1 ]; then
   greptest 'pkcs11-opencryptoki.js '\
-'--pkcs11=glaptop --allow-file-io' \
+'--allow-file-io' \
 '"slot1":{"label":"slot1","keyIdentifier":"1234",'\
 '"certificate":{'\
 '"subject":"/C=US/ST=California/L=Mountain View/O=Google Inc/OU=ChromeOS' \
 "pkcs11-opencryptoki.js"
   greptest 'pkcs11-opencryptoki-delete.js '\
-'--pkcs11=glaptop --allow-file-io' \
+'--allow-file-io' \
 'Slots.slot1: undefined' \
 "pkcs11-opencryptoki-delete.js"
 fi
+PKCS11_TEST=1
+
 # Slightly longer running tests.
 greptest "settimeout.js" "string timeout function timeout"
 greptest "cleartimeout.js" "starting timeouts function timeout"
 
 # Test the callback server; doesn't run as-is on chromeos.
 if [ "$CHROMEOS" != 1 ]; then
   greptest "simple-shutdown.js" "LOOKS OK"
 
   # Fire off this bg task to make an http request
   (sleep 2; \
@@ skipping 11 matching lines @@
 
 if [ $FAILURES -gt 0 ]; then
   echo "TESTS FAILED: $FAILURES"
   echo
   exit 1
 fi
 
 echo "All tests passed."
 echo
 exit 0