summaryrefslogtreecommitdiffstatshomepage
path: root/tests
diff options
context:
space:
mode:
authorstijn <stijn@ignitron.net>2020-12-15 11:54:34 +0100
committerDamien George <damien@micropython.org>2020-12-18 13:56:45 +1100
commit108183fcc01f722d17e373f91f392a2a60ac787a (patch)
tree33110db9ce8892bd3403de2a3dd4b7b61a1e789a /tests
parent505a1853b9490246fbb95850ad8dae6d1b49d002 (diff)
downloadmicropython-108183fcc01f722d17e373f91f392a2a60ac787a.tar.gz
micropython-108183fcc01f722d17e373f91f392a2a60ac787a.zip
tests/misc/sys_settrace: Make test output independent of invoked path.
The original logic of reducing a full path to a relative one assumes "tests/misc" is in the filename which is limited in usage: it never works for CPython on Windows since that will use a backslash as path separator, and also won't work when the filename is a path not relative to the tests directory which happens for example in the common case of running "./run-tests -d misc". Fix all cases by printing only the bare filename, which requires them all to start with sys_settrace_ hence the renaming.
Diffstat (limited to 'tests')
-rw-r--r--tests/misc/sys_settrace_features.py8
-rw-r--r--tests/misc/sys_settrace_generator.py4
-rw-r--r--tests/misc/sys_settrace_generator.py.exp276
-rw-r--r--tests/misc/sys_settrace_loop.py4
-rw-r--r--tests/misc/sys_settrace_loop.py.exp92
-rw-r--r--tests/misc/sys_settrace_subdir/sys_settrace_generic.py (renamed from tests/misc/sys_settrace_subdir/trace_generic.py)6
-rw-r--r--tests/misc/sys_settrace_subdir/sys_settrace_importme.py (renamed from tests/misc/sys_settrace_subdir/trace_importme.py)0
7 files changed, 195 insertions, 195 deletions
diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index d315ea6973..e1b1a059da 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -20,8 +20,8 @@ def print_stacktrace(frame, level=0):
" ",
frame.f_globals["__name__"],
frame.f_code.co_name,
- # reduce full path to some pseudo-relative
- "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+ # Keep just the filename.
+ "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
frame.f_lineno,
)
)
@@ -95,9 +95,9 @@ def do_tests():
print("Who loves the sun?")
print("Not every-", factorial(3))
- from sys_settrace_subdir import trace_generic
+ from sys_settrace_subdir import sys_settrace_generic
- trace_generic.run_tests()
+ sys_settrace_generic.run_tests()
return
diff --git a/tests/misc/sys_settrace_generator.py b/tests/misc/sys_settrace_generator.py
index 4ace0f50e8..43065df4ae 100644
--- a/tests/misc/sys_settrace_generator.py
+++ b/tests/misc/sys_settrace_generator.py
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
" ",
frame.f_globals["__name__"],
frame.f_code.co_name,
- # reduce full path to some pseudo-relative
- "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+ # Keep just the filename.
+ "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
frame.f_lineno,
)
)
diff --git a/tests/misc/sys_settrace_generator.py.exp b/tests/misc/sys_settrace_generator.py.exp
index de9d0bf1c3..a83450afe3 100644
--- a/tests/misc/sys_settrace_generator.py.exp
+++ b/tests/misc/sys_settrace_generator.py.exp
@@ -1,195 +1,195 @@
### trace_handler::main event: call
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:41
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:41
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:42
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:42
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:48
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:48
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:49
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:49
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:50
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:50
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:52
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:42
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:42
+ 1: @__main__:test_generator => sys_settrace_generator.py:52
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:52
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:52
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:56
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:46
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:46
+ 1: @__main__:test_generator => sys_settrace_generator.py:56
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: exception
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:56
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:58
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:58
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:59
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:59
+ 1: @__main__:<module> => sys_settrace_generator.py:69
test_generator 7 8
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:61
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:61
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:62
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:62
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:42
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:42
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:64
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:43
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:64
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:44
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:64
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:63
+ 1: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: call
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:45
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:46
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: return
- 0: @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1: @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:make_gen => sys_settrace_generator.py:46
+ 1: @__main__:test_generator => sys_settrace_generator.py:63
+ 2: @__main__:<module> => sys_settrace_generator.py:69
### trace_handler::main event: line
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:65
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:65
+ 1: @__main__:<module> => sys_settrace_generator.py:69
7
### trace_handler::main event: return
- 0: @__main__:test_generator => miscmisc/sys_settrace_generator.py:65
- 1: @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0: @__main__:test_generator => sys_settrace_generator.py:65
+ 1: @__main__:<module> => sys_settrace_generator.py:69
Total traces executed: 54
diff --git a/tests/misc/sys_settrace_loop.py b/tests/misc/sys_settrace_loop.py
index 06d0dc17bf..1186bd91a0 100644
--- a/tests/misc/sys_settrace_loop.py
+++ b/tests/misc/sys_settrace_loop.py
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
" ",
frame.f_globals["__name__"],
frame.f_code.co_name,
- # reduce full path to some pseudo-relative
- "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+ # Keep just the filename.
+ "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
frame.f_lineno,
)
)
diff --git a/tests/misc/sys_settrace_loop.py.exp b/tests/misc/sys_settrace_loop.py.exp
index f56f98fae0..ff9ef577c5 100644
--- a/tests/misc/sys_settrace_loop.py.exp
+++ b/tests/misc/sys_settrace_loop.py.exp
@@ -1,72 +1,72 @@
### trace_handler::main event: call
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:41
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:41
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:43
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:43
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:44
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:45
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:44
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:45
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:44
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:45
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:44
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:45
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:46
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:46
+ 1: @__main__:<module> => sys_settrace_loop.py:58
test_for_loop 3
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:49
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:49
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:50
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:50
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:51
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:51
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:53
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:52
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:53
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:52
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:53
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:52
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:53
+ 1: @__main__:<module> => sys_settrace_loop.py:58
### trace_handler::main event: line
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:54
+ 1: @__main__:<module> => sys_settrace_loop.py:58
test_while_loop 3
### trace_handler::main event: return
- 0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
- 1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0: @__main__:test_loop => sys_settrace_loop.py:54
+ 1: @__main__:<module> => sys_settrace_loop.py:58
Total traces executed: 23
diff --git a/tests/misc/sys_settrace_subdir/trace_generic.py b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
index 111a9d19ff..a60ca955d7 100644
--- a/tests/misc/sys_settrace_subdir/trace_generic.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
@@ -41,10 +41,10 @@ def test_lambda():
# import
def test_import():
- from sys_settrace_subdir import trace_importme
+ from sys_settrace_subdir import sys_settrace_importme
- trace_importme.dummy()
- trace_importme.saysomething()
+ sys_settrace_importme.dummy()
+ sys_settrace_importme.saysomething()
# class
diff --git a/tests/misc/sys_settrace_subdir/trace_importme.py b/tests/misc/sys_settrace_subdir/sys_settrace_importme.py
index de561ef217..de561ef217 100644
--- a/tests/misc/sys_settrace_subdir/trace_importme.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_importme.py