[LTP] [PATCH] metaparse: ignore macros in tst_test structure parsing

[LTP] [PATCH] metaparse: ignore macros in tst_test structure parsing

[Cyril Hrubis]

All we need to do is to drop all lines starting with '#'.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
This is needed on the top of:

http://patchwork.ozlabs.org/project/ltp/patch/20250429135542.19680-1-chrubis@suse.cz/

In order to produce a proper metadata JSON.

 metadata/metaparse.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/metadata/metaparse.c b/metadata/metaparse.c
index 2b96149dc..9723a92c2 100644
--- a/metadata/metaparse.c
+++ b/metadata/metaparse.c
@@ -25,7 +25,7 @@ static char *includepath;
 
 #define WARN(str) fprintf(stderr, "WARNING: " str "\n")
 
-static void oneline_comment(FILE *f)
+static void remove_to_newline(FILE *f)
 {
 	int c;
 
@@ -126,7 +126,7 @@ static void maybe_comment(FILE *f, struct data_node *doc)
 
 	switch (c) {
 	case '/':
-		oneline_comment(f);
+		remove_to_newline(f);
 	break;
 	case '*':
 		maybe_doc_comment(f, doc);
@@ -571,6 +571,11 @@ static int parse_test_struct(FILE *f, struct data_node *doc, struct data_node *n
 		if (!strcmp(token, "}"))
 			return 0;
 
+		if (!strcmp(token, "#")) {
+			remove_to_newline(f);
+			continue;
+		}
+
 		switch (state) {
 		case 0:
 			id = strdup(token);
-- 
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] metaparse: ignore macros in tst_test structure parsing

[Petr Vorel]

Hi Cyril,

> All we need to do is to drop all lines starting with '#'.

LGTM.

Reviewed-by: Petr Vorel <pvorel@suse.cz>

It'd make sense to mention why you need it - to ignore e.g.
#ifdef __x86_64__

(I first thought where it was needed, but it's a preparation for the cleanup you
proposed in
http://patchwork.ozlabs.org/project/ltp/patch/20250429135542.19680-1-chrubis@suse.cz/ ).

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] metaparse: ignore macros in tst_test structure parsing

[Cyril Hrubis]

Hi!
> (I first thought where it was needed, but it's a preparation for the cleanup you
> proposed in
> http://patchwork.ozlabs.org/project/ltp/patch/20250429135542.19680-1-chrubis@suse.cz/ ).

Indeed, this patch is needed in order to produce a valid JSON metadata
once we start adding preprocessor directives in the middle of tst_test
structure.

Thanks for the review, I've pushed this one, and the change to the
tst_test library too.

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp