At Sunday 06 June 2010, Ralf Wildenhues <[email protected]>
wrote:
> Hi Stefano,
>
> * 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?
Regards,
Stefano
From ea9f0a160e20c9c7378171e113ba1f3cfa944dc2 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <[email protected]>
Date: Sun, 6 Jun 2010 19:11:58 +0200
Subject: [PATCH] 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.
---
ChangeLog | 9 +++++++++
tests/Makefile.am | 1 +
tests/Makefile.in | 1 +
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4f94715..338d6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
2010-06-06 Stefano Lattarini <[email protected]>
+
+ 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.
+
+2010-06-06 Stefano Lattarini <[email protected]>
Ralf Wildenhues <[email protected]>
Fix distcheck failure with distributed generated parallel tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f709593..ffe2b6c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ $(parallel_tests): Makefile.am
$(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
{ echo '#!/bin/sh'; \
echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+ grep "^required=" "$(srcdir)/$$input"; \
echo 'parallel_tests=yes'; \
echo '. ./defs || Exit 1'; \
echo '# So that the sourced test can re-exec ./defs safely.'; \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 36fb41e..cc5e5e3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1390,6 +1390,7 @@ $(parallel_tests): Makefile.am
$(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
{ echo '#!/bin/sh'; \
echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+ grep "^required=" "$(srcdir)/$$input"; \
echo 'parallel_tests=yes'; \
echo '. ./defs || Exit 1'; \
echo '# So that the sourced test can re-exec ./defs safely.'; \
--
1.6.5
