Revert "tests: template-test: added a baseline check to detect slow systems"

This reverts commit 2ee2a78178a842c9b0ef2ca3e12909ca3bb9fe79.

4 files changed, 9 insertions, 76 deletions

diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 5065d0ced4..0a941ba4a6 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -27,8 +27,7 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
 	template-overflow.tmpl template-overflow2.pem template-overflow2.tmpl \
 	template-date.tmpl template-date.pem template-dn-err.tmpl \
 	template-nc.tmpl template-nc.pem xmpp-othername.pem \
-	suppressions.valgrind csr-invalid.der invalid-sig2.pem invalid-sig3.pem \
-	template-basic.tmpl template-basic.pem
+	suppressions.valgrind csr-invalid.der invalid-sig2.pem invalid-sig3.pem
 
 dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane crq invalid-sig
 
diff --git a/tests/cert-tests/template-basic.pem b/tests/cert-tests/template-basic.pem
deleted file mode 100644
index 6c87bffae4..0000000000
--- a/tests/cert-tests/template-basic.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICETCCAXqgAwIBAgIBCTANBgkqhkiG9w0BAQsFADA0MRIwEAYDVQQDEwlhbm9u
-eW1vdXMxETAPBgNVBAoTCEJpZyBjb3JwMQswCQYDVQQGEwJHUjAiGA8yMDA3MDQy
-MTIyMDAwMFoYDzIwMDgwNDIwMjIwMDAwWjA0MRIwEAYDVQQDEwlhbm9ueW1vdXMx
-ETAPBgNVBAoTCEJpZyBjb3JwMQswCQYDVQQGEwJHUjCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEApcbOdUOEv2SeAicT8QNZ93ktku18L1CkA/EtebmGiwV+OrtE
-qq+EzxOYHhxKOPczLXqfctRrbSawMTdwEPtC6didGGV+GUn8BZYEaIMed4a/7fXl
-EjsT/jMYnBp6HWmvRwJgeh+56M/byDQwUZY9jJZcALxh3ggPsTYhf6kA4wUCAwEA
-AaMvMC0wDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUXUCt8M6UQJWLfpmUHZJUIspy
-Nl8wDQYJKoZIhvcNAQELBQADgYEAmm9vjb5Np4B6dKkNsnxau2VNY8jMeXjan/qp
-nxTYf3yQCJIMTKxPLkKbzc8mtrnbs80h86ery6Ea2El0Tan4TEFKJOnRzqXkwj9k
-1cghM4VJKl8qxqnkbWO+CbXstla139UnGjODT9xPNRfLPkn/2I59BKdopm9uREA4
-Z6Vka0A=
------END CERTIFICATE-----
diff --git a/tests/cert-tests/template-basic.tmpl b/tests/cert-tests/template-basic.tmpl
deleted file mode 100644
index 0ab29f1152..0000000000
--- a/tests/cert-tests/template-basic.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-# X.509 Certificate options
-#
-# DN options
-
-# The organization of the subject.
-organization = "Big corp"
-
-# The name (Koala)
-cn = "anonymous"
-
-# The locality of the subject.
-# locality =
-
-# The country of the subject. Two letter code.
-country = GR
-
-# The serial number of the certificate
-serial = 009
-
diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test
index 63a887c75f..068284bb0c 100755
--- a/tests/cert-tests/template-test
+++ b/tests/cert-tests/template-test
@@ -37,35 +37,9 @@ fi
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
-
-datefudge "2007-04-22" \
-    $CERTTOOL --generate-self-signed \
-    --load-privkey $srcdir/template-test.key \
-    --template $srcdir/template-basic.tmpl \
-    --outfile tmp-tt.pem 2>/dev/null
-
-diff $srcdir/template-basic.pem tmp-tt.pem >/dev/null 2>&1
-rc=$?
-counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
-done
-
-# We're done.
-if test "$rc" != "0"; then
-  echo "Baseline test failed, is system slow?"
-  exit 77
-fi
-
-rm -f tmp-tt.pem
-
-rc=1
-counter=1
-
-while [ "$rc" != "0" -a $counter -le 10 ]
-do
-
+      
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
     --load-privkey $srcdir/template-test.key \
@@ -75,7 +49,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-test.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -89,7 +62,7 @@ rm -f tmp-tt.pem
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -100,7 +73,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-utf8.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -114,7 +86,7 @@ rm -f tmp-tt.pem
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -125,7 +97,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-dn.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -156,7 +127,7 @@ if echo __SIZEOF_POINTER__ | cpp -E - - | grep '^8$' >/dev/null; then
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -167,7 +138,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-overflow.pem tmp-tt.pem >/dev/null 2>&1 
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -182,7 +152,7 @@ fi
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -193,7 +163,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-overflow2.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -207,7 +176,7 @@ rm -f tmp-tt.pem
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -218,7 +187,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-date.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.
@@ -234,7 +202,7 @@ rm -f tmp-tt.pem
 rc=1
 counter=1
 
-while [ "$rc" != "0" -a $counter -le 10 ]
+while [ "$rc" != "0" -a $counter -le 3 ]
 do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
@@ -245,7 +213,6 @@ datefudge "2007-04-22" \
 diff $srcdir/template-nc.pem tmp-tt.pem >/dev/null 2>&1
 rc=$?
 counter=`expr $counter + 1` 
-test "$rc" != 0 && sleep 1
 done
 
 # We're done.