Fix shell-script tests

The tests expected the source directory to contain the executables.
This commit is contained in:
Markus Mäkelä 2018-05-10 23:53:53 +03:00
parent ed2d0f4a5b
commit 16b777ad17
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
11 changed files with 12 additions and 11 deletions

View File

@ -8,7 +8,7 @@
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name

View File

@ -6,7 +6,7 @@
## - compare error messages
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name

View File

@ -6,7 +6,7 @@
## - check output of SHOW VARIABLES LIKE 'char%'
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name

View File

@ -6,7 +6,7 @@
## check if Maxscale is alive
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name

View File

@ -1,7 +1,7 @@
#!/bin/bash
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name
export ssl_options="--ssl-cert=$test_dir/ssl-cert/client-cert.pem --ssl-key=$test_dir/ssl-cert/client-key.pem"

View File

@ -5,7 +5,7 @@
## - connects to Maxscale, checks that defined in cmd line DB is selected
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name="mxs791.sh"
echo test name is $test_name

View File

@ -1,5 +1,6 @@
#!/bin/bash
$test_dir/non_native_setup $test_name
$PWD/non_native_setup $test_name
if [ $? -ne 0 ] ; then
echo "configuring maxscale failed"

View File

@ -5,7 +5,7 @@
## - connects to Maxscale, checks that defined in cmd line DB is selected
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name="mxs791_galera.sh"
echo test name is $test_name

View File

@ -5,7 +5,7 @@
## check that Maxscale is reacting correctly on ctrc+c signal and termination does not take ages
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
if [ $maxscale_IP == "127.0.0.1" ] ; then

View File

@ -5,7 +5,7 @@
## run a set of queries in the loop (see setmix.sql) using Perl client
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name

View File

@ -1,7 +1,7 @@
#!/bin/bash
rp=`realpath $0`
export test_dir=`dirname $rp`
export test_dir=`pwd`
export test_name=`basename $rp`
$test_dir/non_native_setup $test_name