Port: Add compat for dirfd

[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 b626a66f08f2dc5b7b27e4a25c344d4047965cca..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>
@@ -2690,7 +2690,7 @@ int main(int argc, char **argv)
 
        plan_no_plan();
 
-       if (!mkdtemp(trace_path)) {
+       if (!bt_mkdtemp(trace_path)) {
                perror("# perror");
        }
 
@@ -2845,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;
        }
@@ -3298,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);
                }
        }