X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=631948cda93d4a440875a8146fb306d4147edf5a;hb=7344b6a307b62685272f8f5dacc42d4e06e5732f;hp=706f1ca43bfac1cbbe8b3abfbad1a93f8d77636d;hpb=fa448dbea32e94c27a86aac25d783ed530dd055b;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 706f1ca43..631948cda 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -43,7 +43,7 @@
 
 int nb_args = 0;
 int named_pipe_args_start = 0;
-pid_t app_pid = -1;
+pid_t app_pid = 0;
 const char *app_state_file = NULL;
 
 static
@@ -156,6 +156,8 @@ int suspend_application(void)
 	/*
 	 * Send SIGUSR1 to application instructing it to bypass tracepoint.
 	 */
+	assert(app_pid > 1);
+
 	ret = kill(app_pid, SIGUSR1);
 	if (ret) {
 		fail("SIGUSR1 failed. errno %d", errno);
@@ -186,6 +188,8 @@ int resume_application(void)
 		goto error;
 	}
 
+	assert(app_pid > 1);
+
 	ret = kill(app_pid, SIGUSR1);
 	if (ret) {
 		fail("SIGUSR1 failed. errno %d", errno);
@@ -662,7 +666,7 @@ end:
 	lttng_condition_destroy(condition);
 }
 
-static void test_notification_channel(const char *session_name,
+static void test_buffer_usage_notification_channel(const char *session_name,
 		const char *channel_name,
 		const enum lttng_domain_type domain_type,
 		const char **argv)
@@ -711,13 +715,13 @@ static void test_notification_channel(const char *session_name,
 	nc_status = lttng_notification_channel_subscribe(
 			notification_channel, low_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-			"Subscribe to condition");
+			"Subscribe to low condition");
 
 	/* Subscribe a valid high condition */
 	nc_status = lttng_notification_channel_subscribe(
 			notification_channel, high_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-			"Subscribe to condition");
+			"Subscribe to high condition");
 
 	resume_application();
 
@@ -899,8 +903,8 @@ int main(int argc, const char *argv[])
 	test_invalid_channel_subscription(domain_type);
 	test_subscription_twice(session_name, channel_name, domain_type);
 
-	diag("Test notification channel api for domain %s", domain_type_string);
-	test_notification_channel(session_name, channel_name, domain_type, argv);
+	diag("Test buffer usage notification channel api for domain %s", domain_type_string);
+	test_buffer_usage_notification_channel(session_name, channel_name, domain_type, argv);
 error:
 	return exit_status();
 }