- need to add typeset for i (forloop counter), there is a risk the global state gets polluted. missing typeset in generate_download_files() prevents haproxy to build

Author: Sashan

bench-scripts/apache_bench.sh

@@ -922,6 +922,7 @@ function run_test {
 }
 
 function setup_tests {
+	typeset i=0
 	install_openssl master
 	install_siege openssl-master
 	install_apache openssl-master
@@ -1008,6 +1009,7 @@ function setup_tests {
 function run_tests {
 	typeset SAVE_RESULT_DIR="${RESULT_DIR}"
 	typeset HAPROXY_OPTIONS=('no' 'client' 'server' 'both')
+	typeset i=""
 
 	for i in event worker pre-fork ; do
 		mkdir -p ${RESULT_DIR}/$i || exit 1

bench-scripts/common_util.sh

@@ -92,6 +92,7 @@ function cleanup {
 
 function clean_build {
 	typeset SAVE_DIR=`pwd`
+	typeset i=""
 	cd "${WORKSPACE_ROOT}"
 	for i in * ; do
 		if [[ -d $i ]] ; then
@@ -309,6 +310,7 @@ function plot_results {
 
 function generate_download_files {
 	typeset HTDOCS=$1
+	typeset i=""
 
 	mkdir -p ${HTDOCS} || exit 1
 

bench-scripts/haproxy_bench.sh

@@ -24,16 +24,16 @@ HOST=${BENCH_HOST:-'127.0.0.1'}
 HAPROXY_VERSION='v3.2.0'
 
 function install_haproxy {
-	typeset SSL_LIB=$1
-	typeset VERSION=${HAPROXY_VERSION:-v3.2.0}
+    typeset SSL_LIB=$1
+    typeset VERSION=${HAPROXY_VERSION:-v3.2.0}
     typeset HAPROXY_REPO="https://github.com/haproxy/haproxy.git"
     typeset BASENAME='haproxy'
     typeset DIRNAME="${BASENAME}-${VERSION}"
     typeset CERTDIR="${INSTALL_ROOT}/${SSL_LIB}/conf/certs"
 
-	if [[ -z "${SSL_LIB}" ]] ; then
+    if [[ -z "${SSL_LIB}" ]] ; then
         SSL_LIB="openssl-master"
-	fi
+    fi
 
     if [[ -f "${INSTALL_ROOT}/${SSL_LIB}/sbin/haproxy" ]] ; then
         echo "haproxy already installed; skipping.."
@@ -44,6 +44,7 @@ function install_haproxy {
         git clone "${HAPROXY_REPO}" -b ${VERSION} --depth 1 . || exit 1
 
         # haproxy does not have a configure script; only a big makefile
+        make clean
         make ${MAKE_OPTS} \
              TARGET=generic \
              USE_OPENSSL=1 \