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