X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=9d92aa61c1d9b70db1d8b1c3a328a0b616e11af3;hb=a046cf3cdf5682791b87221bfc7c13c80e96df00;hp=92f070e5f71c121bc3012256f569db621af2204e;hpb=729950287a59eb7e6dce1d5a05234af2bd4e7db4;p=babeltrace.git diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 92f070e5..9d92aa61 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -44,7 +44,7 @@ #include "tap/tap.h" #include #include -#include +#include "common.h" #define METADATA_LINE_SIZE 512 #define SEQUENCE_TEST_LENGTH 10 @@ -59,11 +59,12 @@ #define DEFAULT_CLOCK_TIME 0 #define DEFAULT_CLOCK_VALUE 0 -#define NR_TESTS 605 +#define NR_TESTS 606 static int64_t current_time = 42; /* Return 1 if uuids match, zero if different. */ +static int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b) { int ret = 0; @@ -84,6 +85,7 @@ end: return ret; } +static void validate_metadata(char *parser_path, char *metadata_path) { int ret = 0; @@ -200,6 +202,7 @@ close_fp: } } +static void validate_trace(char *parser_path, char *trace_path) { int ret = 0; @@ -282,6 +285,7 @@ close_fp: } } +static void append_simple_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream *stream, struct bt_ctf_clock *clock) { @@ -489,7 +493,8 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_get_context_type returns the appropriate type"); bt_put(returned_type); - bt_ctf_stream_class_add_event_class(stream_class, simple_event_class); + ok(!bt_ctf_stream_class_add_event_class(stream_class, simple_event_class), + "Adding simple event class to stream class"); /* * bt_ctf_stream_class_add_event_class() copies the field types @@ -698,6 +703,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, bt_put(ep_enum_field_unsigned_type); } +static void append_complex_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream *stream, struct bt_ctf_clock *clock) { @@ -1278,8 +1284,9 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, bt_put(event); } -static void field_copy_tests_validate_same_type(struct bt_ctf_field *field, - struct bt_ctf_field_type *expected_type, const char *name) +static +void field_copy_tests_validate_same_type(struct bt_ctf_field *field, + struct bt_ctf_field_type *expected_type, const char *name) { struct bt_ctf_field_type *copy_type; @@ -1289,13 +1296,15 @@ static void field_copy_tests_validate_same_type(struct bt_ctf_field *field, bt_put(copy_type); } -static void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a, - struct bt_ctf_field *field_b, const char *name) +static +void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a, + struct bt_ctf_field *field_b, const char *name) { ok(field_a != field_b, "bt_ctf_field_copy creates different pointers (%s)", name); } +static void field_copy_tests() { struct bt_ctf_field_type *len_type = NULL; @@ -1805,6 +1814,7 @@ void field_copy_tests() bt_put(strct_copy); } +static void type_field_tests() { struct bt_ctf_field *uint_12; @@ -2087,6 +2097,7 @@ void type_field_tests() bt_put(returned_type); } +static void packet_resize_test(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream *stream, struct bt_ctf_clock *clock) { @@ -2228,6 +2239,7 @@ end: bt_put(ep_type); } +static void test_empty_stream(struct bt_ctf_writer *writer) { int ret = 0; @@ -2273,6 +2285,7 @@ end: bt_put(stream_class); } +static void test_custom_event_header_stream(struct bt_ctf_writer *writer) { int i, ret; @@ -2478,6 +2491,7 @@ end: bt_put(event_header_type); } +static void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) { int ret = 0; @@ -2594,6 +2608,7 @@ end: bt_put(clock); } +static void append_existing_event_class(struct bt_ctf_stream_class *stream_class) { struct bt_ctf_event_class *event_class; @@ -2612,6 +2627,7 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class) bt_put(event_class); } +static void test_trace_stream_class_clock(void) { struct bt_ctf_trace *trace = NULL; @@ -2870,8 +2886,10 @@ void test_create_writer_vs_non_writer_mode(void) bt_put(non_writer_clock); bt_put(packet); bt_put(packet2); + recursive_rmdir(trace_path); } +static void test_clock_utils(void) { int ret; @@ -3256,7 +3274,7 @@ int main(int argc, char **argv) ok(bt_ctf_clock_set_uuid(clock, NULL) < 0, "bt_ctf_clock_set_uuid correctly handles a NULL UUID"); ok(bt_ctf_clock_set_uuid(clock, tmp_uuid) == 0, - "bt_ctf_clock_set_uuid sets a new uuid succesfully"); + "bt_ctf_clock_set_uuid sets a new uuid successfully"); ret_uuid = bt_ctf_clock_get_uuid(clock); ok(ret_uuid, "bt_ctf_clock_get_uuid returns a UUID after setting a new one"); @@ -3586,33 +3604,6 @@ int main(int argc, char **argv) free(metadata_string); bt_put(stream_class); - /* Remove all trace files and delete temporary trace directory */ - DIR *trace_dir = opendir(trace_path); - if (!trace_dir) { - perror("# opendir"); - return -1; - } - - struct dirent *entry; - while ((entry = readdir(trace_dir))) { - 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); - } - } - - rmdir(trace_path); - closedir(trace_dir); + recursive_rmdir(trace_path); return 0; }