Skip to content

Commit 96d0b6c

Browse files
author
Tiago Alves
committed
WL#12279 SUPPORTS RUNNING TESTSUITE SUBSET
Supports running a testsuite subset via testsuite_suffix parameter that selects a specific file from a testsuite instead of reading all files belonging to the same testsuite. This change synchronizes changes already done for performance testsuite supporting testsuite subsets.
1 parent b009c29 commit 96d0b6c

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

storage/ndb/test/run-test/autotest-run.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
##############
2727

2828
save_args=$*
29-
VERSION="autotest-run.sh version 1.19"
29+
VERSION="autotest-run.sh version 1.20"
3030

3131
DATE=`date '+%Y-%m-%d'`
3232
if [ `uname -s` != "SunOS" ]
@@ -73,6 +73,7 @@ do
7373
--conf=*) conf=`echo $1 | sed s/--conf=//`;;
7474
--version) echo $VERSION; exit;;
7575
--suite=*) RUN=`echo $1 | sed s/--suite=//`;;
76+
--suite-suffix=*) suite_suffix=`echo $1 | sed s/--suite-suffix=//`;;
7677
--run-dir=*) run_dir=`echo $1 | sed s/--run-dir=//`;;
7778
--install-dir=*) install_dir=`echo $1 | sed s/--install-dir=//`;;
7879
--install-dir0=*) install_dir0=`echo $1 | sed s/--install-dir0=//`;;
@@ -204,10 +205,12 @@ else
204205
ndb_cpcc=`which ndb_cpcc`
205206
fi
206207

207-
test_file=$test_dir/$RUN-tests.txt
208+
if [ -n "${suite_suffix}" ]; then
209+
suite_suffix="--${suite_suffix}"
210+
fi
208211

209-
if [ ! -f "$test_file" ]
210-
then
212+
test_file="${test_dir}/${RUN}${suite_suffix}-tests.txt"
213+
if [ ! -f "$test_file" ]; then
211214
echo "Cant find testfile: $test_file"
212215
exit 1
213216
fi
@@ -393,7 +396,7 @@ if [ ${atrt_conf_status} -ne 0 ]; then
393396
else
394397
args="${atrt_defaults_group_suffix_arg}"
395398
args="$args --report-file=report.txt"
396-
args="$args --testcase-file=$test_dir/$RUN-tests.txt"
399+
args="$args --testcase-file=${test_file}"
397400
args="$args ${baseport_arg}"
398401
args="$args ${site_arg} ${clusters_arg}"
399402
args="$args $prefix"

0 commit comments

Comments
 (0)