Skip to content

Commit

Permalink
perf daemon: Fix running test for non root user
Browse files Browse the repository at this point in the history
John reported that the daemon test is not working for non root user.
Changing the tests configurations so it's allowed to run under normal
user.

Fixes: 2291bb9 ("perf tests: Add daemon 'list' command test")
Reported-by: John Garry <john.garry@huawei.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: John Garry <john.garry@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210301122510.64402-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
olsajiri authored and acmel committed Mar 6, 2021
1 parent 31bf4e7 commit 36bc511
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions tools/perf/tests/shell/daemon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ test_list()
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
[session-time]
run = -e task-clock
run = -e task-clock -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand All @@ -159,14 +159,14 @@ EOF
# check 1st session
# pid:size:-e cpu-clock:base/size:base/size/output:base/size/control:base/size/ack:0
local line=`perf daemon --config ${config} -x: | head -2 | tail -1`
check_line_other "${line}" size "-e cpu-clock" ${base}/session-size \
check_line_other "${line}" size "-e cpu-clock -m 1 sleep 10" ${base}/session-size \
${base}/session-size/output ${base}/session-size/control \
${base}/session-size/ack "0"

# check 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0
local line=`perf daemon --config ${config} -x: | head -3 | tail -1`
check_line_other "${line}" time "-e task-clock" ${base}/session-time \
check_line_other "${line}" time "-e task-clock -m 1 sleep 10" ${base}/session-time \
${base}/session-time/output ${base}/session-time/control \
${base}/session-time/ack "0"

Expand All @@ -190,10 +190,10 @@ test_reconfig()
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
[session-time]
run = -e task-clock
run = -e task-clock -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand All @@ -204,7 +204,7 @@ EOF
# check 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0
local line=`perf daemon --config ${config} -x: | head -3 | tail -1`
check_line_other "${line}" time "-e task-clock" ${base}/session-time \
check_line_other "${line}" time "-e task-clock -m 1 sleep 10" ${base}/session-time \
${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"
local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`

Expand All @@ -215,10 +215,10 @@ EOF
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
[session-time]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
EOF

# TEST 1 - change config
Expand All @@ -238,7 +238,7 @@ EOF
# check reconfigured 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0
local line=`perf daemon --config ${config} -x: | head -3 | tail -1`
check_line_other "${line}" time "-e cpu-clock" ${base}/session-time \
check_line_other "${line}" time "-e cpu-clock -m 1 sleep 10" ${base}/session-time \
${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"

# TEST 2 - empty config
Expand Down Expand Up @@ -309,10 +309,10 @@ test_stop()
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
[session-time]
run = -e task-clock
run = -e task-clock -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand Down Expand Up @@ -361,7 +361,7 @@ test_signal()
base=BASE
[session-test]
run = -e cpu-clock --switch-output
run = -e cpu-clock --switch-output -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand Down Expand Up @@ -400,10 +400,10 @@ test_ping()
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
[session-time]
run = -e task-clock
run = -e task-clock -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand Down Expand Up @@ -439,7 +439,7 @@ test_lock()
base=BASE
[session-size]
run = -e cpu-clock
run = -e cpu-clock -m 1 sleep 10
EOF

sed -i -e "s|BASE|${base}|" ${config}
Expand Down

0 comments on commit 36bc511

Please sign in to comment.