From bef1b283354fdd055962b7ad5ab9f59d75a11bd7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 7 Mar 2021 17:34:40 -0700 Subject: sandbox: Drop the 'starting...' message This message is annoying since it is only useful for testing. Drop it and update the test to cope. Signed-off-by: Simon Glass --- test/py/tests/test_log.py | 1 - 1 file changed, 1 deletion(-) (limited to 'test/py') diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index f889120f2b3..140dcb9aa2b 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -45,5 +45,4 @@ def test_log_dropped(u_boot_console): cons = u_boot_console cons.restart_uboot() output = cons.get_spawn_output().replace('\r', '') - assert 'sandbox: starting...' in output assert (not 'debug: main' in output) -- cgit v1.2.3 From a353e76da994820d67858adc64edcfe6a47f87ab Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 7 Mar 2021 17:34:41 -0700 Subject: test: Re-enable test_ofplatdata This was inadvertently disabled after a recent change. Re-enable it. Signed-off-by: Simon Glass --- test/py/tests/test_ofplatdata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/py') diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 92d09b7aa19..e9cce4daf48 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -4,7 +4,7 @@ import pytest import u_boot_utils as util -@pytest.mark.boardspec('sandbox') +@pytest.mark.boardspec('sandbox_spl') @pytest.mark.buildconfigspec('spl_of_platdata') def test_spl_devicetree(u_boot_console): """Test content of spl device-tree""" -- cgit v1.2.3 From 2a2814d5f2714a7b0aef9ea7f9d8d67a34875d55 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 7 Mar 2021 17:35:11 -0700 Subject: test: Rename all linker lists to have a ut_ prefix At present each test suite has its own portion of the linker_list section of the image, but other lists are interspersed. This makes it hard to enumerate all the available tests without knowing the suites that each one is in. Place all tests together in a single contiguous list by giving them common prefix not used elsewhere in U-Boot. This makes it possible to find the start and end of all tests. Signed-off-by: Simon Glass --- test/py/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/py') diff --git a/test/py/conftest.py b/test/py/conftest.py index 9bfd9263455..1b909cde9d3 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -226,7 +226,7 @@ def pytest_configure(config): import u_boot_console_exec_attach console = u_boot_console_exec_attach.ConsoleExecAttach(log, ubconfig) -re_ut_test_list = re.compile(r'_u_boot_list_2_(.*)_test_2_\1_test_(.*)\s*$') +re_ut_test_list = re.compile(r'_u_boot_list_2_ut_(.*)_test_2_\1_test_(.*)\s*$') def generate_ut_subtest(metafunc, fixture_name, sym_path): """Provide parametrization for a ut_subtest fixture. -- cgit v1.2.3