Attachment 12090 Details for Bug 12838 – [Patch] Fix regression tests

[patch] [Patch] Fix regression tests

0001-Fix-regression-tests.patch (text/plain), 1.95 KB, created by Robert Noland on 2007-10-17 13:14:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Noland

Created: 2007-10-17 13:14:22 UTC

Size: 1.95 KB

patch

obsolete

>From 602acb07396556d683ed7062a52ffe6259676d05 Mon Sep 17 00:00:00 2001
>From: Robert Noland <rnoland@rnoland-ibm.acs.internap.com>
>Date: Wed, 17 Oct 2007 16:06:47 -0400
>Subject: [PATCH] Fix regression tests
>
>auth.c - Fix race.
>lock.c - Fix race and premature close of drmfd
>---
> tests/auth.c |    4 ++--
> tests/lock.c |    9 +++++----
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/tests/auth.c b/tests/auth.c
>index 4160d1d..9b6fca9 100644
>--- a/tests/auth.c
>+++ b/tests/auth.c
>@@ -69,10 +69,10 @@ static void client()
> 	int drmfd, ret;
> 
> 	/* XXX: Should make sure we open the same DRM as the master */
>-	drmfd = drm_open_any();
>-
> 	wait_event(0, SERVER_READY);
> 
>+	drmfd = drm_open_any();
>+
> 	/* Get a client magic number and pass it to the master for auth. */
> 	auth.magic = 0; /* Quiet valgrind */
> 	ret = ioctl(drmfd, DRM_IOCTL_GET_MAGIC, &auth);
>diff --git a/tests/lock.c b/tests/lock.c
>index 3f62755..86caa28 100644
>--- a/tests/lock.c
>+++ b/tests/lock.c
>@@ -87,8 +87,6 @@ client_auth(int drmfd)
> 	struct drm_auth auth;
> 	int ret;
> 
>-	wait_event(0, SERVER_READY);
>-
> 	/* Get a client magic number and pass it to the master for auth. */
> 	ret = ioctl(drmfd, DRM_IOCTL_GET_MAGIC, &auth);
> 	if (ret == -1)
>@@ -172,8 +170,6 @@ static void test_open_close_locked(drmfd)
> 	ret = drmUnlock(drmfd, lock1);
> 	if (ret != 0)
> 		errx(1, "lock lost during open/close by same pid");
>-
>-	close(drmfd);
> }
> 
> static void client()
>@@ -181,6 +177,8 @@ static void client()
> 	int drmfd, ret;
> 	unsigned int time;
> 
>+	wait_event(0, SERVER_READY);
>+
> 	/* XXX: Should make sure we open the same DRM as the master */
> 	drmfd = drm_open_any();
> 
>@@ -201,6 +199,7 @@ static void client()
> 	send_event(0, CLIENT_LOCKED);
> 	ret = write(commfd[0], &time, sizeof(time));
> 
>+	close(drmfd);
> 	exit(0);
> }
> 
>@@ -238,6 +237,8 @@ static void server()
> 
> 	if (client_time < unlock_time)
> 		errx(1, "Client took lock before server released it");
>+
>+	close(drmfd);
> }
> 
> int main(int argc, char **argv)
>-- 
>1.5.2.1
>

Actions: View | Splinter Review

Attachments on bug 12838: 12090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.