* 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>
#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>
+#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
#define DEFAULT_CLOCK_IS_ABSOLUTE 0
#define DEFAULT_CLOCK_TIME 0
-static uint64_t current_time = 42;
+#define NR_TESTS 597
+
+static int64_t current_time = 42;
/* Return 1 if uuids match, zero if different. */
int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b)
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);
}
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);
}
"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),
"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"),
{
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);
const char *returned_clock_name;
const char *returned_clock_description;
const uint64_t frequency = 1123456789;
- const uint64_t offset_s = 1351530929945824323;
- const uint64_t offset = 1234567;
+ const int64_t offset_s = 1351530929945824323;
+ const int64_t offset = 1234567;
+ int64_t get_offset_s,
+ get_offset,
+ get_time;
const uint64_t precision = 10;
const int is_absolute = 0xFF;
char *metadata_string;
return -1;
}
- plan_no_plan();
+ plan_tests(NR_TESTS);
- if (!mkdtemp(trace_path)) {
+ if (!bt_mkdtemp(trace_path)) {
perror("# perror");
}
"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;
}
ok(bt_ctf_clock_get_frequency(clock) == frequency,
"bt_ctf_clock_get_frequency returns the correct frequency once it is set");
- ok(bt_ctf_clock_get_offset_s(clock) == DEFAULT_CLOCK_OFFSET_S,
+ ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0,
+ "bt_ctf_clock_get_offset_s succeeds");
+ ok(get_offset_s == DEFAULT_CLOCK_OFFSET_S,
"bt_ctf_clock_get_offset_s returns the correct default offset (in seconds)");
ok(bt_ctf_clock_set_offset_s(clock, offset_s) == 0,
"Set clock offset (seconds)");
- ok(bt_ctf_clock_get_offset_s(clock) == offset_s,
+ ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0,
+ "bt_ctf_clock_get_offset_s succeeds");
+ ok(get_offset_s == offset_s,
"bt_ctf_clock_get_offset_s returns the correct default offset (in seconds) once it is set");
- ok(bt_ctf_clock_get_offset(clock) == DEFAULT_CLOCK_OFFSET,
- "bt_ctf_clock_get_frequency returns the correct default offset (in ticks)");
+ ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0,
+ "bt_ctf_clock_get_offset succeeds");
+ ok(get_offset == DEFAULT_CLOCK_OFFSET,
+ "bt_ctf_clock_get_offset returns the correct default offset (in ticks)");
ok(bt_ctf_clock_set_offset(clock, offset) == 0, "Set clock offset");
- ok(bt_ctf_clock_get_offset(clock) == offset,
- "bt_ctf_clock_get_frequency returns the correct default offset (in ticks) once it is set");
+ ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0,
+ "bt_ctf_clock_get_offset succeeds");
+ ok(get_offset == offset,
+ "bt_ctf_clock_get_offset returns the correct default offset (in ticks) once it is set");
ok(bt_ctf_clock_get_precision(clock) == DEFAULT_CLOCK_PRECISION,
"bt_ctf_clock_get_precision returns the correct default precision");
ok(bt_ctf_clock_get_is_absolute(clock) == !!is_absolute,
"bt_ctf_clock_get_precision returns the correct is_absolute attribute once it is set");
- ok(bt_ctf_clock_get_time(clock) == DEFAULT_CLOCK_TIME,
+ ok(bt_ctf_clock_get_time(clock, &get_time) == 0,
+ "bt_ctf_clock_get_time succeeds");
+ ok(get_time == DEFAULT_CLOCK_TIME,
"bt_ctf_clock_get_time returns the correct default time");
ok(bt_ctf_clock_set_time(clock, current_time) == 0,
"Set clock time");
- ok(bt_ctf_clock_get_time(clock) == current_time,
+ ok(bt_ctf_clock_get_time(clock, &get_time) == 0,
+ "bt_ctf_clock_get_time succeeds");
+ ok(get_time == current_time,
"bt_ctf_clock_get_time returns the correct time once it is set");
ok(bt_ctf_writer_add_clock(writer, clock) == 0,
"bt_ctf_clock_get_frequency correctly handles NULL");
ok(bt_ctf_clock_get_precision(NULL) == -1ULL,
"bt_ctf_clock_get_precision correctly handles NULL");
- ok(bt_ctf_clock_get_offset_s(NULL) == -1ULL,
- "bt_ctf_clock_get_offset_s correctly handles NULL");
- ok(bt_ctf_clock_get_offset(NULL) == -1ULL,
- "bt_ctf_clock_get_offset correctly handles NULL");
+ ok(bt_ctf_clock_get_offset_s(NULL, &get_offset_s) < 0,
+ "bt_ctf_clock_get_offset_s correctly handles NULL clock");
+ ok(bt_ctf_clock_get_offset_s(clock, NULL) < 0,
+ "bt_ctf_clock_get_offset_s correctly handles NULL output");
+ ok(bt_ctf_clock_get_offset(NULL, &get_offset) < 0,
+ "bt_ctf_clock_get_offset correctly handles NULL clock");
+ ok(bt_ctf_clock_get_offset(clock, NULL) < 0,
+ "bt_ctf_clock_get_offset correctly handles NULL output");
ok(bt_ctf_clock_get_is_absolute(NULL) < 0,
"bt_ctf_clock_get_is_absolute correctly handles NULL");
- ok(bt_ctf_clock_get_time(NULL) == -1ULL,
- "bt_ctf_clock_get_time correctly handles NULL");
+ ok(bt_ctf_clock_get_time(NULL, &get_time) < 0,
+ "bt_ctf_clock_get_time correctly handles NULL clock");
+ ok(bt_ctf_clock_get_time(clock, NULL) < 0,
+ "bt_ctf_clock_get_time correctly handles NULL output");
ok(bt_ctf_clock_set_description(NULL, NULL) < 0,
"bt_ctf_clock_set_description correctly handles NULL clock");
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 */
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);
}
}
projects / babeltrace.git / blobdiff