From 9931634e71003c296232e1ec237c22ffb0f3e403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= <flecaille@haproxy.com>
Date: Wed, 22 Aug 2018 10:41:33 +0200
Subject: [PATCH] REGTEST/MINOR: Add a new class of regression testing files.

Add LEVEL #4 regression testing files which is dedicated to
VTC files in relation with bugs they help to reproduce.
At the date of this commit, all VTC files are LEVEL 4 VTC files.
---
 Makefile                                             | 7 +++++++
 reg-tests/log/{h00000.vtc => b00000.vtc}             | 0
 reg-tests/lua/{h00000.lua => b00000.lua}             | 0
 reg-tests/lua/{h00000.vtc => b00000.vtc}             | 2 +-
 reg-tests/seamless-reload/{h00000.vtc => b00000.vtc} | 0
 reg-tests/spoe/{h00000.vtc => b00000.vtc}            | 0
 reg-tests/ssl/{h00000.vtc => b00000.vtc}             | 0
 reg-tests/stick-table/{h00000.vtc => b00000.vtc}     | 0
 8 files changed, 8 insertions(+), 1 deletion(-)
 rename reg-tests/log/{h00000.vtc => b00000.vtc} (100%)
 rename reg-tests/lua/{h00000.lua => b00000.lua} (100%)
 rename reg-tests/lua/{h00000.vtc => b00000.vtc} (97%)
 rename reg-tests/seamless-reload/{h00000.vtc => b00000.vtc} (100%)
 rename reg-tests/spoe/{h00000.vtc => b00000.vtc} (100%)
 rename reg-tests/ssl/{h00000.vtc => b00000.vtc} (100%)
 rename reg-tests/stick-table/{h00000.vtc => b00000.vtc} (100%)

diff --git a/Makefile b/Makefile
index 817161f76..c49239958 100644
--- a/Makefile
+++ b/Makefile
@@ -999,6 +999,11 @@ update-version:
 	echo "$(SUBVERS)" > SUBVERS
 	echo "$(VERDATE)" > VERDATE
 
+# Target to run the regression testing script files.
+# LEVEL 1 scripts are dedicated to pure haproxy compliance tests (prefixed with 'h' letter).
+# LEVEL 2 scripts are slow scripts (prefixed with 's' letter).
+# LEVEL 3 scripts are low interest scripts (prefixed with 'l' letter).
+# LEVEL 4 scripts are in relation with bugs they help to reproduce (prefixed with 'b' letter).
 reg-tests:
 	@if [ ! -x "$(VARNISHTEST_PROGRAM)" ]; then \
 		echo "Please make the VARNISHTEST_PROGRAM variable point to the location of the varnishtest program."; \
@@ -1011,6 +1016,8 @@ reg-tests:
 	   EXPR='s*.vtc'; \
 	elif [ $$LEVEL = 3 ] ; then \
 	   EXPR='l*.vtc'; \
+	elif [ $$LEVEL = 4 ] ; then \
+	   EXPR='b*.vtc'; \
 	fi ; \
 	if [ -n "$$EXPR" ] ; then \
 	   find reg-tests -type f -name "$$EXPR" -print0 | \
diff --git a/reg-tests/log/h00000.vtc b/reg-tests/log/b00000.vtc
similarity index 100%
rename from reg-tests/log/h00000.vtc
rename to reg-tests/log/b00000.vtc
diff --git a/reg-tests/lua/h00000.lua b/reg-tests/lua/b00000.lua
similarity index 100%
rename from reg-tests/lua/h00000.lua
rename to reg-tests/lua/b00000.lua
diff --git a/reg-tests/lua/h00000.vtc b/reg-tests/lua/b00000.vtc
similarity index 97%
rename from reg-tests/lua/h00000.vtc
rename to reg-tests/lua/b00000.vtc
index 2b2ffb0e7..4229eeb06 100644
--- a/reg-tests/lua/h00000.vtc
+++ b/reg-tests/lua/b00000.vtc
@@ -40,7 +40,7 @@ server s1 -repeat 2 {
 
 haproxy h1 -conf {
     global
-        lua-load ${testdir}/h00000.lua
+        lua-load ${testdir}/b00000.lua
 
     frontend fe1
         mode http
diff --git a/reg-tests/seamless-reload/h00000.vtc b/reg-tests/seamless-reload/b00000.vtc
similarity index 100%
rename from reg-tests/seamless-reload/h00000.vtc
rename to reg-tests/seamless-reload/b00000.vtc
diff --git a/reg-tests/spoe/h00000.vtc b/reg-tests/spoe/b00000.vtc
similarity index 100%
rename from reg-tests/spoe/h00000.vtc
rename to reg-tests/spoe/b00000.vtc
diff --git a/reg-tests/ssl/h00000.vtc b/reg-tests/ssl/b00000.vtc
similarity index 100%
rename from reg-tests/ssl/h00000.vtc
rename to reg-tests/ssl/b00000.vtc
diff --git a/reg-tests/stick-table/h00000.vtc b/reg-tests/stick-table/b00000.vtc
similarity index 100%
rename from reg-tests/stick-table/h00000.vtc
rename to reg-tests/stick-table/b00000.vtc