gdb
* README: Mention parallel check. gdb/testsuite * dg-extract-results.sh: New file. * Makefile.in (FORCE_PARALLEL): New variable. (CHECK_TARGET): New conditional variable. (check): Use CHECK_TARGET. (DO_RUNTEST): New variable. (check-single): New target. (TEST_DIRS): New variable. (TEST_TARGETS): Likewise. (check-parallel): New target. (check-gdb.%): New pattern. (BASE1_FILES): New variable. (BASE2_FILES): Likewise. (check-gdb.base%): New pattern. (%/.dir): New pattern. * configure: Rebuild. * aclocal.m4 (AM_CONDITIONAL): New defun. * configure.ac: Check whether user is using GNU make. (GMAKE): New conditional.
This commit is contained in:
Tom Tromey
parent
794684b64f
commit
6bc80edc98
8 changed files with 660 additions and 4 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
2009-06-29 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* README: Mention parallel check.
|
||||||
|
|
||||||
2009-06-29 Sami Wagiaalla <swagiaal@redhat.com>
|
2009-06-29 Sami Wagiaalla <swagiaal@redhat.com>
|
||||||
|
|
||||||
* dwarf2read.c (read_import_statement): Properly set import location
|
* dwarf2read.c (read_import_statement): Properly set import location
|
||||||
|
|
|
||||||
14
gdb/README
14
gdb/README
|
|
@ -642,6 +642,20 @@ or
|
||||||
make site.exp (builds the site specific file)
|
make site.exp (builds the site specific file)
|
||||||
runtest -tool gdb GDB=../gdb (or GDB=<somepath> as appropriate)
|
runtest -tool gdb GDB=../gdb (or GDB=<somepath> as appropriate)
|
||||||
|
|
||||||
|
When using a `make'-based method, you can use the Makefile variable
|
||||||
|
`RUNTESTFLAGS' to pass flags to `runtest', e.g.:
|
||||||
|
|
||||||
|
make RUNTESTFLAGS=--directory=gdb.cp check
|
||||||
|
|
||||||
|
If you use GNU make, you can use its `-j' option to run the testsuite
|
||||||
|
in parallel. This can greatly reduce the amount of time it takes for
|
||||||
|
the testsuite to run. In this case, if you set `RUNTESTFLAGS' then,
|
||||||
|
by default, the tests will be run serially even under `-j'. You can
|
||||||
|
override this and force a parallel run by setting the `make' variable
|
||||||
|
`FORCE_PARALLEL' to any non-empty value. Note that the parallel `make
|
||||||
|
check' assumes that you want to run the entire testsuite, so it is not
|
||||||
|
compatible with some dejagnu options, like `--directory'.
|
||||||
|
|
||||||
The last method gives you slightly more control in case of problems
|
The last method gives you slightly more control in case of problems
|
||||||
with building one or more test executables or if you are using the
|
with building one or more test executables or if you are using the
|
||||||
testsuite `standalone', without it being part of the GDB source tree.
|
testsuite `standalone', without it being part of the GDB source tree.
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,24 @@
|
||||||
|
2009-06-29 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* dg-extract-results.sh: New file.
|
||||||
|
* Makefile.in (FORCE_PARALLEL): New variable.
|
||||||
|
(CHECK_TARGET): New conditional variable.
|
||||||
|
(check): Use CHECK_TARGET.
|
||||||
|
(DO_RUNTEST): New variable.
|
||||||
|
(check-single): New target.
|
||||||
|
(TEST_DIRS): New variable.
|
||||||
|
(TEST_TARGETS): Likewise.
|
||||||
|
(check-parallel): New target.
|
||||||
|
(check-gdb.%): New pattern.
|
||||||
|
(BASE1_FILES): New variable.
|
||||||
|
(BASE2_FILES): Likewise.
|
||||||
|
(check-gdb.base%): New pattern.
|
||||||
|
(%/.dir): New pattern.
|
||||||
|
* configure: Rebuild.
|
||||||
|
* aclocal.m4 (AM_CONDITIONAL): New defun.
|
||||||
|
* configure.ac: Check whether user is using GNU make.
|
||||||
|
(GMAKE): New conditional.
|
||||||
|
|
||||||
2009-06-29 Sami Wagiaalla <swagiaal@redhat.com>
|
2009-06-29 Sami Wagiaalla <swagiaal@redhat.com>
|
||||||
|
|
||||||
* gdb.cp/namespace-nested-import.cc: New test.
|
* gdb.cp/namespace-nested-import.cc: New test.
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,8 @@ RUNTEST = $(RUNTEST_FOR_TARGET)
|
||||||
|
|
||||||
RUNTESTFLAGS =
|
RUNTESTFLAGS =
|
||||||
|
|
||||||
|
FORCE_PARALLEL =
|
||||||
|
|
||||||
RUNTEST_FOR_TARGET = `\
|
RUNTEST_FOR_TARGET = `\
|
||||||
if [ -f $${srcdir}/../../dejagnu/runtest ]; then \
|
if [ -f $${srcdir}/../../dejagnu/runtest ]; then \
|
||||||
echo $${srcdir}/../../dejagnu/runtest; \
|
echo $${srcdir}/../../dejagnu/runtest; \
|
||||||
|
|
@ -122,7 +124,18 @@ site.exp: ./config.status Makefile
|
||||||
|
|
||||||
installcheck:
|
installcheck:
|
||||||
|
|
||||||
check: all site.exp
|
# For GNU make, try to run the tests in parallel. If RUNTESTFLAGS is
|
||||||
|
# not empty, then by default the tests will be serialized. This can
|
||||||
|
# be overridden by setting FORCE_PARALLEL to any non-empty value.
|
||||||
|
# For a non-GNU make, do not parallelize.
|
||||||
|
@GMAKE_TRUE@CHECK_TARGET = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,check-parallel))
|
||||||
|
@GMAKE_FALSE@CHECK_TARGET = check-single
|
||||||
|
|
||||||
|
check: $(CHECK_TARGET)
|
||||||
|
|
||||||
|
# All the hair to invoke dejagnu. A given invocation can just append
|
||||||
|
# $(RUNTESTFLAGS)
|
||||||
|
DO_RUNTEST = \
|
||||||
rootme=`pwd`; export rootme; \
|
rootme=`pwd`; export rootme; \
|
||||||
srcdir=${srcdir} ; export srcdir ; \
|
srcdir=${srcdir} ; export srcdir ; \
|
||||||
EXPECT=${EXPECT} ; export EXPECT ; \
|
EXPECT=${EXPECT} ; export EXPECT ; \
|
||||||
|
|
@ -132,7 +145,46 @@ check: all site.exp
|
||||||
if [ -f $${rootme}/../../expect/expect ] ; then \
|
if [ -f $${rootme}/../../expect/expect ] ; then \
|
||||||
TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
|
TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
|
||||||
export TCL_LIBRARY ; fi ; \
|
export TCL_LIBRARY ; fi ; \
|
||||||
$(RUNTEST) $(RUNTESTFLAGS)
|
$(RUNTEST)
|
||||||
|
|
||||||
|
check-single: all site.exp
|
||||||
|
$(DO_RUNTEST) $(RUNTESTFLAGS)
|
||||||
|
|
||||||
|
# A list of all directories named "gdb.*" which also hold a .exp file.
|
||||||
|
# We filter out gdb.base and add fake entries, because that directory
|
||||||
|
# takes the longest to process, and so we split it in half.
|
||||||
|
TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(srcdir)/gdb.*/*.exp))))))
|
||||||
|
|
||||||
|
TEST_TARGETS = $(addprefix check-,$(TEST_DIRS))
|
||||||
|
|
||||||
|
# We explicitly re-invoke make here for two reasons. First, it lets
|
||||||
|
# us add a -k option, which makes the parallel check mimic the
|
||||||
|
# behavior of the serial check; and second, it means that we can still
|
||||||
|
# regenerate the sum and log files even if a sub-make fails -- which
|
||||||
|
# it usually does because dejagnu exits with an error if any test
|
||||||
|
# fails.
|
||||||
|
check-parallel:
|
||||||
|
$(MAKE) -k $(TEST_TARGETS); \
|
||||||
|
$(SHELL) $(srcdir)/dg-extract-results.sh \
|
||||||
|
$(addsuffix /gdb.sum,$(TEST_DIRS)) > gdb.sum; \
|
||||||
|
$(SHELL) $(srcdir)/dg-extract-results.sh -L \
|
||||||
|
$(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log
|
||||||
|
|
||||||
|
$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all site.exp gdb.%/.dir
|
||||||
|
$(DO_RUNTEST) --directory=gdb.$* --outdir=gdb.$* $(RUNTESTFLAGS)
|
||||||
|
|
||||||
|
# Each half (roughly) of the .exp files from gdb.base.
|
||||||
|
BASE1_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[a-m]*.exp))
|
||||||
|
BASE2_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[n-z]*.exp))
|
||||||
|
|
||||||
|
# Handle each half of gdb.base.
|
||||||
|
check-gdb.base%: all site.exp gdb.base%/.dir
|
||||||
|
@if test ! -d gdb.base$*; then mkdir gdb.base$*; fi
|
||||||
|
$(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTESTFLAGS)
|
||||||
|
|
||||||
|
%/.dir:
|
||||||
|
@-if test ! -d $*; then mkdir $*; fi
|
||||||
|
@echo > $@
|
||||||
|
|
||||||
subdir_do: force
|
subdir_do: force
|
||||||
@for i in $(DODIRS); do \
|
@for i in $(DODIRS); do \
|
||||||
|
|
|
||||||
33
gdb/testsuite/aclocal.m4
vendored
33
gdb/testsuite/aclocal.m4
vendored
|
|
@ -1,2 +1,35 @@
|
||||||
sinclude(../../config/acx.m4)
|
sinclude(../../config/acx.m4)
|
||||||
sinclude(../../config/override.m4)
|
sinclude(../../config/override.m4)
|
||||||
|
|
||||||
|
# AM_CONDITIONAL -*- Autoconf -*-
|
||||||
|
|
||||||
|
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
||||||
|
# Free Software Foundation, Inc.
|
||||||
|
#
|
||||||
|
# This file is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
# serial 7
|
||||||
|
|
||||||
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
||||||
|
# -------------------------------------
|
||||||
|
# Define a conditional.
|
||||||
|
AC_DEFUN([AM_CONDITIONAL],
|
||||||
|
[AC_PREREQ(2.52)dnl
|
||||||
|
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
||||||
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
||||||
|
AC_SUBST([$1_TRUE])
|
||||||
|
AC_SUBST([$1_FALSE])
|
||||||
|
if $2; then
|
||||||
|
$1_TRUE=
|
||||||
|
$1_FALSE='#'
|
||||||
|
else
|
||||||
|
$1_TRUE='#'
|
||||||
|
$1_FALSE=
|
||||||
|
fi
|
||||||
|
AC_CONFIG_COMMANDS_PRE(
|
||||||
|
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
|
||||||
|
AC_MSG_ERROR([[conditional "$1" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally.]])
|
||||||
|
fi])])
|
||||||
|
|
|
||||||
100
gdb/testsuite/configure
vendored
100
gdb/testsuite/configure
vendored
|
|
@ -312,7 +312,7 @@ ac_includes_default="\
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical subdirs RPATH_ENVVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE subdirs RPATH_ENVVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
ac_pwd=`pwd`
|
ac_pwd=`pwd`
|
||||||
|
|
||||||
|
|
@ -1445,6 +1445,93 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Check for the 'make' the user wants to use.
|
||||||
|
for ac_prog in make
|
||||||
|
do
|
||||||
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
set dummy $ac_prog; ac_word=$2
|
||||||
|
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||||
|
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_prog_MAKE+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
if test -n "$MAKE"; then
|
||||||
|
ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
|
||||||
|
else
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||||
|
ac_cv_prog_MAKE="$ac_prog"
|
||||||
|
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
MAKE=$ac_cv_prog_MAKE
|
||||||
|
if test -n "$MAKE"; then
|
||||||
|
echo "$as_me:$LINENO: result: $MAKE" >&5
|
||||||
|
echo "${ECHO_T}$MAKE" >&6
|
||||||
|
else
|
||||||
|
echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
echo "${ECHO_T}no" >&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -n "$MAKE" && break
|
||||||
|
done
|
||||||
|
|
||||||
|
MAKE_IS_GNU=
|
||||||
|
case "`$MAKE --version 2>&1 | sed 1q`" in
|
||||||
|
*GNU*)
|
||||||
|
MAKE_IS_GNU=yes
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
if test "$MAKE_IS_GNU" = yes; then
|
||||||
|
GMAKE_TRUE=
|
||||||
|
GMAKE_FALSE='#'
|
||||||
|
else
|
||||||
|
GMAKE_TRUE='#'
|
||||||
|
GMAKE_FALSE=
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||||
|
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
|
||||||
|
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
|
||||||
|
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.make <<\_ACEOF
|
||||||
|
all:
|
||||||
|
@echo 'ac_maketemp="$(MAKE)"'
|
||||||
|
_ACEOF
|
||||||
|
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||||
|
eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
|
||||||
|
if test -n "$ac_maketemp"; then
|
||||||
|
eval ac_cv_prog_make_${ac_make}_set=yes
|
||||||
|
else
|
||||||
|
eval ac_cv_prog_make_${ac_make}_set=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.make
|
||||||
|
fi
|
||||||
|
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
|
||||||
|
echo "$as_me:$LINENO: result: yes" >&5
|
||||||
|
echo "${ECHO_T}yes" >&6
|
||||||
|
SET_MAKE=
|
||||||
|
else
|
||||||
|
echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
echo "${ECHO_T}no" >&6
|
||||||
|
SET_MAKE="MAKE=${MAKE-make}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Add HP-specific tests when appropriate.
|
# Add HP-specific tests when appropriate.
|
||||||
case $target in
|
case $target in
|
||||||
hppa*-*-hpux*)
|
hppa*-*-hpux*)
|
||||||
|
|
@ -3254,6 +3341,13 @@ LIBOBJS=$ac_libobjs
|
||||||
LTLIBOBJS=$ac_ltlibobjs
|
LTLIBOBJS=$ac_ltlibobjs
|
||||||
|
|
||||||
|
|
||||||
|
if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
|
||||||
|
{ { echo "$as_me:$LINENO: error: conditional \"GMAKE\" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally." >&5
|
||||||
|
echo "$as_me: error: conditional \"GMAKE\" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
|
||||||
: ${CONFIG_STATUS=./config.status}
|
: ${CONFIG_STATUS=./config.status}
|
||||||
ac_clean_files_save=$ac_clean_files
|
ac_clean_files_save=$ac_clean_files
|
||||||
|
|
@ -3799,6 +3893,10 @@ s,@target_cpu@,$target_cpu,;t t
|
||||||
s,@target_vendor@,$target_vendor,;t t
|
s,@target_vendor@,$target_vendor,;t t
|
||||||
s,@target_os@,$target_os,;t t
|
s,@target_os@,$target_os,;t t
|
||||||
s,@target_noncanonical@,$target_noncanonical,;t t
|
s,@target_noncanonical@,$target_noncanonical,;t t
|
||||||
|
s,@MAKE@,$MAKE,;t t
|
||||||
|
s,@GMAKE_TRUE@,$GMAKE_TRUE,;t t
|
||||||
|
s,@GMAKE_FALSE@,$GMAKE_FALSE,;t t
|
||||||
|
s,@SET_MAKE@,$SET_MAKE,;t t
|
||||||
s,@subdirs@,$subdirs,;t t
|
s,@subdirs@,$subdirs,;t t
|
||||||
s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
|
s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
|
||||||
s,@CC@,$CC,;t t
|
s,@CC@,$CC,;t t
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- Autoconf -*-
|
# -*- Autoconf -*-
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
# Copyright 2002, 2003, 2004, 2005
|
# Copyright 2002, 2003, 2004, 2005, 2009
|
||||||
# Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
|
@ -26,6 +26,17 @@ AC_CANONICAL_TARGET
|
||||||
|
|
||||||
ACX_NONCANONICAL_TARGET
|
ACX_NONCANONICAL_TARGET
|
||||||
|
|
||||||
|
# Check for the 'make' the user wants to use.
|
||||||
|
AC_CHECK_PROGS(MAKE, make)
|
||||||
|
MAKE_IS_GNU=
|
||||||
|
case "`$MAKE --version 2>&1 | sed 1q`" in
|
||||||
|
*GNU*)
|
||||||
|
MAKE_IS_GNU=yes
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes)
|
||||||
|
AC_PROG_MAKE_SET
|
||||||
|
|
||||||
# Add HP-specific tests when appropriate.
|
# Add HP-specific tests when appropriate.
|
||||||
case $target in
|
case $target in
|
||||||
hppa*-*-hpux*)
|
hppa*-*-hpux*)
|
||||||
|
|
|
||||||
423
gdb/testsuite/dg-extract-results.sh
Executable file
423
gdb/testsuite/dg-extract-results.sh
Executable file
|
|
@ -0,0 +1,423 @@
|
||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
# For a specified tool and optional list of test variants, extract
|
||||||
|
# test results from one or more test summary (.sum) files and combine
|
||||||
|
# the results into a new test summary file, sent to the standard output.
|
||||||
|
# The resulting file can be used with test result comparison scripts for
|
||||||
|
# results from tests that were run in parallel. See usage() below.
|
||||||
|
|
||||||
|
# Copyright (C) 2008, 2009 Free Software Foundation
|
||||||
|
# Contributed by Janis Johnson <janis187@us.ibm.com>
|
||||||
|
#
|
||||||
|
# This file is part of GCC.
|
||||||
|
#
|
||||||
|
# GCC 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 3, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
#
|
||||||
|
# GCC 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 GCC; see the file COPYING. If not, write to
|
||||||
|
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
PROGNAME=dg-extract-results.sh
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
cat <<EOF >&2
|
||||||
|
Usage: $PROGNAME [-t tool] [-l variant-list] [-L] sum-file ...
|
||||||
|
|
||||||
|
tool The tool (e.g. g++, libffi) for which to create a
|
||||||
|
new test summary file. If not specified then all
|
||||||
|
specified sum files must be for the same tool.
|
||||||
|
variant-list One or more test variant names. If the list is
|
||||||
|
not specified then one is constructed from all
|
||||||
|
variants in the files for <tool>.
|
||||||
|
sum-file A test summary file with the format of those
|
||||||
|
created by runtest from DejaGnu.
|
||||||
|
If -L is used, merge *.log files instead of *.sum. In this
|
||||||
|
mode the exact order of lines may not be preserved, just different
|
||||||
|
Running *.exp chunks should be in correct order.
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
# Write a message to the standard error.
|
||||||
|
|
||||||
|
msg() {
|
||||||
|
echo "$@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
# Parse the command-line options.
|
||||||
|
|
||||||
|
VARIANTS=""
|
||||||
|
TOOL=""
|
||||||
|
MODE="sum"
|
||||||
|
|
||||||
|
while getopts "l:t:L" ARG; do
|
||||||
|
case $ARG in
|
||||||
|
l) VARIANTS="${VARIANTS} ${OPTARG}";;
|
||||||
|
t) test -z "$TOOL" || (msg "${PROGNAME}: only one tool can be specified"; exit 1);
|
||||||
|
TOOL="${OPTARG}";;
|
||||||
|
L) MODE="log";;
|
||||||
|
\?) usage; exit 0;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
shift `expr ${OPTIND} - 1`
|
||||||
|
|
||||||
|
if test $# -lt 1 ; then
|
||||||
|
usage
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
TMPDIR=${TMPDIR-/tmp}
|
||||||
|
SUM_FILES="$@"
|
||||||
|
FIRST_SUM=$1
|
||||||
|
TMP=
|
||||||
|
trap 'EXIT_STATUS=$?; rm -rf $TMP && exit $EXIT_STATUS' 0
|
||||||
|
# Create a (secure) tmp directory for tmp files.
|
||||||
|
{
|
||||||
|
TMP=`(umask 077 && mktemp -d -q "${TMPDIR}/dg-combine-results-$$-XXXXXX") 2>/dev/null` &&
|
||||||
|
test -n "$TMP" && test -d "$TMP"
|
||||||
|
} ||
|
||||||
|
{
|
||||||
|
TMP=${TMPDIR}/dg-combine-results-$$-$RANDOM
|
||||||
|
(umask 077 && mkdir $TMP)
|
||||||
|
} ||
|
||||||
|
{
|
||||||
|
msg "${PROGNAME}: cannot create a temporary directory"
|
||||||
|
{ (exit 1); exit 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Find a good awk.
|
||||||
|
|
||||||
|
if test -z "$AWK" ; then
|
||||||
|
for AWK in gawk nawk awk
|
||||||
|
do
|
||||||
|
if type $AWK 2>&1 | grep 'not found' > /dev/null 2>&1 ; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Verify that the specified summary files exist.
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
for FILE in $SUM_FILES
|
||||||
|
do
|
||||||
|
if ! test -f $FILE ; then
|
||||||
|
msg "${PROGNAME}: file $FILE does not exist."
|
||||||
|
ERROR=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
test $ERROR -eq 0 || exit 1
|
||||||
|
|
||||||
|
if [ -z "$TOOL" ]; then
|
||||||
|
# If no tool was specified, all specified summary files must be for
|
||||||
|
# the same tool.
|
||||||
|
|
||||||
|
CNT=`grep '=== .* tests ===' $SUM_FILES | $AWK '{ print $3 }' | sort -u | wc -l`
|
||||||
|
if [ $CNT -eq 1 ]; then
|
||||||
|
TOOL=`grep '=== .* tests ===' $FIRST_SUM | $AWK '{ print $2 }'`
|
||||||
|
else
|
||||||
|
msg "${PROGNAME}: sum files are for multiple tools, specify a tool"
|
||||||
|
msg ""
|
||||||
|
usage
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Ignore the specified summary files that are not for this tool. This
|
||||||
|
# should keep the relevant files in the same order.
|
||||||
|
|
||||||
|
SUM_FILES=`grep -l "=== $TOOL" $SUM_FILES`
|
||||||
|
if test -z "$SUM_FILES" ; then
|
||||||
|
msg "${PROGNAME}: none of the specified files are results for $TOOL"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$TOOL" = acats ]; then
|
||||||
|
# Acats *.sum or *.log files aren't dejagnu generated, and they have
|
||||||
|
# somewhat different format.
|
||||||
|
ACATS_AWK=${TMP}/acats.awk
|
||||||
|
cat <<EOF > $ACATS_AWK
|
||||||
|
BEGIN {
|
||||||
|
print_prologue=1; curfile=""; insummary=0
|
||||||
|
passcnt=0; failcnt=0; unsupcnt=0; failures=""
|
||||||
|
}
|
||||||
|
/^[ \t]*=== acats configuration ===/ {
|
||||||
|
insummary=0
|
||||||
|
if (print_prologue) print
|
||||||
|
next
|
||||||
|
}
|
||||||
|
/^[ \t]*=== acats tests ===/ {
|
||||||
|
if (print_prologue) print
|
||||||
|
print_prologue=0
|
||||||
|
next
|
||||||
|
}
|
||||||
|
/^Running chapter / {
|
||||||
|
if (curfile) close (curfile)
|
||||||
|
curfile="${TMP}/chapter-"\$3
|
||||||
|
print >> curfile
|
||||||
|
next
|
||||||
|
}
|
||||||
|
/^[ \t]*=== acats Summary ===/ {
|
||||||
|
if (curfile) close (curfile)
|
||||||
|
curfile=""
|
||||||
|
insummary=1
|
||||||
|
next
|
||||||
|
}
|
||||||
|
/^# of expected passes/ { if (insummary == 1) passcnt += \$5; next; }
|
||||||
|
/^# of unexpected failures/ { if (insummary == 1) failcnt += \$5; next; }
|
||||||
|
/^# of unsupported tests/ { if (insummary == 1) unsupcnt += \$5; next; }
|
||||||
|
/^\*\*\* FAILURES: / {
|
||||||
|
if (insummary == 1) {
|
||||||
|
if (failures) sub(/^\*\*\* FAILURES:/,"")
|
||||||
|
failures=failures""\$0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
if (print_prologue) { print; next }
|
||||||
|
if (curfile) print >> curfile
|
||||||
|
}
|
||||||
|
END {
|
||||||
|
system ("cat ${TMP}/chapter-*")
|
||||||
|
print " === acats Summary ==="
|
||||||
|
print "# of expected passes " passcnt
|
||||||
|
print "# of unexpected failures " failcnt
|
||||||
|
if (unsupcnt) print "# of unsupported tests " unsupcnt
|
||||||
|
if (failures) print failures
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
rm -f ${TMP}/chapter-*
|
||||||
|
$AWK -f $ACATS_AWK $SUM_FILES
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If no variants were specified, find all variants in the remaining
|
||||||
|
# summary files. Otherwise, ignore specified variants that aren't in
|
||||||
|
# any of those summary files.
|
||||||
|
|
||||||
|
if test -z "$VARIANTS" ; then
|
||||||
|
VAR_AWK=${TMP}/variants.awk
|
||||||
|
cat <<EOF > $VAR_AWK
|
||||||
|
/^Schedule of variations:/ { in_vars=1; next }
|
||||||
|
/^$/ { in_vars=0 }
|
||||||
|
/^Running target/ { exit }
|
||||||
|
{ if (in_vars==1) print \$1; else next }
|
||||||
|
EOF
|
||||||
|
|
||||||
|
touch ${TMP}/varlist
|
||||||
|
for FILE in $SUM_FILES; do
|
||||||
|
$AWK -f $VAR_AWK $FILE >> ${TMP}/varlist
|
||||||
|
done
|
||||||
|
VARIANTS="`sort -u ${TMP}/varlist`"
|
||||||
|
else
|
||||||
|
VARS="$VARIANTS"
|
||||||
|
VARIANTS=""
|
||||||
|
for VAR in $VARS
|
||||||
|
do
|
||||||
|
grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Find out if we have more than one variant, or any at all.
|
||||||
|
|
||||||
|
VARIANT_COUNT=0
|
||||||
|
for VAR in $VARIANTS
|
||||||
|
do
|
||||||
|
VARIANT_COUNT=`expr $VARIANT_COUNT + 1`
|
||||||
|
done
|
||||||
|
|
||||||
|
if test $VARIANT_COUNT -eq 0 ; then
|
||||||
|
msg "${PROGNAME}: no file for $TOOL has results for the specified variants"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat $SUM_FILES \
|
||||||
|
| $AWK '/^Running/ { if ($2 != "target" && $3 == "...") print "EXPFILE: "$2 } ' \
|
||||||
|
| sort -u > ${TMP}/expfiles
|
||||||
|
|
||||||
|
# Write the begining of the combined summary file.
|
||||||
|
|
||||||
|
head -n 2 $FIRST_SUM
|
||||||
|
echo
|
||||||
|
echo " === $TOOL tests ==="
|
||||||
|
echo
|
||||||
|
echo "Schedule of variations:"
|
||||||
|
for VAR in $VARIANTS
|
||||||
|
do
|
||||||
|
echo " $VAR"
|
||||||
|
done
|
||||||
|
echo
|
||||||
|
|
||||||
|
# For each test variant for the tool, copy test reports from each of the
|
||||||
|
# summary files. Set up two awk scripts from within the loop to
|
||||||
|
# initialize VAR and TOOL with the script, rather than assuming that the
|
||||||
|
# available version of awk can pass variables from the command line.
|
||||||
|
|
||||||
|
for VAR in $VARIANTS
|
||||||
|
do
|
||||||
|
GUTS_AWK=${TMP}/guts.awk
|
||||||
|
cat << EOF > $GUTS_AWK
|
||||||
|
BEGIN {
|
||||||
|
variant="$VAR"
|
||||||
|
firstvar=1
|
||||||
|
expfileno=1
|
||||||
|
cnt=0
|
||||||
|
print_using=0
|
||||||
|
need_close=0
|
||||||
|
}
|
||||||
|
/^EXPFILE: / {
|
||||||
|
expfiles[expfileno] = \$2
|
||||||
|
expfilesr[\$2] = expfileno
|
||||||
|
expfileno = expfileno + 1
|
||||||
|
}
|
||||||
|
/^Running target / {
|
||||||
|
curvar = \$3
|
||||||
|
if (variant == curvar && firstvar == 1) { print; print_using=1; firstvar = 0 }
|
||||||
|
next
|
||||||
|
}
|
||||||
|
/^Using / {
|
||||||
|
if (variant == curvar && print_using) { print; next }
|
||||||
|
}
|
||||||
|
/^Running / {
|
||||||
|
print_using=0
|
||||||
|
if (variant == curvar) {
|
||||||
|
if (need_close) close(curfile)
|
||||||
|
curfile="${TMP}/list"expfilesr[\$2]
|
||||||
|
expfileseen[\$2]=expfileseen[\$2] + 1
|
||||||
|
need_close=0
|
||||||
|
testname="00"
|
||||||
|
next
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/\===/ { curvar = ""; next }
|
||||||
|
/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ {
|
||||||
|
testname=\$2
|
||||||
|
# Ugly hack for gfortran.dg/dg.exp
|
||||||
|
if ("$TOOL" == "gfortran" && testname ~ /^gfortran.dg\/g77\//)
|
||||||
|
testname="h"testname
|
||||||
|
}
|
||||||
|
/^$/ { if ("$MODE" == "sum") next }
|
||||||
|
{ if (variant == curvar && curfile) {
|
||||||
|
if ("$MODE" == "sum") {
|
||||||
|
printf "%s %08d|", testname, cnt >> curfile
|
||||||
|
cnt = cnt + 1
|
||||||
|
}
|
||||||
|
filewritten[curfile]=1
|
||||||
|
need_close=1
|
||||||
|
print >> curfile
|
||||||
|
} else
|
||||||
|
next
|
||||||
|
}
|
||||||
|
END {
|
||||||
|
n=1
|
||||||
|
while (n < expfileno) {
|
||||||
|
if (expfileseen[expfiles[n]]) {
|
||||||
|
print "Running "expfiles[n]" ..."
|
||||||
|
if (filewritten["${TMP}/list"n]) {
|
||||||
|
if (expfileseen[expfiles[n]] == 1)
|
||||||
|
cmd="cat"
|
||||||
|
else
|
||||||
|
cmd="LC_ALL=C sort"
|
||||||
|
if ("$MODE" == "sum")
|
||||||
|
system (cmd" ${TMP}/list"n" | sed -n 's/^[^ ]* [^ |]*|//p'")
|
||||||
|
else
|
||||||
|
system ("cat ${TMP}/list"n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
n = n + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
SUMS_AWK=${TMP}/sums.awk
|
||||||
|
rm -f $SUMS_AWK
|
||||||
|
cat << EOF > $SUMS_AWK
|
||||||
|
BEGIN {
|
||||||
|
variant="$VAR"
|
||||||
|
tool="$TOOL"
|
||||||
|
passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; unsupcnt=0; unrescnt=0;
|
||||||
|
curvar=""; insummary=0
|
||||||
|
}
|
||||||
|
/^Running target / { curvar = \$3; next }
|
||||||
|
/^# of / { if (variant == curvar) insummary = 1 }
|
||||||
|
/^# of expected passes/ { if (insummary == 1) passcnt += \$5; next; }
|
||||||
|
/^# of unexpected successes/ { if (insummary == 1) xpasscnt += \$5; next; }
|
||||||
|
/^# of unexpected failures/ { if (insummary == 1) failcnt += \$5; next; }
|
||||||
|
/^# of expected failures/ { if (insummary == 1) xfailcnt += \$5; next; }
|
||||||
|
/^# of untested testcases/ { if (insummary == 1) untstcnt += \$5; next; }
|
||||||
|
/^# of unresolved testcases/ { if (insummary == 1) unrescnt += \$5; next; }
|
||||||
|
/^# of unsupported tests/ { if (insummary == 1) unsupcnt += \$5; next; }
|
||||||
|
/^$/ { if (insummary == 1)
|
||||||
|
{ insummary = 0; curvar = "" }
|
||||||
|
next
|
||||||
|
}
|
||||||
|
{ next }
|
||||||
|
END {
|
||||||
|
printf ("\t\t=== %s Summary for %s ===\n\n", tool, variant)
|
||||||
|
if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt)
|
||||||
|
if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt)
|
||||||
|
if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt)
|
||||||
|
if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt)
|
||||||
|
if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt)
|
||||||
|
if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt)
|
||||||
|
if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
PVAR=`echo $VAR | sed 's,/,.,g'`
|
||||||
|
TMPFILE=${TMP}/var-$PVAR
|
||||||
|
rm -f $TMPFILE
|
||||||
|
rm -f ${TMP}/list*
|
||||||
|
cat ${TMP}/expfiles $SUM_FILES | $AWK -f $GUTS_AWK
|
||||||
|
cat $SUM_FILES | $AWK -f $SUMS_AWK > $TMPFILE
|
||||||
|
# If there are multiple variants, output the counts for this one;
|
||||||
|
# otherwise there will just be the final counts at the end.
|
||||||
|
test $VARIANT_COUNT -eq 1 || cat $TMPFILE
|
||||||
|
done
|
||||||
|
|
||||||
|
# Set up an awk script to get the combined summary counts for the tool.
|
||||||
|
|
||||||
|
TOTAL_AWK=${TMP}/total.awk
|
||||||
|
cat << EOF > $TOTAL_AWK
|
||||||
|
BEGIN {
|
||||||
|
tool="$TOOL"
|
||||||
|
passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; unsupcnt=0; unrescnt=0
|
||||||
|
}
|
||||||
|
/^# of expected passes/ { passcnt += \$5 }
|
||||||
|
/^# of unexpected failures/ { failcnt += \$5 }
|
||||||
|
/^# of unexpected successes/ { xpasscnt += \$5 }
|
||||||
|
/^# of expected failures/ { xfailcnt += \$5 }
|
||||||
|
/^# of untested testcases/ { untstcnt += \$5 }
|
||||||
|
/^# of unresolved testcases/ { unrescnt += \$5 }
|
||||||
|
/^# of unsupported tests/ { unsupcnt += \$5 }
|
||||||
|
END {
|
||||||
|
printf ("\n\t\t=== %s Summary ===\n\n", tool)
|
||||||
|
if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt)
|
||||||
|
if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt)
|
||||||
|
if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt)
|
||||||
|
if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt)
|
||||||
|
if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt)
|
||||||
|
if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt)
|
||||||
|
if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt)
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Find the total summaries for the tool and add to the end of the output.
|
||||||
|
cat ${TMP}/var-* | $AWK -f $TOTAL_AWK
|
||||||
|
|
||||||
|
# This is ugly, but if there's version output from the compiler under test
|
||||||
|
# at the end of the file, we want it. The other thing that might be there
|
||||||
|
# is the final summary counts.
|
||||||
|
tail -n 2 $FIRST_SUM | grep -q '^#' || tail -n 2 $FIRST_SUM
|
||||||
|
|
||||||
|
exit 0
|
||||||
Loading…
Add table
Add a link
Reference in a new issue