smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/py: Drop importing utils as util

Browse Source 
Now that we have a shorter name, we don't need this sort of thing.
Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # test_android
This commit is contained in:
Simon Glass
2025-02-09 09:07:16 -07:00
parent d428226459
commit 2ddab2962a
18 changed files with 110 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/py/tests/test_trace.py
View File

@@ -6,7 +6,7 @@ import os
import pytest
import re
import utils as util
import utils
# This is needed for Azure, since the default '..' directory is not writeable
TMPDIR = '/tmp/test_trace'
@@ -80,12 +80,12 @@ def check_function(cons, fname, proftool, map_fname, trace_dat):
map_fname (str): Filename of System.map
trace_dat (str): Filename of output file
"""
out = util.run_and_log(
out = utils.run_and_log(
cons, [proftool, '-t', fname, '-o', trace_dat, '-m', map_fname,
'dump-ftrace'])
# Check that trace-cmd can read it
out = util.run_and_log(cons, ['trace-cmd', 'dump', trace_dat])
out = utils.run_and_log(cons, ['trace-cmd', 'dump', trace_dat])
# Tracing meta data in file /tmp/test_trace/trace.dat:
# [Initial format]
@@ -114,7 +114,7 @@ def check_function(cons, fname, proftool, map_fname, trace_dat):
# Check that the trace has something useful
cmd = f"trace-cmd report -l {trace_dat} |grep -E '(initf_|initr_)'"
out = util.run_and_log(cons, ['sh', '-c', cmd])
out = utils.run_and_log(cons, ['sh', '-c', cmd])
# Format:
# u-boot-1 0..... 60.805596: function: initf_malloc
@@ -156,13 +156,13 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat):
"""
# Generate the funcgraph format
out = util.run_and_log(
out = utils.run_and_log(
cons, [proftool, '-t', fname, '-o', trace_dat, '-m', map_fname,
'dump-ftrace', '-f', 'funcgraph'])
# Check that the trace has what we expect
cmd = f'trace-cmd report -l {trace_dat} |head -n 70'
out = util.run_and_log(cons, ['sh', '-c', cmd])
out = utils.run_and_log(cons, ['sh', '-c', cmd])
# First look for this:
# u-boot-1 0..... 282.101360: funcgraph_entry: 0.004 us | initf_malloc();
@@ -204,7 +204,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat):
# Now look for initf_dm() and dm_timer_init() so we can check the bootstage
# time
cmd = f"trace-cmd report -l {trace_dat} |grep -E '(initf_dm|dm_timer_init)'"
out = util.run_and_log(cons, ['sh', '-c', cmd])
out = utils.run_and_log(cons, ['sh', '-c', cmd])
start_timestamp = None
end_timestamp = None
@@ -241,7 +241,7 @@ def check_flamegraph(cons, fname, proftool, map_fname, trace_fg):
"""
# Generate the flamegraph format
out = util.run_and_log(
out = utils.run_and_log(
cons, [proftool, '-t', fname, '-o', trace_fg, '-m', map_fname,
'dump-flamegraph'])
@@ -258,7 +258,7 @@ def check_flamegraph(cons, fname, proftool, map_fname, trace_fg):
assert found == 2
# Generate the timing graph
out = util.run_and_log(
utils.run_and_log(
cons, [proftool, '-t', fname, '-o', trace_fg, '-m', map_fname,
'dump-flamegraph', '-f', 'timing'])