kc3-lang/automake/tests/test-driver-custom.test

• Show log

  Commit

• Hash : 0c81b43f
  Author :
  Date : 2011-07-28T12:25:22
  

  test harness: use new `.trs' files to hold test metadata
  
  With this change, the test harness will keep test metadata in
  dedicated `.trs' files, instead of having them embedded into the
  `.log' files.  This allows for easier forward-compatibility and
  extension of test metadata, and for more flexibility in the
  format of the `.log' files.  Note that this change makes the
  `:end-metadata:' field obsolete.
  
  * doc/automake.texi (Parallel Test Harness, Log files generation
  and test results recording): Document the new APIs and behaviour;
  some related minor rewordings and fixlets.
  * NEWS: Update.
  * automake.in (handle_tests): When bringing in the content of
  `check2.am', substitute %BASE% with the basename of the `.log'
  file being created by a rule.  Add the generated `.trs' files
  to the list of files to be cleaned by "make mostlyclean".
  * lib/am/check.am (am__test_driver_flags): Rename ...
  (am__common_driver_flags): ... to this, and remove the flags
  `--test-name' and `--log-file' from it: they are now define in
  the proper rules in `check2.am'.
  (am__TEST_BASES): New internal variable, holding the names of
  the tests, with any registered extension removed.
  (am__stealth_MAKE): New internal variable, can be used instead of
  $(MAKE) in recipes requiring a recursive call to make, but which
  are not intended to be executed by "make -n".
  (.log.trs): New suffix rule, to recover from deletion of `.trs'
  files.
  ($(TEST_SUITE_LOG)): Almost completely rewritten to follow the
  new API of "test logs in `.log' files, test metadata in `.trs'
  files".  It goes to some length to work correctly in face of
  unreadable or missing `.log' and `.trs' files, and to error out
  with proper error messages when this is not possible.
  [%?PARALLEL_TESTS%] (check-TESTS): Also remove relevant "stale"
  `.trs' files (in addition to `.log files) before remaking the
  $(TEST_SUITE_LOG).
  (recheck, recheck-html): Look for the `:recheck:' field in the
  `.trs' files, not in the `.log' files.
  * lib/am/check2.am (?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Adjust
  the call to the test driver, in particularly passing the new
  option `--trs-file'.
  [%am__EXEEXT%] (?GENERIC?%EXT%$(EXEEXT).log): Likewise.
  * lib/tap-driver ($USAGE): Adjust the help screen.
  (Getopt::Long::GetOptions): Handle the `--trs-file' option,
  through the use of ...
  ($trs_file): ... this new global variable.
  (finish): Write metadata for the test run to `$trs_file' rather
  then to `$log_file', through the use of ...
  (write_test_results): ... this new function.
  * lib/test-driver (print_usage): Update the help screen.
  (Option parsing): Handle the `--trs-file' option, through the
  use of ...
  ($resfile): ... this new global variable.
  (Main code): Write metadata for the test run to `$trsfile' rather
  than to `$logfile'.
  Minor related adjustments to comments.
  * tests/.gitignore: Ignore `*.trs' files.
  * tests/parallel-tests-unreadable-log.test: Moved ...
  * tests/parallel-tests-unreadable.test: ... to this, and extended
  to also check the semantics for unreadable `.trs' files.
  * tests/test-driver-end-metadata.test: Deleted as obsolete.
  * tests/test-driver-metadata-no-leading-space.test: Likewise.
  * tests/test-driver-global-log.test: Renamed ...
  * tests/test-metadata-global-log.test: ... to this, and modified
  as to verify the new APIs and semantics.
  * tests/test-driver-recheck: Renamed ...
  * tests/test-metadata-recheck.test: ... to this, and modified
  likewise.
  * tests/parallel-tests-once.test: New test.
  * tests/parallel-tests-make-n.test: Likewise.
  * test-metadata-results.test: Likewise.
  * test-missing.test: Likewise.
  * test-missing2.test: Likewise.
  * test-trs-basic.test: Likewise.
  * test-trs-recover.test: Likewise.
  * test-trs-recover2.test: Likewise.
  * tests/Makefile.am (TESTS): Update.
  

Download

• tests/test-driver-custom.test

• #! /bin/sh
  # Copyright (C) 2011 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/>.
  
  # Custom test drivers: per-extension test drivers.
  
  parallel_tests=yes
  . ./defs || Exit 1
  
  cat >> configure.in << 'END'
  AC_OUTPUT
  END
  
  cat > Makefile.am << 'END'
  # Automake shouldn't match the '/test' in 'sub/test' as '.test' suffix.
  TESTS = 1.chk 2.test 3 4.c.chk 5.suf sub/test
  
  TEST_EXTENSIONS = .chk .test
  
  CHK_LOG_DRIVER = ./chk-wrapper
  TEST_LOG_DRIVER = $(SHELL) $(srcdir)/test-wrapper
  LOG_DRIVER = noext-wrapper
  
  AM_CHK_LOG_DRIVER_FLAGS = --am-chk
  CHK_LOG_DRIVER_FLAGS = --chk
  AM_TEST_LOG_DRIVER_FLAGS = -am-test
  TEST_LOG_DRIVER_FLAGS = -test
  AM_LOG_DRIVER_FLAGS = am
  LOG_DRIVER_FLAGS = _
  END
  
  mkdir sub bin
  PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
  
  cat > wrapper.skel <<'END'
  #! /bin/sh
  set -e
  
  me=`echo "$0" | sed 's,^.*/,,'`
  if test -z "$me"; then
    echo "$0: cannot determine program name" >&2
    exit 99
  fi
  
  am_log_wflags='@am_log_wflags@'
  log_wflags='@log_wflags@'
  
  test_name=INVALID
  log_file=BAD.log
  trs_file=BAD.trs
  extra_opts=
  while test $# -gt 0; do
    case $1 in
      --test-name) test_name=$2; shift;;
      --log-file) log_file=$2; shift;;
      --trs-file) trs_file=$2; shift;;
      # Ignored.
      --expect-failure) shift;;
      --color-tests) shift;;
      --enable-hard-errors) shift;;
      # Remembered in the same order they're passed in.
      $am_log_wflags|$log_wflags) extra_opts="$extra_opts $1";;
      # Explicitly terminate option list.
      --) shift; break;;
      # Shouldn't happen
      *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
    esac
    shift
  done
  
  echo "$me" "$test_name" $extra_opts > "$log_file"
  : > "$trs_file"
  
  exec "$@"
  exit 127
  END
  
  sed -e 's|@am_log_wflags@|--am-chk|' \
      -e 's|@log_wflags@|--chk|' \
      < wrapper.skel > chk-wrapper
  
  sed -e 's|@am_log_wflags@|-am-test|' \
      -e 's|@log_wflags@|-test|' \
      < wrapper.skel > test-wrapper
  
  sed -e 's|@am_log_wflags@|am|' \
      -e 's|@log_wflags@|_|' \
      < wrapper.skel > bin/noext-wrapper
  
  # `test-wrapper' is deliberately not made executable.
  chmod a+x chk-wrapper bin/noext-wrapper
  
  # Not needed anymore.
  rm -f wrapper.skel
  
  cat > 1.chk << 'END'
  #! /bin/sh
  exit 0
  END
  chmod a+x 1.chk
  cp 1.chk 2.test
  cp 1.chk 3
  cp 1.chk 4.c.chk
  cp 1.chk 5.suf
  cp 1.chk sub/test
  
  $ACLOCAL
  $AUTOCONF
  $AUTOMAKE
  
  ./configure
  $MAKE
  VERBOSE=yes $MAKE check
  ls -l . sub
  
  test ! -r BAD.log
  test ! -r BAD.trs
  
  echo 'chk-wrapper 1.chk --am-chk --chk' > 1.exp
  echo 'test-wrapper 2.test -am-test -test' > 2.exp
  echo 'noext-wrapper 3 am _' > 3.exp
  echo 'chk-wrapper 4.c.chk --am-chk --chk' > 4.c.exp
  echo 'noext-wrapper 5.suf am _' > 5.suf.exp
  echo 'noext-wrapper sub/test am _' > sub/test.exp
  
  st=0
  for x in 1 2 3 4.c 5.suf sub/test; do
    cat $x.log
    diff $x.exp $x.log || st=1
  done
  
  Exit $st
  

Download