|
26 | 26 | ############## |
27 | 27 |
|
28 | 28 | save_args=$* |
29 | | -VERSION="autotest-run.sh version 1.19" |
| 29 | +VERSION="autotest-run.sh version 1.20" |
30 | 30 |
|
31 | 31 | DATE=`date '+%Y-%m-%d'` |
32 | 32 | if [ `uname -s` != "SunOS" ] |
|
73 | 73 | --conf=*) conf=`echo $1 | sed s/--conf=//`;; |
74 | 74 | --version) echo $VERSION; exit;; |
75 | 75 | --suite=*) RUN=`echo $1 | sed s/--suite=//`;; |
| 76 | + --suite-suffix=*) suite_suffix=`echo $1 | sed s/--suite-suffix=//`;; |
76 | 77 | --run-dir=*) run_dir=`echo $1 | sed s/--run-dir=//`;; |
77 | 78 | --install-dir=*) install_dir=`echo $1 | sed s/--install-dir=//`;; |
78 | 79 | --install-dir0=*) install_dir0=`echo $1 | sed s/--install-dir0=//`;; |
@@ -204,10 +205,12 @@ else |
204 | 205 | ndb_cpcc=`which ndb_cpcc` |
205 | 206 | fi |
206 | 207 |
|
207 | | -test_file=$test_dir/$RUN-tests.txt |
| 208 | +if [ -n "${suite_suffix}" ]; then |
| 209 | + suite_suffix="--${suite_suffix}" |
| 210 | +fi |
208 | 211 |
|
209 | | -if [ ! -f "$test_file" ] |
210 | | -then |
| 212 | +test_file="${test_dir}/${RUN}${suite_suffix}-tests.txt" |
| 213 | +if [ ! -f "$test_file" ]; then |
211 | 214 | echo "Cant find testfile: $test_file" |
212 | 215 | exit 1 |
213 | 216 | fi |
@@ -393,7 +396,7 @@ if [ ${atrt_conf_status} -ne 0 ]; then |
393 | 396 | else |
394 | 397 | args="${atrt_defaults_group_suffix_arg}" |
395 | 398 | args="$args --report-file=report.txt" |
396 | | - args="$args --testcase-file=$test_dir/$RUN-tests.txt" |
| 399 | + args="$args --testcase-file=${test_file}" |
397 | 400 | args="$args ${baseport_arg}" |
398 | 401 | args="$args ${site_arg} ${clusters_arg}" |
399 | 402 | args="$args $prefix" |
|
0 commit comments