hello,

when playing with travis-ci, I've found that ssl, pcre tests
are executed even if haproxy is built without such features.

thanks!
Ilya Shipitcin
From 5e786e8bc2a12ad4b53e3fdbfc3464738fd4e6df Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <[email protected]>
Date: Wed, 17 Apr 2019 12:19:56 +0500
Subject: [PATCH] REGTESTS: exclude tests that require ssl, pcre if no such
 feature is enabled

Signed-off-by: Ilya Shipitsin <[email protected]>
---
 reg-tests/checks/s00004.vtc          | 1 +
 reg-tests/connection/b00000.vtc      | 1 +
 reg-tests/http-rules/h00003.vtc      | 1 +
 reg-tests/peers/s_tls_basic_sync.vtc | 1 +
 reg-tests/ssl/b00000.vtc             | 1 +
 5 files changed, 5 insertions(+)

diff --git a/reg-tests/checks/s00004.vtc b/reg-tests/checks/s00004.vtc
index 1caeea1b..87cc5705 100644
--- 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 f4206ebf..b5b06297 100644
--- 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 64cedc29..5bf94fc2 100644
--- 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 81ab7ba1..6710d319 100644
--- 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 30030e36..9171c455 100644
--- 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
 
 
-- 
2.20.1

Reply via email to