From f00171196d2268716ec573f2f9263db7e6cf9bae Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Nov 13 2009 22:02:20 +0000 Subject: - redirect stderr for an individual test to devnull so that we don't see stderr log messages - explicitly signal an successful end-of-test for every test so that we don't miss failures in cases when success wouldn't produce output --- diff --git a/tests/001-keyiread/expected.out b/tests/001-keyiread/expected.out index 0f363c5..76d021f 100644 --- a/tests/001-keyiread/expected.out +++ b/tests/001-keyiread/expected.out @@ -10,3 +10,4 @@ OK (1536). OK (2048). OK (3072). OK (4096). +Test complete. diff --git a/tests/001-keyiread/run.sh b/tests/001-keyiread/run.sh index f72f2da..88887f4 100755 --- a/tests/001-keyiread/run.sh +++ b/tests/001-keyiread/run.sh @@ -29,3 +29,4 @@ for size in 512 1024 1536 2048 3072 4096 ; do EOF $toolsdir/keyiread entry.$size done +echo Test complete. diff --git a/tests/002-keygen/expected.out b/tests/002-keygen/expected.out index beedfb2..aff39b5 100644 --- a/tests/002-keygen/expected.out +++ b/tests/002-keygen/expected.out @@ -22,3 +22,4 @@ OK. OK (3072). OK. OK (4096). +Test complete. diff --git a/tests/002-keygen/run.sh b/tests/002-keygen/run.sh index 669e1f6..5de27f8 100755 --- a/tests/002-keygen/run.sh +++ b/tests/002-keygen/run.sh @@ -31,3 +31,4 @@ for size in 512 1024 1536 2048 3072 4096 ; do sed -i 's,^key_gen_size.*,,g' entry.$size $toolsdir/keyiread entry.$size done +echo Test complete. diff --git a/tests/003-csrgen/expected.out b/tests/003-csrgen/expected.out index 23f33a7..df80e0f 100644 --- a/tests/003-csrgen/expected.out +++ b/tests/003-csrgen/expected.out @@ -51,3 +51,4 @@ The last CSR (the one with everything) was: 544:d=2 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption 555:d=2 hl=2 l= 0 prim: NULL 557:d=1 hl=3 l= 129 prim: BIT STRING +Test complete. diff --git a/tests/003-csrgen/run.sh b/tests/003-csrgen/run.sh index d56f161..c3dd295 100755 --- a/tests/003-csrgen/run.sh +++ b/tests/003-csrgen/run.sh @@ -104,3 +104,4 @@ done done echo "The last CSR (the one with everything) was:" openssl req -in csr.nss.$size -outform der | openssl asn1parse -inform der +echo Test complete. diff --git a/tests/004-selfsign/expected.out b/tests/004-selfsign/expected.out index ba61937..7419bf2 100644 --- a/tests/004-selfsign/expected.out +++ b/tests/004-selfsign/expected.out @@ -16,3 +16,4 @@ MAC verified OK pk12util: PKCS12 EXPORT SUCCESSFUL MAC verified OK 4096 OK. +Test complete. diff --git a/tests/004-selfsign/run.sh b/tests/004-selfsign/run.sh index d459d14..ad06d6f 100755 --- a/tests/004-selfsign/run.sh +++ b/tests/004-selfsign/run.sh @@ -63,3 +63,4 @@ for size in 512 1024 1536 2048 3072 4096 ; do echo $size OK. fi done +echo Test complete. diff --git a/tests/005-dbusm/expected.out b/tests/005-dbusm/expected.out index 4af757b..8ddb949 100644 --- a/tests/005-dbusm/expected.out +++ b/tests/005-dbusm/expected.out @@ -22,3 +22,4 @@ Message 20 - s:This is a first string.,s:This is a second string.,s:This is a th Message 21 - s:This is a first string.,s:This is a second string.,s:This is a third string.,n:23456,[s:This,s:is,s:a,s:first,s:string,s:array.],[s:This,s:is,s:a,s:second,s:string,s:array.],[s:This,s:is,s:a,s:third,s:string,s:array.],n:34567,[s:This,s:is,s:a,s:fourth,s:string,s:array.] Message 22 - s:This is a string.,[s:This,s:is,s:a,s:first,s:string,s:array.],[s:This,s:is,s:a,s:second,s:string,s:array.],[s:This,s:is,s:a,s:third,s:string,s:array.],n:12345,[s:This,s:is,s:a,s:fourth,s:string,s:array.] Message 23 - [{key 0=b:TRUE},{key 1=n:12345},{key 2=s:this is a string value},{key 3=as:[This,is,a,string,array.]] +Test complete. diff --git a/tests/005-dbusm/run.sh b/tests/005-dbusm/run.sh index 6ae6df6..7a29a5f 100755 --- a/tests/005-dbusm/run.sh +++ b/tests/005-dbusm/run.sh @@ -5,3 +5,5 @@ cd "$tmpdir" source "$srcdir"/functions "$builddir"/../src/tdbusm-check + +echo Test complete. diff --git a/tests/006-serial/expected.out b/tests/006-serial/expected.out index e3b982d..ff603f0 100644 --- a/tests/006-serial/expected.out +++ b/tests/006-serial/expected.out @@ -1023,3 +1023,4 @@ Starting value = 01 03FF 0400 0401 +Test complete. diff --git a/tests/006-serial/run.sh b/tests/006-serial/run.sh index d19d2cb..cfe93cd 100755 --- a/tests/006-serial/run.sh +++ b/tests/006-serial/run.sh @@ -5,3 +5,5 @@ cd "$tmpdir" source "$srcdir"/functions "$builddir"/../src/serial-check + +echo Test complete. diff --git a/tests/007-certsave/expected.out b/tests/007-certsave/expected.out index 4489ea9..a487fcf 100644 --- a/tests/007-certsave/expected.out +++ b/tests/007-certsave/expected.out @@ -1,4 +1,4 @@ dos2unix: converting file cert.original to UNIX format ... dos2unix: converting file cert.nss to UNIX format ... dos2unix: converting file cert.openssl to UNIX format ... -OK +Test complete. diff --git a/tests/007-certsave/run.sh b/tests/007-certsave/run.sh index 1044b31..78c5a8c 100755 --- a/tests/007-certsave/run.sh +++ b/tests/007-certsave/run.sh @@ -60,4 +60,5 @@ if ! cmp cert.nss cert.openssl ; then cat cert.nss cert.openssl exit 1 fi -echo OK + +echo Test complete. diff --git a/tests/008-certread/expected.out b/tests/008-certread/expected.out index 9357c3e..96c35d3 100644 --- a/tests/008-certread/expected.out +++ b/tests/008-certread/expected.out @@ -5,3 +5,4 @@ cert_principal=bjensen@EXAMPLE.COM,bjensen@EXAMPLE.COM cert_serial=47 cert_spki=30820122300d06092a864886f70d01010105000382010f003082010a0282010100c7811d5c2e6a4c31a783ac3d3fa8a20873cabe52b322b294a27e40fe019d0cf1352993dcefae6ed46a82fff545e923df4679e90317dc3f5c8097dd4429924d0e892e9b9b817d4366d8321eae239d4b6262c39bcd0f37f8e5e53bf91422d19525adb7d3cfab010e8592923c4b45b089781f6486666c88e0864a5f8fe5d33ed8d5b01c0a571af7f7ef87ab4cc0fb563328f6447be994d02f2cef3874b731225d511c3a7c0b2f6e50a44543515c5d1ca1c17e754e9ac37d8eef413b8f1bfb3208079aad4928abfa34ecf7e26a457d349ec3d75689e15cc1cec4e8dcf693095770fcc087d7cde5b5d31340dd86028bae978994e271fb0557c678eccaead32cad09ed0203010001 cert_subject=CN=Babs Jensen +Test complete. diff --git a/tests/008-certread/run.sh b/tests/008-certread/run.sh index 47e17bb..4827930 100755 --- a/tests/008-certread/run.sh +++ b/tests/008-certread/run.sh @@ -68,4 +68,5 @@ if ! cmp entry.nss.clean entry.openssl.clean ; then fi # Let the caller make sure it looks right. grep ^cert_ entry.nss.clean | sort -exit 0 + +echo Test complete. diff --git a/tests/009-oiddict/expected.out b/tests/009-oiddict/expected.out index fa2e7a7..da11a4b 100644 --- a/tests/009-oiddict/expected.out +++ b/tests/009-oiddict/expected.out @@ -27,3 +27,4 @@ id-pkix.3 -> 1.3.6.1.5.5.7.3 1.3.6.1.5.2 -> iso.org.dod.internet.security.kerberosV5 1.3.6.1.5.2.3 -> id-pkinit 1.3.6.1.4.1.311.20.2.2 -> id-ms-kp-sc-logon +Test complete. diff --git a/tests/009-oiddict/run.sh b/tests/009-oiddict/run.sh index adba243..38fb1d3 100755 --- a/tests/009-oiddict/run.sh +++ b/tests/009-oiddict/run.sh @@ -45,3 +45,5 @@ for oid in $oids ; do name=`$toolsdir/oid2name "$oid"` echo $oid '->' $name done + +echo Test complete. diff --git a/tests/010-iterate/expected.out b/tests/010-iterate/expected.out index 7ccfcad..87741b3 100644 --- a/tests/010-iterate/expected.out +++ b/tests/010-iterate/expected.out @@ -140,3 +140,40 @@ HAVE_CSR -START- NEED_TO_SUBMIT -STOP- + +[Enroll until the CA rejects us.] +HAVE_KEY_PAIR +-START- +NEED_CSR +GENERATING_CSR +HAVE_CSR +-STOP- +HAVE_CSR +-START- +NEED_TO_SUBMIT +SUBMITTING +CA_REJECTED +-STOP- +CA_REJECTED +-START- +CA_REJECTED +-STOP- + +[Enroll until the CA turns out to be unreachable.] +HAVE_KEY_PAIR +-START- +NEED_CSR +GENERATING_CSR +HAVE_CSR +-STOP- +HAVE_CSR +-START- +NEED_TO_SUBMIT +SUBMITTING +CA_UNREACHABLE +-STOP- +HAVE_CSR +-START- +NEED_TO_SUBMIT +-STOP- +Test complete. diff --git a/tests/010-iterate/run.sh b/tests/010-iterate/run.sh index 3dc2930..2e7c7c3 100755 --- a/tests/010-iterate/run.sh +++ b/tests/010-iterate/run.sh @@ -201,7 +201,6 @@ EOF $toolsdir/iterate ca3 entry3 NEED_CSR,GENERATING_CSR $toolsdir/iterate ca3 entry3 NEED_TO_SUBMIT,SUBMITTING $toolsdir/iterate ca3 entry3 "" -exit 0 echo echo '[Enroll until the CA rejects us.]' cat > entry3 << EOF @@ -236,4 +235,4 @@ EOF $toolsdir/iterate ca3 entry3 NEED_CSR,GENERATING_CSR $toolsdir/iterate ca3 entry3 NEED_TO_SUBMIT,SUBMITTING $toolsdir/iterate ca3 entry3 "" -exit 0 +echo Test complete. diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 30f468b..cb7a128 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -42,7 +42,7 @@ for testid in "$@" $subdirs ; do rm -fr "$tmpdir"/* if test -r ./expected.out ; then echo -n "Running test "$testid"... " - ./run.sh "$tmpdir" > "$tmpfile" + ./run.sh "$tmpdir" > "$tmpfile" 2> /dev/null if cmp "$tmpfile" expected.out ; then stat=0 echo "OK"