@@ -27,7 +27,7 @@ check_vmlinux() {
2727
2828trace_test_string () {
2929 echo " Testing perf trace's string augmentation"
30- output=" $( perf trace -e renameat* --max-events=1 -- mv ${file1} ${file2} 2>&1 ) "
30+ output=" $( perf trace --sort-events - e renameat* --max-events=1 -- mv ${file1} ${file2} 2>&1 ) "
3131 if ! echo " $output " | grep -q -E " ^mv/[0-9]+ renameat(2)?\(.*, \" ${file1} \" , .*, \" ${file2} \" , .*\) += +[0-9]+$"
3232 then
3333 printf " String augmentation test failed, output:\n$output \n"
@@ -38,7 +38,7 @@ trace_test_string() {
3838trace_test_buffer () {
3939 echo " Testing perf trace's buffer augmentation"
4040 # echo will insert a newline (\10) at the end of the buffer
41- output=" $( perf trace -e write --max-events=1 -- echo " ${buffer} " 2>&1 ) "
41+ output=" $( perf trace --sort-events - e write --max-events=1 -- echo " ${buffer} " 2>&1 ) "
4242 if ! echo " $output " | grep -q -E " ^echo/[0-9]+ write\([0-9]+, ${buffer} .*, [0-9]+\) += +[0-9]+$"
4343 then
4444 printf " Buffer augmentation test failed, output:\n$output \n"
@@ -48,7 +48,7 @@ trace_test_buffer() {
4848
4949trace_test_struct_btf () {
5050 echo " Testing perf trace's struct augmentation"
51- output=" $( perf trace -e clock_nanosleep --force-btf --max-events=1 -- sleep 1 2>&1 ) "
51+ output=" $( perf trace --sort-events - e clock_nanosleep --force-btf --max-events=1 -- sleep 1 2>&1 ) "
5252 if ! echo " $output " | grep -q -E " ^sleep/[0-9]+ clock_nanosleep\(0, 0, \{1,\}, 0x[0-9a-f]+\) += +[0-9]+$"
5353 then
5454 printf " BTF struct augmentation test failed, output:\n$output \n"
0 commit comments