X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser-test.c;h=fdde409e0ee114bbb98ecc4f230e9dbc5faddeac;hp=47ee6b8a27489e2ca8bb6367c9bddb25c15ca527;hb=a398348262109d4272d93b787014e9c901d99b67;hpb=34f7b02c8e97da51ff316e802160d17d2a418d87

diff --git a/formats/ctf/metadata/ctf-parser-test.c b/formats/ctf/metadata/ctf-parser-test.c
index 47ee6b8a..fdde409e 100644
--- a/formats/ctf/metadata/ctf-parser-test.c
+++ b/formats/ctf/metadata/ctf-parser-test.c
@@ -20,39 +20,53 @@
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
+#include <endian.h>
+#include <babeltrace/ctf/metadata.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-extern int yydebug;
+int babeltrace_verbose, babeltrace_debug;
 
 int main(int argc, char **argv)
 {
 	struct ctf_scanner *scanner;
+	struct ctf_trace *trace;
 	int ret = 0;
 
-	yydebug = 1;
+	babeltrace_debug = 1;
 	scanner = ctf_scanner_alloc(stdin);
 	if (!scanner) {
 		fprintf(stdout, "Error allocating scanner\n");
 		return -ENOMEM;
 	}
-	ctf_scanner_append_ast(scanner);
+	ret = ctf_scanner_append_ast(scanner);
+	if (ret) {
+		fprintf(stdout, "Error creating AST\n");
+		goto end;
+	}
 
 	ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stdout, "error visiting AST for XML output\n");
+		fprintf(stdout, "Error visiting AST for XML output\n");
 		goto end;
 	}
 
 	ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stdout, "CTF semantic validation error %d\n", ret);
+		fprintf(stdout, "Error in CTF semantic validation %d\n", ret);
 		goto end;
 	}
+	trace = malloc(sizeof(*trace));
+	ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
+			trace, BYTE_ORDER);
+	if (ret) {
+		fprintf(stdout, "Error in CTF metadata constructor %d\n", ret);
+		goto free_trace;
+	}
+free_trace:
+	free(trace);
 end:
 	ctf_scanner_free(scanner);
 	return ret;
 } 
-
-