X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser-test.c;h=72c45885dc939f62c1622fd0aea08e6ad7895d77;hp=9f481743d7a723be28ac8771f497b90e4dd2a2ff;hb=43e34335c78d923564d369e9af46b634ce9ad55f;hpb=67905e421502703d87176702b4844f70fd60ded4

diff --git a/formats/ctf/metadata/ctf-parser-test.c b/formats/ctf/metadata/ctf-parser-test.c
index 9f481743..72c45885 100644
--- a/formats/ctf/metadata/ctf-parser-test.c
+++ b/formats/ctf/metadata/ctf-parser-test.c
@@ -20,39 +20,56 @@
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
+#include <babeltrace/endian.h>
+#include <babeltrace/babeltrace-internal.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;
+	babeltrace_verbose = 1;
 	scanner = ctf_scanner_alloc(stdin);
 	if (!scanner) {
 		fprintf(stderr, "Error allocating scanner\n");
 		return -ENOMEM;
 	}
-	ctf_scanner_append_ast(scanner);
+	ret = ctf_scanner_append_ast(scanner);
+	if (ret) {
+		fprintf(stderr, "Error creating AST\n");
+		goto end;
+	}
 
-	ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
+	ret = ctf_visitor_print_xml(stderr, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stderr, "error visiting AST for XML output\n");
+		fprintf(stderr, "Error visiting AST for XML output\n");
 		goto end;
 	}
 
-	ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
+	ret = ctf_visitor_semantic_check(stderr, 0, &scanner->ast->root);
 	if (ret) {
-		fprintf(stderr, "CTF semantic validation error %d\n", ret);
+		fprintf(stderr, "Error in CTF semantic validation %d\n", ret);
 		goto end;
 	}
+	trace = malloc(sizeof(*trace));
+	memset(trace, 0, sizeof(*trace));
+	ret = ctf_visitor_construct_metadata(stderr, 0, &scanner->ast->root,
+			trace, BYTE_ORDER);
+	if (ret) {
+		fprintf(stderr, "Error in CTF metadata constructor %d\n", ret);
+		goto free_trace;
+	}
+free_trace:
+	free(trace);
 end:
 	ctf_scanner_free(scanner);
 	return ret;
 } 
-
-