Fix: ctf writer test on Cygwin

[babeltrace.git] / tests / lib / test_ctf_writer.c

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index ee979f0b1b3f5a88c783752f478d936b43a42f63..53613c916acd9dc7f2e63e69c052b0e186cdae49 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -94,7 +94,7 @@ void validate_metadata(char *parser_path, char *metadata_path)
                        goto result;
                }
 
-               execl(parser_path, "ctf-parser-test", (char *) NULL);
+               execl(parser_path, parser_path, (char *) NULL);
                perror("# Could not launch the ctf metadata parser process");
                exit(-1);
        }
@@ -201,7 +201,7 @@ void validate_trace(char *parser_path, char *trace_path)
                        goto result;
                }
 
-               execl(parser_path, "babeltrace", trace_path, (char *) NULL);
+               execl(parser_path, parser_path, trace_path, (char *) NULL);
                perror("# Could not launch the babeltrace process");
                exit(-1);
        }
@@ -507,8 +507,6 @@ void type_field_tests()
        struct bt_ctf_field_type *uint_12_type =
                bt_ctf_field_type_integer_create(12);
        struct bt_ctf_field_type *enumeration_type;
-       struct bt_ctf_field_type *enumeration_sequence_type;
-       struct bt_ctf_field_type *enumeration_array_type;
 
        ok(uint_12_type, "Create an unsigned integer type");
        ok(bt_ctf_field_type_integer_set_base(uint_12_type,
@@ -613,17 +611,6 @@ void type_field_tests()
        enumeration_type = bt_ctf_field_type_enumeration_create(uint_12_type);
        ok(enumeration_type,
                "Create an enumeration type with an unsigned 12-bit integer as container");
-       enumeration_sequence_type = bt_ctf_field_type_sequence_create(
-               enumeration_type, "count");
-       ok(!enumeration_sequence_type,
-               "Check enumeration types are validated when creating a sequence");
-       enumeration_array_type = bt_ctf_field_type_array_create(
-               enumeration_type, 10);
-       ok(!enumeration_array_type,
-               "Check enumeration types are validated when creating an array");
-       ok(bt_ctf_field_type_structure_add_field(composite_structure_type,
-               enumeration_type, "enumeration"),
-               "Check enumeration types are validated when adding them as structure members");
        enumeration = bt_ctf_field_create(enumeration_type);
        ok(!enumeration,
                "Check enumeration types are validated before instantiation");
@@ -640,8 +627,6 @@ void type_field_tests()
        bt_ctf_field_type_put(int_16_type);
        bt_ctf_field_type_put(uint_12_type);
        bt_ctf_field_type_put(enumeration_type);
-       bt_ctf_field_type_put(enumeration_sequence_type);
-       bt_ctf_field_type_put(enumeration_array_type);
 }
 
 void packet_resize_test(struct bt_ctf_stream_class *stream_class,