diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 02:19:36 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 02:19:36 +0100 |
| commit | 2adc128922ae37991d97826ad09ea6079f9a83f8 (patch) | |
| tree | 275b5f9f8634753569fbd63630f7ecd21bb925fc /t | |
| parent | a7db2b5cb7da80935fd700d437d058a23e84b3b6 (diff) | |
| parent | e3c5559332e55ac4c938b7de663ed29d2a460df8 (diff) | |
| download | automake-2adc128922ae37991d97826ad09ea6079f9a83f8.tar.gz | |
Merge branch 'fix-dryrun-detection' into ng/master
* fix-dryrun-detection:
make flags analysis: fix bug in $(MFLAGS) parsing (typo-induced)
make flags analysis: expose bug in dry-run recognition
Diffstat (limited to 't')
| -rw-r--r-- | t/make-dryrun.tap | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap index 1d6fe7478..9394bbbcd 100644 --- a/t/make-dryrun.tap +++ b/t/make-dryrun.tap @@ -18,7 +18,7 @@ . test-init.sh -plan_ 132 +plan_ $((27 * 6)) echo AC_OUTPUT >> configure.ac @@ -42,6 +42,7 @@ dry-recursive: $(MAKE) dry-plain END +# Each invocation of this will run 6 tests. check_make () { msg= mode= @@ -86,15 +87,22 @@ $AUTOMAKE || fatal_ "automake failed" check_make --run check_make --run -k -# Test against a known regression. This was especially heinous, since +# Test against known regressions. These were especially heinous, since # make running in normal mode was sometimes mistaken for make running # in dry mode. + check_make --run TESTS="n1.test n2.test" check_make --run TESTS="n1 n2" MAKEFLAGS="TESTS='n1 n2'" check_make --run TESTS="n1 n2" MAKEFLAGS='TESTS="n1 n2"' check_make --run FOOFLAGS="-n -n -knf2 n --none -n" check_make --run MYFLAGS="-n --dryrun -n --dry-run -n" +check_make --run -- --print-directory -k +check_make --run -- --debug=an +check_make --run -- --print-directory --no-builtin-rules +check_make --run -- --no-print-directory +check_make --run -- --no-print-directory --no-builtin-rules + # ---------------------------------------------------------------------- check_make --dry -- -n |