X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=8b502d379e33168d22d75da92969298936f6ab8e;hb=3eb20877b87e3026c6a6ca7eeb7722cf28a5588c;hp=31fcb6264edfbe14576ec216b540bc2f764dc2e3;hpb=9962ad4bc65d2dc5800bb9e186cac6f54f2e430a;p=babeltrace.git diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 31fcb626..8b502d37 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -32,15 +32,14 @@ #include #include #include +#include #include #include #include -#include #include #include #include #include -#include #include #include "tap/tap.h" #include @@ -62,6 +61,14 @@ #define NR_TESTS 623 +struct bt_utsname { + char sysname[BABELTRACE_HOST_NAME_MAX]; + char nodename[BABELTRACE_HOST_NAME_MAX]; + char release[BABELTRACE_HOST_NAME_MAX]; + char version[BABELTRACE_HOST_NAME_MAX]; + char machine[BABELTRACE_HOST_NAME_MAX]; +}; + static int64_t current_time = 42; static unsigned int packet_resize_test_length = PACKET_RESIZE_TEST_DEF_LENGTH; @@ -91,83 +98,46 @@ static void validate_trace(char *parser_path, char *trace_path) { int ret = 0; - char babeltrace_output_path[] = "/tmp/babeltrace_output_XXXXXX"; - int babeltrace_output_fd = -1; + gchar *standard_error = NULL; + gint exit_status; + char *argv[] = {parser_path, trace_path, NULL}; - if (!trace_path) { + if (!parser_path || !trace_path) { ret = -1; goto result; } - babeltrace_output_fd = mkstemp(babeltrace_output_path); - unlink(babeltrace_output_path); - - if (babeltrace_output_fd == -1) { - diag("Failed to create a temporary file for trace parsing."); + if (!g_spawn_sync(NULL, + argv, + NULL, + G_SPAWN_STDOUT_TO_DEV_NULL, + NULL, + NULL, + NULL, + &standard_error, + &exit_status, + NULL)) { + diag("Failed to spawn babeltrace."); ret = -1; goto result; } - pid_t pid = fork(); - if (pid) { - int status = 0; - waitpid(pid, &status, 0); - ret = WIFEXITED(status) ? WEXITSTATUS(status) : -1; - } else { - ret = dup2(babeltrace_output_fd, STDOUT_FILENO); - if (ret < 0) { - perror("# dup2 babeltrace_output_fd to STDOUT"); - goto result; - } + /* Replace by g_spawn_check_exit_status when we require glib >= 2.34 */ +#if G_OS_UNIX + ret = WIFEXITED(exit_status) ? WEXITSTATUS(exit_status) : -1; +#else + ret = exit_status; +#endif - ret = dup2(babeltrace_output_fd, STDERR_FILENO); - if (ret < 0) { - perror("# dup2 babeltrace_output_fd to STDERR"); - goto result; - } - - execl(parser_path, parser_path, trace_path, NULL); - perror("# Could not launch the babeltrace process"); - exit(-1); + if (ret != 0) { + diag("Babeltrace returned an error."); + diag_multiline(standard_error); + goto result; } + result: ok(ret == 0, "Babeltrace could read the resulting trace"); - - if (ret && babeltrace_output_fd >= 0) { - char *line; - size_t len = METADATA_LINE_SIZE; - FILE *babeltrace_output_fp = NULL; - - babeltrace_output_fp = fdopen(babeltrace_output_fd, "r"); - if (!babeltrace_output_fp) { - perror("fdopen on babeltrace_output_fd"); - goto close_fp; - } - babeltrace_output_fd = -1; - - line = malloc(len); - if (!line) { - diag("malloc error"); - } - rewind(babeltrace_output_fp); - while (bt_getline(&line, &len, babeltrace_output_fp) > 0) { - diag("%s", line); - } - - free(line); -close_fp: - if (babeltrace_output_fp) { - if (fclose(babeltrace_output_fp)) { - diag("fclose error"); - } - } - } - - if (babeltrace_output_fd >= 0) { - if (close(babeltrace_output_fd)) { - diag("close error"); - } - } + g_free(standard_error); } static @@ -2431,7 +2401,7 @@ static void test_create_writer_vs_non_writer_mode(void) { int ret; - char trace_path[] = "/tmp/ctfwriter_XXXXXX"; + gchar *trace_path; const char *writer_stream_name = "writer stream instance"; struct bt_ctf_writer *writer = NULL; struct bt_ctf_trace *writer_trace = NULL; @@ -2454,6 +2424,7 @@ void test_create_writer_vs_non_writer_mode(void) struct bt_ctf_packet *packet = NULL; struct bt_ctf_packet *packet2 = NULL; + trace_path = g_build_filename(g_get_tmp_dir(), "ctfwriter_XXXXXX", NULL); if (!bt_mkdtemp(trace_path)) { perror("# perror"); } @@ -2623,6 +2594,7 @@ void test_create_writer_vs_non_writer_mode(void) bt_put(packet); bt_put(packet2); recursive_rmdir(trace_path); + g_free(trace_path); } static @@ -2831,8 +2803,8 @@ void test_trace_uuid(void) int main(int argc, char **argv) { const char *env_resize_length; - char trace_path[] = "/tmp/ctfwriter_XXXXXX"; - char metadata_path[sizeof(trace_path) + 9]; + gchar *trace_path; + gchar *metadata_path; const char *clock_name = "test_clock"; const char *clock_description = "This is a test clock"; const char *returned_clock_name; @@ -2846,8 +2818,8 @@ int main(int argc, char **argv) const int is_absolute = 0xFF; char *metadata_string; struct bt_ctf_writer *writer; - struct utsname name; - char hostname[BABELTRACE_HOST_NAME_MAX]; + struct bt_utsname name = {"GNU/Linux", "testhost", "4.4.0-87-generic", + "#110-Ubuntu SMP Tue Jul 18 12:55:35 UTC 2017", "x86_64"}; struct bt_ctf_clock *clock, *ret_clock; struct bt_ctf_clock_class *ret_clock_class; struct bt_ctf_stream_class *stream_class, *ret_stream_class; @@ -2883,12 +2855,12 @@ int main(int argc, char **argv) plan_tests(NR_TESTS); + trace_path = g_build_filename(g_get_tmp_dir(), "ctfwriter_XXXXXX", NULL); if (!bt_mkdtemp(trace_path)) { perror("# perror"); } - strcpy(metadata_path, trace_path); - strcat(metadata_path + sizeof(trace_path) - 1, "/metadata"); + metadata_path = g_build_filename(trace_path, "metadata", NULL); writer = bt_ctf_writer_create(trace_path); ok(writer, "bt_ctf_create succeeds in creating trace with path"); @@ -2908,13 +2880,9 @@ int main(int argc, char **argv) "bt_ctf_trace_get_native_byte_order returns a correct endianness"); /* Add environment context to the trace */ - ret = gethostname(hostname, sizeof(hostname)); - if (ret < 0) { - return ret; - } - ok(bt_ctf_writer_add_environment_field(writer, "host", hostname) == 0, + ok(bt_ctf_writer_add_environment_field(writer, "host", name.nodename) == 0, "Add host (%s) environment field to writer instance", - hostname); + name.nodename); ok(bt_ctf_writer_add_environment_field(NULL, "test_field", "test_value"), "bt_ctf_writer_add_environment_field error with NULL writer"); @@ -3038,12 +3006,6 @@ int main(int argc, char **argv) "bt_ctf_trace_get_environment_field_value successfully replaces an existing field"); BT_PUT(obj); - /* On Solaris, uname() can return any positive value on success */ - if (uname(&name) < 0) { - perror("uname"); - return -1; - } - ok(bt_ctf_writer_add_environment_field(writer, "sysname", name.sysname) == 0, "Add sysname (%s) environment field to writer instance", name.sysname); @@ -3513,6 +3475,9 @@ int main(int argc, char **argv) validate_trace(argv[1], trace_path); - //recursive_rmdir(trace_path); + recursive_rmdir(trace_path); + g_free(trace_path); + g_free(metadata_path); + return 0; }