VirtualBox

Ignore:
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:
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/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 
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette