[v2,11/32] selftests/ftrace: Use loopback address instead of localhost
diff mbox series

Message ID 153443726327.23257.3638322755203446041.stgit@devbox
State Superseded
Headers show
Series
  • selftests/ftrace: Improve ftracetest with coverage check
Related show

Commit Message

Masami Hiramatsu Aug. 16, 2018, 4:34 p.m. UTC
Use raw loopback address instead of localhost, because
"localhost" can depend on nsswitch and in some case
we can not resolve the localhost.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 .../selftests/ftrace/test.d/event/event-enable.tc  |    2 +-
 .../selftests/ftrace/test.d/event/event-pid.tc     |    2 +-
 .../ftrace/test.d/event/subsystem-enable.tc        |    2 +-
 .../ftrace/test.d/event/toplevel-enable.tc         |    2 +-
 .../ftrace/test.d/ftrace/func-filter-pid.tc        |    2 +-
 .../inter-event/trigger-field-variable-support.tc  |    2 +-
 .../trigger-inter-event-combined-hist.tc           |    2 +-
 .../inter-event/trigger-onmatch-action-hist.tc     |    2 +-
 .../trigger-onmatch-onmax-action-hist.tc           |    2 +-
 .../inter-event/trigger-onmax-action-hist.tc       |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

Comments

Steven Rostedt Aug. 24, 2018, 9:52 p.m. UTC | #1
On Fri, 17 Aug 2018 01:34:23 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:

> Use raw loopback address instead of localhost, because
> "localhost" can depend on nsswitch and in some case
> we can not resolve the localhost.
> 
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
>  .../selftests/ftrace/test.d/event/event-enable.tc  |    2 +-
>  .../selftests/ftrace/test.d/event/event-pid.tc     |    2 +-
>  .../ftrace/test.d/event/subsystem-enable.tc        |    2 +-
>  .../ftrace/test.d/event/toplevel-enable.tc         |    2 +-
>  .../ftrace/test.d/ftrace/func-filter-pid.tc        |    2 +-
>  .../inter-event/trigger-field-variable-support.tc  |    2 +-
>  .../trigger-inter-event-combined-hist.tc           |    2 +-
>  .../inter-event/trigger-onmatch-action-hist.tc     |    2 +-
>  .../trigger-onmatch-onmax-action-hist.tc           |    2 +-
>  .../inter-event/trigger-onmax-action-hist.tc       |    2 +-
>  10 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> index 386dbddbdc11..a028628cdd0e 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> @@ -14,7 +14,7 @@ fail() { #msg
>  }
>  
>  yield() {
> -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
>  }
>  
>  if [ ! -f set_event -o ! -d events/sched ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> index 6dbf67544fde..6d2897f6a106 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> @@ -17,7 +17,7 @@ fail() { #msg
>  }
>  
>  yield() {
> -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
>  }
>  
>  if [ ! -f set_event -o ! -d events/sched ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> index 10eb17f161b7..9f0221b39d4d 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> @@ -14,7 +14,7 @@ fail() { #msg
>  }
>  
>  yield() {
> -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
>  }
>  
>  if [ ! -f set_event -o ! -d events/sched ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> index 8d55a233c1a4..5f3611047d3a 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> @@ -13,7 +13,7 @@ fail() { #msg
>  }
>  
>  yield() {
> -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
>  }
>  
>  if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> index 970903cb7834..cd52cf6a1fc4 100644
> --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> @@ -49,7 +49,7 @@ fail() { # msg
>  }
>  
>  yield() {
> -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
>  }

Perhaps we should make this a helper function since it's used so much.

>  
>  do_test() {
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> index 575af23df04e..59b58c77e9ce 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> @@ -23,7 +23,7 @@ echo 'hist:keys=comm:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/
>  echo 'hist:keys=next_comm:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,sched.sched_waking.prio,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
>  echo 'hist:keys=pid,prio,comm:vals=lat:sort=pid,prio' > events/synthetic/wakeup_latency/trigger
>  
> -ping localhost -c 3
> +ping 127.0.0.1 -c 3
>  if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
>      fail "Failed to create inter-event histogram"
>  fi
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> index 92aef26e2631..0a7709fdfd8e 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> @@ -37,7 +37,7 @@ echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events
>  echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
>  echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking+wakeup_latency/trigger
>  
> -ping localhost -c 3
> +ping 127.0.0.1 -c 3
>  if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then
>      fail "Failed to create combined histogram"
>  fi
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> index 1ef5dd4521f0..c5bdf8338aeb 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> @@ -29,7 +29,7 @@ echo "Test histogram variables,simple expression support and onmatch action"
>  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
>  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
>  echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
> -ping localhost -c 5
> +ping 127.0.0.1 -c 5
>  if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
>      fail "Failed to create onmatch action inter-event histogram"
>  fi
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> index 7234683ee5e5..47cb76bfd9c0 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> @@ -29,7 +29,7 @@ echo "Test histogram variables,simple expression support and onmatch-onmax actio
>  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
>  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm):onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
>  echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
> -ping localhost -c 5
> +ping 127.0.0.1 -c 5
>  if [ ! grep -q "ping" events/synthetic/wakeup_latency/hist -o ! grep -q "max:" events/sched/sched_switch/hist]; then
>      fail "Failed to create onmatch-onmax action inter-event histogram"
>  fi
> diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> index 55b9630a1d70..6fa0c449035c 100644
> --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> @@ -27,7 +27,7 @@ echo "Test onmax action"
>  
>  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_waking/trigger
>  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
> -ping localhost -c 3
> +ping 127.0.0.1 -c 3

Perhaps we should also add a variable LOCALHOST="127.0.0.1" and use
that. I rather not have the raw address all over the place, in case we
want to change its meaning, it's best to do it in one place.

-- Steve

>  if ! grep -q "max:" events/sched/sched_switch/hist; then
>      fail "Failed to create onmax action inter-event histogram"
>  fi
Masami Hiramatsu Aug. 25, 2018, 1:47 a.m. UTC | #2
On Fri, 24 Aug 2018 17:52:11 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> On Fri, 17 Aug 2018 01:34:23 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
> 
> > Use raw loopback address instead of localhost, because
> > "localhost" can depend on nsswitch and in some case
> > we can not resolve the localhost.
> > 
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > ---
> >  .../selftests/ftrace/test.d/event/event-enable.tc  |    2 +-
> >  .../selftests/ftrace/test.d/event/event-pid.tc     |    2 +-
> >  .../ftrace/test.d/event/subsystem-enable.tc        |    2 +-
> >  .../ftrace/test.d/event/toplevel-enable.tc         |    2 +-
> >  .../ftrace/test.d/ftrace/func-filter-pid.tc        |    2 +-
> >  .../inter-event/trigger-field-variable-support.tc  |    2 +-
> >  .../trigger-inter-event-combined-hist.tc           |    2 +-
> >  .../inter-event/trigger-onmatch-action-hist.tc     |    2 +-
> >  .../trigger-onmatch-onmax-action-hist.tc           |    2 +-
> >  .../inter-event/trigger-onmax-action-hist.tc       |    2 +-
> >  10 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> > index 386dbddbdc11..a028628cdd0e 100644
> > --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> > @@ -14,7 +14,7 @@ fail() { #msg
> >  }
> >  
> >  yield() {
> > -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> > +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
> >  }
> >  
> >  if [ ! -f set_event -o ! -d events/sched ]; then
> > diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> > index 6dbf67544fde..6d2897f6a106 100644
> > --- a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
> > @@ -17,7 +17,7 @@ fail() { #msg
> >  }
> >  
> >  yield() {
> > -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> > +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
> >  }
> >  
> >  if [ ! -f set_event -o ! -d events/sched ]; then
> > diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> > index 10eb17f161b7..9f0221b39d4d 100644
> > --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> > @@ -14,7 +14,7 @@ fail() { #msg
> >  }
> >  
> >  yield() {
> > -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> > +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
> >  }
> >  
> >  if [ ! -f set_event -o ! -d events/sched ]; then
> > diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> > index 8d55a233c1a4..5f3611047d3a 100644
> > --- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> > @@ -13,7 +13,7 @@ fail() { #msg
> >  }
> >  
> >  yield() {
> > -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> > +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
> >  }
> >  
> >  if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
> > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> > index 970903cb7834..cd52cf6a1fc4 100644
> > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
> > @@ -49,7 +49,7 @@ fail() { # msg
> >  }
> >  
> >  yield() {
> > -    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> > +    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
> >  }
> 
> Perhaps we should make this a helper function since it's used so much.

Yeah, agree. OK, I'll add a patch to move it in common place.

> 
> >  
> >  do_test() {
> > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> > index 575af23df04e..59b58c77e9ce 100644
> > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
> > @@ -23,7 +23,7 @@ echo 'hist:keys=comm:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/
> >  echo 'hist:keys=next_comm:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,sched.sched_waking.prio,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
> >  echo 'hist:keys=pid,prio,comm:vals=lat:sort=pid,prio' > events/synthetic/wakeup_latency/trigger
> >  
> > -ping localhost -c 3
> > +ping 127.0.0.1 -c 3
> >  if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
> >      fail "Failed to create inter-event histogram"
> >  fi
> > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> > index 92aef26e2631..0a7709fdfd8e 100644
> > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
> > @@ -37,7 +37,7 @@ echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events
> >  echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
> >  echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking+wakeup_latency/trigger
> >  
> > -ping localhost -c 3
> > +ping 127.0.0.1 -c 3
> >  if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then
> >      fail "Failed to create combined histogram"
> >  fi
> > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> > index 1ef5dd4521f0..c5bdf8338aeb 100644
> > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
> > @@ -29,7 +29,7 @@ echo "Test histogram variables,simple expression support and onmatch action"
> >  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
> >  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
> >  echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
> > -ping localhost -c 5
> > +ping 127.0.0.1 -c 5
> >  if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
> >      fail "Failed to create onmatch action inter-event histogram"
> >  fi
> > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> > index 7234683ee5e5..47cb76bfd9c0 100644
> > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
> > @@ -29,7 +29,7 @@ echo "Test histogram variables,simple expression support and onmatch-onmax actio
> >  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
> >  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm):onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
> >  echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
> > -ping localhost -c 5
> > +ping 127.0.0.1 -c 5
> >  if [ ! grep -q "ping" events/synthetic/wakeup_latency/hist -o ! grep -q "max:" events/sched/sched_switch/hist]; then
> >      fail "Failed to create onmatch-onmax action inter-event histogram"
> >  fi
> > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> > index 55b9630a1d70..6fa0c449035c 100644
> > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
> > @@ -27,7 +27,7 @@ echo "Test onmax action"
> >  
> >  echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_waking/trigger
> >  echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
> > -ping localhost -c 3
> > +ping 127.0.0.1 -c 3
> 
> Perhaps we should also add a variable LOCALHOST="127.0.0.1" and use
> that. I rather not have the raw address all over the place, in case we
> want to change its meaning, it's best to do it in one place.

Agreed. That should be moved in the common place too.

Thank you,

> 
> -- Steve
> 
> >  if ! grep -q "max:" events/sched/sched_switch/hist; then
> >      fail "Failed to create onmax action inter-event histogram"
> >  fi
>

Patch
diff mbox series

diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
index 386dbddbdc11..a028628cdd0e 100644
--- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
@@ -14,7 +14,7 @@  fail() { #msg
 }
 
 yield() {
-    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
index 6dbf67544fde..6d2897f6a106 100644
--- a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
@@ -17,7 +17,7 @@  fail() { #msg
 }
 
 yield() {
-    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index 10eb17f161b7..9f0221b39d4d 100644
--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -14,7 +14,7 @@  fail() { #msg
 }
 
 yield() {
-    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
index 8d55a233c1a4..5f3611047d3a 100644
--- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
@@ -13,7 +13,7 @@  fail() { #msg
 }
 
 yield() {
-    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
 }
 
 if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
index 970903cb7834..cd52cf6a1fc4 100644
--- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
+++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
@@ -49,7 +49,7 @@  fail() { # msg
 }
 
 yield() {
-    ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+    ping 127.0.0.1 -c 1 || sleep .001 || usleep 1 || sleep 1
 }
 
 do_test() {
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
index 575af23df04e..59b58c77e9ce 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
@@ -23,7 +23,7 @@  echo 'hist:keys=comm:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/
 echo 'hist:keys=next_comm:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,sched.sched_waking.prio,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
 echo 'hist:keys=pid,prio,comm:vals=lat:sort=pid,prio' > events/synthetic/wakeup_latency/trigger
 
-ping localhost -c 3
+ping 127.0.0.1 -c 3
 if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
     fail "Failed to create inter-event histogram"
 fi
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
index 92aef26e2631..0a7709fdfd8e 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
@@ -37,7 +37,7 @@  echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events
 echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
 echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking+wakeup_latency/trigger
 
-ping localhost -c 3
+ping 127.0.0.1 -c 3
 if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then
     fail "Failed to create combined histogram"
 fi
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
index 1ef5dd4521f0..c5bdf8338aeb 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
@@ -29,7 +29,7 @@  echo "Test histogram variables,simple expression support and onmatch action"
 echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
 echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
 echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
-ping localhost -c 5
+ping 127.0.0.1 -c 5
 if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
     fail "Failed to create onmatch action inter-event histogram"
 fi
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
index 7234683ee5e5..47cb76bfd9c0 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
@@ -29,7 +29,7 @@  echo "Test histogram variables,simple expression support and onmatch-onmax actio
 echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
 echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm):onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
 echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
-ping localhost -c 5
+ping 127.0.0.1 -c 5
 if [ ! grep -q "ping" events/synthetic/wakeup_latency/hist -o ! grep -q "max:" events/sched/sched_switch/hist]; then
     fail "Failed to create onmatch-onmax action inter-event histogram"
 fi
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
index 55b9630a1d70..6fa0c449035c 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
@@ -27,7 +27,7 @@  echo "Test onmax action"
 
 echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_waking/trigger
 echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
-ping localhost -c 3
+ping 127.0.0.1 -c 3
 if ! grep -q "max:" events/sched/sched_switch/hist; then
     fail "Failed to create onmax action inter-event histogram"
 fi