X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftest_sessions.c;h=f444e30438bb3aeff3a3d9ee54531788b40aeb79;hp=3e45c21b669563846e41dbfd0e624496cf95b9df;hb=10a8a2237343699e3923d87e24dbf2d7fe225377;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e

diff --git a/tests/test_sessions.c b/tests/test_sessions.c
index 3e45c21b6..f444e3043 100644
--- a/tests/test_sessions.c
+++ b/tests/test_sessions.c
@@ -24,10 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <sys/types.h>
 
-#include <lttng-sessiond-comm.h>
+#include <bin/lttng-sessiond/session.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 
-#include <lttng-sessiond/session.h>
 #include "utils.h"
 
 #define SESSION1 "test1"
@@ -118,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);
@@ -251,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;
@@ -258,6 +260,7 @@ 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;
@@ -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);