Port: Add compat for dirfd

[deliverable/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 e50b213d0ba0ed973e7c12b2b3e36e59aae4dfb8..6617412cd2130a358c33c733fa12f78c8dba4950 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -31,7 +31,7 @@
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/values.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <babeltrace/compat/stdlib.h>
 #include <stdio.h>
 #include <sys/utsname.h>
 #include <babeltrace/compat/limits.h>
@@ -39,7 +39,7 @@
 #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>
@@ -953,7 +953,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_get_id returns the correct value");
 
        /* Test event class attributes */
-       assert(obj = bt_value_integer_create_init(15));
+       obj = bt_value_integer_create_init(15);
+       assert(obj);
        ok(bt_ctf_event_class_set_attribute(NULL, "id", obj),
                "bt_ctf_event_class_set_attribute handles a NULL event class correctly");
        ok(bt_ctf_event_class_set_attribute(event_class, NULL, obj),
@@ -992,7 +993,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_get_attribute_value_by_name returns the correct value");
        BT_PUT(obj);
 
-       assert(obj = bt_value_string_create_init("nu name"));
+       obj = bt_value_string_create_init("nu name");
+       assert(obj);
        assert(!bt_ctf_event_class_set_attribute(event_class, "name", obj));
        ret_string = bt_ctf_event_class_get_name(event_class);
        ok(!strcmp(ret_string, "nu name"),
@@ -2630,7 +2632,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 {
        struct bt_ctf_event_class *event_class;
 
-       assert(event_class = bt_ctf_event_class_create("Simple Event"));
+       event_class = bt_ctf_event_class_create("Simple Event");
+       assert(event_class);
        ok(bt_ctf_stream_class_add_event_class(stream_class, event_class),
                "two event classes with the same name cannot cohabit within the same stream class");
        bt_put(event_class);
@@ -2687,7 +2690,7 @@ int main(int argc, char **argv)
 
        plan_no_plan();
 
-       if (!mkdtemp(trace_path)) {
+       if (!bt_mkdtemp(trace_path)) {
                perror("# perror");
        }
 
@@ -2842,7 +2845,8 @@ int main(int argc, char **argv)
                "bt_ctf_trace_get_environment_field_value successfully replaces an existing field");
        BT_PUT(obj);
 
-       if (uname(&name)) {
+       /* On Solaris, uname() can return any positive value on success */
+       if (uname(&name) < 0) {
                perror("uname");
                return -1;
        }
@@ -3295,7 +3299,7 @@ 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);
+                       unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
                }
        }