diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2022-07-06 17:29:06 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-07-14 01:32:42 +0200 |
| commit | a832a44e67e77dd1a9ec57e9c054feddb0355cfc (patch) | |
| tree | e9ca9aa3034126a52f035c9d4ce015a703507438 /test/lib | |
| parent | 544f790bf837ebe7d7e25fa59a5790e5dbb412a1 (diff) | |
| download | passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar.gz passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar.bz2 passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar.lz passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar.xz passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.tar.zst passt-a832a44e67e77dd1a9ec57e9c054feddb0355cfc.zip | |
tests: Explicitly list test files in test/run, remove "onlyfor" support
Currently test/run uses wildcards to run all of the tests in a directory.
However, that wildcard list is filtered down by the "onlyfor" directives
in the test files... usually to a single file.
Therefore, just explicitly list the files we *really* want to run for this
test mode. This makes it easier to see at the top level what tests will
be executed, and to change that list temporarily while debugging specific
failures.
This means the "onlyfor" directive no longer has any purpose, and we can
remove it. "onlyfor" was also the only used of the $MODE variable, so we
can remove that too.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/lib')
| -rwxr-xr-x | test/lib/setup | 10 | ||||
| -rwxr-xr-x | test/lib/test | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/test/lib/setup b/test/lib/setup index 604cfee..0d0f3cf 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -20,15 +20,11 @@ VMEM="$((${__mem_kib} / 1024 / 4))" # setup_build() - Set up pane layout for build tests setup_build() { - MODE=build - layout_host } # setup_passt() - Start qemu and passt setup_passt() { - MODE=passt - layout_passt # Ports: @@ -65,8 +61,6 @@ setup_passt() { # setup_pasta() - Create a network and user namespace, connect pasta to it setup_pasta() { - MODE=pasta - layout_pasta pane_run NS 'echo $$' @@ -98,8 +92,6 @@ setup_pasta() { # setup_passt_in_ns() - Set up namespace (with pasta), run qemu and passt into it setup_passt_in_ns() { - MODE=passt_in_ns - layout_passt_in_pasta # Ports: @@ -180,8 +172,6 @@ setup_passt_in_ns() { # setup_two_guests() - Set up two namespace, run qemu and passt in both of them setup_two_guests() { - MODE=passt_in_ns - layout_two_guests # Ports: diff --git a/test/lib/test b/test/lib/test index 12f2588..cb89e0b 100755 --- a/test/lib/test +++ b/test/lib/test @@ -13,9 +13,6 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio <sbrivio@redhat.com> -# Empty, 'passt' or 'pasta', to match against 'onlyfor' directive -MODE= - # test_iperf3() - Ugly helper for iperf3c/iperf3s directives # $1: Role: client or server # $2: Pane name, can be lowercase @@ -426,12 +423,6 @@ test() { __list="$(list_add "${__list}" "${__f}")" continue fi - - if [ -n "$(file_def "${__f}" onlyfor)" ] && \ - ! list_has "$(file_def "${__f}" onlyfor)" "${MODE}"; then - continue - fi - __list="$(list_add "${__list}" "${__f}")" done cd .. |