Pull the certificate files from the source directory. Ensure that the

certificate tests only run on a localhost-hosted test server since the
host name is explicitly checked.

diff --git a/tests/data/test310 b/tests/data/test310
index 005f71310674756d6f49b7817948a585faea0f32..15cdaf4566e672c1e7c2141929982d08ac44a30d 100644 (file)
--- a/tests/data/test310
+++ b/tests/data/test310
@@ -32,8 +32,12 @@ https Server-localhost-sv.pem
 simple HTTPS GET
  </name>
  <command>
---cacert certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/310
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/310
 </command>
+# Ensure that we're running on localhost because we're checking the host name
+<precheck>
+perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+</precheck>
 </client>
 
 #

diff --git a/tests/data/test311 b/tests/data/test311
index cd51fff74614f38e4deb011a90b322bb7b5e1840..13c2d4d0003ab0fdd03289861b65b90e4679b9ef 100644 (file)
--- a/tests/data/test311
+++ b/tests/data/test311
@@ -24,8 +24,12 @@ https Server-localhost0h-sv.pem
 HTTPS wrong subjectAltName but right CN
  </name>
  <command>
---cacert certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/311
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/311
 </command>
+# Ensure that we're running on localhost because we're checking the host name
+<precheck>
+perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+</precheck>
 </client>
 
 #

diff --git a/tests/data/test312 b/tests/data/test312
index 5adb1e35260d7ce85bfe66174e50446dd4531dde..7f390b4c9815b8836d29ee1e8b1a703640cf0e2d 100644 (file)
--- a/tests/data/test312
+++ b/tests/data/test312
@@ -24,8 +24,12 @@ https Server-localhost.nn-sv.pem
 HTTPS GET to localhost and null-prefixed CN cert
  </name>
  <command>
---cacert certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/312
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/312
 </command>
+# Ensure that we're running on localhost because we're checking the host name
+<precheck>
+perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+</precheck>
 </client>
 
 #