Skip to content

Commit 5d9ded8

Browse files
committed
fix tune for non-valgrind travis builds
1 parent ce34b3a commit 5d9ded8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

testme.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ _runtest()
128128
# get switched off without some effort, so we just let it run twice for testing purposes
129129
_make "$1" "$2" ""
130130
echo -e "\rRun autotune $1 $2"
131-
$_timeout ./etc/tune_it.sh > test_${suffix}.log || _die "running autotune" $?
131+
$_timeout $TUNE_CMD > ../test_${suffix}.log || _die "running autotune" $?
132132
else
133133
_make "$1" "$2" "test_standalone"
134134
echo -e "\rRun test $1 $2"
@@ -154,7 +154,7 @@ echo "autotune branch"
154154
# The shell used for /bin/sh is DASH 0.5.7-4ubuntu1 on the author's machine which fails valgrind, so
155155
# we just run on instance of etc/tune with the same options as in etc/tune_it.sh
156156
echo -e "\rRun etc/tune $1 $2 once inside valgrind"
157-
$_timeout $VALGRIND_BIN $VALGRIND_OPTS ./etc/tune -t -r 10 -L 3 > test_${suffix}.log || _die "running etc/tune" $?
157+
$_timeout $VALGRIND_BIN $VALGRIND_OPTS $TUNE_CMD > test_${suffix}.log || _die "running etc/tune" $?
158158
else
159159
_make "$1" "$2" "test_standalone"
160160
echo -e "\rRun test $1 $2 inside valgrind"
@@ -195,6 +195,7 @@ VALGRIND_OPTS=" --leak-check=full --show-leak-kinds=all --error-exitcode=1 "
195195
#VALGRIND_OPTS=""
196196
VALGRIND_BIN=""
197197
CHECK_FORMAT=""
198+
TUNE_CMD="./etc/tune -t -r 10 -L 3"
198199

199200
alive_pid=0
200201

0 commit comments

Comments
 (0)