From 1845598356b4f044a33ed7dc0bbae084117825fc Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Thu, 26 Sep 2024 20:24:10 -0400 Subject: [PATCH] fix --- .../daos_dtx/00_harmonize_VOS_pool_path.patch | 2 +- src/test/daos_dtx/08_cmocka_filter_fix.patch | 21 +++++++++++++++++++ src/test/daos_dtx/README.md | 2 ++ src/test/daos_dtx/TESTS.py | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/test/daos_dtx/08_cmocka_filter_fix.patch diff --git a/src/test/daos_dtx/00_harmonize_VOS_pool_path.patch b/src/test/daos_dtx/00_harmonize_VOS_pool_path.patch index 9808020418..508edc3341 100644 --- a/src/test/daos_dtx/00_harmonize_VOS_pool_path.patch +++ b/src/test/daos_dtx/00_harmonize_VOS_pool_path.patch @@ -48,7 +48,7 @@ index 618f9feddd..7452ba2a34 100644 + char uuid_str2[] = "591d19e4-69fe-11ef-b13d-a4bf0165c389"; memset(tcx, 0, sizeof(*tcx)); -+ ++ + uuid_parse(uuid_str, tcx->tc_po_uuid); + // uuid_generate_time_safe(tcx->tc_po_uuid); + // uuid_unparse(tcx->tc_po_uuid, uuid_str); diff --git a/src/test/daos_dtx/08_cmocka_filter_fix.patch b/src/test/daos_dtx/08_cmocka_filter_fix.patch new file mode 100644 index 0000000000..c1f511dcdb --- /dev/null +++ b/src/test/daos_dtx/08_cmocka_filter_fix.patch @@ -0,0 +1,21 @@ +diff --git a/src/dtx/tests/dtx_tests.c b/src/dtx/tests/dtx_tests.c +index b06a2f4ea8..7236a2bda0 100644 +--- a/src/dtx/tests/dtx_tests.c ++++ b/src/dtx/tests/dtx_tests.c +@@ -61,6 +61,7 @@ int + main(int argc, char **argv) + { + int rc = 0; ++ char filter[1024]; + int nr_failed = 0; + int opt = 0; + int index = 0; +@@ -107,8 +108,6 @@ main(int argc, char **argv) + #if CMOCKA_FILTER_SUPPORTED == 1 /** requires cmocka 1.1.5 */ + { + /** Add wildcards for easier filtering */ +- char filter[sizeof(optarg) + 2]; +- + sprintf(filter, "*%s*", optarg); + cmocka_set_test_filter(filter); + printf("Test filter: %s\n", filter); diff --git a/src/test/daos_dtx/README.md b/src/test/daos_dtx/README.md index ecd57428ea..9326fb9ae0 100644 --- a/src/test/daos_dtx/README.md +++ b/src/test/daos_dtx/README.md @@ -25,3 +25,5 @@ in the respective teardown. - introduces a basic DTX life-cycle UT - `07_disable_ABT_init.patch` which: - prevents ABT from screwing with Valgrind +- `08_cmocka_filter_fix.patch` which: + - fix cmocka's filter (invalid size calculation) diff --git a/src/test/daos_dtx/TESTS.py b/src/test/daos_dtx/TESTS.py index caa0f3593d..06a6c4bb9c 100755 --- a/src/test/daos_dtx/TESTS.py +++ b/src/test/daos_dtx/TESTS.py @@ -20,8 +20,8 @@ class DTX_TESTS(t.Test): def run(self, ctx): cmd = ['dtx_tests', '-S', ctx.testdir] - ctx.exec(*cmd, '-e', 'DTX400.a', cmd_requires_cwd=False) - ctx.exec(*cmd, '-e', 'DTX400.b', cmd_requires_cwd=False) + ctx.exec(*cmd, '-f', 'DTX400.a', cmd_requires_cwd=False) + ctx.exec(*cmd, '-f', 'DTX400.b', cmd_requires_cwd=False) @t.require_valgrind_enabled('memcheck')