File openposix-sem_timedwait-11-1-Fix.patch of Package ltp-stable

Overview Repositories Revisions Requests Users Attributes Meta

File openposix-sem_timedwait-11-1-Fix.patch of Package ltp-stable (Revision d6db72c7b946cd513ca5465b3986a20e)

Currently displaying revision d6db72c7b946cd513ca5465b3986a20e , Show latest

From a79a82302502866c45dfdc2ab5e48187d7c34ec4 Mon Sep 17 00:00:00 2001
From: Cyril Hrubis <chrubis@suse.cz>
Date: Mon, 20 Jun 2022 11:21:43 +0200
Subject: [PATCH 4/7] openposix: sem_timedwait/11-1: Fix

Actually run both of the cases (valid timeout and invalid timeout).

The timeout is not actually invalid, but rather in the past, which is
important to test as the system has to try to lock the semaphore first
and only if that fails it should check the timeout.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Reviewed-by: Li Wang <liwang@redhat.com>
Reviewed-by: Martin Doucha <mdoucha@suse.cz>
Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>
---
 .../conformance/interfaces/sem_timedwait/11-1.c  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/11-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/11-1.c
index f87afaa43..b06bf0522 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/11-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/11-1.c
@@ -24,7 +24,7 @@
 #include "posixtest.h"
 
 #define TIMEOUT 2
-#define INVALIDTIMEOUT -2
+#define NEGATIVETIMEOUT -2
 #define TEST "11-1"
 #define FUNCTION "sem_timedwait"
 #define ERROR_PREFIX "unexpected error: " FUNCTION " " TEST ": "
@@ -45,7 +45,7 @@ int main(void)
 			ts[i].tv_sec = time(NULL) + TIMEOUT;
 			ts[i].tv_nsec = 0;
 		} else if (i == 1) {
-			ts[i].tv_sec = time(NULL) + INVALIDTIMEOUT;
+			ts[i].tv_sec = time(NULL) + NEGATIVETIMEOUT;
 			ts[i].tv_nsec = 0;
 		}
 		/* Lock Semaphore */
@@ -61,15 +61,15 @@ int main(void)
 			return PTS_UNRESOLVED;
 		}
 
+		sem_destroy(&mysemp[i]);
+
 		/* Checking if the value of the Semaphore decremented by one */
-		if ((val[i] == 0) && (sts[i] == 0)) {
-			puts("TEST PASSED");
-			sem_destroy(&mysemp[i]);
-			return PTS_PASS;
-		} else {
+		if ((val[i] != 0) || (sts[i] != 0)) {
 			puts("TEST FAILED");
-			sem_destroy(&mysemp[i]);
 			return PTS_FAIL;
 		}
 	}
+
+	puts("TEST PASSED");
+	return PTS_PASS;
 }
-- 
2.34.1

Places

File openposix-sem_timedwait-11-1-Fix.patch of Package ltp-stable (Revision d6db72c7b946cd513ca5465b3986a20e)

Places