[Valgrind-developers] valgrind: r13388: mips: define allexec files as soft links

[<sv...@va...>]

petarj	2013-05-11 23:23:27 +0100 (Sat, 11 May 2013)

  New Revision: 13388

  Log:
    mips: define allexec files as soft links
    
    This change is a follow up to r13385. It removes physical copies of the
    allexec c-files in none/tests/mips32/ and none/tests/mips64/ and defines
    them as soft-links to a common file like other arches do.
    
    Credits to Philippe for noticing it.

  Added files:
    trunk/none/tests/mips32/allexec.c
    trunk/none/tests/mips64/allexec.c
  Removed files:
    trunk/none/tests/mips32/allexec.c
    trunk/none/tests/mips64/allexec.c


  Property changed: trunk/none/tests/mips64/allexec.c (+0 -0)
___________________________________________________________________
Name: svn:special
   + *

  Added: trunk/none/tests/mips64/allexec.c (+1 -0)
===================================================================
--- trunk/none/tests/mips64/allexec.c	2013-05-11 16:05:04 +01:00 (rev 13387)
+++ trunk/none/tests/mips64/allexec.c	2013-05-11 23:23:27 +01:00 (rev 13388)
@@ -0,0 +1 @@
+link ../allexec.c
\ No newline at end of file

  Deleted: trunk/none/tests/mips64/allexec.c (+0 -50)
===================================================================
--- trunk/none/tests/mips64/allexec.c	2013-05-11 16:05:04 +01:00 (rev 13387)
+++ trunk/none/tests/mips64/allexec.c	2013-05-11 23:23:27 +01:00 (rev 13388)
@@ -1,50 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-extern char **environ;
-
-#define S(...) (fprintf(stdout, __VA_ARGS__),fflush(stdout))
-#define FORKEXECWAIT(exec_call) do { \
-      int status;\
-      pid_t child = fork(); \
-      if (child == 0) {exec_call; perror ("exec failed");} \
-      else if (child == -1) perror ("cannot fork\n"); \
-      else if (child != wait (&status)) perror ("error waiting child"); \
-      else S("child exited\n"); \
-   } while (0)
-
-void test_allexec (char *exec)
-{
-   FORKEXECWAIT (execlp(exec, exec, NULL));
-   FORKEXECWAIT (execlp(exec, exec, "constant_arg1", "constant_arg2", NULL));
-   FORKEXECWAIT (execve(exec, NULL, environ));
-}
-
-
-/* If a single argument "exec" is given, will execute itself
-   (in bi-arch, a 32 bit and 64 bit variant) via various exec system calls.
-   Note that this test can only be run after the prerequisite have been
-   prepared by allexec_prepare_prereq, which will a.o. make links
-   for the allexec32 and allexec64 executables. On single arch build,
-   these links points to the same executable to ensure this test works
-   everywhere the same.
-   No arguments or more arguments means just print its args. */
-int main(int argc, char **argv, char **envp) 
-{
-   if ( (argc == 2) && (strcmp (argv[1], "exec") == 0)) {
-      S("%s will exec ./allexec32\n", argv[0]);
-      test_allexec ("./allexec32");
-      S("%s will exec ./allexec64\n", argv[0]);
-      test_allexec ("./allexec64");
-   } else {
-      int i;
-      S("program exec-ed:");
-      for (i = 0; i < argc; i++) S(" %s", argv[i]);
-      S("\n");
-   }
-   return 0;
-}

  Property changed: trunk/none/tests/mips32/allexec.c (+0 -0)
___________________________________________________________________
Name: svn:special
   + *

  Added: trunk/none/tests/mips32/allexec.c (+1 -0)
===================================================================
--- trunk/none/tests/mips32/allexec.c	2013-05-11 16:05:04 +01:00 (rev 13387)
+++ trunk/none/tests/mips32/allexec.c	2013-05-11 23:23:27 +01:00 (rev 13388)
@@ -0,0 +1 @@
+link ../allexec.c
\ No newline at end of file

  Deleted: trunk/none/tests/mips32/allexec.c (+0 -50)
===================================================================
--- trunk/none/tests/mips32/allexec.c	2013-05-11 16:05:04 +01:00 (rev 13387)
+++ trunk/none/tests/mips32/allexec.c	2013-05-11 23:23:27 +01:00 (rev 13388)
@@ -1,50 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-extern char **environ;
-
-#define S(...) (fprintf(stdout, __VA_ARGS__),fflush(stdout))
-#define FORKEXECWAIT(exec_call) do { \
-      int status;\
-      pid_t child = fork(); \
-      if (child == 0) {exec_call; perror ("exec failed");} \
-      else if (child == -1) perror ("cannot fork\n"); \
-      else if (child != wait (&status)) perror ("error waiting child"); \
-      else S("child exited\n"); \
-   } while (0)
-
-void test_allexec (char *exec)
-{
-   FORKEXECWAIT (execlp(exec, exec, NULL));
-   FORKEXECWAIT (execlp(exec, exec, "constant_arg1", "constant_arg2", NULL));
-   FORKEXECWAIT (execve(exec, NULL, environ));
-}
-
-
-/* If a single argument "exec" is given, will execute itself
-   (in bi-arch, a 32 bit and 64 bit variant) via various exec system calls.
-   Note that this test can only be run after the prerequisite have been
-   prepared by allexec_prepare_prereq, which will a.o. make links
-   for the allexec32 and allexec64 executables. On single arch build,
-   these links points to the same executable to ensure this test works
-   everywhere the same.
-   No arguments or more arguments means just print its args. */
-int main(int argc, char **argv, char **envp) 
-{
-   if ( (argc == 2) && (strcmp (argv[1], "exec") == 0)) {
-      S("%s will exec ./allexec32\n", argv[0]);
-      test_allexec ("./allexec32");
-      S("%s will exec ./allexec64\n", argv[0]);
-      test_allexec ("./allexec64");
-   } else {
-      int i;
-      S("program exec-ed:");
-      for (i = 0; i < argc; i++) S(" %s", argv[i]);
-      S("\n");
-   }
-   return 0;
-}