Merge branch '2.2' into 2.3

maxscale-system-test/mdbci/run_test.sh

@@ -70,6 +70,11 @@ if [ $res == 0 ] ; then
     cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=$name -DCMAKE_BUILD_TYPE=Debug
     cd maxscale-system-test
     make
+set -x
+    echo ${test_set} | grep "NAME#"
+    if [ $? == 0 ] ; then
+        named_test=`echo ${test_set} | sed "s/NAME#//" | sed "s/ //g"`
+    fi
 
     if [ ! -z "${named_test}" ] ; then
         ./${named_test}

maxscale-system-test/mdbci/set_env.sh

@@ -74,7 +74,9 @@ export maxscale_IP=$maxscale_network
 export maxscale_access_user=$maxscale_whoami
 
 # Sysbench directory (should be sysbench >= 0.5)
-export sysbench_dir=${sysbench_dir:-"$HOME/sysbench_deb7/sysbench/"}
+sb=`which sysbench`
+export sysbench_dir=$(dirname ${sb})
+#export sysbench_dir=${sysbench_dir:-""}
 
 export ssl=true