Skip to content

Commit c3ec441

Browse files
author
Tiago Alves
committed
BUG#91011 FIX AUTOTEST-RUN.SH SCRIPT CALL
When autotest-run.sh was modified to use bash instead of standard sh, autotest-boot.sh got broken due to calling autotest-run.sh with "sh". Fix autotest-boot.sh to call autotest-run.sh without assuming which interpreter is used. NOTE: There are several ways to achieve the above. Using "source" or "." is not one of them, as that reads the script to the current one and executes the code. Also, because autotest-run.sh calls exit, that would prematurely fail autotest-boot.sh. Opting for simply calling the script and quoting script name to be able to correctly support paths with spaces. NOTE 2: "-x" debug option was purposely removed. If more information needs to be reported that should be improved in autotest-run.sh.
1 parent 3826bd0 commit c3ec441

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
@@ -312,7 +312,7 @@ fi
312312
script=$install_dir0/mysql-test/ndb/autotest-run.sh
313313
for R in $RUN
314314
do
315-
sh -x $script $save_args --conf=$conf --run-dir=$install_dir --install-dir0=$install_dir0 --install-dir1=$install_dir1 --suite=$R --nolock $extra_args
315+
"$script" $save_args --conf=$conf --run-dir=$install_dir --install-dir0=$install_dir0 --install-dir1=$install_dir1 --suite=$R --nolock $extra_args
316316
done
317317

318318
if [ "$build" ]

0 commit comments

Comments
 (0)