ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

perf daemon: Fix running test for non root user

Browse Source 
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: 2291bb915b ("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>
This commit is contained in:
Jiri Olsa
2021-03-01 13:25:10 +01:00
committed by Arnaldo Carvalho de Melo
parent 31bf4e7cb6
commit 36bc511f63
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/perf/tests/shell/daemon.sh
View File

@@ -140,10 +140,10 @@ test_list()
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
[session-time] [session-time]
run = -e task-clock run = -e task-clock -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}
@@ -159,14 +159,14 @@ EOF
# check 1st session # check 1st session
# pid:size:-e cpu-clock:base/size:base/size/output:base/size/control:base/size/ack:0 # 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` 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/output ${base}/session-size/control \
${base}/session-size/ack "0" ${base}/session-size/ack "0"
# check 2nd session # check 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0 # 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` 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/output ${base}/session-time/control \
${base}/session-time/ack "0" ${base}/session-time/ack "0"
@@ -190,10 +190,10 @@ test_reconfig()
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
[session-time] [session-time]
run = -e task-clock run = -e task-clock -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}
@@ -204,7 +204,7 @@ EOF
# check 2nd session # check 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0 # 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` 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" ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"
local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'` local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
@@ -215,10 +215,10 @@ EOF
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
[session-time] [session-time]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
EOF EOF
# TEST 1 - change config # TEST 1 - change config
@@ -238,7 +238,7 @@ EOF
# check reconfigured 2nd session # check reconfigured 2nd session
# pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0 # 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` 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" ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"
# TEST 2 - empty config # TEST 2 - empty config
@@ -309,10 +309,10 @@ test_stop()
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
[session-time] [session-time]
run = -e task-clock run = -e task-clock -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}
@@ -361,7 +361,7 @@ test_signal()
base=BASE base=BASE
[session-test] [session-test]
run = -e cpu-clock --switch-output run = -e cpu-clock --switch-output -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}
@@ -400,10 +400,10 @@ test_ping()
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
[session-time] [session-time]
run = -e task-clock run = -e task-clock -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}
@@ -439,7 +439,7 @@ test_lock()
base=BASE base=BASE
[session-size] [session-size]
run = -e cpu-clock run = -e cpu-clock -m 1 sleep 10
EOF EOF
sed -i -e "s|BASE|${base}|" ${config} sed -i -e "s|BASE|${base}|" ${config}