Patchwork elf: tst-ldconfig-bad-aux-cache: use support_capture_subprocess

login
register
mail settings
Submitter Alexandra Hájková
Date Aug. 1, 2019, 2:47 p.m.
Message ID <20190801144713.12287-1-ahajkova@redhat.com>
Download mbox | patch
Permalink /patch/33893/
State New
Headers show

Comments

Alexandra Hájková - Aug. 1, 2019, 2:47 p.m.
From: Alexandra Hájková <ahajkova@redhat.com>

---
 elf/tst-ldconfig-bad-aux-cache.c | 70 ++++++++++++++------------------
 1 file changed, 30 insertions(+), 40 deletions(-)
Florian Weimer - Aug. 1, 2019, 2:53 p.m.
* Alexandra Hájková:

> +#include <support/capture_subprocess.h>
>  #include <support/check.h>
>  #include <support/support.h>
>  #include <support/xunistd.h>
> @@ -52,6 +53,12 @@ display_info (const char *fpath, const struct stat *sb,
>    return 0;
>  }
>  
> +static void
> +execv_wrapper(void *args)
> +{
> +    execv(((char **)args)[0], (char **)args);
> +}

I think there should be spaces after execv and the casts.

And I forgot to mention that this should have _exit (1); after the
execve, so that a failure results in an error notification to the
parent.  Maybe you could even use

  FAIL_EXIT1 ("execve: %m");

(exit is safe in this context, too.)

> +  struct support_capture_subprocess result;
> +  result = support_capture_subprocess (execv_wrapper, args);
> +  support_capture_subprocess_check (&result, "execv", 0, sc_allow_none);
> +
> +  xstat (path, &fs);
> +
> +  size = fs.st_size;
> +  /* Run 3 tests, each truncating aux-cache shorter and shorter.  */
> +  for (i = 3; i > 0; i--)
> +  {
> +      new_size = size * i / 4;
> +      if (truncate (path, new_size))
> +          FAIL_EXIT1 ("truncation failed: %m");
> +      if (nftw (path, display_info, 1000, 0) == -1)
> +          FAIL_EXIT1 ("nftw failed.");
> +
> +      /* Verify that ldconfig can run with a truncated
> +         aux-cache and doesn't crash.  */
> +      struct support_capture_subprocess result;
> +      result = support_capture_subprocess (execv_wrapper, args);
> +      support_capture_subprocess_check (&result, "execv", 0, sc_allow_none);
> +  }

This is a great simplification, thanks.  It's now much clearer what the
test is actually doing.

Florian

Patch

diff --git a/elf/tst-ldconfig-bad-aux-cache.c b/elf/tst-ldconfig-bad-aux-cache.c
index 68ce90a956..45b1010b20 100644
--- a/elf/tst-ldconfig-bad-aux-cache.c
+++ b/elf/tst-ldconfig-bad-aux-cache.c
@@ -31,6 +31,7 @@ 
 #include <ftw.h>
 #include <stdint.h>
 
+#include <support/capture_subprocess.h>
 #include <support/check.h>
 #include <support/support.h>
 #include <support/xunistd.h>
@@ -52,6 +53,12 @@  display_info (const char *fpath, const struct stat *sb,
   return 0;
 }
 
+static void
+execv_wrapper(void *args)
+{
+    execv(((char **)args)[0], (char **)args);
+}
+
 /* Run ldconfig with a corrupt aux-cache, in particular we test for size
    truncation that might happen if a previous ldconfig run failed or if
    there were storage or power issues while we were writing the file.
@@ -61,54 +68,37 @@  static int
 do_test (void)
 {
   char *prog = xasprintf ("%s/ldconfig", support_install_rootsbindir);
-  char *const args[] = { prog, NULL };
+  char *args[] = { prog, NULL };
   const char *path = "/var/cache/ldconfig/aux-cache";
   struct stat64 fs;
   long int size, new_size, i;
-  int status;
-  pid_t pid;
 
   /* Create the needed directories. */
   xmkdirp ("/var/cache/ldconfig", 0777);
 
-  pid = xfork ();
   /* Run ldconfig fist to generate the aux-cache.  */
-  if (pid == 0)
-    {
-      execv (args[0], args);
-      _exit (1);
-    }
-  else
-    {
-      xwaitpid (pid, &status, 0);
-      TEST_COMPARE(status, 0);
-      xstat (path, &fs);
-
-      size = fs.st_size;
-      /* Run 3 tests, each truncating aux-cache shorter and shorter.  */
-      for (i = 3; i > 0; i--)
-        {
-          new_size = size * i / 4;
-          if (truncate (path, new_size))
-              FAIL_EXIT1 ("truncation failed: %m");
-          if (nftw (path, display_info, 1000, 0) == -1)
-              FAIL_EXIT1 ("nftw failed.");
-
-          pid = xfork ();
-          /* Verify that ldconfig can run with a truncated
-             aux-cache and doesn't crash.  */
-          if (pid == 0)
-            {
-              execv (args[0], args);
-              _exit (1);
-            }
-          else
-            {
-              xwaitpid (pid, &status, 0);
-              TEST_COMPARE(status, 0);
-            }
-        }
-    }
+  struct support_capture_subprocess result;
+  result = support_capture_subprocess (execv_wrapper, args);
+  support_capture_subprocess_check (&result, "execv", 0, sc_allow_none);
+
+  xstat (path, &fs);
+
+  size = fs.st_size;
+  /* Run 3 tests, each truncating aux-cache shorter and shorter.  */
+  for (i = 3; i > 0; i--)
+  {
+      new_size = size * i / 4;
+      if (truncate (path, new_size))
+          FAIL_EXIT1 ("truncation failed: %m");
+      if (nftw (path, display_info, 1000, 0) == -1)
+          FAIL_EXIT1 ("nftw failed.");
+
+      /* Verify that ldconfig can run with a truncated
+         aux-cache and doesn't crash.  */
+      struct support_capture_subprocess result;
+      result = support_capture_subprocess (execv_wrapper, args);
+      support_capture_subprocess_check (&result, "execv", 0, sc_allow_none);
+  }
 
   free (prog);
   return 0;