diff options
author | Tom Rini <trini@konsulko.com> | 2025-04-07 16:40:02 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-04-08 11:43:23 -0600 |
commit | ff61d6bfd1c9534d3fc2397846a5899639f2e55d (patch) | |
tree | dcfe4bc52848a5637c975a3352b57885e5b8a06d /test/py/tests/test_stackprotector.py | |
parent | 34820924edbc4ec7803eb89d9852f4b870fa760a (diff) | |
parent | f892a7f397a66d8d09f418d1e0e06dfb48bac27d (diff) |
Merge branch 'next'
Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.
Diffstat (limited to 'test/py/tests/test_stackprotector.py')
-rw-r--r-- | test/py/tests/test_stackprotector.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/py/tests/test_stackprotector.py b/test/py/tests/test_stackprotector.py index b87392c54ff..a7e20d6307c 100644 --- a/test/py/tests/test_stackprotector.py +++ b/test/py/tests/test_stackprotector.py @@ -6,10 +6,10 @@ import signal @pytest.mark.buildconfigspec('cmd_stackprotector_test') @pytest.mark.notbuildconfigspec('asan') -def test_stackprotector(u_boot_console): +def test_stackprotector(ubman): """Test that the stackprotector function works.""" - u_boot_console.run_command('stackprot_test',wait_for_prompt=False) + ubman.run_command('stackprot_test',wait_for_prompt=False) expected_response = 'Stack smashing detected' - u_boot_console.wait_for(expected_response) - u_boot_console.restart_uboot() + ubman.wait_for(expected_response) + ubman.restart_uboot() |