From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 6 Sep 2011 15:37:32 +0000 (+0200)
Subject: Merge branch 'master' into test-protocols
X-Git-Tag: ng-0.5a~89^2~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c605c816f97609c6b55765a1c8916fdb082dccca;p=thirdparty%2Fautomake.git

Merge branch 'master' into test-protocols

* master:
  tests: fix spurious failures due to ignored signals
---

c605c816f97609c6b55765a1c8916fdb082dccca
diff --cc tests/parallel-tests-interrupt.test
index ed404122b,730522239..bf4f7f0d1
--- a/tests/parallel-tests-interrupt.test
+++ b/tests/parallel-tests-interrupt.test
@@@ -65,11 -57,14 +65,15 @@@ $AUTOMAK
  trapped_signals='1 2 13 15'
  
  for signum in $trapped_signals; do
+   if is_blocked_signal $signum; then
+     echo "$me: signal $signum is blocked, skipping part of the test"
+     continue
+   fi
 -  rm -f pid fail *.log *.log-t
 +  rm -f pid fail *.log
    env signum=$signum $MAKE check && { ls -l; Exit 1; }
    ls -l
 -  cat foo.log-t || :
 +  # These files shouldn't exist, but in case they do, their content might
 +  # provide helpful information about the causes of the failure(s).
    cat foo.log || :
    cat test-suite.log || :
    test -f fail && Exit 1