Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 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:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/tests

    • Property svn:ignore
      --- 
+++

  • trunk/src/kmk/tests/test_driver.pl

    r1993 r2591  
    77#
    88# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    9 # 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     9# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     10# Foundation, Inc.
    1011# This file is part of GNU Make.
    1112#
    … …  
    3031# variables and then calls &toplevel, which does all the real work.
    3132
    32 # $Id: test_driver.pl,v 1.24 2007/11/04 21:54:02 psmith Exp $
     33# $Id: test_driver.pl,v 1.30 2010/07/28 05:39:50 psmith Exp $
    3334
    3435
    … …  
    5455$test_timeout = 5;
    5556
     57# Path to Perl
     58$perl_name = $^X;
    5659
    5760# %makeENV is the cleaned-out environment.
    … …  
    239242{
    240243  # Set up an initial value.  In perl5 we can do it the easy way.
    241   #
    242244  $osname = defined($^O) ? $^O : '';
     245
     246  # Find a path to Perl
    243247
    244248  # See if the filesystem supports long file names with multiple
    … …  
    276280    if ($osname =~ /not found/i)
    277281    {
    278         $osname = "(something unixy with no uname)";
     282        $osname = "(something posixy with no uname)";
    279283    }
    280284    elsif ($@ ne "" || $?)
    … …  
    283287        if ($@ ne "" || $?)
    284288        {
    285             $osname = "(something unixy)";
     289            $osname = "(something posixy)";
    286290        }
    287291    }
    … …  
    460464      $diffext = 'd';
    461465      $baseext = 'b';
     466      $runext = 'r';
    462467      $extext = '';
    463468    } else {
    … …  
    465470      $diffext = 'diff';
    466471      $baseext = 'base';
     472      $runext = 'run';
    467473      $extext = '.';
    468474    }
    … …  
    470476    $diff_filename = "$testpath.$diffext";
    471477    $base_filename = "$testpath.$baseext";
     478    $run_filename = "$testpath.$runext";
    472479    $tmp_filename = "$testpath.$tmpfilesuffix";
    473480
    … …  
    483490    $tests_run = 0;
    484491    $tests_passed = 0;
     492
    485493    $code = do $perl_testname;
    486494
    … …  
    716724
    717725    &create_file (&get_basefile, $answer);
     726    &create_file (&get_runfile, $command_string);
    718727
    719728    print "\nCreating Difference File ...\n" if $debug;
    … …  
    723732    local($command) = "diff -c " . &get_basefile . " " . $logfile;
    724733    &run_command_with_output(&get_difffile,$command);
     734  } else {
     735      &rmfiles ();
    725736  }
    726737
    … …  
    816827      local $SIG{ALRM} = sub { die "timeout\n"; };
    817828      alarm $test_timeout;
    818       $code = system @_;
     829      $code = system(@_);
    819830      alarm 0;
    820831  };
    … …  
    853864  my $filename = shift;
    854865
    855   print "\nrun_command_with_output($filename): @_\n" if $debug;
     866  print "\nrun_command_with_output($filename,$runname): @_\n" if $debug;
    856867  &attach_default_output ($filename);
    857868  my $code = _run_command(@_);
    … …  
    12261237}
    12271238
     1239# This subroutine returns a command filename with a number appended
     1240# to the end corresponding to how many logfiles (and thus command files)
     1241# have been created in the current running test.
     1242
     1243sub get_runfile
     1244{
     1245  return ($run_filename . &num_suffix ($num_of_logfiles));
     1246}
     1247
    12281248# just like logfile, only a generic tmp filename for use by the test.
    12291249# they are automatically cleaned up unless -keep was used, or the test fails.
Note: See TracChangeset for help on using the changeset viewer.