Move hash table to common/ directory

[lttng-tools.git] / tests / test_sessions.c

diff --git a/tests/test_sessions.c b/tests/test_sessions.c
index 3e9bbbbb5ae64307d1c020beee2e529593c48acf..5b17e63911eeb8c45fdd05723978d79eae209313 100644 (file)
--- a/tests/test_sessions.c
+++ b/tests/test_sessions.c
@@ -24,9 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <sys/types.h>
 
 #include <lttng-sessiond-comm.h>
-#include "ltt-sessiond/session.h"
+
+#include <lttng-sessiond/session.h>
 #include "utils.h"
 
 #define SESSION1 "test1"
@@ -117,7 +119,7 @@ static int create_one_session(char *name, char *path)
 {
        int ret;
 
-       ret = session_create(name, path);
+       ret = session_create(name, path, geteuid(), getegid());
        if (ret == LTTCOMM_OK) {
                /* Validate */
                ret = find_session_name(name);
@@ -250,6 +252,7 @@ int main(int argc, char **argv)
        }
 
        printf("Create 1 session %s: ", SESSION1);
+       fflush(stdout);
        ret = create_one_session(SESSION1, PATH1);
        if (ret < 0) {
                return -1;
@@ -257,13 +260,13 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Validating created session %s: ", SESSION1);
+       fflush(stdout);
        tmp = session_find_by_name(SESSION1);
        if (tmp == NULL) {
                return -1;
        }
        /* Basic init session values */
        assert(tmp->kernel_session == NULL);
-       assert(tmp->ust_session_list.count == 0);
        assert(strlen(tmp->path));
        assert(strlen(tmp->name));
        session_lock(tmp);
@@ -272,6 +275,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Destroy 1 session %s: ", SESSION1);
+       fflush(stdout);
        ret = destroy_one_session(tmp);
        if (ret < 0) {
                return -1;
@@ -279,6 +283,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Two session with same name: ");
+       fflush(stdout);
        ret = two_session_same_name();
        if (ret < 0) {
                return -1;
@@ -288,6 +293,7 @@ int main(int argc, char **argv)
        empty_session_list();
 
        printf("Fuzzing create_session arguments: ");
+       fflush(stdout);
        ret = fuzzing_create_args();
        if (ret < 0) {
                return -1;
@@ -295,6 +301,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Fuzzing destroy_session argument: ");
+       fflush(stdout);
        ret = fuzzing_destroy_args();
        if (ret < 0) {
                return -1;
@@ -302,6 +309,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Creating %d sessions: ", MAX_SESSIONS);
+       fflush(stdout);
        for (i = 0; i < MAX_SESSIONS; i++) {
                tmp_name = get_random_string();
                ret = create_one_session(tmp_name, PATH1);
@@ -314,6 +322,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Destroying %d sessions: ", MAX_SESSIONS);
+       fflush(stdout);
        for (i = 0; i < MAX_SESSIONS; i++) {
                cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
                        ret = destroy_one_session(iter);