Skip to content

Commit 2187d6c

Browse files
committed
Merge branch 'selftests-tc-increase-timeout-and-add-missing-kconfig'
Matthieu Baerts says: ==================== selftests: tc: increase timeout and add missing kconfig When looking for something else in LKFT reports [1], I noticed that the TC selftest ended with a timeout error: not ok 1 selftests: tc-testing: tdc.sh # TIMEOUT 45 seconds I also noticed most of the tests were skipped because the "teardown stage" did not complete successfully. It was due to missing kconfig. These patches fix these two errors plus an extra one because this selftest reads info from "/proc/net/nf_conntrack". Thank you Pedro for having helped me fixing these issues [2]. Link: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230711/testrun/18267241/suite/kselftest-tc-testing/test/tc-testing_tdc_sh/log [1] Link: https://lore.kernel.org/netdev/[email protected]/T/ [2] ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 8fcd7c7 + 031c99e commit 2187d6c

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

tools/testing/selftests/tc-testing/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ CONFIG_NF_CONNTRACK=m
55
CONFIG_NF_CONNTRACK_MARK=y
66
CONFIG_NF_CONNTRACK_ZONES=y
77
CONFIG_NF_CONNTRACK_LABELS=y
8+
CONFIG_NF_CONNTRACK_PROCFS=y
9+
CONFIG_NF_FLOW_TABLE=m
810
CONFIG_NF_NAT=m
911
CONFIG_NETFILTER_XT_TARGET_LOG=m
1012

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
timeout=900

0 commit comments

Comments
 (0)