Re: [BIKESHEDDING PATCH] Generated tests are now just a thin layer around other tests.

[Ralf Wildenhues]

* Stefano Lattarini wrote on Sun, Jun 06, 2010 at 07:13:48PM CEST:
> At Sunday 06 June 2010, Ralf Wildenhues wrote:
> > * Stefano Lattarini wrote on Thu, Jun 03, 2010 at 02:07:19PM CEST:
> > > What about the attached new try?  It just complicates the
> > > generated tests a little bit, but this is a more than fair
> > > tradeoff IMO.
> > 
> > That looks like a better idea to me.
> But it doesn't work with tests using e.g. 'required=libtool'  :-(
> For example, pr401b-p.test now fails.  Ouch.
> 
> What about the attached fix?

Almost.  BSD make uses 'sh -ec' to execute rule commands, this one can
fail reasonably.  I'm pushing this amended change instead, and fixing
the comment language while we're at it.

Thanks, and sorry for not having rerun the complete testsuite before
pushing the original patch.

Cheers,
Ralf

2010-06-06  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>

        Fix error in generation of parallel tests.
        * tests/Makefile.am ($(parallel_tests)): Cope with $required
        being defined by the source tests, ensuring that it's defined
        to the same value in the generated tests; this is *necessary*
        to have it correctly recognized and processed by the ./defs
        intialization.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e647b03..340d1f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,9 +33,10 @@ $(parallel_tests): Makefile.am
        $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
        { echo '#!/bin/sh'; \
          echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+         if grep "^required=" "$(srcdir)/$$input"; then :; else :; fi; \
          echo 'parallel_tests=yes'; \
          echo '. ./defs || Exit 1'; \
-         echo '# So that the sourced test can re-exec ./defs safely.'; \
+         echo '# Allow the sourced test to re-source ./defs safely.'; \
          echo 'cd "$$curdir" || Exit 1'; \
          echo ". \"\$$testsrcdir/$$input\""; \
        } > address@hidden