Changeset 2591 in kBuild for trunk/src/kmk/tests/run_make_tests.pl

Timestamp:

Jun 17, 2012 8:45:31 PM (12 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• tests (modified) (1 prop)
• tests/run_make_tests.pl (modified) (11 diffs)

trunk/src/kmk

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

trunk/src/kmk/tests/run_make_tests.pl

@@ -13 +13 @@
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 # This file is part of GNU Make.
 #
@@ -29 +30 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 $valgrind = 0;              # invoke make with valgrind
-$valgrind_args = '--num-callers=15 --tool=memcheck --leak-check=full';
+$valgrind_args = '';
+$memcheck_args = '--num-callers=15 --tool=memcheck --leak-check=full';
+$massif_args = '--num-callers=15 --tool=massif --alloc-fn=xmalloc --alloc-fn=xcalloc --alloc-fn=xrealloc --alloc-fn=xstrdup --alloc-fn=xstrndup';
 $pure_log = undef;
+
+$command_string = '';
+
+$all_tests = 0;
 
 require "test_driver.pl";
@@ -44 +52 @@
    local($option) = @_;
 
-   if ($option =~ /^-make([-_]?path)?$/)
-   {
-      $make_path = shift @argv;
-      if (!-f $make_path)
-      {
-         print "$option $make_path: Not found.\n";
-         exit 0;
-      }
-      return 1;
-   }
-
-   if ($option =~ /^-valgrind$/i) {
-     $valgrind = 1;
-     return 1;
+   if ($option =~ /^-make([-_]?path)?$/i) {
+       $make_path = shift @argv;
+       if (!-f $make_path) {
+           print "$option $make_path: Not found.\n";
+           exit 0;
+       }
+       return 1;
+   }
+
+   if ($option =~ /^-all([-_]?tests)?$/i) {
+       $all_tests = 1;
+       return 1;
+   }
+
+   if ($option =~ /^-(valgrind|memcheck)$/i) {
+       $valgrind = 1;
+       $valgrind_args = $memcheck_args;
+       return 1;
+   }
+
+   if ($option =~ /^-massif$/i) {
+       $valgrind = 1;
+       $valgrind_args = $massif_args;
+       return 1;
    }
 
@@ -106 +124 @@
     $makestring =~ s/#MAKEPATH#/$mkpath/g;
     $makestring =~ s/#MAKE#/$make_name/g;
+    $makestring =~ s/#PERL#/$perl_name/g;
     $makestring =~ s/#PWD#/$pwd/g;
 
@@ -120 +139 @@
   $answer =~ s/#MAKEPATH#/$mkpath/g;
   $answer =~ s/#MAKE#/$make_name/g;
+  $answer =~ s/#PERL#/$perl_name/g;
   $answer =~ s/#PWD#/$pwd/g;
 
@@ -149 +169 @@
   }
 
+  $command_string = "$command\n";
+
   if ($valgrind) {
     print VALGRIND "\n\nExecuting: $command\n";
@@ -156 +178 @@
   {
       my $old_timeout = $test_timeout;
-      $test_timeout = $timeout if $timeout;
+      $timeout and $test_timeout = $timeout;
+
+      # If valgrind is enabled, turn off the timeout check
+      $valgrind and $test_timeout = 0;
 
       $code = &run_command_with_output($logname,$command);
@@ -184 +209 @@
     print "Error running $make_path (expected $expected_code; got $code): $command\n";
     $test_passed = 0;
+    $runf = &get_runfile;
+    &create_file (&get_runfile, $command_string);
     # If it's a SIGINT, stop here
     if ($code & 127) {
       print STDERR "\nCaught signal ".($code & 127)."!\n";
-      exit($code);
+      ($code & 127) == 2 and exit($code);
     }
     return 0;
@@ -196 +223 @@
   }
 
-  1;
+  return 1;
 }
 
@@ -202 +229 @@
 {
    &print_standard_usage ("run_make_tests",
-                          "[-make_path make_pathname] [-valgrind]",);
+                          "[-make_path make_pathname] [-memcheck] [-massif]",);
 }
 
 sub print_help
 {
-   &print_standard_help ("-make_path",
-          "\tYou may specify the pathname of the copy of make to run.");
+   &print_standard_help (
+        "-make_path",
+        "\tYou may specify the pathname of the copy of make to run.",
+        "-valgrind",
+        "-memcheck",
+        "\tRun the test suite under valgrind's memcheck tool.",
+        "\tChange the default valgrind args with the VALGRIND_ARGS env var.",
+        "-massif",
+        "\tRun the test suite under valgrind's massif toool.",
+        "\tChange the default valgrind args with the VALGRIND_ARGS env var."
+       );
 }
 
@@ -336 +372 @@
 
    if ($valgrind) {
+     my $args = $valgrind_args;
      open(VALGRIND, "> valgrind.out")
        || die "Cannot open valgrind.out: $!\n";
      #  -q --leak-check=yes
-     exists $ENV{VALGRIND_ARGS} and $valgrind_args = $ENV{VALGRIND_ARGS};
-     $make_path = "valgrind --log-fd=".fileno(VALGRIND)." $valgrind_args $make_path";
+     exists $ENV{VALGRIND_ARGS} and $args = $ENV{VALGRIND_ARGS};
+     $make_path = "valgrind --log-fd=".fileno(VALGRIND)." $args $make_path";
      # F_SETFD is 2
      fcntl(VALGRIND, 2, 0) or die "fcntl(setfd) failed: $!\n";

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc