From fd3d965ddea25cabcda450f3bae23af3039fc674 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Wed, 26 Oct 2022 16:23:58 +0200
Subject: [PATCH] Allow use of libnux hwsimtest runner outside of libnux
* requires to not always add the special case'd tests from libnux
to the testset
Change-Id: I3677e910540f772642d85fdb4d6df3f48b3945bc
---
tests/hw/libnux/test_hwsimtests_vx_v2.py | 3 ++-
tests/hw/libnux/test_hwsimtests_vx_v3.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/hw/libnux/test_hwsimtests_vx_v2.py b/tests/hw/libnux/test_hwsimtests_vx_v2.py
index 502a846..9390758 100644
--- a/tests/hw/libnux/test_hwsimtests_vx_v2.py
+++ b/tests/hw/libnux/test_hwsimtests_vx_v2.py
@@ -87,7 +87,8 @@ class LibnuxHwSimTestsVx(unittest.TestCase):
setattr(LibnuxHwSimTestsVx, test.name, test_method)
-LibnuxHwSimTestsVx.TESTS.update(get_special_binaries("vx", "v2"))
+LibnuxHwSimTestsVx.TESTS.update(
+ get_special_binaries("vx", "v2").intersection(find_binaries("vx", "v2")))
LibnuxHwSimTestsVx.TESTS.update(find_binaries("vx", "v2"))
LibnuxHwSimTestsVx.generate_cases()
diff --git a/tests/hw/libnux/test_hwsimtests_vx_v3.py b/tests/hw/libnux/test_hwsimtests_vx_v3.py
index 42b0faa..0f13cba 100644
--- a/tests/hw/libnux/test_hwsimtests_vx_v3.py
+++ b/tests/hw/libnux/test_hwsimtests_vx_v3.py
@@ -87,7 +87,8 @@ class LibnuxHwSimTestsVx(unittest.TestCase):
setattr(LibnuxHwSimTestsVx, test.name, test_method)
-LibnuxHwSimTestsVx.TESTS.update(get_special_binaries("vx", "v3"))
+LibnuxHwSimTestsVx.TESTS.update(
+ get_special_binaries("vx", "v3").intersection(find_binaries("vx", "v3")))
LibnuxHwSimTestsVx.TESTS.update(find_binaries("vx", "v3"))
LibnuxHwSimTestsVx.generate_cases()
--
GitLab