From 6b3d0ff488b18ebe6b54b70026431ff8e14ba6db Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 20 Oct 2019 17:32:42 +0100
Subject: [PATCH] Tetsuite: feature-check multileaf OCSP testcases

---
 test/confs/5602                                               | 1 -
 test/confs/5612                                               | 1 +
 test/confs/5615                                               | 2 +-
 test/confs/{5652 => 5665}                                     | 0
 test/confs/{5655 => 5670}                                     | 0
 test/log/{5602 => 5612}                                       | 0
 test/log/{5652 => 5665}                                       | 0
 test/log/{5655 => 5670}                                       | 0
 .../5602 => 5612-OCSP-OpenSSL-multileaf/5612}                 | 0
 test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES             | 4 ++++
 .../5652 => 5665-OCSP-GnuTLS-multileaf/5665}                  | 0
 test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES              | 4 ++++
 .../{5655-OCSP-GnuTLS-1.3/5655 => 5670-OCSP-GnuTLS-1.3/5670}  | 0
 .../{5655-OCSP-GnuTLS-1.3 => 5670-OCSP-GnuTLS-1.3}/REQUIRES   | 0
 14 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 120000 test/confs/5602
 create mode 120000 test/confs/5612
 rename test/confs/{5652 => 5665} (100%)
 rename test/confs/{5655 => 5670} (100%)
 rename test/log/{5602 => 5612} (100%)
 rename test/log/{5652 => 5665} (100%)
 rename test/log/{5655 => 5670} (100%)
 rename test/scripts/{5600-OCSP-OpenSSL/5602 => 5612-OCSP-OpenSSL-multileaf/5612} (100%)
 create mode 100644 test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES
 rename test/scripts/{5650-OCSP-GnuTLS/5652 => 5665-OCSP-GnuTLS-multileaf/5665} (100%)
 create mode 100644 test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES
 rename test/scripts/{5655-OCSP-GnuTLS-1.3/5655 => 5670-OCSP-GnuTLS-1.3/5670} (100%)
 rename test/scripts/{5655-OCSP-GnuTLS-1.3 => 5670-OCSP-GnuTLS-1.3}/REQUIRES (100%)

diff --git a/test/confs/5602 b/test/confs/5602
deleted file mode 120000
index 4602aa558..000000000
--- a/test/confs/5602
+++ /dev/null
@@ -1 +0,0 @@
-5652
\ No newline at end of file
diff --git a/test/confs/5612 b/test/confs/5612
new file mode 120000
index 000000000..7d60415e2
--- /dev/null
+++ b/test/confs/5612
@@ -0,0 +1 @@
+5665
\ No newline at end of file
diff --git a/test/confs/5615 b/test/confs/5615
index 36c91e7a2..a21fc1bc9 120000
--- a/test/confs/5615
+++ b/test/confs/5615
@@ -1 +1 @@
-5655
\ No newline at end of file
+5670
\ No newline at end of file
diff --git a/test/confs/5652 b/test/confs/5665
similarity index 100%
rename from test/confs/5652
rename to test/confs/5665
diff --git a/test/confs/5655 b/test/confs/5670
similarity index 100%
rename from test/confs/5655
rename to test/confs/5670
diff --git a/test/log/5602 b/test/log/5612
similarity index 100%
rename from test/log/5602
rename to test/log/5612
diff --git a/test/log/5652 b/test/log/5665
similarity index 100%
rename from test/log/5652
rename to test/log/5665
diff --git a/test/log/5655 b/test/log/5670
similarity index 100%
rename from test/log/5655
rename to test/log/5670
diff --git a/test/scripts/5600-OCSP-OpenSSL/5602 b/test/scripts/5612-OCSP-OpenSSL-multileaf/5612
similarity index 100%
rename from test/scripts/5600-OCSP-OpenSSL/5602
rename to test/scripts/5612-OCSP-OpenSSL-multileaf/5612
diff --git a/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES b/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES
new file mode 100644
index 000000000..0d1bd9f7a
--- /dev/null
+++ b/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES
@@ -0,0 +1,4 @@
+support OpenSSL
+support OCSP
+running IPv4
+feature _HAVE_TLS_OCSP_LIST
diff --git a/test/scripts/5650-OCSP-GnuTLS/5652 b/test/scripts/5665-OCSP-GnuTLS-multileaf/5665
similarity index 100%
rename from test/scripts/5650-OCSP-GnuTLS/5652
rename to test/scripts/5665-OCSP-GnuTLS-multileaf/5665
diff --git a/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES b/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES
new file mode 100644
index 000000000..37e377db0
--- /dev/null
+++ b/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES
@@ -0,0 +1,4 @@
+support GnuTLS
+support OCSP
+running IPv4
+feature _HAVE_TLS_OCSP_LIST
diff --git a/test/scripts/5655-OCSP-GnuTLS-1.3/5655 b/test/scripts/5670-OCSP-GnuTLS-1.3/5670
similarity index 100%
rename from test/scripts/5655-OCSP-GnuTLS-1.3/5655
rename to test/scripts/5670-OCSP-GnuTLS-1.3/5670
diff --git a/test/scripts/5655-OCSP-GnuTLS-1.3/REQUIRES b/test/scripts/5670-OCSP-GnuTLS-1.3/REQUIRES
similarity index 100%
rename from test/scripts/5655-OCSP-GnuTLS-1.3/REQUIRES
rename to test/scripts/5670-OCSP-GnuTLS-1.3/REQUIRES
-- 
2.25.1