Skip to content

Commit

Permalink
rcutorture: Simplify functions.sh include path
Browse files Browse the repository at this point in the history
Inclusions of 'functions.sh' from 'kvm-test-1-run.sh' and
'kvm-recheck*.sh' use its absolute path.  Because the directory containing
'functions.sh' is already in PATH, the full path is unnecessary.  This
commit therefore simplifies the inclusions to use the short relative path.

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
  • Loading branch information
sjp38 authored and paulmck committed Dec 11, 2017
1 parent fa48beb commit feef2d2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ else
echo Unreadable results directory: $i
exit 1
fi
. tools/testing/selftests/rcutorture/bin/functions.sh
. functions.sh

configfile=`echo $i | sed -e 's/^.*\///'`
ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

i="$1"
. tools/testing/selftests/rcutorture/bin/functions.sh
. functions.sh

if test "`grep -c 'rcu_exp_grace_period.*start' < $i/console.log`" -lt 100
then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ else
exit 1
fi
PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
. tools/testing/selftests/rcutorture/bin/functions.sh
. functions.sh

if kvm-recheck-rcuperf-ftrace.sh $i
then
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
. tools/testing/selftests/rcutorture/bin/functions.sh
. functions.sh
for rd in "$@"
do
firsttime=1
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ T=${TMPDIR-/tmp}/kvm-test-1-run.sh.$$
trap 'rm -rf $T' 0
mkdir $T

. $KVM/bin/functions.sh
. functions.sh
. $CONFIGFRAG/ver_functions.sh

config_template=${1}
Expand Down

0 comments on commit feef2d2

Please sign in to comment.