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 4ea02bccb0eadf8abf15024732f690611e738cf4..53613c916acd9dc7f2e63e69c052b0e186cdae49 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <sys/utsname.h>
 #include <babeltrace/compat/limits.h>
+#include <babeltrace/compat/stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
@@ -38,6 +39,7 @@
 #include <fcntl.h>
 #include <babeltrace/compat/dirent.h>
 #include "tap/tap.h"
+#include <sys/stat.h>
 
 #define METADATA_LINE_SIZE 512
 #define SEQUENCE_TEST_LENGTH 10
@@ -92,7 +94,7 @@ void validate_metadata(char *parser_path, char *metadata_path)
                        goto result;
                }
 
-               execl(parser_path, "ctf-parser-test", NULL);
+               execl(parser_path, parser_path, (char *) NULL);
                perror("# Could not launch the ctf metadata parser process");
                exit(-1);
        }
@@ -126,12 +128,12 @@ result:
                rewind(metadata_fp);
 
                /* Output the metadata and parser output as diagnostic */
-               while (getline(&line, &len, metadata_fp) > 0) {
+               while (bt_getline(&line, &len, metadata_fp) > 0) {
                        diag("%s", line);
                }
 
                rewind(parser_output_fp);
-               while (getline(&line, &len, parser_output_fp) > 0) {
+               while (bt_getline(&line, &len, parser_output_fp) > 0) {
                        diag("%s", line);
                }
 
@@ -199,7 +201,7 @@ void validate_trace(char *parser_path, char *trace_path)
                        goto result;
                }
 
-               execl(parser_path, "babeltrace", trace_path, NULL);
+               execl(parser_path, parser_path, trace_path, (char *) NULL);
                perror("# Could not launch the babeltrace process");
                exit(-1);
        }
@@ -223,7 +225,7 @@ result:
                        diag("malloc error");
                }
                rewind(babeltrace_output_fp);
-               while (getline(&line, &len, babeltrace_output_fp) > 0) {
+               while (bt_getline(&line, &len, babeltrace_output_fp) > 0) {
                        diag("%s", line);
                }
 
@@ -505,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,
@@ -611,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");
@@ -638,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,
@@ -845,7 +832,19 @@ int main(int argc, char **argv)
 
        struct dirent *entry;
        while ((entry = readdir(trace_dir))) {
-               if (entry->d_type == DT_REG) {
+               struct stat st;
+               char filename[PATH_MAX];
+
+               if (snprintf(filename, sizeof(filename), "%s/%s",
+                                       trace_path, entry->d_name) <= 0) {
+                       continue;
+               }
+
+               if (stat(entry->d_name, &st)) {
+                       continue;
+               }
+
+               if (S_ISREG(st.st_mode)) {
                        unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
                }
        }