From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE9276E2E5 for ; Tue, 19 May 2020 08:42:28 +0000 (UTC) Date: Tue, 19 May 2020 11:42:26 +0300 From: Petri Latvala Message-ID: <20200519084226.GY9497@platvala-desk.ger.corp.intel.com> References: <20200519061028.26699-1-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200519061028.26699-1-anshuman.gupta@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t] tests/kms_content_protection: CP cleanup exit handler List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Anshuman Gupta Cc: igt-dev@lists.freedesktop.org, chris@chris-wilson.co.uk List-ID: On Tue, May 19, 2020 at 11:40:28AM +0530, Anshuman Gupta wrote: > Add HDCP content protection cleanup igt exit handler, > earlier it was done through igt_fixture which doesn't > trigger hdcp cleanup on igt abortion due to any signal. > This should avoid any HDCP content protection leak. > > Cc: Ramalingam C > Signed-off-by: Anshuman Gupta > --- > tests/kms_content_protection.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c > index 3b9cedcb..f3101b8a 100644 > --- a/tests/kms_content_protection.c > +++ b/tests/kms_content_protection.c > @@ -651,12 +651,21 @@ static void test_content_protection_cleanup(void) > } > } > > +static void test_content_protection_exit_handler(int sig) > +{ > + igt_fixture { > + test_content_protection_cleanup(); > + igt_display_fini(&data.display); > + } Don't put it in an igt_fixture. If a test fails, you're still inside a subtest and entering an igt_fixture will fail. You can trust the state to be correct without the fixture because you only install the exit handler when we're actually executing and the init has been already done. -- Petri Latvala _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev