From b6252b334d024933fbb475ee7ce7095a21851c7e Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Mon, 13 Nov 2023 14:08:29 +0100 Subject: [PATCH] tests/periph/selftest_shield: fix integration The test should execute only with `make test-with-config` and not with `make test`, as boards without the shield cannot pass the test. For some reason I accidentally added both variants, which makes no sense. This drops the `make test` variant. Finally, the `README.md` is updated to refer to `make test-with-config` instead of `make test`. --- tests/periph/selftest_shield/README.md | 2 +- .../tests-with-config/01-run.py | 7 +++++-- tests/periph/selftest_shield/tests/01-run.py | 21 ------------------- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100755 tests/periph/selftest_shield/tests/01-run.py diff --git a/tests/periph/selftest_shield/README.md b/tests/periph/selftest_shield/README.md index 8c1706ceff..a2dd818d91 100644 --- a/tests/periph/selftest_shield/README.md +++ b/tests/periph/selftest_shield/README.md @@ -26,7 +26,7 @@ - (Background: If the UART at D0 and D1 is used for stdio, it cannot be looped and tested) 5. Flash and run the test - - In this directory, run `make BOARD= flash test` + - In this directory, run `make BOARD= flash test-with-config` ## Details diff --git a/tests/periph/selftest_shield/tests-with-config/01-run.py b/tests/periph/selftest_shield/tests-with-config/01-run.py index 606d413ed1..005393cb48 100755 --- a/tests/periph/selftest_shield/tests-with-config/01-run.py +++ b/tests/periph/selftest_shield/tests-with-config/01-run.py @@ -1,17 +1,20 @@ #!/usr/bin/env python3 -# Copyright (C) 2022 Otto-von-Guericke-Universität Magdeburg +# Copyright (C) 2023 Otto-von-Guericke-Universität Magdeburg # # This file is subject to the terms and conditions of the GNU Lesser # General Public License v2.1. See the file LICENSE in the top level # directory for more details. +# @author Marian Buschsieweke + import sys from testrunner import run def testfunc(child): - child.expect('ALL TESTS SUCCEEDED') + child.expect("self-testing peripheral drivers") + child.expect("ALL TESTS SUCCEEDED") if __name__ == "__main__": diff --git a/tests/periph/selftest_shield/tests/01-run.py b/tests/periph/selftest_shield/tests/01-run.py deleted file mode 100755 index 005393cb48..0000000000 --- a/tests/periph/selftest_shield/tests/01-run.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2023 Otto-von-Guericke-Universität Magdeburg -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. - -# @author Marian Buschsieweke - -import sys -from testrunner import run - - -def testfunc(child): - child.expect("self-testing peripheral drivers") - child.expect("ALL TESTS SUCCEEDED") - - -if __name__ == "__main__": - sys.exit(run(testfunc))