Tests: notification: fail on trigger unregistration failure

[lttng-tools.git] / tests / regression / tools / notification / notification.c

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 092ac5f1ec5e978fafbdaf89467bf3eb3ac2c6ee..bdea55921d3825cfbfbee824c509e01bc4596327 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -1220,7 +1220,8 @@ static void test_subscription_twice(const char *session_name,
                        domain_type, BUFFER_USAGE_TYPE_LOW, 0.99, &condition,
                        &action, &trigger);
        if (ret) {
-               fail("Setup error on trigger registration");
+               fail("Setup error on trigger registration in %s()",
+                               __FUNCTION__);
                goto end;
        }
 
@@ -1245,7 +1246,11 @@ static void test_subscription_twice(const char *session_name,
                        "Subscribe to a condition for which subscription was already done");
 
 end:
-       lttng_unregister_trigger(trigger);
+       ret = lttng_unregister_trigger(trigger);
+       if (ret) {
+               fail("Failed to unregister trigger in %s()", __FUNCTION__);
+       }
+
        lttng_trigger_destroy(trigger);
        lttng_notification_channel_destroy(notification_channel);
        lttng_action_destroy(action);
@@ -2569,7 +2574,7 @@ int main(int argc, const char *argv[])
        }
        case 4:
        {
-               plan_tests(12);
+               plan_tests(11);
                /* Test cases that need the kernel tracer. */
                assert(domain_type == LTTNG_DOMAIN_KERNEL);
 
@@ -2582,7 +2587,7 @@ int main(int argc, const char *argv[])
        }
        case 5:
        {
-               plan_tests(25);
+               plan_tests(23);
                /* Test cases that need the kernel tracer. */
                assert(domain_type == LTTNG_DOMAIN_KERNEL);
 
@@ -2602,7 +2607,7 @@ int main(int argc, const char *argv[])
        {
                const char *testapp_path, *test_symbol_name;
 
-               plan_tests(12);
+               plan_tests(11);
 
                if (argc < 7) {
                        fail("Missing parameter for tests to run %d", argc);
@@ -2629,7 +2634,7 @@ int main(int argc, const char *argv[])
                        plan_tests(221);
                        break;
                case LTTNG_DOMAIN_KERNEL:
-                       plan_tests(216);
+                       plan_tests(215);
                        break;
                default:
                        assert(0);