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