From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 5 Jul 2024 01:52:22 +0000 (-0700)
Subject: selftests: net: ksft: interrupt cleanly on KeyboardInterrupt
X-Git-Tag: v6.11-rc1~163^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0ee68a8bef9cf27e324a017691ee64b235c310e;p=thirdparty%2Flinux.git

selftests: net: ksft: interrupt cleanly on KeyboardInterrupt

It's very useful to be able to interrupt the tests during development.
Detect KeyboardInterrupt, run the cleanups and exit.

Link: https://patch.msgid.link/20240705015222.675840-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py
index 3aaa2748a58e4..f26c20df9db43 100644
--- a/tools/testing/selftests/net/lib/py/ksft.py
+++ b/tools/testing/selftests/net/lib/py/ksft.py
@@ -146,6 +146,7 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
 
     global KSFT_RESULT
     cnt = 0
+    stop = False
     for case in cases:
         KSFT_RESULT = True
         cnt += 1
@@ -160,10 +161,13 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
         except KsftXfailEx as e:
             comment = "XFAIL " + str(e)
             cnt_key = 'xfail'
-        except Exception as e:
+        except BaseException as e:
+            stop |= isinstance(e, KeyboardInterrupt)
             tb = traceback.format_exc()
             for line in tb.strip().split('\n'):
                 ksft_pr("Exception|", line)
+            if stop:
+                ksft_pr("Stopping tests due to KeyboardInterrupt.")
             KSFT_RESULT = False
             cnt_key = 'fail'
 
@@ -175,6 +179,9 @@ def ksft_run(cases=None, globs=None, case_pfx=None, args=()):
         ktap_result(KSFT_RESULT, cnt, case, comment=comment)
         totals[cnt_key] += 1
 
+        if stop:
+            break
+
     print(
         f"# Totals: pass:{totals['pass']} fail:{totals['fail']} xfail:{totals['xfail']} xpass:0 skip:{totals['skip']} error:0"
     )