Ignore:
Timestamp:
Oct 29, 2008, 12:02:45 AM (17 years ago)
Author:
bird
Message:

Load gnumake-2008-10-28-CVS into vendor/gnumake/current.

Location:
vendor/gnumake/current/tests/scripts
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • vendor/gnumake/current/tests/scripts/features/parallelism

    r501 r1989  
    7070# for this situation and print a message if it occurred.  This test used
    7171# to trigger this code when I added it but no longer does after the fix.
     72# We have to increase the timeout from the default (5s) on this test.
    7273
    7374run_make_test("
    … …  
    8081
    8182first second: ; \@echo \$\@; $sleep_command 1; echo \$\@",
    82               '-j2', "first\nfirst\nsecond\nsecond");
     83              '-j2', "first\nfirst\nsecond\nsecond", 0, 7);
    8384
    8485# Michael Matz <matz@suse.de> reported a bug where if make is running in
    … …  
    127128
    128129
     130# TEST #9 -- Savannah bugs 3330 and 15919
     131# In earlier versions of make this will either give the wrong answer, or hang.
     132
     133utouch(-10, 'target');
     134run_make_test('target: intermed ; touch $@
     135
     136.INTERMEDIATE: intermed
     137intermed: | phony ; touch $@
     138
     139.PHONY: phony
     140phony: ; : phony', '-rR -j', ': phony');
     141unlink('target');
     142
     143
    129144# Make sure that all jobserver FDs are closed if we need to re-exec the
    130145# master copy.

  • vendor/gnumake/current/tests/scripts/functions/eval

    r501 r1989  
    164164
    165165run_make_test('deps: ; $(eval deps: foo)', '',
    166               '#MAKEFILE#:1: *** prerequisites cannot be defined in command scripts.  Stop.',
     166              '#MAKEFILE#:1: *** prerequisites cannot be defined in recipes.  Stop.',
    167167              512);
    168168

  • vendor/gnumake/current/tests/scripts/misc/close_stdout

    r501 r1989  
    44
    55if (-e '/dev/full') {
    6   run_make_test('', '-v > /dev/full', '#MAKE#: write error', 256);
     6  run_make_test('', '-v > /dev/full', '/^#MAKE#: write error/', 256);
    77}
    88

  • vendor/gnumake/current/tests/scripts/options/dash-l

    r53 r1989  
    4646$mkoptions .= " -j 4" if ($parallel_jobs);
    4747
    48 &run_make_with_options($makefile, $mkoptions, &get_logfile);
     48# We have to wait longer than the default (5s).
     49&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8);
    4950
    5051$slurp = &read_file_into_string (&get_logfile(1));

  • vendor/gnumake/current/tests/scripts/targets/SECONDARY

    r284 r1989  
    122122unlink('version2');
    123123
     124# TEST #9 -- Savannah bug #15919
     125# The original fix for this bug caused a new bug, shown here.
     126
     127touch(qw(1.a 2.a));
     128
     129run_make_test('
     130%.c : %.b ; cp $< $@
     131%.b : %.a ; cp $< $@
     132all : 1.c 2.c', '-rR -j',
     133'cp 1.a 1.b
     134cp 2.a 2.b
     135cp 1.b 1.c
     136cp 2.b 2.c
     137rm 1.b 2.b');
     138
     139unlink(qw(1.a 2.a 1.c 2.c));
     140
     141# TEST #10 -- Savannah bug #15919
     142touch('test.0');
     143run_make_test('
     144.SECONDARY : test.1 test.2 test.3
     145
     146test : test.4
     147
     148%.4 : %.int %.3 ; touch $@
     149
     150%.int : %.3 %.2 ; touch $@
     151
     152%.3 : | %.2 ; touch $@
     153
     154%.2 : %.1 ; touch $@
     155
     156%.1 : %.0 ; touch $@', '-rR -j 2',
     157'touch test.1
     158touch test.2
     159touch test.3
     160touch test.int
     161touch test.4
     162rm test.int');
     163
     164# After a touch of test.0 it should give the same output, except we don't need
     165# to rebuild test.3 (order-only)
     166sleep(1);
     167touch('test.0');
     168run_make_test(undef, '-rR -j 2',
     169'touch test.1
     170touch test.2
     171touch test.int
     172touch test.4
     173rm test.int');
     174
     175# With both test.0 and test.3 updated it should still build everything except
     176# test.3
     177sleep(1);
     178touch('test.0', 'test.3');
     179run_make_test(undef, '-rR -j 2',
     180'touch test.1
     181touch test.2
     182touch test.int
     183touch test.4
     184rm test.int');
     185
     186unlink(qw(test.0 test.1 test.2 test.3 test.4));
     187
    124188# This tells the test driver that the perl test script executed properly.
    1251891;

  • vendor/gnumake/current/tests/scripts/variables/special

    r284 r1989  
    5151# &compare_output($answer, &get_logfile(1));
    5252
     53# Test the .RECIPEPREFIX variable
     54&run_make_test('
     55define foo
     56: foo-one \
     57foo-two
     58: foo-three
     59        : foo-four
     60endef
     61
     62orig: ; : orig-one
     63        : orig-two \
     64orig-three \
     65        orig-four \
     66                orig-five \\\\
     67        : orig-six
     68        $(foo)
     69
     70.RECIPEPREFIX = >
     71test: ; : test-one
     72>: test-two \
     73test-three \
     74>test-four \
     75>       test-five \\\\
     76>: test-six
     77>$(foo)
     78
     79.RECIPEPREFIX =
     80reset: ; : reset-one
     81        : reset-two \
     82reset-three \
     83        reset-four \
     84                reset-five \\\\
     85        : reset-six
     86        $(foo)
     87',
     88               'orig test reset',
     89               ': orig-one
     90: orig-two \
     91orig-three \
     92orig-four \
     93        orig-five \\\\
     94: orig-six
     95: foo-one foo-two
     96: foo-three
     97: foo-four
     98: test-one
     99: test-two \
     100test-three \
     101test-four \
     102        test-five \\\\
     103: test-six
     104: foo-one foo-two
     105: foo-three
     106: foo-four
     107: reset-one
     108: reset-two \
     109reset-three \
     110reset-four \
     111        reset-five \\\\
     112: reset-six
     113: foo-one foo-two
     114: foo-three
     115: foo-four');
    53116
    541171;
Note: See TracChangeset for help on using the changeset viewer.