Restructure benchmark scripts

[jogme]

Detailed information about the reason doing this is at openssl/project#1683

Resolves: openssl/project#1684
Resolves: openssl/project#1685

[Sashan]

I prefer to keep definitions of global env. variables in run/config scripts. diff below does this tweak. otherwise it looks good.

diff --git a/bench-scripts/bench_config_apache.sh b/bench-scripts/bench_config_apache.sh
index 613fd57..3c4e480 100755
--- a/bench-scripts/bench_config_apache.sh
+++ b/bench-scripts/bench_config_apache.sh
@@ -53,10 +53,15 @@ set -x
 #
 
 INSTALL_ROOT=${BENCH_INSTALL_ROOT:-"/tmp/bench.binaries"}
+RESULT_DIR=${BENCH_RESULTS:-"${INSTALL_ROOT}/results"}
 WORKSPACE_ROOT=${BENCH_WORKSPACE_ROOT:-"/tmp/bench.workspace"}
 MAKE_OPTS=${BENCH_MAKE_OPTS}
 HTTPS_PORT=${BENCH_HTTPS_PORT:-'4430'}
 HTTP_PORT=${BENCH_HTTP_PORT:-'8080'}
+CERT_SUBJ=${BENCH_CERT_SUBJ:-'/CN=localhost'}
+CERT_ALT_SUBJ=${BENCH_CERT_ALT_SUBJ:-'subjectAltName=DNS:localhost,IP:127.0.0.1'}
+TEST_TIME=${BENCH_TEST_TIME:-'5M'}
+HOST=${BENCH_HOST:-'127.0.0.1'}
 APACHE_VERSION='2.4.65'
 
 . ./common_util.sh
diff --git a/bench-scripts/bench_config_haproxy.sh b/bench-scripts/bench_config_haproxy.sh
index 4ed4218..d75aed9 100755
--- a/bench-scripts/bench_config_haproxy.sh
+++ b/bench-scripts/bench_config_haproxy.sh
@@ -17,6 +17,7 @@ HAPROXY_NOSSL_PORT='42128'
 HAPROXY_C2P_PORT='42132'
 HAPROXY_P2S_PORT='42134'
 HAPROXY_C2S_PORT='42136'
+CERT_SUBJ=${BENCH_CERT_SUBJ:-'/CN=localhost'}
 CERT_ALT_SUBJ=${BENCH_CERT_ALT_SUBJ:-'subjectAltName=DNS:localhost,IP:127.0.0.1'}
 HOST=${BENCH_HOST:-'127.0.0.1'}
 HAPROXY_VERSION='v3.2.0'
diff --git a/bench-scripts/bench_config_nginx.sh b/bench-scripts/bench_config_nginx.sh
index 53d2ed6..b871d9c 100755
--- a/bench-scripts/bench_config_nginx.sh
+++ b/bench-scripts/bench_config_nginx.sh
@@ -18,10 +18,13 @@ set -x
 #
 INSTALL_ROOT=${BENCH_INSTALL_ROOT:-"/tmp/bench.binaries"}
 WORKSPACE_ROOT=${BENCH_WORKSPACE_ROOT:-"/tmp/bench.workspace"}
-RESULT_DIR=${BENCH_RESULTS:-"${INSTALL_ROOT}/results"}
 MAKE_OPTS=${BENCH_MAKE_OPTS}
 HTTPS_PORT=${BENCH_HTTPS_PORT:-'4430'}
 HTTP_PORT=${BENCH_HTTP_PORT:-'8080'}
+CERT_SUBJ=${BENCH_CERT_SUBJ:-'/CN=localhost'}
+CERT_ALT_SUBJ=${BENCH_CERT_ALT_SUBJ:-'subjectAltName=DNS:localhost,IP:127.0.0.1'}
+TEST_TIME=${BENCH_TEST_TIME:-'5M'}
+HOST=${BENCH_HOST:-'127.0.0.1'}
 
 . ./common_util.sh
 
diff --git a/bench-scripts/bench_run_apache.sh b/bench-scripts/bench_run_apache.sh
index e538f7c..14ca505 100755
--- a/bench-scripts/bench_run_apache.sh
+++ b/bench-scripts/bench_run_apache.sh
@@ -54,10 +54,14 @@ set -x
 
 INSTALL_ROOT=${BENCH_INSTALL_ROOT:-"/tmp/bench.binaries"}
 RESULT_DIR=${BENCH_RESULTS:-"${INSTALL_ROOT}/results"}
+WORKSPACE_ROOT=${BENCH_WORKSPACE_ROOT:-"/tmp/bench.workspace"}
 HTTPS_PORT=${BENCH_HTTPS_PORT:-'4430'}
 HTTP_PORT=${BENCH_HTTP_PORT:-'8080'}
+CERT_SUBJ=${BENCH_CERT_SUBJ:-'/CN=localhost'}
+CERT_ALT_SUBJ=${BENCH_CERT_ALT_SUBJ:-'subjectAltName=DNS:localhost,IP:127.0.0.1'}
 TEST_TIME=${BENCH_TEST_TIME:-'5M'}
 HOST=${BENCH_HOST:-'127.0.0.1'}
+APACHE_VERSION='2.4.65'
 HAPROXY='no'
 
 . ./common_util.sh
diff --git a/bench-scripts/bench_run_haproxy.sh b/bench-scripts/bench_run_haproxy.sh
index 2c318cd..269e41e 100755
--- a/bench-scripts/bench_run_haproxy.sh
+++ b/bench-scripts/bench_run_haproxy.sh
@@ -11,6 +11,7 @@
 set -x
 
 INSTALL_ROOT=${BENCH_INSTALL_ROOT:-"/tmp/bench.binaries"}
+RESULT_DIR=${BENCH_RESULTS:-"${INSTALL_ROOT}/results"}
 
 function run_haproxy {
     typeset SSL_LIB=$1

[jogme]

Some changes broke the script.. Looking into it

[Sashan]

looks good, I've just added a suggestion to update README.md. please check it and adjust it as you desire. if you like it, just resubmit PR and I will approve it.
thanks.

[jogme]

@Sashan I fixed a few nits in the readme and I redid the whole other patch, because I had an issue there which caused haproxy to not run.. PTAL

[Sashan]

looks good to me. thanks. let's get this in.

[Sashan]

looks good to me.