ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest_common.sh: small fixes and adjustments

Browse Source 
Introduce SPDK_AUTOTEST_X to allow controlling '-x' flag.
Fix ldconfig detection - it is not always in /usr/sbin but should be in
PATH.
Fix (once again) regexp in print_backtrace. Also obey current '-x'
option.

Change-Id: I782b6445e7d44ceb168fd4d9874300f1c71f4f80
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/387610
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-11-15 19:43:15 +01:00 committed by Jim Harris
parent 45caa6f859
commit e5e3658612
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/autotest_common.sh
View File

@ -1,4 +1,11 @@
set -xe : ${SPDK_AUTOTEST_X=true}; export SPDK_AUTOTEST_X
if $SPDK_AUTOTEST_X; then
set -x
fi
set -e
PS4=' \t \$ ' PS4=' \t \$ '
ulimit -c unlimited ulimit -c unlimited
@ -70,7 +77,7 @@ case `uname` in
config_params+=' --enable-ubsan' config_params+=' --enable-ubsan'
fi fi
if [ $SPDK_RUN_ASAN -eq 1 ]; then if [ $SPDK_RUN_ASAN -eq 1 ]; then
if /usr/sbin/ldconfig -p | grep -q asan; then if ldconfig -p | grep -q asan; then
config_params+=' --enable-asan' config_params+=' --enable-asan'
else else
SPDK_RUN_ASAN=0 SPDK_RUN_ASAN=0
@ -339,6 +346,7 @@ function run_test() {
} }
function print_backtrace() { function print_backtrace() {
local shell_options="$-"
set +x set +x
echo "========== Backtrace start: ==========" echo "========== Backtrace start: =========="
echo "" echo ""
@ -348,13 +356,13 @@ function print_backtrace() {
local src="${BASH_SOURCE[$i]}" local src="${BASH_SOURCE[$i]}"
echo "in $src:$line_nr -> $func()" echo "in $src:$line_nr -> $func()"
echo " ..." echo " ..."
nl -w 4 -ba -nln $src | grep -B 5 -A 5 "^$line_nr" | \ nl -w 4 -ba -nln $src | grep -B 5 -A 5 "^$line_nr[^0-9]" | \
sed "s/^/ /g" | sed "s/^ $line_nr /=> $line_nr /g" sed "s/^/ /g" | sed "s/^ $line_nr /=> $line_nr /g"
echo " ..." echo " ..."
done done
echo "" echo ""
echo "========== Backtrace end ==========" echo "========== Backtrace end =========="
set -x [[ "$shell_options" =~ x ]] && set -x
return 0 return 0
} }