Changeset 2591 for trunk/src/kmk/tests


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:
35 edited
9 copied

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/ChangeLog

    r1993 r2591  
     12010-07-28  Paul Smith  <psmith@gnu.org>
     2
     3        * scripts/targets/POSIX: Compatibility issues with Solaris (and
     4        Tru64?); "false" returns different exit codes, and set -x shows
     5        output with extra whitespace.  Run the commands by hand first to
     6        find out what the real shell would do, then compare what make does.
     7        * scripts/variables/SHELL: Ditto.
     8
     92010-07-12  Paul Smith  <psmith@gnu.org>
     10
     11        * test_driver.pl: Add a new $perl_name containing the path to Perl.
     12        * run_make_tests.pl (run_make_test): Replace the special string
     13        #PERL# in a makefile etc. with the path the Perl executable so
     14        makefiles can use it.
     15
     16        * scripts/targets/ONESHELL: Add a new set of regression tests for
     17        the .ONESHELL feature.
     18
     192010-07-06  Paul Smith  <psmith@gnu.org>
     20
     21        * scripts/variables/SHELL: Test the new .SHELLFLAGS variable.
     22
     23        * scripts/targets/POSIX: New file.  Test the .POSIX special target.
     24        Verify that enabling .POSIX changes the shell flags to set -e.
     25
     262010-07-01  Paul Smith  <psmith@gnu.org>
     27
     28        * scripts/features/recursion: Add a space to separate command-line
     29        args.  Fixes Savannah bug #29968.
     30
     312009-11-12  Boris Kolpackov  <boris@codesynthesis.com>
     32
     33        * scripts/features/vpath3: Test for the new library search
     34        behavior.
     35
     362009-10-06  Boris Kolpackov  <boris@codesynthesis.com>
     37
     38        * scripts/features/se_explicit: Enable the test for now fixed
     39        Savannah bug 25780.
     40
     412009-10-06  Boris Kolpackov  <boris@codesynthesis.com>
     42
     43        * scripts/variables/undefine: Tests for the new undefine feature.
     44
     452009-10-03  Paul Smith  <psmith@gnu.org>
     46
     47        * scripts/features/parallelism: Test for open Savannah bug #26846.
     48
     49        * scripts/variables/MAKE: Rewrite for new run_make_test() format.
     50
     51        * scripts/variables/MAKEFLAGS: Created.
     52        Add test for Savannah bug #2216 (still open).
     53
     54        * scripts/features/include: Test for Savannah bug #102 (still open).
     55
     562009-09-30  Boris Kolpackov  <boris@codesynthesis.com>
     57
     58        * scripts/features/include: Add diagnostics issuing tests for
     59        cases where targets have been updated and failed with the
     60        dontcare flag. Savannah bugs #15110, #25493, #12686, #17740.
     61
     622009-09-28  Paul Smith  <psmith@gnu.org>
     63
     64        * scripts/functions/shell: Add regression test for Savannah bug
     65        #20513 (still open).
     66
     67        * scripts/features/se_explicit: Add regression tests for Savannah
     68        bug #25780 (still open).
     69
     70        * run_make_tests.pl (valid_option): Add a new flag, -all([-_]?tests)?
     71        that runs tests we know will fail.  This allows us to add
     72        regression tests to the test suite for bugs that haven't been
     73        fixed yet.
     74
     752009-09-28  Boris Kolpackov  <boris@codesynthesis.com>
     76
     77        * scripts/features/patspecific_vars: Add a test for the shortest
     78        stem first order.
     79
     80        * scripts/features/patternrules: Add a test for the shortest stem
     81        first order.
     82
     832009-09-24  Paul Smith  <psmith@gnu.org>
     84
     85        * scripts/features/se_implicit: Add a test for order-only
     86        secondary expansion prerequisites.
     87
     882009-09-23  Paul Smith  <psmith@gnu.org>
     89
     90        * scripts/features/patternrules: Test that we can remove pattern
     91        rules, both single and multiple prerequisites.  Savannah bug #18622.
     92
     93        * scripts/features/echoing: Rework for run_make_test().
     94
     952009-06-14  Paul Smith  <psmith@gnu.org>
     96
     97        * scripts/features/vpath: Verify we don't get bogus circular
     98        dependency warnings if we choose a different file via vpath during
     99        update.  Savannah bug #13529.
     100
     1012009-06-13  Paul Smith  <psmith@gnu.org>
     102
     103        * scripts/variables/MAKEFILES: Verify that MAKEFILES included
     104        files (and files included by them) don't set the default goal.
     105        Savannah bug #13401.
     106
     107        * scripts/functions/wildcard: Test that wildcards with
     108        non-existent glob matchers return empty.
     109
     1102009-06-09  Paul Smith  <psmith@gnu.org>
     111
     112        * scripts/options/dash-B: Test the $? works correctly with -B.
     113        Savannah bug #17825.
     114
     115        * scripts/features/patternrules: Test that dependencies of
     116        "also_make" targets are created properly.  Savannah bug #19108.
     117
     118        * test_driver.pl (compare_output): Create a "run" file for failed
     119        tests containing the command that was run.
     120        (get_runfile): New function.
     121
     122        * run_make_tests.pl (valid_option): Enhanced support for valgrind:
     123        allow memcheck and massif tools.
     124
     125        * scripts/features/patternrules: Have to comment out a line in the
     126        first test due to backing out a change that broke the implicit
     127        rule search algorithm.  Savannah bug #17752.
     128        * scripts/misc/general4: Remove a test that is redundant with
     129        patternrules.
     130
     131        * scripts/features/parallelism: Add a test for re-exec with
     132        jobserver master override.  Savannah bug #18124.
     133
     1342009-06-08  Paul Smith  <psmith@gnu.org>
     135
     136        * scripts/features/targetvars: Add a test for continued target
     137        vars after a semicolon.  Savannah bug #17521.
     138
     1392009-06-07  Paul Smith  <psmith@gnu.org>
     140
     141        * scripts/features/se_explicit: Make sure we catch defining
     142        prereqs during snap_deps().  Savannah bug #24622.
     143
     144        * scripts/variables/automatic: Check prereq ordering when the
     145        target with the recipe has no prereqs.  Savannah bug #21198.
     146
     147        * scripts/variables/LIBPATTERNS: Add a new set of test for
     148        $(.LIBPATTERNS) (previously untested!)
     149
     1502009-06-04  Paul Smith  <psmith@gnu.org>
     151
     152        * scripts/variables/SHELL: The export target-specific SHELL test
     153        has an incorrect known-good-value.
     154
     155        * scripts/misc/general4: Check for whitespace (ffeed, vtab, etc.)
     156
     157        * scripts/features/se_explicit: Add tests for Savannah bug #24588.
     158
     1592009-05-31  Paul Smith  <psmith@gnu.org>
     160
     161        * scripts/variables/DEFAULT_GOAL: Add tests for Savannah bug #25697.
     162
     163        * scripts/features/targetvars: Add tests of overrides for Savannah
     164        bug #26207.
     165        * scripts/features/patspecific_vars: Ditto.
     166
     167        * scripts/features/patternrules: Add a test for Savannah bug #26593.
     168
     1692009-05-30  Paul Smith  <psmith@gnu.org>
     170
     171        * scripts/variables/flavors: Update with new variable flavor tests.
     172        * scripts/variables/define: Create a new set of tests for
     173        define/endef and move those aspects of the flavors suite here.
     174
     1752009-05-25  Paul Smith  <psmith@gnu.org>
     176
     177        * scripts/features/targetvars: Ditto.
     178
     179        * scripts/features/export: Test new variable parsing abilities.
     180
     1812009-02-23  Ramon Garcia  <ramon.garcia.f@gmail.com>
     182
     183        * scripts/variables/private: Create a new suite of tests for 'private'.
     184
    11852007-11-04  Paul Smith  <psmith@gnu.org>
    2186
    … …  
    8811065
    8821066Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    883 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     10672002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    8841068This file is part of GNU Make.
    8851069

  • trunk/src/kmk/tests/NEWS

    r1993 r2591  
    165165-------------------------------------------------------------------------------
    166166Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    167 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     1672002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    168168This file is part of GNU Make.
    169169

  • trunk/src/kmk/tests/README

    r1993 r2591  
    99 -----------------------------------------------------------------------------
    1010 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    11  2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     11 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    1212 This file is part of GNU Make.
    1313

  • trunk/src/kmk/tests/mkshadow

    r1993 r2591  
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     8# Foundation, Inc.
    89# This file is part of GNU Make.
    910#

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

    r1993 r2591  
    1313
    1414# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    15 # 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     15# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
     16# Foundation, Inc.
    1617# This file is part of GNU Make.
    1718#
    … …  
    2930# this program.  If not, see <http://www.gnu.org/licenses/>.
    3031
     32
    3133$valgrind = 0;              # invoke make with valgrind
    32 $valgrind_args = '--num-callers=15 --tool=memcheck --leak-check=full';
     34$valgrind_args = '';
     35$memcheck_args = '--num-callers=15 --tool=memcheck --leak-check=full';
     36$massif_args = '--num-callers=15 --tool=massif --alloc-fn=xmalloc --alloc-fn=xcalloc --alloc-fn=xrealloc --alloc-fn=xstrdup --alloc-fn=xstrndup';
    3337$pure_log = undef;
     38
     39$command_string = '';
     40
     41$all_tests = 0;
    3442
    3543require "test_driver.pl";
    … …  
    4452   local($option) = @_;
    4553
    46    if ($option =~ /^-make([-_]?path)?$/)
    47    {
    48       $make_path = shift @argv;
    49       if (!-f $make_path)
    50       {
    51          print "$option $make_path: Not found.\n";
    52          exit 0;
    53       }
    54       return 1;
    55    }
    56 
    57    if ($option =~ /^-valgrind$/i) {
    58      $valgrind = 1;
    59      return 1;
     54   if ($option =~ /^-make([-_]?path)?$/i) {
     55       $make_path = shift @argv;
     56       if (!-f $make_path) {
     57           print "$option $make_path: Not found.\n";
     58           exit 0;
     59       }
     60       return 1;
     61   }
     62
     63   if ($option =~ /^-all([-_]?tests)?$/i) {
     64       $all_tests = 1;
     65       return 1;
     66   }
     67
     68   if ($option =~ /^-(valgrind|memcheck)$/i) {
     69       $valgrind = 1;
     70       $valgrind_args = $memcheck_args;
     71       return 1;
     72   }
     73
     74   if ($option =~ /^-massif$/i) {
     75       $valgrind = 1;
     76       $valgrind_args = $massif_args;
     77       return 1;
    6078   }
    6179
    … …  
    106124    $makestring =~ s/#MAKEPATH#/$mkpath/g;
    107125    $makestring =~ s/#MAKE#/$make_name/g;
     126    $makestring =~ s/#PERL#/$perl_name/g;
    108127    $makestring =~ s/#PWD#/$pwd/g;
    109128
    … …  
    120139  $answer =~ s/#MAKEPATH#/$mkpath/g;
    121140  $answer =~ s/#MAKE#/$make_name/g;
     141  $answer =~ s/#PERL#/$perl_name/g;
    122142  $answer =~ s/#PWD#/$pwd/g;
    123143
    … …  
    149169  }
    150170
     171  $command_string = "$command\n";
     172
    151173  if ($valgrind) {
    152174    print VALGRIND "\n\nExecuting: $command\n";
    … …  
    156178  {
    157179      my $old_timeout = $test_timeout;
    158       $test_timeout = $timeout if $timeout;
     180      $timeout and $test_timeout = $timeout;
     181
     182      # If valgrind is enabled, turn off the timeout check
     183      $valgrind and $test_timeout = 0;
    159184
    160185      $code = &run_command_with_output($logname,$command);
    … …  
    184209    print "Error running $make_path (expected $expected_code; got $code): $command\n";
    185210    $test_passed = 0;
     211    $runf = &get_runfile;
     212    &create_file (&get_runfile, $command_string);
    186213    # If it's a SIGINT, stop here
    187214    if ($code & 127) {
    188215      print STDERR "\nCaught signal ".($code & 127)."!\n";
    189       exit($code);
     216      ($code & 127) == 2 and exit($code);
    190217    }
    191218    return 0;
    … …  
    196223  }
    197224
    198   1;
     225  return 1;
    199226}
    200227
    … …  
    202229{
    203230   &print_standard_usage ("run_make_tests",
    204                           "[-make_path make_pathname] [-valgrind]",);
     231                          "[-make_path make_pathname] [-memcheck] [-massif]",);
    205232}
    206233
    207234sub print_help
    208235{
    209    &print_standard_help ("-make_path",
    210           "\tYou may specify the pathname of the copy of make to run.");
     236   &print_standard_help (
     237        "-make_path",
     238        "\tYou may specify the pathname of the copy of make to run.",
     239        "-valgrind",
     240        "-memcheck",
     241        "\tRun the test suite under valgrind's memcheck tool.",
     242        "\tChange the default valgrind args with the VALGRIND_ARGS env var.",
     243        "-massif",
     244        "\tRun the test suite under valgrind's massif toool.",
     245        "\tChange the default valgrind args with the VALGRIND_ARGS env var."
     246       );
    211247}
    212248
    … …  
    336372
    337373   if ($valgrind) {
     374     my $args = $valgrind_args;
    338375     open(VALGRIND, "> valgrind.out")
    339376       || die "Cannot open valgrind.out: $!\n";
    340377     #  -q --leak-check=yes
    341      exists $ENV{VALGRIND_ARGS} and $valgrind_args = $ENV{VALGRIND_ARGS};
    342      $make_path = "valgrind --log-fd=".fileno(VALGRIND)." $valgrind_args $make_path";
     378     exists $ENV{VALGRIND_ARGS} and $args = $ENV{VALGRIND_ARGS};
     379     $make_path = "valgrind --log-fd=".fileno(VALGRIND)." $args $make_path";
    343380     # F_SETFD is 2
    344381     fcntl(VALGRIND, 2, 0) or die "fcntl(setfd) failed: $!\n";

  • trunk/src/kmk/tests/scripts/features/echoing

    r969 r2591  
    1 $description = "The following test creates a makefile to test command \n"
    2               ."echoing.  It tests that when a command line starts with \n"
    3               ."a '\@', the echoing of that line is suppressed.  It also \n"
    4               ."tests the -n option which tells make to ONLY echo the  \n"
    5               ."commands and no execution happens.  In this case, even \n"
    6               ."the commands with '\@' are printed. Lastly, it tests the \n"
    7               ."-s flag which tells make to prevent all echoing, as if \n"
    8               ."all commands started with a '\@'.";
     1#                                                                    -*-perl-*-
     2$description = "The following test creates a makefile to test command
     3echoing.  It tests that when a command line starts with
     4a '\@', the echoing of that line is suppressed.  It also
     5tests the -n option which tells make to ONLY echo the
     6commands and no execution happens.  In this case, even
     7the commands with '\@' are printed. Lastly, it tests the
     8-s flag which tells make to prevent all echoing, as if
     9all commands started with a '\@'.";
    910
    10 $details = "This test is similar to the 'clean' test except that a '\@' has\n"
    11           ."been placed in front of the delete command line.  Four tests \n"
    12           ."are run here.  First, make is run normally and the first echo\n"
    13           ."command should be executed.  In this case there is no '\@' so \n"
    14           ."we should expect make to display the command AND display the \n"
    15           ."echoed message.  Secondly, make is run with the clean target, \n"
    16           ."but since there is a '\@' at the beginning of the command, we\n"
    17           ."expect no output; just the deletion of a file which we check \n"
    18           ."for.  Third, we give the clean target again except this time\n"
    19           ."we give make the -n option.  We now expect the command to be \n"
    20           ."displayed but not to be executed.  In this case we need only \n"
    21           ."to check the output since an error message would be displayed\n"
    22           ."if it actually tried to run the delete command again and the \n"
    23           ."file didn't exist. Lastly, we run the first test again with \n"
    24           ."the -s option and check that make did not echo the echo \n"
    25           ."command before printing the message.";
     11$details = "This test is similar to the 'clean' test except that a '\@' has
     12been placed in front of the delete command line.  Four tests
     13are run here.  First, make is run normally and the first echo
     14command should be executed.  In this case there is no '\@' so
     15we should expect make to display the command AND display the
     16echoed message.  Secondly, make is run with the clean target,
     17but since there is a '\@' at the beginning of the command, we
     18expect no output; just the deletion of a file which we check
     19for.  Third, we give the clean target again except this time
     20we give make the -n option.  We now expect the command to be
     21displayed but not to be executed.  In this case we need only
     22to check the output since an error message would be displayed
     23if it actually tried to run the delete command again and the
     24file didn't exist. Lastly, we run the first test again with
     25the -s option and check that make did not echo the echo
     26command before printing the message.\n";
    2627
    2728$example = "EXAMPLE_FILE";
    2829
    29 open(MAKEFILE,"> $makefile");
    30 
    31 # The Contents of the MAKEFILE ...
    32 
    33 print MAKEFILE "all: \n";
    34 print MAKEFILE "\techo This makefile did not clean the dir... good\n";
    35 print MAKEFILE "clean: \n";
    36 print MAKEFILE "\t\@$delete_command $example\n";
    37 
    38 # END of Contents of MAKEFILE
    39 
    40 close(MAKEFILE);
    41 
    42 &touch($example);
     30touch($example);
    4331
    4432# TEST #1
    4533# -------
    4634
    47 &run_make_with_options($makefile,"",&get_logfile,0);
    48 $answer = "echo This makefile did not clean the dir... good\n"
    49          ."This makefile did not clean the dir... good\n";
    50 &compare_output($answer,&get_logfile(1));
    51 
     35run_make_test("
     36all:
     37\techo This makefile did not clean the dir... good
     38clean:
     39\t\@$delete_command $example\n",
     40              '', 'echo This makefile did not clean the dir... good
     41This makefile did not clean the dir... good');
    5242
    5343# TEST #2
    5444# -------
    5545
    56 &run_make_with_options($makefile,"clean",&get_logfile,0);
     46run_make_test(undef, 'clean', '');
    5747if (-f $example) {
    5848  $test_passed = 0;
     49  unlink($example);
    5950}
    60 &compare_output('',&get_logfile(1));
    6151
    6252# TEST #3
    6353# -------
    6454
    65 &run_make_with_options($makefile,"-n clean",&get_logfile,0);
    66 $answer = "$delete_command $example\n";
    67 &compare_output($answer,&get_logfile(1));
     55run_make_test(undef, '-n clean', "$delete_command $example\n");
    6856
    6957
    … …  
    7159# -------
    7260
    73 &run_make_with_options($makefile,"-s",&get_logfile,0);
    74 $answer = "This makefile did not clean the dir... good\n";
    75 &compare_output($answer,&get_logfile(1));
     61run_make_test(undef, '-s', "This makefile did not clean the dir... good\n");
    7662
    7763
    78641;
    79 
    80 
    81 
    82 
    83 
    84 
    85 
    86 
    87 

  • trunk/src/kmk/tests/scripts/features/export

    r969 r2591  
    77# about that here.
    88
    9 open(MAKEFILE,"> $makefile");
    10 
    11 # The Contents of the MAKEFILE ...
    12 
    13 print MAKEFILE <<'EOMAKE';
    14 
     9&run_make_test('
    1510FOO = foo
    1611BAR = bar
    … …  
    4136        @echo "FOO=$(FOO) BAR=$(BAR) BAZ=$(BAZ) BOZ=$(BOZ) BITZ=$(BITZ) BOTZ=$(BOTZ)"
    4237        @echo "FOO=$$FOO BAR=$$BAR BAZ=$$BAZ BOZ=$$BOZ BITZ=$$BITZ BOTZ=$$BOTZ"
    43 
    44 EOMAKE
    45 
    46 close(MAKEFILE);
    47 
    48 # TEST 0: basics
    49 
    50 &run_make_with_options($makefile,"",&get_logfile,0);
    51 
    52 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    53 FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    54 
    55 &compare_output($answer,&get_logfile(1));
     38',
     39           '', "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     40FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    5641
    5742# TEST 1: make sure vars inherited from the parent are exported
    … …  
    5944$extraENV{FOO} = 1;
    6045
    61 &run_make_with_options($makefile,"",&get_logfile,0);
    62 
    63 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    64 FOO=foo BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    65 
    66 &compare_output($answer,&get_logfile(1));
     46&run_make_test(undef, '', "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     47FOO=foo BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    6748
    6849# TEST 2: global export.  Explicit unexport takes precedence.
    6950
    70 &run_make_with_options($makefile,"EXPORT_ALL=1",&get_logfile,0);
    71 
    72 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    73 FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    74 
    75 &compare_output($answer,&get_logfile(1));
     51run_make_test(undef, "EXPORT_ALL=1" ,
     52              "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     53FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    7654
    7755# TEST 3: global unexport.  Explicit export takes precedence.
    7856
    79 &run_make_with_options($makefile,"UNEXPORT_ALL=1",&get_logfile,0);
    80 
    81 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    82 FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    83 
    84 &compare_output($answer,&get_logfile(1));
     57&run_make_test(undef, "UNEXPORT_ALL=1",
     58               "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     59FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    8560
    8661# TEST 4: both: in the above makefile the unexport comes last so that rules.
    8762
    88 &run_make_with_options($makefile,"EXPORT_ALL=1 UNEXPORT_ALL=1",&get_logfile,0);
    89 
    90 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    91 FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    92 
    93 &compare_output($answer,&get_logfile(1));
     63&run_make_test(undef, "EXPORT_ALL=1 UNEXPORT_ALL=1",
     64               "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     65FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    9466
    9567# TEST 5: test the pseudo target.
    9668
    97 &run_make_with_options($makefile,"EXPORT_ALL_PSEUDO=1",&get_logfile,0);
    98 
    99 $answer = "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
    100 FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
    101 
    102 &compare_output($answer,&get_logfile(1));
    103 
     69&run_make_test(undef, "EXPORT_ALL_PSEUDO=1",
     70               "FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=botz
     71FOO=foo BAR=bar BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n");
    10472
    10573# TEST 6: Test the expansion of variables inside export
    10674
    107 $makefile2 = &get_tmpfile;
    108 
    109 open(MAKEFILE, "> $makefile2");
    110 
    111 print MAKEFILE <<'EOF';
    112 
     75&run_make_test('
    11376foo = f-ok
    11477bar = b-ok
    … …  
    12689        @echo foo=$(foo) bar=$(bar)
    12790        @echo foo=$$foo bar=$$bar
    128 
    129 EOF
    130 
    131 close(MAKEFILE);
    132 
    133 &run_make_with_options($makefile2,"",&get_logfile,0);
    134 $answer = "foo=f-ok bar=b-ok\nfoo=f-ok bar=b-ok\n";
    135 &compare_output($answer,&get_logfile(1));
    136 
     91',
     92             "", "foo=f-ok bar=b-ok\nfoo=f-ok bar=b-ok\n");
    13793
    13894# TEST 7: Test the expansion of variables inside unexport
    13995
    140 $makefile3 = &get_tmpfile;
    141 
    142 open(MAKEFILE, "> $makefile3");
    143 
    144 print MAKEFILE <<'EOF';
    145 
     96&run_make_test('
    14697foo = f-ok
    14798bar = b-ok
    … …  
    161112        @echo foo=$(foo) bar=$(bar)
    162113        @echo foo=$$foo bar=$$bar
    163 
    164 EOF
    165 
    166 close(MAKEFILE);
    167 
    168 &run_make_with_options($makefile3,"",&get_logfile,0);
    169 $answer = "foo=f-ok bar=b-ok\nfoo= bar=\n";
    170 &compare_output($answer,&get_logfile(1));
    171 
     114',
     115              '', "foo=f-ok bar=b-ok\nfoo= bar=\n");
    172116
    173117# TEST 7: Test exporting multiple variables on the same line
    174118
    175 $makefile4 = &get_tmpfile;
    176 
    177 open(MAKEFILE, "> $makefile4");
    178 
    179 print MAKEFILE <<'EOF';
    180 
     119&run_make_test('
    181120A = a
    182121B = b
    … …  
    197136
    198137all: ; @echo A=$$A B=$$B C=$$C D=$$D E=$$E F=$$F G=$$G H=$$H I=$$I J=$$J
    199 EOF
    200 
    201 close(MAKEFILE);
    202 
    203 &run_make_with_options($makefile4,"",&get_logfile,0);
    204 $answer = "A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j\n";
    205 &compare_output($answer,&get_logfile(1));
    206 
     138',
     139               '', "A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j\n");
    207140
    208141# TEST 8: Test unexporting multiple variables on the same line
    209142
    210 $makefile5 = &get_tmpfile;
     143@extraENV{qw(A B C D E F G H I J)} = qw(1 2 3 4 5 6 7 8 9 10);
    211144
    212 open(MAKEFILE, "> $makefile5");
    213 
    214 print MAKEFILE <<'EOF';
    215 
     145&run_make_test('
    216146A = a
    217147B = b
    … …  
    232162
    233163all: ; @echo A=$$A B=$$B C=$$C D=$$D E=$$E F=$$F G=$$G H=$$H I=$$I J=$$J
    234 EOF
     164',
     165               '', "A= B= C= D= E= F= G= H= I= J=\n");
    235166
    236 close(MAKEFILE);
     167# TEST 9: Check setting a variable named "export"
    237168
    238 @extraENV{qw(A B C D E F G H I J)} = qw(1 2 3 4 5 6 7 8 9 10);
     169&run_make_test('
     170export = 123
     171export export
     172export export = 456
     173a: ; @echo "\$$(export)=$(export) / \$$export=$$export"
     174',
     175               '', "\$(export)=456 / \$export=456\n");
    239176
    240 &run_make_with_options($makefile5,"",&get_logfile,0);
    241 $answer = "A= B= C= D= E= F= G= H= I= J=\n";
    242 &compare_output($answer,&get_logfile(1));
     177# TEST 9: Check "export" as a target
    243178
     179&run_make_test('
     180a: export
     181export: ; @echo "$@"
     182',
     183               '', "export\n");
    244184
    245185# This tells the test driver that the perl test script executed properly.

  • trunk/src/kmk/tests/scripts/features/include

    r969 r2591  
    9191', '', '');
    9292
    93 1;
    94 
    9593
    9694# Make sure that we don't die when the command fails but we dontcare.
    … …  
    118116sinclude', '', '');
    119117
     118
     119# Test that the diagnostics is issued even if the target has been
     120# tried before with the dontcare flag (direct dependency case).
     121#
     122run_make_test('
     123-include foo
     124
     125all: bar
     126
     127foo: baz
     128bar: baz
     129',
     130'',
     131"#MAKE#: *** No rule to make target `baz', needed by `bar'.  Stop.\n",
     132512);
     133
     134# Test that the diagnostics is issued even if the target has been
     135# tried before with the dontcare flag (indirect dependency case).
     136#
     137run_make_test('
     138-include foo
     139
     140all: bar
     141
     142foo: baz
     143bar: baz
     144baz: end
     145',
     146'',
     147"#MAKE#: *** No rule to make target `end', needed by `baz'.  Stop.\n",
     148512);
     149
     150# Test that the diagnostics is issued even if the target has been
     151# tried before with the dontcare flag (include/-include case).
     152#
     153run_make_test('
     154include bar
     155-include foo
     156
     157all:
     158
     159foo: baz
     160bar: baz
     161baz: end
     162',
     163'',
     164"#MAKEFILE#:2: bar: No such file or directory
     165#MAKE#: *** No rule to make target `end', needed by `baz'.  Stop.\n",
     166512);
     167
     168if ($all_tests) {
     169    # Test that include of a rebuild-able file doesn't show a warning
     170    # Savannah bug #102
     171    run_make_test(q!
     172include foo
     173foo: ; @echo foo = bar > $@
     174!,
     175                  '', "#MAKE#: `foo' is up to date.\n");
     176    rmfiles('foo');
     177}
     178
    1201791;

  • trunk/src/kmk/tests/scripts/features/override

    r969 r2591  
    1 $description = "The following test creates a makefile to ...";
     1#                                                                    -*-perl-*-
     2
     3$description = "Test the override directive on variable assignments.";
    24
    35$details = "";
    46
    5 open(MAKEFILE,"> $makefile");
     7# TEST 0: Basic override
    68
    7 # The Contents of the MAKEFILE ...
     9run_make_test('
     10X = start
     11override recur = $(X)
     12override simple := $(X)
     13X = end
     14all: ; @echo "$(recur) $(simple)"
     15',
     16              'recur=I simple=J', "end start\n");
    817
    9 print MAKEFILE "override define foo\n"
    10               ."\@echo First comes the definition.\n"
    11               ."\@echo Then comes the override.\n"
    12               ."endef\n"
    13               ."all: \n"
    14               ."\t\$(foo)\n";
     18# TEST 1: Override with append
    1519
    16 # END of Contents of MAKEFILE
     20run_make_test('
     21X += X1
     22override X += X2
     23override Y += Y1
     24Y += Y2
     25all: ; @echo "$(X) $(Y)"
     26',
     27              '', "X1 X2 Y1\n");
    1728
    18 close(MAKEFILE);
     29# TEST 2: Override with append to the command line
    1930
    20 &run_make_with_options($makefile,"foo=Hello",&get_logfile);
     31run_make_test(undef, 'X=C Y=C', "C X2 C Y1\n");
    2132
    22 # Create the answer to what should be produced by this Makefile
    23 $answer = "First comes the definition.\n"
    24          ."Then comes the override.\n";
     33# Test override of define/endef
    2534
    26 &compare_output($answer,&get_logfile(1));
     35run_make_test('
     36override define foo
     37@echo First comes the definition.
     38@echo Then comes the override.
     39endef
     40all: ; $(foo)
     41',
     42              'foo=Hello', "First comes the definition.\nThen comes the override.\n");
     43
    2744
    28451;
    29 
    30 
    31 
    32 
    33 
    34 

  • trunk/src/kmk/tests/scripts/features/parallelism

    r2186 r2591  
    4444              "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
    4545
    46 unlink('1.inc', '2.inc');
     46rmfiles(qw(1.inc 2.inc));
    4747
    4848
    … …  
    6363              "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
    6464
    65 unlink('1.inc', '2.inc');
     65rmfiles(qw(1.inc 2.inc));
    6666
    6767# Grant Taylor reports a problem where tokens can be lost (not written back
    … …  
    153153.PHONY: phony
    154154phony: ; : phony', '-rR -j', ': phony');
    155 unlink('target');
    156 
     155rmfiles('target');
     156
     157# TEST #10: Don't put --jobserver-fds into a re-exec'd MAKEFLAGS.
     158# We can't test this directly because there's no way a makefile can
     159# show the value of MAKEFLAGS we were re-exec'd with.  We can intuit it
     160# by looking for "disabling jobserver mode" warnings; we should only
     161# get one from the original invocation and none from the re-exec.
     162# See Savannah bug #18124
     163
     164run_make_test(q!
     165-include inc.mk
     166recur:
     167#       @echo 'MAKEFLAGS = $(MAKEFLAGS)'
     168        @rm -f inc.mk
     169        @$(MAKE) -j2 -f #MAKEFILE# all
     170all:
     171#       @echo 'MAKEFLAGS = $(MAKEFLAGS)'
     172        @echo $@
     173inc.mk:
     174#       @echo 'MAKEFLAGS = $(MAKEFLAGS)'
     175        @echo 'FOO = bar' > $@
     176!,
     177              '--no-print-directory -j2', "#MAKE#[1]: warning: -jN forced in submake: disabling jobserver mode.\nall\n");
     178
     179rmfiles('inc.mk');
     180
     181if ($all_tests) {
     182    # Implicit files aren't properly recreated during parallel builds
     183    # Savannah bug #26864
     184
     185    # The first run works fine
     186    run_make_test(q!
     187%.bar: %.x foo.y ; cat $^ > $@
     188%.x: ; touch $@
     189foo.y: foo.y.in ; cp $< $@
     190foo.y.in: ; touch $@
     191!,
     192                  '-j2 main.bar',
     193                  "touch foo.y.in
     194touch main.x
     195cp foo.y.in foo.y
     196cat main.x foo.y > main.bar
     197rm main.x");
     198
     199    # Now we touch the .in file and make sure it still works
     200    touch('foo.y.in');
     201
     202    run_make_test(undef, '-j2 main.bar', "cp foo.y.in foo.y
     203touch main.x
     204cat main.x foo.y > main.bar
     205rm main.x");
     206
     207    # Clean up
     208    rmfiles(qw(foo.y foo.y.in main.bar));
     209}
     210
     211if ($all_tests) {
     212    # Jobserver FD handling is messed up in some way.
     213    # Savannah bug #28189
     214    # It doesn't look like that bug anymore but this is the code it runs
     215
     216    run_make_test(q!
     217ifdef EXTRA
     218vpath %.dst /
     219xxx.dst: ; true
     220yyy.dst: ; true
     221endif
     222
     223M := $(MAKE)
     224xx: ; $M --no-print-directory -j2 -f $(MAKEFILE_LIST) xxx.dst yyy.dst EXTRA=1
     225!,
     226                  '-j2',
     227                  '#MAKE#[1]: warning: -jN forced in submake: disabling jobserver mode.
     228true
     229true
     230');
     231}
    157232
    158233# Make sure that all jobserver FDs are closed if we need to re-exec the
    … …  
    183258#               'bar');
    184259
    185 # unlink('dependfile', 'output');
     260# rmfiles(qw(dependfile output));
    186261
    187262
    … …  
    189264# run_make_test(undef, '-j2 recurse INCL=false', 'bar');
    190265
    191 # unlink('dependfile', 'output');
     266# rmfiles(qw(dependfile output));
    192267
    1932681;

  • trunk/src/kmk/tests/scripts/features/patspecific_vars

    r2173 r2591  
    121121pattrn: global: new $t pattern: good $t inherit: good $t;');
    122122
     123# TEST #8: override in pattern-specific variables
     124
     125run_make_test('
     126a%: override FOO += f1
     127a%: FOO += f2
     128ab: ; @echo "$(FOO)"
     129',
     130              '', "f1\n");
     131
     132run_make_test(undef, 'FOO=C', "C f1\n");
     133
     134# TEST #9: Test shortest stem selection in pattern-specific variables.
     135
     136run_make_test('
     137%-mt.x: x := two
     138%.x: x := one
     139
     140all: foo.x foo-mt.x
     141
     142foo.x: ;@echo $x
     143foo-mt.x: ;@echo $x
     144',
     145'',
     146"one\ntwo");
    123147
    1241481;

  • trunk/src/kmk/tests/scripts/features/patternrules

    • Property svn:keywords deleted
    r1952 r2591  
    1616#
    1717
    18 run_make_test('
     18run_make_test(q!
    1919.PHONY: all
    2020
    2121all: case.1 case.2 case.3
    22 a: void
     22
     23# We can't have this, due to "Implicit Rule Search Algorithm" step 5c
     24#xxx: void
    2325
    2426# 1 - existing file
    … …  
    4244
    43453.implicit-phony:
    44 ',
    45 '',
    46 '');
     46!, '', '');
    4747
    4848# TEST #1: make sure files that are built via implicit rules are marked
    … …  
    150150unlink('foo.in', 'foo.h', 'foo.c', 'foo.o');
    151151
     152# TEST #5: make sure both prefix and suffix patterns work with multiple
     153#          target patterns (Savannah bug #26593).
     154#
     155run_make_test('
     156all: foo.s1 foo.s2 p1.foo p2.foo
     157
     158p1.% p2.%: %.orig
     159        @echo $@
     160%.s1 %.s2: %.orig
     161        @echo $@
     162
     163.PHONY: foo.orig
     164',
     165              '', "foo.s1\np1.foo\n");
     166
     167# TEST 6: Make sure that non-target files are still eligible to be created
     168# as part of implicit rule chaining.  Savannah bug #17752.
     169
     170run_make_test(q!
     171BIN = xyz
     172COPY = $(BIN).cp
     173SRC = $(BIN).c
     174allbroken: $(COPY) $(BIN) ; @echo ok
     175$(SRC): ; @echo 'main(){}' > $@
     176%.cp: % ; @cp $< $@
     177% : %.c ; @cp $< $@
     178clean: ; @rm -rf $(SRC) $(COPY) $(BIN)
     179!,
     180              '', "ok\n");
     181
     182unlink(qw(xyz xyz.cp xyz.c));
     183
     184# TEST 7: Make sure that all prereqs of all "also_make" targets get created
     185# before any of the things that depend on any of them.  Savannah bug #19108.
     186
     187run_make_test(q!
     188final: x ; @echo $@
     189x: x.t1 x.t2 ; @echo $@
     190x.t2: dep
     191dep: ; @echo $@
     192%.t1 %.t2: ; @echo $*.t1 ; echo $*.t2
     193!,
     194              '', "dep\nx.t1\nx.t2\nx\nfinal\n");
     195
     196
     197# TEST 8: Verify we can remove pattern rules.  Savannah bug #18622.
     198
     199my @f = (qw(foo.w foo.ch));
     200touch(@f);
     201
     202run_make_test(q!
     203CWEAVE := :
     204
     205# Disable builtin rules
     206%.tex : %.w
     207%.tex : %.w %.ch
     208!,
     209              'foo.tex',
     210              "#MAKE#: *** No rule to make target `foo.tex'.  Stop.", 512);
     211
     212unlink(@f);
     213
     214# TEST #9: Test shortest stem selection in pattern rules.
     215
     216run_make_test('
     217%.x: ;@echo one
     218%-mt.x: ;@echo two
     219
     220all: foo.x foo-mt.x
     221',
     222'',
     223"one\ntwo");
     224
     2251;
     226
    152227# This tells the test driver that the perl test script executed properly.
    1532281;

  • trunk/src/kmk/tests/scripts/features/recursion

    r1956 r2591  
    1717        @echo THE END
    1818',
    19               ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
     19              ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
    2020              ($vos
    2121               ? "#MAKE#: Entering directory `#PWD#'

  • trunk/src/kmk/tests/scripts/features/se_explicit

    • Property svn:keywords deleted
    r1981 r2591  
    2727# TEST #1: automatic variables.
    2828#
    29 run_make_test('
     29run_make_test(q!
    3030.SECONDEXPANSION:
    31 .DEFAULT: ; @echo $@
     31.DEFAULT: ; @echo '$@'
    3232
    3333foo: bar baz
    … …  
    4242     $$*.6
    4343
    44 ',
     44!,
    4545'-j1',
    4646'bar
    … …  
    6363# Test #2: target/pattern -specific variables.
    6464#
    65 run_make_test('
     65run_make_test(q!
    6666.SECONDEXPANSION:
    67 .DEFAULT: ; @echo $@
     67.DEFAULT: ; @echo '$@'
    6868
    6969foo.x: $$a $$b
    … …  
    7272
    7373%.x: b := baz
    74 
    75 ',
     74!,
    7675'',
    7776'bar
    … …  
    8281# Test #3: order of prerequisites.
    8382#
    84 run_make_test('
     83run_make_test(q!
    8584.SECONDEXPANSION:
    86 .DEFAULT: ; @echo $@
     85.DEFAULT: ; @echo '$@'
    8786
    8887all: foo bar baz
    8988
    9089# Subtest #1
    91 #
    9290foo: foo.1; @:
    93 
    9491foo: foo.2
    95 
    9692foo: foo.3
    9793
    98 
    9994# Subtest #2
    100 #
    10195bar: bar.2
    102 
    10396bar: bar.1; @:
    104 
    10597bar: bar.3
    10698
    107 
    10899# Subtest #3
    109 #
    110100baz: baz.1
    111 
    112101baz: baz.2
    113 
    114102baz: ; @:
    115 
    116 ',
     103!,
    117104'-j1',
    118105'foo.1
    … …  
    126113');
    127114
     115# TEST #4: eval in a context where there is no reading_file
     116run_make_test(q!
     117.SECONDEXPANSION:
     118all : $$(eval $$(info test))
     119!,
     120            '', "test\n#MAKE#: Nothing to be done for `all'.\n");
     121
     122# TEST #5: (NEGATIVE) catch eval in a prereq list trying to create new
     123# target/prereq relationships.
     124
     125run_make_test(q!
     126.SECONDEXPANSION:
     127proj1.exe : proj1.o $$(eval $$(test))
     128define test
     129proj1.o : proj1.c
     130proj1.c: proj1.h
     131endef
     132!,
     133              '', "#MAKE#: *** prerequisites cannot be defined in recipes.  Stop.\n", 512);
     134
     135
     136# Automatic $$+ variable expansion issue.  Savannah bug #25780
     137run_make_test(q!
     138all : foo foo
     139.SECONDEXPANSION:
     140all : $$+ ; @echo '$+'
     141foo : ;
     142!,
     143                  '', "foo foo foo foo\n");
     144
     145
     146# Automatic $$+ variable expansion issue.  Savannah bug #25780
     147run_make_test(q!
     148all : bar bar
     149bar : ;
     150q%x : ;
     151.SECONDEXPANSION:
     152a%l: q1x $$+ q2x ; @echo '$+'
     153!,
     154                  '', "q1x bar bar q2x bar bar\n");
     155
     156
    128157# This tells the test driver that the perl test script executed properly.
    1291581;

  • trunk/src/kmk/tests/scripts/features/se_implicit

    • Property svn:keywords deleted
    r1982 r2591  
    1212# Test #1: automatic variables.
    1313#
    14 run_make_test('
    15 .SECONDEXPANSION:
    16 .DEFAULT: ; @echo $@
     14run_make_test(q!
     15.SECONDEXPANSION:
     16.DEFAULT: ; @echo '$@'
    1717
    1818foo.a: bar baz
    … …  
    38385.buz \
    39396.a:
    40         @echo $@
    41 
    42 ',
     40        @echo '$@'
     41
     42!,
    4343'-j1',
    4444'1.foo.a
    … …  
    6161# Test #2: target/pattern -specific variables.
    6262#
    63 run_make_test('
     63run_make_test(q!
    6464.SECONDEXPANSION:
    6565foo.x:
    … …  
    7272%.x: x_b := baz
    7373
    74 bar baz: ; @echo $@
    75 
    76 ',
    77 '',
    78 'bar
    79 baz
    80 ');
     74bar baz: ; @echo '$@'
     75!,
     76              '', "bar\nbaz\n");
    8177
    8278
    8379# Test #3: order of prerequisites.
    8480#
    85 run_make_test('
    86 .SECONDEXPANSION:
    87 .DEFAULT: ; @echo $@
     81run_make_test(q!
     82.SECONDEXPANSION:
     83.DEFAULT: ; @echo '$@'
    8884
    8985all: foo bar baz
    … …  
    9894foo: foo.3
    9995
    100 foo.1: ; @echo $@
     96foo.1: ; @echo '$@'
    10197
    10298
    … …  
    109105bar: bar.3
    110106
    111 bar.1: ; @echo $@
     107bar.1: ; @echo '$@'
    112108
    113109
    … …  
    119115
    120116%az: ; @:
    121 
    122 ',
    123 '-j1',
     117!,
     118              '-j1',
    124119'foo.1
    125120foo.2
    … …  
    135130# Test #4: stem splitting logic.
    136131#
    137 run_make_test('
     132run_make_test(q!
    138133.SECONDEXPANSION:
    139134$(dir)/tmp/bar.o:
    140135
    141 $(dir)/tmp/foo/bar.c: ; @echo $@
    142 $(dir)/tmp/bar/bar.c: ; @echo $@
    143 foo.h: ; @echo $@
     136$(dir)/tmp/foo/bar.c: ; @echo '$@'
     137$(dir)/tmp/bar/bar.c: ; @echo '$@'
     138foo.h: ; @echo '$@'
    144139
    145140%.o: $$(addsuffix /%.c,foo bar) foo.h
    146         @echo $@: {$<} $^
    147 
    148 ',
    149 "dir=$dir",
    150 "$dir/tmp/foo/bar.c
     141        @echo '$@: {$<} $^'
     142!,
     143              "dir=$dir", "$dir/tmp/foo/bar.c
    151144$dir/tmp/bar/bar.c
    152145foo.h
    … …  
    157150# Test #5: stem splitting logic and order-only prerequisites.
    158151#
    159 run_make_test('
     152run_make_test(q!
    160153.SECONDEXPANSION:
    161154$(dir)/tmp/foo.o: $(dir)/tmp/foo.c
    162 $(dir)/tmp/foo.c: ; @echo $@
    163 bar.h: ; @echo $@
     155$(dir)/tmp/foo.c: ; @echo '$@'
     156bar.h: ; @echo '$@'
    164157
    165158%.o: %.c|bar.h
    166         @echo $@: {$<} {$|} $^
    167 
    168 ',
    169 "dir=$dir",
    170 "$dir/tmp/foo.c
     159        @echo '$@: {$<} {$|} $^'
     160
     161!,
     162              "dir=$dir", "$dir/tmp/foo.c
    171163bar.h
    172164$dir/tmp/foo.o: {$dir/tmp/foo.c} {bar.h} $dir/tmp/foo.c
    … …  
    176168# Test #6: lack of implicit prerequisites.
    177169#
    178 run_make_test('
     170run_make_test(q!
    179171.SECONDEXPANSION:
    180172foo.o: foo.c
    181 foo.c: ; @echo $@
     173foo.c: ; @echo '$@'
    182174
    183175%.o:
    184         @echo $@: {$<} $^
    185 
    186 ',
    187 '',
    188 'foo.c
    189 foo.o: {foo.c} foo.c
    190 ');
     176        @echo '$@: {$<} $^'
     177!,
     178              '', "foo.c\nfoo.o: {foo.c} foo.c\n");
     179
    191180
    192181# Test #7: Test stem from the middle of the name.
    193182#
    194 run_make_test('
     183run_make_test(q!
    195184.SECONDEXPANSION:
    196185foobarbaz:
    197186
    198187foo%baz: % $$*.1
    199         @echo $*
     188        @echo '$*'
    200189
    201190bar bar.1:
    202         @echo $@
    203 
    204 ',
    205 '',
    206 'bar
    207 bar.1
    208 bar
    209 ');
     191        @echo '$@'
     192!,
     193              '', "bar\nbar.1\nbar\n");
     194
    210195
    211196# Test #8: Make sure stem triple-expansion does not happen.
    212197#
    213 run_make_test('
     198run_make_test(q!
    214199.SECONDEXPANSION:
    215200foo$$bar:
    216201
    217202f%r: % $$*.1
    218         @echo \'$*\'
     203        @echo '$*'
    219204
    220205oo$$ba oo$$ba.1:
    221         @echo \'$@\'
    222 
    223 ',
    224 '',
    225 'oo$ba
     206        @echo '$@'
     207!,
     208              '', 'oo$ba
    226209oo$ba.1
    227210oo$ba
    228211');
    229212
     213# Test #9: Check the value of $^
     214run_make_test(q!
     215.SECONDEXPANSION:
     216
     217%.so: | $$(extra) ; @echo $^
     218
     219foo.so: extra := foo.o
     220foo.so:
     221foo.o:
     222!,
     223              '', "\n");
    230224
    231225# This tells the test driver that the perl test script executed properly.

  • trunk/src/kmk/tests/scripts/features/se_statpat

    • Property svn:keywords deleted
    r1983 r2591  
    66# Test #1: automatic variables.
    77#
    8 run_make_test('
     8# bird: Had to add -j1 here earlier...
     9run_make_test(q!
    910.SECONDEXPANSION:
    10 .DEFAULT: ; @echo $@
     11.DEFAULT: ; @echo '$@'
    1112
    1213foo.a foo.b: foo.%: bar.% baz.%
    13 
    1414foo.a foo.b: foo.%: biz.% | buz.%
    1515
    … …  
    2020                    $$|.5 \
    2121                    $$*.6
    22 
    23 ',
    24 '-j1',
    25 'bar.a
     22!,
     23              '', 'bar.a
    2624baz.a
    2725biz.a
    … …  
    4240# Test #2: target/pattern -specific variables.
    4341#
    44 run_make_test('
     42run_make_test(q!
    4543.SECONDEXPANSION:
    46 .DEFAULT: ; @echo $@
     44.DEFAULT: ; @echo '$@'
    4745
    4846foo.x foo.y: foo.%: $$(%_a) $$($$*_b)
    … …  
    5149
    5250%.x: x_b := baz
    53 
    54 
    55 ',
    56 '',
    57 'bar
    58 baz
    59 ');
     51!,
     52              '', "bar\nbaz\n");
    6053
    6154
    6255# Test #3: order of prerequisites.
    6356#
    64 run_make_test('
     57# bird: Had to add -j1 here earlier...
     58run_make_test(q!
    6559.SECONDEXPANSION:
    66 .DEFAULT: ; @echo $@
     60.DEFAULT: ; @echo '$@'
    6761
    6862all: foo.a bar.a baz.a
    6963
    7064# Subtest #1
    71 #
    7265foo.a foo.b: foo.%: foo.%.1; @:
    73 
    7466foo.a foo.b: foo.%: foo.%.2
    75 
    7667foo.a foo.b: foo.%: foo.%.3
    7768
    7869
    7970# Subtest #2
    80 #
    8171bar.a bar.b: bar.%: bar.%.2
    82 
    8372bar.a bar.b: bar.%: bar.%.1; @:
    84 
    8573bar.a bar.b: bar.%: bar.%.3
    8674
    8775
    8876# Subtest #3
    89 #
    9077baz.a baz.b: baz.%: baz.%.1
    91 
    9278baz.a baz.b: baz.%: baz.%.2
    93 
    9479baz.a baz.b: ; @:
    95 
    96 ',
    97 '-j1',
    98 'foo.a.1
     80!,
     81             '', 'foo.a.1
    9982foo.a.2
    10083foo.a.3
    … …  
    10992# Test #4: Make sure stem triple-expansion does not happen.
    11093#
    111 run_make_test('
     94run_make_test(q!
    11295.SECONDEXPANSION:
    11396foo$$bar: f%r: % $$*.1
    114         @echo \'$*\'
     97        @echo '$*'
    11598
    11699oo$$ba oo$$ba.1:
    117         @echo \'$@\'
    118 
    119 ',
    120 '',
    121 'oo$ba
     100        @echo '$@'
     101!,
     102              '', 'oo$ba
    122103oo$ba.1
    123104oo$ba

  • trunk/src/kmk/tests/scripts/features/targetvars

    r2165 r2591  
    77rules, semicolon interference, etc.";
    88
    9 open(MAKEFILE,"> $makefile");
    10 
    11 print MAKEFILE <<'EOF';
     9run_make_test('
    1210SHELL = /bin/sh
    1311export FOO = foo
    … …  
    1816three: ; BAR=1000
    1917        @echo $(FOO) $(BAR)
    20 # Some things that shouldn't be target vars
     18# Some things that shouldn not be target vars
    2119funk : override
    2220funk : override adelic
    … …  
    2523four:FOO=x
    2624four:VAR$(FOO)=ok
    27 four: ; @echo '$(FOO) $(VAR$(FOO)) $(VAR) $(VARx)'
     25four: ; @echo "$(FOO) $(VAR$(FOO)) $(VAR) $(VARx)"
    2826five:FOO=x
    2927five six : VAR$(FOO)=good
    30 five six: ;@echo '$(FOO) $(VAR$(FOO)) $(VAR) $(VARx) $(VARfoo)'
     28five six: ;@echo "$(FOO) $(VAR$(FOO)) $(VAR) $(VARx) $(VARfoo)"
    3129# Test per-target variable inheritance
    3230seven: eight
    … …  
    4240# Test = escaping
    4341EQ = =
    44 ten: one\=two
    45 ten: one \= two
     42ten: one$(EQ)two
     43ten: one $(EQ) two
    4644ten one$(EQ)two $(EQ):;@echo $@
    4745.PHONY: one two three four five six seven eight nine ten $(EQ) one$(EQ)two
    … …  
    5553foo.r : RVAR += rvar
    5654foo.t : TVAR := $(QVAR)
    57 EOF
    58 
    59 close(MAKEFILE);
    60 
    61 # TEST #1
    62 
    63 &run_make_with_options($makefile, "-j1 one two three", &get_logfile);
    64 $answer = "one bar\nfoo two\nBAR=1000\nfoo bar\n";
    65 &compare_output($answer,&get_logfile(1));
     55',
     56                 "one two three", "one bar\nfoo two\nBAR=1000\nfoo bar\n");
    6657
    6758# TEST #2
    6859
    69 &run_make_with_options($makefile, "-j1 one two FOO=1 BAR=2", &get_logfile);
    70 $answer = "one 2\n1 2\n";
    71 &compare_output($answer,&get_logfile(1));
     60run_make_test(undef, "one two FOO=1 BAR=2", "one 2\n1 2\n");
    7261
    7362# TEST #3
    7463
    75 &run_make_with_options($makefile, "-j1 four", &get_logfile);
    76 $answer = "x ok  ok\n";
    77 &compare_output($answer,&get_logfile(1));
     64run_make_test(undef, "four", "x ok  ok\n");
    7865
    7966# TEST #4
    8067
    81 &run_make_with_options($makefile, "-j1 seven", &get_logfile);
    82 $answer = "eight: seven eight\nseven: seven seven\n";
    83 &compare_output($answer,&get_logfile(1));
     68run_make_test(undef, "seven", "eight: seven eight\nseven: seven seven\n");
    8469
    8570# TEST #5
    8671
    87 &run_make_with_options($makefile, "-j1 nine", &get_logfile);
    88 $answer = "wallace bar wallace bar\n";
    89 &compare_output($answer,&get_logfile(1));
     72run_make_test(undef, "nine", "wallace bar wallace bar\n");
    9073
    9174# TEST #5-a
    9275
    93 &run_make_with_options($makefile, "-j1 nine-a", &get_logfile);
    94 $answer = "baz\n";
    95 &compare_output($answer,&get_logfile(1));
     76run_make_test(undef, "nine-a", "baz\n");
    9677
    9778# TEST #6
    9879
    99 &run_make_with_options($makefile, "-j1 ten", &get_logfile);
    100 $answer = "one=two\none bar\n=\nfoo two\nten\n";
    101 &compare_output($answer,&get_logfile(1));
     80run_make_test(undef, "ten", "one=two\none bar\n=\nfoo two\nten\n");
    10281
    10382# TEST #6
    10483
    105 &run_make_with_options($makefile, "-j1 foo.q bar.q", &get_logfile);
    106 $answer = "qvar = rvar\nqvar =\n";
    107 &compare_output($answer,&get_logfile(1));
     84run_make_test(undef, "foo.q bar.q", "qvar = rvar\nqvar =\n");
    10885
    10986# TEST #7
    11087
    111 &run_make_with_options($makefile, "-j1 foo.t bar.s", &get_logfile);
    112 $answer = "qvar = qvar\nqvar =\n";
    113 &compare_output($answer,&get_logfile(1));
     88run_make_test(undef, "foo.t bar.s", "qvar = qvar\nqvar =\n");
    11489
    11590
    … …  
    11792# For PR/1378: Target-specific vars don't inherit correctly
    11893
    119 $makefile2 = &get_tmpfile;
    120 
    121 open(MAKEFILE,"> $makefile2");
    122 print MAKEFILE <<'EOF';
     94run_make_test('
    12395foo: FOO = foo
    12496bar: BAR = bar
    … …  
    12698bar: baz
    12799baz: ; @echo $(FOO) $(BAR)
    128 EOF
    129 close(MAKEFILE);
    130 
    131 &run_make_with_options("$makefile2", "", &get_logfile);
    132 $answer = "foo bar\n";
    133 &compare_output($answer, &get_logfile(1));
     100', "", "foo bar\n");
    134101
    135102# TEST #9
    … …  
    137104# Also PR/1831
    138105
    139 $makefile3 = &get_tmpfile;
    140 
    141 open(MAKEFILE,"> $makefile3");
    142 print MAKEFILE <<'EOF';
     106run_make_test('
    143107.PHONY: all one
    144108all: FOO += baz
    … …  
    150114one: FOO += boz
    151115one: ; @echo $(FOO)
    152 EOF
    153 close(MAKEFILE);
    154 
    155 &run_make_with_options("$makefile3", "", &get_logfile);
    156 $answer = "bar baz biz boz\nbar baz\n";
    157 &compare_output($answer, &get_logfile(1));
     116',
     117              '', "bar baz biz boz\nbar baz\n");
    158118
    159119# Test #10
    160120
    161 &run_make_with_options("$makefile3", "one", &get_logfile);
    162 $answer = "bar biz boz\n";
    163 &compare_output($answer, &get_logfile(1));
     121run_make_test(undef, 'one', "bar biz boz\n");
    164122
    165123# Test #11
    166124# PR/1709: Test semicolons in target-specific variable values
    167125
    168 $makefile4 = &get_tmpfile;
    169 
    170 open(MAKEFILE, "> $makefile4");
    171 print MAKEFILE <<'EOF';
     126run_make_test('
    172127foo : FOO = ; ok
    173 foo : ; @echo '$(FOO)'
    174 EOF
    175 close(MAKEFILE);
    176 
    177 &run_make_with_options("$makefile4", "", &get_logfile);
    178 $answer = "; ok\n";
    179 &compare_output($answer, &get_logfile(1));
     128foo : ; @echo "$(FOO)"
     129',
     130              '', "; ok\n");
    180131
    181132# Test #12
    … …  
    183134# I nailed it this time :-/.
    184135
    185 $makefile5 = &get_tmpfile;
    186 
    187 open(MAKEFILE, "> $makefile5");
    188 print MAKEFILE <<'EOF';
     136run_make_test('
    189137.PHONY: a
    190138
    … …  
    196144a: BLAH := bar
    197145a: COMMAND += snafu $(BLAH)
    198 EOF
    199 close(MAKEFILE);
    200 
    201 &run_make_with_options("$makefile5", "", &get_logfile);
    202 $answer = "bar snafu bar\n";
    203 &compare_output($answer, &get_logfile(1));
     146',
     147              '', "bar snafu bar\n");
    204148
    205149# Test #13
    206150# Test double-colon rules with target-specific variable values
    207151
    208 $makefile6 = &get_tmpfile;
    209 
    210 open(MAKEFILE, "> $makefile6");
    211 print MAKEFILE <<'EOF';
     152run_make_test('
    212153W = bad
    213154X = bad
    … …  
    225166  fo% : Z = pat
    226167endif
    227 
    228 EOF
    229 close(MAKEFILE);
    230 
    231 &run_make_with_options("$makefile6", "foo", &get_logfile);
    232 $answer = "ok ok foo nopat\nok ok foo nopat\n";
    233 &compare_output($answer, &get_logfile(1));
     168',
     169             'foo', "ok ok foo nopat\nok ok foo nopat\n");
    234170
    235171# Test #14
    … …  
    237173# inheritance
    238174
    239 &run_make_with_options("$makefile6", "bar", &get_logfile);
    240 $answer = "ok ok bar nopat\nok ok bar nopat\n";
    241 &compare_output($answer, &get_logfile(1));
     175run_make_test(undef, 'bar', "ok ok bar nopat\nok ok bar nopat\n");
    242176
    243177# Test #15
    244178# Test double-colon rules with pattern-specific variable values
    245179
    246 &run_make_with_options("$makefile6", "foo PATTERN=yes", &get_logfile);
    247 $answer = "ok ok foo pat\nok ok foo pat\n";
    248 &compare_output($answer, &get_logfile(1));
    249 
     180run_make_test(undef, 'foo PATTERN=yes', "ok ok foo pat\nok ok foo pat\n");
    250181
    251182# Test #16
    … …  
    253184# (> make default buffer length)
    254185
    255 $makefile7 = &get_tmpfile;
    256 
    257 open(MAKEFILE, "> $makefile7");
    258 print MAKEFILE <<'EOF';
     186run_make_test('
    259187base_metals_fmd_reports.sun5 base_metals_fmd_reports CreateRealPositions        CreateMarginFunds deals_changed_since : BUILD_OBJ=$(shell if [ -f               "build_information.generate" ]; then echo "$(OBJ_DIR)/build_information.o"; else echo "no build information"; fi  )
    260188
    261189deals_changed_since: ; @echo $(BUILD_OBJ)
    262 
    263 EOF
    264 close(MAKEFILE);
    265 
    266 &run_make_with_options("$makefile7", '', &get_logfile);
    267 $answer = "no build information\n";
    268 &compare_output($answer, &get_logfile(1));
     190',
     191              '', "no build information\n");
    269192
    270193# TEST #17
    … …  
    287210.INTERMEDIATE: foo.x rules.mk
    288211',
    289               '-I t1',
    290               'MYVAR= FOOVAR=bar ALLVAR=xxx');
     212              '-I t1', 'MYVAR= FOOVAR=bar ALLVAR=xxx');
    291213
    292214rmfiles('t1/rules.mk');
    … …  
    298220# double-expansion.  See Savannah bug #15913.
    299221
    300 run_make_test("
    301 VAR := \$\$FOO
     222run_make_test('
     223VAR := $$FOO
    302224foo: VAR += BAR
    303 foo: ; \@echo '\$(VAR)'",
    304               '',
    305               '$FOO BAR');
     225foo: ; @echo '."'".'$(VAR)'."'".'
     226',
     227              '', '$FOO BAR');
     228
     229# TEST #19: Override with append variables
     230
     231run_make_test('
     232a: override FOO += f1
     233a: FOO += f2
     234a: ; @echo "$(FOO)"
     235',
     236              '', "f1\n");
     237
     238run_make_test(undef, 'FOO=C', "C f1\n");
     239
     240# TEST #20: Check for continuation after semicolons
     241
     242run_make_test(q!
     243a: A = 'hello; \
     244world'
     245a: ; @echo $(A)
     246!,
     247              '', "hello; world\n");
     248
     249# TEST #19: Test define/endef variables as target-specific vars
     250
     251# run_make_test('
     252# define b
     253# @echo global
     254# endef
     255# a: define b
     256# @echo local
     257# endef
     258
     259# a: ; $(b)
     260# ',
     261#               '', "local\n");
    306262
    3072631;

  • trunk/src/kmk/tests/scripts/features/vpath

    r2162 r2591  
     1#                                                                     -*-perl-*-
     2
    13$description = "The following test creates a makefile to test the \n"
    24              ."vpath directive which allows you to specify a search \n"
    … …  
    6163}
    6264
     65# TEST 2: after vpath lookup ensure we don't get incorrect circular dependency
     66# warnings due to change of struct file ptr.  Savannah bug #13529.
     67
     68mkdir('vpath-d', 0777);
     69
     70run_make_test(q!
     71vpath %.te vpath-d/
     72.SECONDARY:
     73default: vpath-d/a vpath-d/b
     74vpath-d/a: fail.te
     75vpath-d/b : fail.te
     76vpath-d/fail.te:
     77!,
     78              '', "#MAKE#: Nothing to be done for `default'.\n");
     79
     80rmdir('vpath-d');
     81
    63821;

  • trunk/src/kmk/tests/scripts/functions/abspath

    • Property svn:keywords deleted

  • trunk/src/kmk/tests/scripts/functions/realpath

    • Property svn:keywords deleted

  • trunk/src/kmk/tests/scripts/functions/shell

    r969 r2591  
    1212
    1313
     14# Test unescaped comment characters in shells.  Savannah bug #20513
     15if ($all_tests) {
     16    run_make_test(q!
     17FOO := $(shell echo '#')
     18foo: ; echo '$(FOO)'
     19!,
     20              '', "#\n");
     21}
     22
    1423# Test shells inside exported environment variables.
    1524# This is the test that fails if we try to put make exported variables into

  • trunk/src/kmk/tests/scripts/functions/wildcard

    r969 r2591  
    8282&compare_output($answer,&get_logfile(1));
    8383
     84# TEST #4: Verify that failed wildcards don't return the pattern
     85
     86run_make_test(q!
     87all: ; @echo $(wildcard xz--y*.7)
     88!,
     89              '', "\n");
    8490
    85911;
    86 
    87 
    88 
    89 
    90 
    91 
    92 
    93 
    94 

  • trunk/src/kmk/tests/scripts/misc/general4

    r1963 r2591  
    3030!$is_kmk ? 0 : 512);
    3131unlink('foo.c');
    32 
    33 
    34 # Test other implicit rule searching
    35 
    36 &touch('bar');
    37 run_make_test('
    38 test.foo:
    39 %.foo : baz ; @echo done $<
    40 %.foo : bar ; @echo done $<
    41 fox: baz
    42 ',
    43               '',
    44               'done bar');
    45 unlink('bar');
    4632
    4733
    … …  
    8470              '', "mkdir -p dir/subdir\ntouch dir/subdir/file.\$b\ncp dir/subdir/file.\$b dir/subdir/file.\$a\n");
    8571
     72# Test odd whitespace at the beginning of a line
     73
     74run_make_test("
     75all:
     76   \f
     77
     78    \\
     79 \f  \\
     80    \013 \\
     81all: ; \@echo hi
     82",
     83              '', "hi\n");
     84
    86851;

  • trunk/src/kmk/tests/scripts/options/dash-B

    r969 r2591  
    7171rmfiles('foo.x', 'blah.x');
    7272
     73# Test that $? is set properly with -B; all prerequisites will be newer!
     74
     75utouch(-10, 'x.b');
     76touch('x.a');
     77
     78run_make_test(q!
     79x.a: x.b ; @echo $?
     80!,
     81              '-B', "x.b\n");
     82
     83unlink(qw(x.a x.b));
     84
    73851;

  • trunk/src/kmk/tests/scripts/options/symlinks

    • Property svn:keywords deleted

  • trunk/src/kmk/tests/scripts/variables/DEFAULT_GOAL

    • Property svn:keywords deleted
    r969 r2591  
    7474'foo');
    7575
     76# TEST #5: .DEFAULT_GOAL containing just whitespace (Savannah bug #25697)
     77
     78run_make_test('
     79N =
     80.DEFAULT_GOAL = $N  $N  # Just whitespace
     81
     82foo: ; @echo "boo"
     83',
     84              '', "#MAKE#: *** No targets.  Stop.\n", 512);
    7685
    7786# This tells the test driver that the perl test script executed properly.

  • trunk/src/kmk/tests/scripts/variables/MAKE

    r969 r2591  
    11#                                                                    -*-perl-*-
    22
    3 $description = "The following test creates a makefile to test MAKE \n"
    4               ."(very generic)";
     3$description = "Test proper behavior of the MAKE variable";
    54
    65$details = "DETAILS";
    76
    8 open(MAKEFILE,"> $makefile");
     7run_make_test(q!
     8TMP  := $(MAKE)
     9MAKE := $(subst X=$(X),,$(MAKE))
     10all:
     11        @echo $(TMP)
     12        $(MAKE) -f #MAKEFILE# foo
    913
    10 # The Contents of the MAKEFILE ...
     14foo:
     15        @echo $(MAKE)
     16!,
     17              '',
     18              "#MAKEPATH#\n#MAKEPATH# -f #MAKEFILE# foo\n"
     19              . "#MAKE#[1]: Entering directory `#PWD#'\n"
     20              . "#MAKEPATH#\n#MAKE#[1]: Leaving directory `#PWD#'\n");
    1121
    12 print MAKEFILE "TMP  := \$(MAKE)\n";
    13 print MAKEFILE "MAKE := \$(subst X=\$(X),,\$(MAKE))\n\n";
    14 print MAKEFILE "all:\n";
    15 print MAKEFILE "\t\@echo \$(TMP)\n";
    16 print MAKEFILE "\t\$(MAKE) -f $makefile foo\n\n";
    17 print MAKEFILE "foo:\n";
    18 print MAKEFILE "\t\@echo \$(MAKE)\n";
    19 
    20 # END of Contents of MAKEFILE
    21 
    22 close(MAKEFILE);
    23 
    24 # Create the answer to what should be produced by this Makefile
    25 $answer = "$mkpath\n$mkpath -f $makefile foo\n"
    26         . "${make_name}[1]: Entering directory `$pwd'\n"
    27         . "$mkpath\n${make_name}[1]: Leaving directory `$pwd'\n";
    28 
    29 &run_make_with_options($makefile,"",&get_logfile,0);
    30 
    31 &rmfiles("foo");
    32 # COMPARE RESULTS
    33 &compare_output($answer,&get_logfile(1));
     22rmfiles("foo");
    3423
    35241;

  • trunk/src/kmk/tests/scripts/variables/MAKEFILES

    r969 r2591  
    3232&compare_output($answer,&get_logfile(1));
    3333
     34# TEST 2: Verify that included makefiles don't set the default goal.
     35# See Savannah bug #13401.
     36
     37create_file('xx-inc.mk', '
     38include_goal: ; @echo $@
     39include xx-ind.mk
     40');
     41
     42create_file('xx-ind.mk', '
     43indirect_goal: ; @echo $@
     44');
     45
     46run_make_test(q!
     47top: ; @echo $@
     48!,
     49              'MAKEFILES=xx-inc.mk', "top\n");
     50
     51unlink(qw(xx-inc.mk xx-ind.mk));
     52
    34531;

  • trunk/src/kmk/tests/scripts/variables/MFILE_LIST

    • Property svn:keywords deleted

  • trunk/src/kmk/tests/scripts/variables/SHELL

    • Property svn:keywords deleted
    r1969 r2591  
    5050$extraENV{SHELL} = $mshell;
    5151
    52 # bird: This was wrong, see Savannah bug #24655. Fixed in kBuild.
    53 run_make_test("all: export SHELL := /./$mshell\n".'
    54 all:;@echo "$(SHELL) $$SHELL"
    55 ', '', "/./$mshell /./$mshell");
     52# bird: This was wrong at some point, see Savannah bug #24655. Was first fixed in kBuild.
     53run_make_test("
     54SHELL := /././$mshell
     55one: two
     56two: export SHELL := /./$mshell\n".'
     57one two:;@echo "$@: $(SHELL) $$SHELL"
     58', '', "two: /./$mshell /./$mshell\none: /././$mshell $mshell\n");
     59
     60# Test .SHELLFLAGS
     61
     62# We don't know the output here: on Solaris for example, every line printed
     63# by the shell in -x mode has a trailing space (!!)
     64my $script = 'true; true';
     65my $flags = '-xc';
     66my $out = `/bin/sh $flags '$script' 2>&1`;
     67
     68run_make_test(qq!
     69.SHELLFLAGS = $flags
     70all: ; \@$script
     71!,
     72              '', $out);
     73
     74# We can't just use "false" because on different systems it provides a
     75# different exit code--once again Solaris: false exits with 255 not 1
     76$script = 'true; false; true';
     77$flags = '-xec';
     78$out = `/bin/sh $flags '$script' 2>&1`;
     79my $err = $? >> 8;
     80
     81run_make_test(qq!
     82.SHELLFLAGS = $flags
     83all: ; \@$script
     84!,
     85              '', "$out#MAKE#: *** [all] Error $err\n", 512);
    5686
    57871;

  • trunk/src/kmk/tests/scripts/variables/automatic

    r1984 r2591  
    108108unlink('foo');
    109109
     110# TEST #4: ensure prereq ordering is correct when the commmand target has none
     111# See Savannah bug #21198
     112
     113run_make_test('
     114all : A B
     115all : ; @echo $@ -- $^ -- $<
     116all : C D
     117all : E F
     118A B C D E F G H : ; @:
     119',
     120              '', "all -- A B C D E F -- A\n");
     121
    1101221;

  • trunk/src/kmk/tests/scripts/variables/flavors

    r1970 r2591  
    55$details = "";
    66
    7 open(MAKEFILE, "> $makefile");
     7# TEST 0: Recursive
    88
    9 # The Contents of the MAKEFILE ...
    10 
    11 print MAKEFILE <<'EOF';
     9run_make_test('
     10ugh = Goodbye
    1211foo = $(bar)
    1312bar = ${ugh}
    1413ugh = Hello
     14all: ; @echo $(foo)
     15',
     16              '', "Hello\n");
    1517
    16 all: multi ; @echo $(foo)
    17 
    18 multi: ; $(multi)
    19 
    20 x := foo
    21 y := $(x) bar
    22 x := later
    23 
    24 nullstring :=
    25 space := $(nullstring) $(nullstring)
    26 
    27 next: ; @echo $x$(space)$y
    28 
    29 define multi
    30 @echo hi
    31 echo there
    32 endef
    33 
    34 ifdef BOGUS
    35 define
    36 @echo error
    37 endef
    38 endif
    39 
    40 define outer
    41  define inner
    42   A = B
    43  endef
    44 endef
    45 
    46 $(eval $(outer))
    47 
    48 outer: ; @echo $(inner)
    49 
    50 EOF
    51 
    52 # END of Contents of MAKEFILE
    53 
    54 close(MAKEFILE);
    55 
    56 # TEST #1
    57 # -------
    58 
    59 &run_make_with_options($makefile, "", &get_logfile);
    60 $answer = "hi\necho there\nthere\nHello\n";
    61 &compare_output($answer, &get_logfile(1));
    62 
    63 # TEST #2
    64 # -------
    65 
    66 &run_make_with_options($makefile, "next", &get_logfile);
    67 $answer = "later foo bar\n";
    68 &compare_output($answer, &get_logfile(1));
    69 
    70 # TEST #3
    71 # -------
    72 
    73 &run_make_with_options($makefile, "BOGUS=true", &get_logfile, 512);
    74 $answer = "$makefile:24: *** empty variable name.  Stop.\n";
    75 &compare_output($answer, &get_logfile(1));
    76 
    77 # TEST #4
    78 # -------
    79 
    80 &run_make_with_options($makefile, "outer", &get_logfile);
    81 $answer = "A = B\n";
    82 &compare_output($answer, &get_logfile(1));
    83 
    84 # Clean up from "old style" testing.  If all the above tests are converted to
    85 # run_make_test() syntax than this line can be removed.
    86 $makefile = undef;
    87 
    88 # -------------------------
    89 # Make sure that prefix characters apply properly to define/endef values.
    90 #
    91 # There's a bit of oddness here if you try to use a variable to hold the
    92 # prefix character for a define.  Even though something like this:
    93 #
    94 #       define foo
    95 #       echo bar
    96 #       endef
    97 #
    98 #       all: ; $(V)$(foo)
    99 #
    100 # (where V=@) can be seen by the user to be obviously different than this:
    101 #
    102 #       define foo
    103 #       $(V)echo bar
    104 #       endef
    105 #
    106 #       all: ; $(foo)
    107 #
    108 # and the user thinks it should behave the same as when the "@" is literal
    109 # instead of in a variable, that can't happen because by the time make
    110 # expands the variables for the command line and sees it begins with a "@" it
    111 # can't know anymore whether the prefix character came before the variable
    112 # reference or was included in the first line of the variable reference.
    113 
    114 # TEST #5
    115 # -------
     18# TEST 1: Simple
    11619
    11720run_make_test('
    118 define FOO
    119 $(V1)echo hello
    120 $(V2)echo world
    121 endef
    122 all: ; @$(FOO)
    123 ', '', 'hello
    124 world');
     21bar = Goodbye
     22foo := $(bar)
     23bar = ${ugh}
     24ugh = Hello
     25all: ; @echo $(foo)
     26',
     27              '', "Goodbye\n");
    12528
    126 # TEST #6
    127 # -------
    128 
    129 run_make_test(undef, 'V1=@ V2=@', 'hello
    130 world');
    131 
    132 # TEST #7
    133 # -------
     29# TEST 2: Append to recursive
    13430
    13531run_make_test('
    136 define FOO
    137 $(V1)echo hello
    138 $(V2)echo world
    139 endef
    140 all: ; $(FOO)
    141 ', 'V1=@', 'hello
    142 echo world
    143 world');
     32foo = Hello
     33ugh = Goodbye
     34foo += $(bar)
     35bar = ${ugh}
     36ugh = Hello
     37all: ; @echo $(foo)
     38',
     39              '', "Hello Hello\n");
    14440
    145 # TEST #8
    146 # -------
    147 
    148 run_make_test(undef, 'V2=@', 'echo hello
    149 hello
    150 world');
    151 
    152 # TEST #9
    153 # -------
    154 
    155 run_make_test(undef, 'V1=@ V2=@', 'hello
    156 world');
    157 
    158 # TEST #10
    159 # -------
    160 # Test the basics; a "@" internally to the variable applies to only one line.
    161 # A "@" before the variable applies to the entire variable.
     41# TEST 3: Append to simple
    16242
    16343run_make_test('
    164 define FOO
    165 @echo hello
    166 echo world
    167 endef
    168 define BAR
    169 echo hello
    170 echo world
    171 endef
     44foo := Hello
     45ugh = Goodbye
     46bar = ${ugh}
     47foo += $(bar)
     48ugh = Hello
     49all: ; @echo $(foo)
     50',
     51              '', "Hello Goodbye\n");
    17252
    173 all: foo bar
    174 foo: ; $(FOO)
    175 bar: ; @$(BAR)
    176 ', '-j1', 'hello
    177 echo world
    178 world
    179 hello
    180 world
    181 ');
     53# TEST 4: Conditional pre-set
     54
     55run_make_test('
     56foo = Hello
     57ugh = Goodbye
     58bar = ${ugh}
     59foo ?= $(bar)
     60ugh = Hello
     61all: ; @echo $(foo)
     62',
     63              '', "Hello\n");
     64
     65# TEST 5: Conditional unset
     66
     67run_make_test('
     68ugh = Goodbye
     69bar = ${ugh}
     70foo ?= $(bar)
     71ugh = Hello
     72all: ; @echo $(foo)
     73',
     74              '', "Hello\n");
    18275
    183761;

  • 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.