From 5c59ee9488f8764c02992d9db3408af8ecb18e4d Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Tue, 18 Aug 2009 00:18:54 +0000
Subject: 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.

---
 tests/data/test310 | 6 +++++-
 tests/data/test311 | 6 +++++-
 tests/data/test312 | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'tests/data')

diff --git a/tests/data/test310 b/tests/data/test310
index 005f71310..15cdaf456 100644
--- 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 cd51fff74..13c2d4d00 100644
--- 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 5adb1e352..7f390b4c9 100644
--- 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>
 
 #
-- 
cgit v1.2.3