5:06 p.m.
A new commit from upstream now sets a timeout of 45 seconds per test. That's
too low for MPTCP. We need more.
But increasing the timeout was not working because selftests scripts were
looking for this new 'settings' file in the wrong directory. I am going to send
the first patch upstream as it might be required for other selftests and not
specific to MPTCP.
Matthieu Baerts (2):
selftests: settings: tests can be in subsubdirs
selftests:mptcp: increase timeout
tools/testing/selftests/kselftest/runner.sh | 2 +-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 7 +++++++
tools/testing/selftests/net/mptcp/settings | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/net/mptcp/settings
--
2.20.1
5:06 p.m.
New subject: [PATCH 1/2] selftests: settings: tests can be in subsubdirs
Commit 852c8cbf34d3 (selftests/kselftest/runner.sh: Add 45 second
timeout per test) adds support for a new per-test-directory "settings"
file. But this only works for tests not in a sub-subdirectories, e.g.
- tools/testing/selftests/rtc (rtc) is OK,
- tools/testing/selftests/net/mptcp (net/mptcp) is not.
We have to increase the timeout for net/mptcp tests which are not
upstreamed yet but this fix is valid for other tests if they need to add
a "settings" file, see the full list with:
tools/testing/selftests/*/*/**/Makefile
Note that this patch changes the text header message printed at the end
of the execution but this text is modified only for the tests that are
in sub-subdirectories, e.g.
ok 1 selftests: net/mptcp: mptcp_connect.sh
Before we had:
ok 1 selftests: mptcp: mptcp_connect.sh
But showing the full target name is probably better, just in case a
subsubdir has the same name as another one in another subdirectory.
Fixes: 852c8cbf34d3 (selftests/kselftest/runner.sh: Add 45 second timeout per test)
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
tools/testing/selftests/kselftest/runner.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/kselftest/runner.sh
b/tools/testing/selftests/kselftest/runner.sh
index 84de7bc74f2c..0d7a89901ef7 100644
--- a/tools/testing/selftests/kselftest/runner.sh
+++ b/tools/testing/selftests/kselftest/runner.sh
@@ -90,7 +90,7 @@ run_one()
run_many()
{
echo "TAP version 13"
- DIR=$(basename "$PWD")
+ DIR="${PWD#${BASE_DIR}/}"
test_num=0
total=$(echo "$@" | wc -w)
echo "1..$total"
--
2.20.1
5:06 p.m.
New subject: [PATCH 2/2] selftests:mptcp: increase timeout
Instead of 45s, we switch to 450s.
In my tests, on a few years old machines with KASAN, etc. it took up to
3 minutes and 30 seconds. I then doubled the value and rounded it to 7.5
minutes.
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 7 +++++++
tools/testing/selftests/net/mptcp/settings | 1 +
2 files changed, 8 insertions(+)
create mode 100644 tools/testing/selftests/net/mptcp/settings
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index f0528df9ac31..4a29b3284a8b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
+time_start=$(date +%s)
+
ret=0
sin=""
sout=""
@@ -317,4 +319,9 @@ for sender in 1 2 3 4;do
run_tests ns4 ns$sender 10.0.3.1
done
+time_end=$(date +%s)
+tiem_run=$((time_end-time_start))
+
+echo "Time: ${time_run} seconds"
+
exit $ret
diff --git a/tools/testing/selftests/net/mptcp/settings
b/tools/testing/selftests/net/mptcp/settings
new file mode 100644
index 000000000000..026384c189c9
--- /dev/null
+++ b/tools/testing/selftests/net/mptcp/settings
@@ -0,0 +1 @@
+timeout=450
--
2.20.1
6:21 a.m.
New subject: [PATCH 2/2] selftests:mptcp: increase timeout
Hi Florian,
On 22/10/2019 22:24, Florian Westphal wrote:
Matthieu Baerts <matthieu.baerts(a)tessares.net> wrote:
> +time_end=$(date +%s)
> +tiem_run=$((time_end-time_start))
^^^^^^^
Ahem... Other than that, this looks good, thanks.
Thank you for your review!
My bad, I hesitated to keep this "feature", then I renamed the variables
just before sending the patch, in a hurry already thinking about what I
would put on my pizza... I will avoid redoing that next time!
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
976
days inactive
977
days old
4 comments
2 participants
participants (2)
-
Florian Westphal -
Matthieu Baerts