From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: testsuite: fix cris stat3 in diff setups
Date: Wed, 2 Nov 2022 20:30:42 +0545 [thread overview]
Message-ID: <20221102144542.19653-1-vapier@gentoo.org> (raw)
This test uses the test itself as an input to stating regular files.
This gets funky though: when we run check in parallel, the output
object dir is the subdir that matches the .exp file. When we run
with -j1, the output object dir is the sim builddir itself.
The old test would append argv[0] to find the file, while the new
test uses basename on it. Each method works in only one of the
aforementioned build scenarios. Rather than complicate this any
more, switch to a different file that we know will always exist:
the Makefile.
---
sim/testsuite/cris/c/stat3.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/sim/testsuite/cris/c/stat3.c b/sim/testsuite/cris/c/stat3.c
index 321da1b2bd61..a6e4897436c1 100644
--- a/sim/testsuite/cris/c/stat3.c
+++ b/sim/testsuite/cris/c/stat3.c
@@ -7,21 +7,25 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#define mybasename(x) ({ const char *x_ = (x), *y_ = strrchr (x_, '/'); y_ != NULL ? y_ + 1 : x_; })
int main (int argc, char *argv[])
{
- char path[1024] = "/";
+ /* Pick a regular file we know will always be in the sim builddir. */
+ char path[1024] = "/Makefile";
struct stat buf;
- strcat (path, mybasename (argv[0]));
if (stat (".", &buf) != 0
|| !S_ISDIR (buf.st_mode))
- abort ();
+ {
+ fprintf (stderr, "cwd is not a directory\n");
+ return 1;
+ }
if (stat (path, &buf) != 0
|| !S_ISREG (buf.st_mode))
- abort ();
+ {
+ fprintf (stderr, "%s: is not a regular file\n", path);
+ return 1;
+ }
printf ("pass\n");
exit (0);
}
-
--
2.37.3
reply other threads:[~2022-11-02 16:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221102144542.19653-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/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).