kc3-lang/automake/t/parallel-tests-log-override-1.sh

• Show log

  Commit

• Hash : ffd4ecc9
  Author :
  Date : 2013-05-20T11:23:01
  

  tests: better idiom to override make macro defs on the cmdline
  
  We now do so with a new wrapper shell function 'run_make()', which
  relies on the use of AM_MAKEFLAGS, avoiding the use of the '-e' make
  option.  The use of that option (that causes the environment variables
  to take precedence over the macro definitions in the Makefile) has
  proved to be quite brittle in the past, causing annoying and sometimes
  problematic spurious failures.  This has worsened in some still
  unpublished work going on in development branches.  It's time to solve
  the issue once and for all.
  
  Note that we do not convert all uses of $MAKE in the testsuite right
  away; we might do so in follow-up changes, with leisure, to avoid a
  "patch bomb" effect (this commit is already too much of a bomb itself).
  What we do in this commit is to get rid of all "$MAKE -e" invocations.
  
  We admit that the implementation and feature-set of 'run_make()' are
  far from perfect, but good enough for our current purposes.  We'll
  improve 'run_make()' if and when the need arises.
  
  * syntax-checks.mk (sc_tests_no_make_e): New syntax check, guard against
  the use of "$MAKE -e".
  (syntax_check_rules): Add it.
  (sc_tests_overriding_macros_on_cmdline): Adjust.
  (lint): New, alias for 'maintainer-check', for lazy typists.  Idea
  backported from the 'maint' branch (Automake 1.13a).
  * t/ax/am-test-lib.sh (run_make): New function.  Run $MAKE with the
  given command-line arguments, handling command-line override of variable
  definitions in a smart way (using AM_MAKEFLAGS if a non-GNU make
  implementation is detected to be in use).
  (useless_vpath_rebuild): Adjust to use 'run_make', to avoid a spurious
  maintainer check failure.
  (yl_distcheck): Use 'run_make' rather than bare '$MAKE'.
  (single_quote, append_single_quoted, is_valid_varname): New auxiliary
  function, used, directly or indirectly, by it.
  * Many tests: Adjust to avoid the use of "$MAKE -e", and prefer the
  use of 'run_make' in few other contexts as well, where it makes sense.
  Other minor fixlets while at it.
  
  Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
  

Download

• t/parallel-tests-log-override-1.sh

• #! /bin/sh
  # Copyright (C) 2011-2013 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2, or (at your option)
  # any later version.
  #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
  
  . test-init.sh
  
  cat >> configure.ac <<'END'
  AC_OUTPUT
  END
  
  cat > Makefile.am <<'END'
  TESTS = pass.test skip.test xfail.test
  XFAIL_TESTS = xfail.test
  EXTRA_DIST = $(TESTS)
  END
  
  cat > pass.test <<'END'
  #! /bin/sh
  exit 0
  END
  
  cat > skip.test <<'END'
  #! /bin/sh
  echo "% test skipped %"
  exit 77
  END
  
  cat > xfail.test <<'END'
  #! /bin/sh
  echo "# expected failure #"
  exit 1
  END
  
  chmod a+x *.test
  
  test_log_edit ()
  {
    sed -e "s|^  *$me 1\.0:.*$|  $me 1.0: ???|" \
        -e "s|^=====*|=======================|" $*
  }
  
  test_log_expected ()
  {
    test_log_edit orig > exp
    test_log_edit $1   > got
    diff exp got || exit 1
    rm -f exp got
  }
  
  $ACLOCAL
  $AUTOCONF
  $AUTOMAKE -a
  
  ./configure
  
  $MAKE check
  ls -l
  cat test-suite.log
  cp test-suite.log orig
  
  $MAKE clean
  test -f test-suite.log && exit 99 # Sanity check.
  
  # Check that we can override the testsuite log file at runtime.
  run_make TEST_SUITE_LOG=zardoz.log check
  ls -l
  test ! -e test-suite.log
  cat zardoz.log
  test_log_expected zardoz.log
  # Sanity check the distribution too (this also does minimal checks on
  # VPATH support).
  run_make TEST_SUITE_LOG=zardoz.log distcheck
  
  # Check that cleanup rules remove the correct file even when
  # user overrides are in place.
  cp orig test-suite.log
  run_make TEST_SUITE_LOG=zardoz.log clean
  ls -l
  test ! -e zardoz.log
  diff orig test-suite.log
  
  # Check that the default testsuite log doesn't get unduly modified.
  # Also check that the testsuite log file doesn't need to be named
  # accordingly to the '*.log' pattern.
  chmod a-w test-suite.log
  run_make TEST_SUITE_LOG=TheLogFile check
  ls -l
  diff orig test-suite.log
  test_log_expected TheLogFile
  run_make TEST_SUITE_LOG=TheLogFile clean
  ls -l
  test ! -e TheLogFile
  diff orig test-suite.log
  
  :
  

Download