projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Activate streaming tests in make check
[lttng-tools.git]
/
tests
/
tools
/
test_sessions.c
diff --git
a/tests/tools/test_sessions.c
b/tests/tools/test_sessions.c
index e55593561891d2827ba8cb8761e188e31c1d3e92..cd8003dda5b17342e98c614232ec062989d3e9ff 100644
(file)
--- a/
tests/tools/test_sessions.c
+++ b/
tests/tools/test_sessions.c
@@
-97,6
+97,17
@@
static int find_session_name(char *name)
return -1;
}
return -1;
}
+static int session_list_count(void)
+{
+ int count = 0;
+ struct ltt_session *iter;
+
+ cds_list_for_each_entry(iter, &session_list->head, list) {
+ count++;
+ }
+ return count;
+}
+
/*
* Empty session list manually.
*/
/*
* Empty session list manually.
*/
@@
-106,12
+117,11
@@
static void empty_session_list(void)
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
cds_list_del(&iter->list);
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
cds_list_del(&iter->list);
- session_list->count--;
free(iter);
}
/* Session list must be 0 */
free(iter);
}
/* Session list must be 0 */
- assert(!session_list
->count
);
+ assert(!session_list
_count()
);
}
/*
}
/*
@@
-186,14
+196,8
@@
static int fuzzing_create_args(void)
return -1;
}
return -1;
}
- ret = create_one_session(SESSION1, NULL);
- if (ret > 0) {
- printf("Session created with %s, (null)\n", SESSION1);
- return -1;
- }
-
/* Session list must be 0 */
/* Session list must be 0 */
- assert(!session_list
->count
);
+ assert(!session_list
_count()
);
return 0;
}
return 0;
}
@@
-209,7
+213,7
@@
static int fuzzing_destroy_args(void)
}
/* Session list must be 0 */
}
/* Session list must be 0 */
- assert(!session_list
->count
);
+ assert(!session_list
_count()
);
return 0;
}
return 0;
}
@@
-221,6
+225,7
@@
static int fuzzing_destroy_args(void)
static int two_session_same_name(void)
{
int ret;
static int two_session_same_name(void)
{
int ret;
+ struct ltt_session *sess;
ret = create_one_session(SESSION1, PATH1);
if (ret < 0) {
ret = create_one_session(SESSION1, PATH1);
if (ret < 0) {
@@
-228,8
+233,8
@@
static int two_session_same_name(void)
return -1;
}
return -1;
}
-
ret = create_one_session(SESSION1, PATH
1);
- if (
ret < 0
) {
+
sess = session_find_by_name(SESSION
1);
+ if (
sess
) {
/* Success */
return 0;
}
/* Success */
return 0;
}
@@
-341,7
+346,7
@@
int main(int argc, char **argv)
PRINT_OK();
/* Session list must be 0 */
PRINT_OK();
/* Session list must be 0 */
- assert(!session_list
->count
);
+ assert(!session_list
_count()
);
/* Success */
return 0;
/* Success */
return 0;
This page took
0.024635 seconds
and
4
git commands to generate.