From ad664ffc7a7efdf6fba793442d7dc81df7c7a195 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 28 Feb 2024 10:09:20 +0100 Subject: [PATCH 1/2] test: fix util_poolset test to work w/o ndctl Signed-off-by: Tomasz Gromadzki --- src/test/util_poolset/grep7.log.match | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/util_poolset/grep7.log.match b/src/test/util_poolset/grep7.log.match index b89d04ba9fb..c6a96c6a44f 100644 --- a/src/test/util_poolset/grep7.log.match +++ b/src/test/util_poolset/grep7.log.match @@ -3,9 +3,6 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)util_poolset$(nW) ut version 1.0 -src version: $(nW) -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ the NOHDRS poolset option is not supported for local poolsets the NOHDRS poolset option is not supported for local poolsets the NOHDRS poolset option is not supported for local poolsets From 13c1deca7e4598ba8f5f338dec1b96528128aef8 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 28 Feb 2024 10:34:49 +0100 Subject: [PATCH 2/2] test: fix test for non-ndctl build Signed-off-by: Tomasz Gromadzki --- src/test/arch_flags/log0.log.match | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/arch_flags/log0.log.match b/src/test/arch_flags/log0.log.match index bb87a7f820b..f55300c8a02 100644 --- a/src/test/arch_flags/log0.log.match +++ b/src/test/arch_flags/log0.log.match @@ -3,7 +3,6 @@ $(OPT): <1> [$(*)]$(W)compiled with support for shutdown state $(OPT): <1> [$(*)]$(W)compiled with libndctl 63+ : <1> [$(*)]$(W)pid $(nW): program: $(nW) : <1> [$(*)]$(W)arch_flags version 0.0 -: <1> [$(*)]$(W)src version: $(nW) $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind pmemcheck $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind helgrind $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind memcheck