projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: Remove statement which has no side-effect
[lttng-tools.git]
/
tests
/
unit
/
test_kernel_data.c
diff --git
a/tests/unit/test_kernel_data.c
b/tests/unit/test_kernel_data.c
index 1359b7fa8d97386253ac6b4bb7a22f80e095acb9..603d54cb251333e28bd37e5c62e8cc7009f2d911 100644
(file)
--- a/
tests/unit/test_kernel_data.c
+++ b/
tests/unit/test_kernel_data.c
@@
-30,17
+30,18
@@
#include <tap/tap.h>
#include <tap/tap.h>
-/* This path will NEVER be created in this test */
-#define PATH1 "/tmp/.test-junk-lttng"
-
#define RANDOM_STRING_LEN 11
/* Number of TAP tests in this file */
#define NUM_TESTS 10
#define RANDOM_STRING_LEN 11
/* Number of TAP tests in this file */
#define NUM_TESTS 10
-/* For
lttnger
r.h */
+/* For
erro
r.h */
int lttng_opt_quiet = 1;
int lttng_opt_verbose;
int lttng_opt_quiet = 1;
int lttng_opt_verbose;
+int lttng_opt_mi;
+
+int ust_consumerd32_fd;
+int ust_consumerd64_fd;
static const char alphanum[] =
"0123456789"
static const char alphanum[] =
"0123456789"
@@
-69,7
+70,7
@@
static char *get_random_string(void)
static void test_create_one_kernel_session(void)
{
static void test_create_one_kernel_session(void)
{
- kern = trace_kernel_create_session(
PATH1
);
+ kern = trace_kernel_create_session();
ok(kern != NULL, "Create kernel session");
ok(kern->fd == -1 &&
ok(kern != NULL, "Create kernel session");
ok(kern->fd == -1 &&
@@
-79,9
+80,6
@@
static void test_create_one_kernel_session(void)
kern->stream_count_global == 0 &&
kern->metadata == NULL,
"Validate kernel session");
kern->stream_count_global == 0 &&
kern->metadata == NULL,
"Validate kernel session");
-
- /* Init list in order to avoid sefaults from cds_list_del */
- trace_kernel_destroy_session(kern);
}
static void test_create_kernel_metadata(void)
}
static void test_create_kernel_metadata(void)
@@
-100,9
+98,9
@@
static void test_create_kernel_metadata(void)
kern->metadata->conf->attr.num_subbuf
== DEFAULT_METADATA_SUBBUF_NUM &&
kern->metadata->conf->attr.switch_timer_interval
kern->metadata->conf->attr.num_subbuf
== DEFAULT_METADATA_SUBBUF_NUM &&
kern->metadata->conf->attr.switch_timer_interval
- == DEFAULT_CHANNEL_SWITCH_TIMER &&
+ == DEFAULT_
KERNEL_
CHANNEL_SWITCH_TIMER &&
kern->metadata->conf->attr.read_timer_interval
kern->metadata->conf->attr.read_timer_interval
- == DEFAULT_CHANNEL_READ_TIMER &&
+ == DEFAULT_
KERNEL_
CHANNEL_READ_TIMER &&
kern->metadata->conf->attr.output
== DEFAULT_KERNEL_CHANNEL_OUTPUT,
"Validate kernel session metadata");
kern->metadata->conf->attr.output
== DEFAULT_KERNEL_CHANNEL_OUTPUT,
"Validate kernel session metadata");
@@
-123,7
+121,6
@@
static void test_create_kernel_channel(void)
ok(chan->fd == -1 &&
chan->enabled == 1 &&
chan->stream_count == 0 &&
ok(chan->fd == -1 &&
chan->enabled == 1 &&
chan->stream_count == 0 &&
- chan->ctx == NULL &&
chan->channel->attr.overwrite == attr.attr.overwrite,
"Validate kernel channel");
chan->channel->attr.overwrite == attr.attr.overwrite,
"Validate kernel channel");
@@
-142,7
+139,7
@@
static void test_create_kernel_event(void)
ev.type = LTTNG_EVENT_TRACEPOINT;
ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
ev.type = LTTNG_EVENT_TRACEPOINT;
ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
- event = trace_kernel_create_event(&ev);
+ event = trace_kernel_create_event(&ev
, NULL, NULL
);
ok(event != NULL, "Create kernel event");
ok(event->fd == -1 &&
ok(event != NULL, "Create kernel event");
ok(event->fd == -1 &&
@@
-174,10
+171,10
@@
static void test_create_kernel_stream(void)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- diag("Kernel data structure unit test");
-
plan_tests(NUM_TESTS);
plan_tests(NUM_TESTS);
+ diag("Kernel data structure unit test");
+
test_create_one_kernel_session();
test_create_kernel_metadata();
test_create_kernel_channel();
test_create_one_kernel_session();
test_create_kernel_metadata();
test_create_kernel_channel();
This page took
0.025185 seconds
and
4
git commands to generate.