Tests: Fix test plans and do not skip on fail

[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 a5b22d23581e2ec3deeeb916d401a69cebd73636..d246510e9fae0e88564cd9bdf5b76f193d4ecd2e 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -19,7 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <babeltrace/ctf-writer/writer.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/stream.h>
@@ -35,14 +34,16 @@
 #include <stdio.h>
 #include <sys/utsname.h>
 #include <babeltrace/compat/limits.h>
+#include <babeltrace/compat/stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <sys/wait.h>
 #include <fcntl.h>
-#include <dirent.h>
+#include <babeltrace/compat/dirent.h>
 #include "tap/tap.h"
 #include <math.h>
 #include <float.h>
+#include <sys/stat.h>
 
 #define METADATA_LINE_SIZE 512
 #define SEQUENCE_TEST_LENGTH 10
@@ -56,6 +57,8 @@
 #define DEFAULT_CLOCK_IS_ABSOLUTE 0
 #define DEFAULT_CLOCK_TIME 0
 
+#define NR_TESTS 588
+
 static uint64_t current_time = 42;
 
 /* Return 1 if uuids match, zero if different. */
@@ -160,12 +163,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) {
                        fprintf(stderr, "# %s", line);
                }
 
                rewind(parser_output_fp);
-               while (getline(&line, &len, parser_output_fp) > 0) {
+               while (bt_getline(&line, &len, parser_output_fp) > 0) {
                        fprintf(stderr, "# %s", line);
                }
 
@@ -257,7 +260,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);
                }
 
@@ -2688,7 +2691,7 @@ int main(int argc, char **argv)
                return -1;
        }
 
-       plan_no_plan();
+       plan_tests(NR_TESTS);
 
        if (!bt_mkdtemp(trace_path)) {
                perror("# perror");
@@ -3284,9 +3287,6 @@ int main(int argc, char **argv)
        bt_put(packet_header_field);
        bt_put(trace);
        free(metadata_string);
-
-       ok(bt_ctf_stream_class_get_trace(stream_class) == NULL,
-               "bt_ctf_stream_class_get_trace returns NULL after its trace has been reclaimed");
        bt_put(stream_class);
 
        /* Remove all trace files and delete temporary trace directory */
@@ -3298,8 +3298,20 @@ int main(int argc, char **argv)
 
        struct dirent *entry;
        while ((entry = readdir(trace_dir))) {
-               if (entry->d_type == DT_REG) {
-                       unlinkat(dirfd(trace_dir), entry->d_name, 0);
+               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);
                }
        }