[binutils-gdb] sim: testsuite: fix cris stat3 in diff setups

[binutils-gdb] sim: testsuite: fix cris stat3 in diff setups

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7b3dd7b9b3b20cbcf624e85a0d1305c5e3d68663

commit 7b3dd7b9b3b20cbcf624e85a0d1305c5e3d68663
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed Nov 2 20:27:54 2022 +0545

    sim: testsuite: fix cris stat3 in diff setups
    
    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.

Diff:
---
 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 321da1b2bd6..a6e4897436c 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);
 }
-