REGTESTS: exclude tests that require ssl, pcre if no such feature is enabled

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>

diff --git a/reg-tests/checks/s00004.vtc b/reg-tests/checks/s00004.vtc
index 1caeea1b36e71274d906b68294f5b0d5dce846e4..87cc570563dacc62d49cca0039900b2da45129a3 100644 (file)
--- a/reg-tests/checks/s00004.vtc
+++ b/reg-tests/checks/s00004.vtc
@@ -1,4 +1,5 @@
 varnishtest "Health-check test over TLS/SSL"
+#REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro
 
 

diff --git a/reg-tests/connection/b00000.vtc b/reg-tests/connection/b00000.vtc
index f4206ebf59dd71bb88233ed78db6e6eb04688bb5..b5b06297bbf75109a0db396120c57645f2fa6874 100644 (file)
--- a/reg-tests/connection/b00000.vtc
+++ b/reg-tests/connection/b00000.vtc
@@ -9,6 +9,7 @@
 # without storing it first.
 
 varnishtest "PROXY protocol random failures"
+#REQUIRE_OPTIONS=OPENSSL
 
 feature ignore_unknown_macro
 

diff --git a/reg-tests/http-rules/h00003.vtc b/reg-tests/http-rules/h00003.vtc
index 64cedc292ed5da0d090f72ee7a46aa3341a82ffb..5bf94fc21007f9e9c8a98be8cd2d1cf00b696e22 100644 (file)
--- a/reg-tests/http-rules/h00003.vtc
+++ b/reg-tests/http-rules/h00003.vtc
@@ -1,4 +1,5 @@
 varnishtest "haproxy host header: map / redirect tests"
+#REQUIRE_OPTIONS=PCRE
 feature ignore_unknown_macro
 
 #REQUIRE_VERSION=1.6

diff --git a/reg-tests/peers/s_tls_basic_sync.vtc b/reg-tests/peers/s_tls_basic_sync.vtc
index 81ab7ba10cbdc858ad31c9a2f6da0746c3dff9f3..6710d3196072d8dc85aff8d231b0b227847cbfbd 100644 (file)
--- a/reg-tests/peers/s_tls_basic_sync.vtc
+++ b/reg-tests/peers/s_tls_basic_sync.vtc
@@ -1,4 +1,5 @@
 vtest "Basic test for peers protocol over SSL/TLS"
+#REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro
 
 haproxy h1 -arg "-L A" -conf {

diff --git a/reg-tests/ssl/b00000.vtc b/reg-tests/ssl/b00000.vtc
index 30030e3617a2a254fb9277e1dd6a8e393acfe329..9171c4554782a1c7767453a30155b59c98152649 100644 (file)
--- a/reg-tests/ssl/b00000.vtc
+++ b/reg-tests/ssl/b00000.vtc
@@ -17,6 +17,7 @@
 
 
 varnishtest "OpenSSL bug: Random crashes"
+#REQUIRE_OPTIONS=OPENSSL
 feature ignore_unknown_macro