tests: adjust for capitalization differences in newer gnutls-serv
authorDan Fandrich <dan@coneharvesters.com>
Fri, 11 Jul 2014 21:43:13 +0000 (23:43 +0200)
committerDan Fandrich <dan@coneharvesters.com>
Fri, 11 Jul 2014 21:47:48 +0000 (23:47 +0200)
tests/data/test320
tests/runtests.pl

index 89b4e14..4f621c7 100644 (file)
@@ -15,7 +15,7 @@ Content-type: text/html
 \r
 
 <HTML><BODY>
-<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GNUTLS</a></H1></CENTER>
+<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
 
 
 <p>Session ID: <i>003030000100000001000000000000000030330001000000B062410001000000</i></p>
@@ -64,7 +64,7 @@ Content-type: text/html
 \r
 
 <HTML><BODY>
-<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GNUTLS</a></H1></CENTER>
+<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
 
 
 
@@ -89,6 +89,7 @@ Accept: */*
 s/^<p>Session ID:.*//
 s/^<hr><P>Your HTTP header was:<PRE>.*/<PRE>/
 s/Protocol version:.*[0-9]//
+s/GNUTLS/GnuTLS/
 </stripfile>
 </verify>
 
index af4609f..810b807 100755 (executable)
@@ -1037,7 +1037,7 @@ sub verifyhttptls {
         close(FILE);
     }
 
-    if($data && ($data =~ /GNUTLS/) && open(FILE, "<$pidfile")) {
+    if($data && ($data =~ /(GNUTLS|GnuTLS)/) && open(FILE, "<$pidfile")) {
         $pid=0+<FILE>;
         close(FILE);
         if($pid > 0) {