I've now also merged 'maint' into 'master', 'java-work', 'yacc-work', and 'parallel-tests-maint'; merged 'master' into 'testsuite-work'; merged 'yacc-work' into 'ylwrap-refactor'; and finally pushed all the modified branches.
The merge 'maint -> java-work' called for additional edits, *not* due to spurious conflicts, but instead to keep the semantic of the merged patch more faithful w.r.t. the commits that had been done in the target 'java-work' branch in the meantime. You can find such edits (as output of "git diff") attached. Regards, Stefano
diff --git a/ChangeLog b/ChangeLog index 815d338..b6702cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ driver. * tests/pr401b.test: Likewise. * tests/pr401c.test: Likewise. + * tests/java-flat.test: Likewise, and properly update heading + comments. + * tests/java-nested.test: Likewise, but defining `parallel_tests' + to "yes" instead, for improved coverage in conjunction with the + sister test `java-flat.test'. 2011-05-20 Stefano Lattarini <stefano.lattar...@gmail.com> diff --git a/tests/Makefile.in b/tests/Makefile.in index 0be14f6..25aab82 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -302,8 +302,6 @@ color2-p.test \ comment9-p.test \ dejagnu-p.test \ exeext4-p.test \ -java-compile-run-flat-p.test \ -java-compile-run-nested-p.test \ maken3-p.test \ maken4-p.test diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test index 76fde6c..0d5651e 100755 --- a/tests/java-compile-run-flat.test +++ b/tests/java-compile-run-flat.test @@ -18,10 +18,13 @@ # Also meddle with wrapper scripts, as would be probably seen in a real # "UNIX-style" use case. # This test uses a "flat" setup for the source tree (i.e., everything in -# the top-level directory); the sister test `java-compile-run-nested.test' -# do similar checks with a more usual, "nested" setup. +# the top-level directory), and forces the use of the old, non-parallel +# testsuite driver. The sister test `java-compile-run-nested.test' do +# similar checks with a more usual, "nested" setup, and using the newer +# 'parallel-tests' driver. required='java javac' +parallel_tests=no . ./defs || Exit 1 set -e diff --git a/tests/java-compile-run-nested.test b/tests/java-compile-run-nested.test index 1a9abfd..ec75c92 100755 --- a/tests/java-compile-run-nested.test +++ b/tests/java-compile-run-nested.test @@ -18,11 +18,14 @@ # Also meddle with wrapper scripts, as would be probably seen in a real # "UNIX-style" use case. # This test uses a typical "nested" source tree setup (i.e., different -# componenets/aspects are separeted into different subdirectories); the -# sister test `java-compile-run-flat.test' do similar checks with a -# "flat" setup (i.e., everything in the top-level directory). +# components/aspects are separated into different subdirectories), +# and uses the 'parallel-tests' testsuite driver. The sister test +# `java-compile-run-flat.test' do similar checks with a "flat" setup +# (i.e., everything in the top-level directory), and forcing the use +# of the older non-parallel 'simple-tests' driver. required='java javac' +parallel_tests=yes . ./defs || Exit 1 set -e
