public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 3/6] Cygwin: testsuite: Fix TEST_RETURN for 64-bit
Date: Fri, 26 Aug 2022 13:59:39 +0100	[thread overview]
Message-ID: <20220826125943.49-4-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20220826125943.49-1-jon.turney@dronecode.org.uk>

The result of a function call won't fit in an int if it's e.g. a pointer.
---
 winsup/testsuite/libltp/include/usctest.h | 6 +++---
 winsup/testsuite/libltp/lib/parse_opts.c  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/winsup/testsuite/libltp/include/usctest.h b/winsup/testsuite/libltp/include/usctest.h
index 6a095db1c..fef349d04 100644
--- a/winsup/testsuite/libltp/include/usctest.h
+++ b/winsup/testsuite/libltp/include/usctest.h
@@ -159,7 +159,7 @@ struct usc_errno_t {
  **********************************************************************/
 #ifdef  _USC_LIB_
 
-extern int TEST_RETURN;
+extern long TEST_RETURN;
 extern int TEST_ERRNO;
 
 #else
@@ -173,7 +173,7 @@ extern struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
  * Globals for returning the return code and errno from the system call
  * test macros.
  ***********************************************************************/
-extern int TEST_RETURN;
+extern long TEST_RETURN;
 extern int TEST_ERRNO;
 
 /***********************************************************************
@@ -210,7 +210,7 @@ extern void STD_opts_help();
  *	SCALL = system call and parameters to execute
  *
  ***********************************************************************/
-#define TEST(SCALL) TEST_RETURN = (unsigned) SCALL;  TEST_ERRNO=errno;
+#define TEST(SCALL) TEST_RETURN = SCALL;  TEST_ERRNO=errno;
 
 /***********************************************************************
  * TEST_VOID: calls a system call
diff --git a/winsup/testsuite/libltp/lib/parse_opts.c b/winsup/testsuite/libltp/lib/parse_opts.c
index 0282a0976..1f41bfdd2 100644
--- a/winsup/testsuite/libltp/lib/parse_opts.c
+++ b/winsup/testsuite/libltp/lib/parse_opts.c
@@ -110,7 +110,7 @@ struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
    * Globals for returning the return code and errno from the system call
    * test macros.
    ***********************************************************************/
-int TEST_RETURN;
+long TEST_RETURN;
 int TEST_ERRNO;
 
   /***********************************************************************
-- 
2.37.2


  parent reply	other threads:[~2022-08-26 13:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-26 12:59 [PATCH 0/6] testsuite: various fixes Jon Turney
2022-08-26 12:59 ` [PATCH 1/6] Cygwin: testsuite: Don't write coredump in a child which is expected to segfault Jon Turney
2022-08-26 12:59 ` [PATCH 2/6] Cygwin: testsuite: Remove passing tests from XFAIL list Jon Turney
2022-08-26 12:59 ` Jon Turney [this message]
2022-08-26 12:59 ` [PATCH 4/6] Cygwin: testsuite: Fix size of write to temporary file to be mmap()ed Jon Turney
2022-08-26 12:59 ` [PATCH 5/6] Cygwin: testsuite: In pathconf01 use the temporary directory instead of "/tmp" Jon Turney
2022-08-26 12:59 ` [PATCH 6/6] Cygwin: testsuite: Add x86_64 code to "dynamically load cygwin" test Jon Turney
2022-08-26 16:07 ` [PATCH 0/6] testsuite: various fixes Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220826125943.49-4-jon.turney@dronecode.org.uk \
    --to=jon.turney@dronecode.org.uk \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).