X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Frotation.c;h=5554f631adcaea8447ec57bbe24a9dc11d333366;hp=ed9ae8944c29c90e2fe938291367c6af610b18a8;hb=af3bf6a08c0496198969d7d53dddcb06a22f83a1;hpb=88a5c0a9ce2333f12a1bd5d6b0ea527b86cde819

diff --git a/tests/regression/tools/notification/rotation.c b/tests/regression/tools/notification/rotation.c
index ed9ae8944..5554f631a 100644
--- a/tests/regression/tools/notification/rotation.c
+++ b/tests/regression/tools/notification/rotation.c
@@ -79,7 +79,6 @@ int test_condition(struct lttng_condition *condition, const char *type_name)
 	ok(out_session_name && !strcmp(session_name, out_session_name),
 			"Session name returned by %s condition matches the expected name",
 			type_name);
-end:
 	return ret;
 }
 
@@ -322,10 +321,11 @@ int test_notification(
 
 	location_status = lttng_trace_archive_location_local_get_absolute_path(
 			location, &chunk_path);
-	ok(location_status == LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK,
+	ok(location_status == LTTNG_TRACE_ARCHIVE_LOCATION_STATUS_OK && chunk_path,
 			"Retrieved path from location returned by the session rotation completed notification");
 	diag("Chunk available at %s", chunk_path ? chunk_path : "NULL");
-	ok(!strncmp(session->output_path, chunk_path, strlen(session->output_path)),
+
+	ok(chunk_path && !strncmp(session->output_path, chunk_path, strlen(session->output_path)),
 			"Returned path from location starts with the output path");
 
 end:
@@ -373,9 +373,6 @@ int main(int argc, const char *argv[])
 	session.output_path = argv[2];
 
 	plan_tests(TEST_COUNT);
-	if (ret) {
-		goto error;
-	}
 
 	notification_channel = lttng_notification_channel_create(
 			lttng_session_daemon_notification_endpoint);