From dc614a04cbbf13a3f7e9a44f5b144142c81073b2 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Wed, 8 Nov 2023 14:24:13 +0000 Subject: [PATCH] Merge tests: fix regression tests to run on kernels that only have network_v8 upstream kernels only have network_v8 unfortunately the tcp tests were only being run against kernels that had network (which is v7). Kernels that support both (Ubuntu) would be tested against v8, so v8 has been tested but pure upstream kernels were failing to be tested correctly. This patch will only make sure one of the supported verserions are tested. This is determined by the parser which prefers v8. In the future the tests need to be extended to run the tests against all kernel supported versions. Signed-off-by: John Johansen MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1120 Approved-by: Christian Boltz Merged-by: John Johansen (cherry picked from commit dcc719c69c0473a4060c3314679b0ec8fc4c716d) Signed-off-by: John Johansen --- tests/regression/apparmor/tcp.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/regression/apparmor/tcp.sh b/tests/regression/apparmor/tcp.sh index 703f1c55f..4d27b7bb4 100755 --- a/tests/regression/apparmor/tcp.sh +++ b/tests/regression/apparmor/tcp.sh @@ -14,8 +14,14 @@ pwd=`cd $pwd ; /bin/pwd` bin=$pwd +# TODO: +# need to update so we can run the test for ech supported +# need to be able to modify the compile features to choose the +# kernel feature supported +# need to be able to query the parser if it supports the +# kernel feature . $bin/prologue.inc -requires_kernel_features network +requires_any_of_kernel_features network network_v8 port=34567 ip="127.0.0.1"