#define SESSION1 "test1"
-/* This path will NEVER be created in this test */
-#define PATH1 "/tmp/.test-junk-lttng"
-
#define MAX_SESSIONS 10000
#define RANDOM_STRING_LEN 11
/* Number of TAP tests in this file */
-#define NUM_TESTS 12
+#define NUM_TESTS 11
static struct ltt_session_list *session_list;
/*
* Test creation of 1 session
*/
-static int create_one_session(char *name, char *path)
+static int create_one_session(char *name)
{
int ret;
- ret = session_create(name, path, geteuid(), getegid());
+ ret = session_create(name, geteuid(), getegid());
if (ret == LTTNG_OK) {
/* Validate */
ret = find_session_name(name);
static int destroy_one_session(struct ltt_session *session)
{
int ret;
+ char session_name[NAME_MAX];
- ret = session_destroy(session);
+ strncpy(session_name, session->name, sizeof(session->name));
+ session_name[sizeof(session_name) - 1] = '\0';
+ ret = session_destroy(session);
if (ret == LTTNG_OK) {
- /* Validate */
- if (session == NULL) {
- return 0;
- }
- ret = find_session_name(session->name);
+ ret = find_session_name(session_name);
if (ret < 0) {
/* Success, -1 means that the sesion is NOT found */
return 0;
int ret;
struct ltt_session *sess;
- ret = create_one_session(SESSION1, PATH1);
+ ret = create_one_session(SESSION1);
if (ret < 0) {
/* Fail */
return -1;
void test_create_one_session(void)
{
- ok(create_one_session(SESSION1, PATH1) == 0,
+ ok(create_one_session(SESSION1) == 0,
"Create session: %s",
SESSION1);
}
"Validating session: session found");
ok(tmp->kernel_session == NULL &&
- strlen(tmp->path) &&
strlen(tmp->name),
"Validating session: basic sanity check");
void test_bogus_session_param(void)
{
- ok(create_one_session(NULL, NULL) < 0,
- "Create session with bogus param: NULL, NULL should fail");
-
- ok(create_one_session(NULL, PATH1) < 0,
- "Create session with bogus param: NULL, %s should fail",
- PATH1);
+ ok(create_one_session(NULL) < 0,
+ "Create session with bogus param: NULL should fail");
ok(session_list_count() == 0,
"Create session with bogus param: session list empty");
for (i = 0; i < MAX_SESSIONS; i++) {
char *tmp_name = get_random_string();
- ret = create_one_session(tmp_name, PATH1);
+ ret = create_one_session(tmp_name);
if (ret < 0) {
diag("session %d (name: %s) creation failed", i, tmp_name);
++failed;
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
ret = destroy_one_session(iter);
if (ret < 0) {
- diag("session %d (name: %s) destroy failed", i, iter->name);
+ diag("session %d destroy failed", i);
++failed;
}
}
int main(int argc, char **argv)
{
- diag("Sessions unit tests");
-
plan_tests(NUM_TESTS);
+ diag("Sessions unit tests");
+
test_session_list();
test_create_one_session();