From: Stefano Lattarini Date: Sun, 18 Sep 2011 14:32:46 +0000 (+0200) Subject: Merge branch 'java-work' X-Git-Tag: ng-0.5a~123 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16912bdf1eeeeac517377e15c6c8bfe7743f9419;p=thirdparty%2Fautomake.git Merge branch 'java-work' * java-work: fix: remove duplicated ChangeLog entries java: allow both JAVA and nobase_JAVA in the same Makefile.am java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am fix: regenerate tests/Makefile.in tests defs: use `skip_' for skipping java-related tests java tests: use $PATH_SEPARATOR where appropriate java coverage: test JAVACFLAGS and AM_JAVACFLAGS java coverage: test rebuild rules for java java coverage: try to build and run a java program test defs: new requirement for the default java interpreter java tests: tweak and make stricter a couple of tests java coverage: add test on uninstall with JAVA primary java tests: require java compiler more properly java: allow both JAVA and nobase_JAVA in the same Makefile.am java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am --- 16912bdf1eeeeac517377e15c6c8bfe7743f9419 diff --cc ChangeLog index 73c92ee21,758814e44..50dfb61d9 --- a/ChangeLog +++ b/ChangeLog @@@ -951,17 -687,12 +956,23 @@@ with the same timestamp in alphabetical order when using the `-t' option. +2011-05-07 Stefano Lattarini + + tests: fix spurious failure of extradep.test on FreeBSD + * tests/extradep.test: When using `ls -t' to determine whether a + file has been updated, make sure to use as reference a file whose + timestamp is expected to be *strictly* older that that of the file + being checked. This is required because at least FreeBSD `ls' do + not sort files with the same timestamp in alphabetical order when + using the `-t' option. + * tests/extradep2.test: Likewise. + + 2011-05-04 Stefano Lattarini + + tests defs: use `skip_' for skipping java-related tests + * tests/defs.in (java, javac): Use `skip_' to signal test + skipping. + 2011-05-04 Stefano Lattarini tests defs: allow requirements for compilers (mostly dummy) @@@ -1324,37 -999,6 +1441,28 @@@ * THANKS: Update. Report from Petteri Räty. +2011-04-09 Stefano Lattarini + Bruno Haible + + coverage: add tests on remake rules in more complex situations + * tests/defs (using_gmake): New function. + (for tool in $required): Use it when $tool is 'GNUmake'. + * tests/remake-moved-m4-file.test: New test. + * tests/remake-deleted-m4-file.test: Likewise. + * tests/remake-renamed-m4-file.test: Likewise. + * tests/remake-renamed-m4-macro-and-file.test: Likewise. + * tests/remake-renamed-m4-macro.test: Likewise. + * tests/remake-add-acsubst-gnulib.test: Likewise. + * tests/remake-add-header-gnulib.test: Likewise. + * tests/remake-remove-header-gnulib.test: Likewise. + * tests/Makefile.am (TESTS): Update. + +2011-04-09 Stefano Lattarini + + typofix in 'tests/defs' + * tests/defs: Fix typo (`itslef' instead of `itself') in + comments. + - 2011-04-06 Stefano Lattarini - - coverage: more on java support EXTRA_ and noinst_ prefixes - * tests/java-extra.test: New test, checking support for the - prefix `EXTRA_' with the JAVA primary. - * tests/java-noinst.test: New test, checking support for the - prefix `noinst_' with the JAVA primary. - * tests/Makefile.am (TESTS): Update. - 2011-04-09 Ralf Wildenhues Clarify regex code in depcomp. diff --cc automake.in index 288ff61f7,208a66bf9..04c32d38e mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc tests/Makefile.am index fe89caaf5,ac2addefc..eefee648b --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -24,7 -21,7 +24,8 @@@ all.test auxdir2.test \ cond17.test \ gcj6.test \ +override-conditional-2.test \ + java-nobase.test \ pr8365-remake-timing.test \ yacc-dist-nobuild-subdir.test \ vala-vpath.test \ diff --cc tests/Makefile.in index da0702a8d,02eeddf51..fd014c784 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -293,83 -281,42 +293,83 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -XFAIL_TESTS = \ -all.test \ -auxdir2.test \ -cond17.test \ -gcj6.test \ -java-nobase.test \ -pr8365-remake-timing.test \ -yacc-dist-nobuild-subdir.test \ -vala-vpath.test \ -txinfo5.test - -parallel_tests = \ -check-concurrency-bug9245-p.test \ -check-exported-srcdir-p.test \ -check-tests-in-builddir-p.test \ -check-tests_environment-p.test \ -check-p.test \ -check10-p.test \ -check11-p.test \ -check2-p.test \ -check3-p.test \ -check4-p.test \ -check5-p.test \ -check6-p.test \ -check7-p.test \ -check8-p.test \ -check9-p.test \ -color-p.test \ -color2-p.test \ -comment9-p.test \ -dejagnu-p.test \ -exeext4-p.test \ -maken3-p.test \ -maken4-p.test - -MAINTAINERCLEANFILES = $(parallel_tests) +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ + $(TESTS) distcheck-hook-m4.am +XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \ - override-conditional-2.test pr8365-remake-timing.test \ - yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \ - $(instspc_xfail_tests) ++ override-conditional-2.test java-nobase.test \ ++ pr8365-remake-timing.test yacc-dist-nobuild-subdir.test \ ++ vala-vpath.test txinfo5.test $(instspc_xfail_tests) +parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \ + check-exported-srcdir-p.test check-tests-in-builddir-p.test \ + check-tests_environment-p.test check-p.test check10-p.test \ + check11-p.test check12-p.test check2-p.test check3-p.test \ + check4-p.test check5-p.test check6-p.test check7-p.test \ + check8-p.test check9-p.test color-p.test color2-p.test \ + comment9-p.test dejagnu-p.test exeext4-p.test maken3-p.test \ + maken4-p.test posixsubst-tests-p.test +instspc_tests = instspc-squote-build.test instspc-squote-install.test \ + instspc-dquote-build.test instspc-dquote-install.test \ + instspc-bquote-build.test instspc-bquote-install.test \ + instspc-sharp-build.test instspc-sharp-install.test \ + instspc-dollar-build.test instspc-dollar-install.test \ + instspc-bang-build.test instspc-bang-install.test \ + instspc-bslash-build.test instspc-bslash-install.test \ + instspc-ampersand-build.test instspc-ampersand-install.test \ + instspc-percent-build.test instspc-percent-install.test \ + instspc-leftpar-build.test instspc-leftpar-install.test \ + instspc-rightpar-build.test instspc-rightpar-install.test \ + instspc-pipe-build.test instspc-pipe-install.test \ + instspc-caret-build.test instspc-caret-install.test \ + instspc-tilde-build.test instspc-tilde-install.test \ + instspc-qmark-build.test instspc-qmark-install.test \ + instspc-star-build.test instspc-star-install.test \ + instspc-plus-build.test instspc-plus-install.test \ + instspc-minus-build.test instspc-minus-install.test \ + instspc-comma-build.test instspc-comma-install.test \ + instspc-colon-build.test instspc-colon-install.test \ + instspc-semicol-build.test instspc-semicol-install.test \ + instspc-equal-build.test instspc-equal-install.test \ + instspc-less-build.test instspc-less-install.test \ + instspc-more-build.test instspc-more-install.test \ + instspc-at-build.test instspc-at-install.test \ + instspc-lqbrack-build.test instspc-lqbrack-install.test \ + instspc-rqbrack-build.test instspc-rqbrack-install.test \ + instspc-lcbrack-build.test instspc-lcbrack-install.test \ + instspc-rcbrack-build.test instspc-rcbrack-install.test \ + instspc-space-build.test instspc-space-install.test \ + instspc-tab-build.test instspc-tab-install.test \ + instspc-linefeed-build.test instspc-linefeed-install.test \ + instspc-backspace-build.test instspc-backspace-install.test \ + instspc-formfeed-build.test instspc-formfeed-install.test \ + instspc-carriageret-build.test \ + instspc-carriageret-install.test \ + instspc-quadrigraph0-build.test \ + instspc-quadrigraph0-install.test \ + instspc-quadrigraph1-build.test \ + instspc-quadrigraph1-install.test \ + instspc-quadrigraph2-build.test \ + instspc-quadrigraph2-install.test \ + instspc-quadrigraph3-build.test \ + instspc-quadrigraph3-install.test \ + instspc-quadrigraph4-build.test \ + instspc-quadrigraph4-install.test instspc-a_b-build.test \ + instspc-a_b-install.test instspc-a__b-build.test \ + instspc-a__b-install.test instspc-a_lf_b-build.test \ + instspc-a_lf_b-install.test instspc-dotdotdot-build.test \ + instspc-dotdotdot-install.test instspc-dosdrive-build.test \ + instspc-dosdrive-install.test instspc-miscglob1-build.test \ + instspc-miscglob1-install.test instspc-miscglob2-build.test \ + instspc-miscglob2-install.test +instspc_xfail_tests = instspc-squote-build.test \ + instspc-dquote-build.test instspc-bquote-build.test \ + instspc-sharp-build.test instspc-dollar-build.test \ + instspc-bslash-build.test instspc-ampersand-build.test \ + instspc-linefeed-build.test instspc-quadrigraph0-build.test \ + instspc-a_lf_b-build.test instspc-squote-install.test \ + instspc-dquote-install.test instspc-bquote-install.test \ + instspc-sharp-install.test instspc-dollar-install.test \ + instspc-linefeed-install.test instspc-a_lf_b-install.test # Some testsuite-influential variables should be overridable from the # test scripts, but not from the environment.