Skip to content

R
riscv-gcc-1
Commit 717c4789 by Jakub Jelinek Committed by Jakub Jelinek
Options

Makefile.in (dg_target_exps): Remove. 

gcc/
	* Makefile.in (dg_target_exps): Remove.
	(check_gcc_parallelize): Change to just an upper bound number.
	(check-%-subtargets): Always print the non-parallelized goals.
	(check_p_vars, check_p_comma, check_p_subwork): Remove.
	(check_p_count, check_p_numbers0, check_p_numbers1, check_p_numbers2,
	check_p_numbers3, check_p_numbers4, check_p_numbers5,
	check_p_numbers6): New variables.
	(check_p_numbers): Set to sequence from 1 to 9999.
	(check_p_subdirs): Set to sequence from 1 to minimum of
	$(check_p_count) and either GCC_TEST_PARALLEL_SLOTS env var if set,
	or 128.
	(check-%, check-parallel-%): Rewritten so that for parallelized
	testing each job runs all the *.exp files, with
	GCC_RUNTEST_PARALLELIZE_DIR set in environment.
gcc/go/
	* Make-lang.in (check_go_parallelize): Change to just an upper bound
	number.
gcc/fortran/
	* Make-lang.in (check_gfortran_parallelize): Change to just an upper
	bound number.
gcc/cp/
	* Make-lang.in (check_g++_parallelize): Change to just an upper bound
	number.
gcc/objc/
	* Make-lang.in (check_objc_parallelize): Change to just an upper
	bound number.
gcc/ada/
	* gcc-interface/Make-lang.in (check_acats_numbers0,
	check_acats_numbers1, check_acats_numbers2, check_acats_numbers3,
	check_acats_numbers4, check_acats_numbers5, check_acats_numbers6,
	check_acats_numbers, check_acats_subdirs): New variables.
	(check_acats_targets): Use $(check_acats_subdirs).
	(check-acats, check-acats%): Rewritten so that for parallelized
	testing each job runs all the chapters files, with
	GCC_RUNTEST_PARALLELIZE_DIR set in environment.  Prepare the support
	directory sequentially and share it.
	(check-acats-subtargets): Always print just check-acats.
gcc/testsuite/
	* lib/gcc-defs.exp (gcc_parallel_test_run_p,
	gcc_parallel_test_enable): New procedures.  If
	GCC_RUNTEST_PARALLELIZE_DIR is set in environment, override
	runtest_file_p to invoke also gcc_parallel_test_run_p.
	* g++.dg/guality/guality.exp (check_guality): Save/restore
	test_counts array around the body of the procedure.
	* gcc.dg/guality/guality.exp (check_guality): Likewise.
	* g++.dg/plugin/plugin.exp: Run all the tests serially
	by the first parallel runtest encountering it.
	* gcc.dg/plugin/plugin.exp: Likewise.
	* gcc.misc-tests/matrix1.exp: Likewise.
	* gcc.misc-tests/dhry.exp: Likewise.
	* gcc.misc-tests/acker1.exp: Likewise.
	* gcc.misc-tests/linkage.exp: Likewise.
	* gcc.misc-tests/mg.exp: Likewise.
	* gcc.misc-tests/mg-2.exp: Likewise.
	* gcc.misc-tests/sort2.exp: Likewise.
	* gcc.misc-tests/sieve.exp: Likewise.
	* gcc.misc-tests/options.exp: Likewise.
	* gcc.misc-tests/help.exp: Likewise.
	* go.test/go-test.exp (go-gc-tests): Use
	gcc_parallel_test_enable {0, 1} around all handling of
	each test.
	* objc.dg/gnu-encoding/gnu-encoding.exp: Likewise.
	* ada/acats/run_all.sh: Parallelize using mkdir inside of
	a shared directory.  Avoid forking and expr uses if
	shell supports $(()).
libstdc++-v3/
	* testsuite/Makefile.am (check_p_numbers0, check_p_numbers1,
	check_p_numbers2, check_p_numbers3, check_p_numbers4,
	check_p_numbers5, check_p_numbers6, check_p_numbers,
	check_p_subdirs): New variables.
	(check_DEJAGNU_normal_targets): Use check_p_subdirs.
	(check-DEJAGNU): Rewritten so that for parallelized
	testing each job runs all the *.exp files, with
	GCC_RUNTEST_PARALLELIZE_DIR set in environment.
	* testsuite/Makefile.in: Regenerated.
	* testsuite/lib/libstdc++.exp (gcc_parallel_test_run_p,
	gcc_parallel_test_enable): New procedures.  If
	GCC_RUNTEST_PARALLELIZE_DIR is set in environment, override
	runtest_file_p to invoke also gcc_parallel_test_run_p.
	* testsuite/libstdc++-abi/abi.exp: Run all the tests serially
	by the first parallel runtest encountering it.  Fix up path
	of the extract_symvers script.
	* testsuite/libstdc++-xmethods/xmethods.exp: Run all the tests
	serially by the first parallel runtest encountering it.  Run
	dg-finish even in case of error.

From-SVN: r215273
parent 737a4826
Showing with 673 additions and 225 deletions
gcc/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* Makefile.in (dg_target_exps): Remove.
(check_gcc_parallelize): Change to just an upper bound number.
(check-%-subtargets): Always print the non-parallelized goals.
(check_p_vars, check_p_comma, check_p_subwork): Remove.
(check_p_count, check_p_numbers0, check_p_numbers1, check_p_numbers2,
check_p_numbers3, check_p_numbers4, check_p_numbers5,
check_p_numbers6): New variables.
(check_p_numbers): Set to sequence from 1 to 9999.
(check_p_subdirs): Set to sequence from 1 to minimum of
$(check_p_count) and either GCC_TEST_PARALLEL_SLOTS env var if set,
or 128.
(check-%, check-parallel-%): Rewritten so that for parallelized
testing each job runs all the *.exp files, with
GCC_RUNTEST_PARALLELIZE_DIR set in environment.
2014-09-15 David Malcolm <dmalcolm@redhat.com>
* config/arc/arc-protos.h (arc_attr_type): Strengthen param from
gcc/ada/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* gcc-interface/Make-lang.in (check_acats_numbers0,
check_acats_numbers1, check_acats_numbers2, check_acats_numbers3,
check_acats_numbers4, check_acats_numbers5, check_acats_numbers6,
check_acats_numbers, check_acats_subdirs): New variables.
(check_acats_targets): Use $(check_acats_subdirs).
(check-acats, check-acats%): Rewritten so that for parallelized
testing each job runs all the chapters files, with
GCC_RUNTEST_PARALLELIZE_DIR set in environment. Prepare the support
directory sequentially and share it.
(check-acats-subtargets): Always print just check-acats.
2014-08-25 Martin Liska <mliska@suse.cz>
* gcc-interface/utils.c (rest_of_subprog_body_compilation): Adjust to
......
gcc/ada/gcc-interface/Make-lang.in
......@@ -862,7 +862,18 @@ check-ada-subtargets: check-acats-subtargets check-gnat-subtargets
ACATSDIR = $(TESTSUITEDIR)/ada/acats
check_acats_targets = $(patsubst %,check-acats%, 0 1 2)
check_acats_numbers0:=1 2 3 4 5 6 7 8 9
check_acats_numbers1:=0 $(check_acats_numbers0)
check_acats_numbers2:=$(foreach i,$(check_acats_numbers0),$(addprefix $(i),$(check_acats_numbers1)))
check_acats_numbers3:=$(addprefix 0,$(check_acats_numbers1)) $(check_acats_numbers2)
check_acats_numbers4:=$(foreach i,$(check_acats_numbers0),$(addprefix $(i),$(check_acats_numbers3)))
check_acats_numbers5:=$(addprefix 0,$(check_acats_numbers3)) $(check_acats_numbers4)
check_acats_numbers6:=$(foreach i,$(check_acats_numbers0),$(addprefix $(i),$(check_acats_numbers5)))
check_acats_numbers:=$(check_acats_numbers0) $(check_acats_numbers2) $(check_acats_numbers4) $(check_acats_numbers6)
check_acats_subdirs=$(wordlist 1, \
$(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128), \
$(check_acats_numbers))
check_acats_targets = $(addprefix check-acats, $(check_acats_subdirs))
check-acats:
@test -d $(ACATSDIR) || mkdir -p $(ACATSDIR); \
......@@ -870,35 +881,45 @@ check-acats:
EXPECT=$(EXPECT); export EXPECT; \
if [ -z "$(CHAPTERS)" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; \
then \
rm -rf $(ACATSDIR)-parallel; \
mkdir $(ACATSDIR)-parallel; \
( testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \
export testdir; \
cd $(ACATSDIR) && $(SHELL) $${testdir}/run_acats NONE ) \
|| exit 1; \
GCC_RUNTEST_PARALLELIZE_DIR=$$rootme/$(ACATSDIR)-parallel; \
export GCC_RUNTEST_PARALLELIZE_DIR; \
$(MAKE) $(check_acats_targets); \
for idx in 0 1 2; do \
rm -rf $(ACATSDIR)-parallel; \
acats_sums= ; acats_logs= ; \
for idx in "" $(check_acats_subdirs); do \
[ -d $(ACATSDIR)$$idx ] || continue; \
mv -f $(ACATSDIR)$$idx/acats.sum $(ACATSDIR)$$idx/acats.sum.sep; \
mv -f $(ACATSDIR)$$idx/acats.log $(ACATSDIR)$$idx/acats.log.sep; \
acats_sums="$$acats_sums $(ACATSDIR)$$idx/acats.sum.sep"; \
acats_logs="$$acats_logs $(ACATSDIR)$$idx/acats.log.sep"; \
done; \
$(SHELL) $(srcdir)/../contrib/dg-extract-results.sh \
$(ACATSDIR)0/acats.sum.sep $(ACATSDIR)1/acats.sum.sep \
$(ACATSDIR)2/acats.sum.sep > $(ACATSDIR)/acats.sum; \
$$acats_sums > $(ACATSDIR)/acats.sum; \
$(SHELL) $(srcdir)/../contrib/dg-extract-results.sh -L \
$(ACATSDIR)0/acats.log.sep $(ACATSDIR)1/acats.log.sep \
$(ACATSDIR)2/acats.log.sep > $(ACATSDIR)/acats.log; \
$$acats_logs > $(ACATSDIR)/acats.log; \
exit 0; \
fi; \
testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \
export testdir; cd $(ACATSDIR) && $(SHELL) $${testdir}/run_acats $(CHAPTERS)
check-acats-subtargets:
@echo $(check_acats_targets)
@echo check-acats
# Parallelized check-acats
$(check_acats_targets): check-acats%:
if [ -f $$GCC_RUNTEST_PARALLELIZE_DIR/finished ]; then \
rm -rf $(ACATSDIR)$*; exit 0; \
fi; \
test -d $(ACATSDIR)$* || mkdir -p $(ACATSDIR)$*; \
testdir=`cd ${srcdir}/${ACATSDIR} && ${PWD_COMMAND}`; \
case "$*" in \
0) chapters="`cd $$testdir/tests; echo [a-b]* c[0-4]*`";; \
1) chapters="`cd $$testdir/tests; echo c[5-9ab]*`";; \
2) chapters="`cd $$testdir/tests; echo c[c-z]* [d-z]*`";; \
esac; \
export testdir; cd $(ACATSDIR)$* && $(SHELL) $${testdir}/run_acats $$chapters
export testdir; cd $(ACATSDIR)$* && $(SHELL) $${testdir}/run_acats
touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished
.PHONY: check-acats $(check_acats_targets)
......
gcc/cp/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* Make-lang.in (check_g++_parallelize): Change to just an upper bound
number.
2014-09-13 Marek Polacek <polacek@redhat.com>
PR c++/60862
......
gcc/cp/Make-lang.in
......@@ -156,11 +156,7 @@ check-c++-subtargets : check-g++-subtargets
lang_checks += check-g++
lang_checks_parallelized += check-g++
# For description see comment above check_gcc_parallelize in gcc/Makefile.in.
check_g++_parallelize = old-deja.exp \
dg.exp=g++.dg/[0-9A-Za-bd-su-z]* \
dg.exp=g++.dg/[ct]* \
dg.exp=c-c++-common/*,dg-torture.exp
check_g++_parallelize = 10000
#
# Install hooks:
# cc1plus is installed elsewhere as part of $(COMPILERS).
......
gcc/fortran/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* Make-lang.in (check_gfortran_parallelize): Change to just an upper
bound number.
2014-09-13 Tobias Burnus <burnus@net-b.de>
PR fortran/63252
......
gcc/fortran/Make-lang.in
......@@ -168,12 +168,7 @@ check-fortran-subtargets : check-gfortran-subtargets
lang_checks += check-gfortran
lang_checks_parallelized += check-gfortran
# For description see comment above check_gcc_parallelize in gcc/Makefile.in.
check_gfortran_parallelize = dg.exp=gfortran.dg/\[adAD\]* \
dg.exp=gfortran.dg/\[bcBC\]* \
dg.exp=gfortran.dg/\[nopNOP\]* \
dg.exp=gfortran.dg/\[isuvISUV\]* \
dg.exp=gfortran.dg/\[efhkqrxzEFHKQRXZ\]* \
dg.exp=gfortran.dg/\[0-9gjlmtwyGJLMTWY\]*
check_gfortran_parallelize = 10000
# GFORTRAN documentation.
GFORTRAN_TEXI = \
......
gcc/go/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* Make-lang.in (check_go_parallelize): Change to just an upper bound
number.
2014-09-03 Chris Manghane <cmang@google.com>
* go-gcc.cc (Gcc_backend::implicit_variable): Remove init
......
gcc/go/Make-lang.in
......@@ -131,11 +131,7 @@ go.srcman: doc/gccgo.1
lang_checks += check-go
lang_checks_parallelized += check-go
check_go_parallelize = go-test.exp=*/test/\[0-57-9a-bd-hj-qs-zA-Z\]* \
go-test.exp=*/test/c* \
go-test.exp=*/test/i* \
go-test.exp=*/test/r* \
go-test.exp=*/test/6*
check_go_parallelize = 10
# Install hooks.
......
gcc/objc/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* Make-lang.in (check_objc_parallelize): Change to just an upper
bound number.
2014-07-14 Jan Hubicka <hubicka@ucw.cz>
* objc-act.c (objc_common_tree_size): New function.
......
gcc/objc/Make-lang.in
......@@ -96,7 +96,7 @@ lang_checks += check-objc
# The following allows you to do 'make check-objc -j2'. The
# execute.exp tests will be run in parallel with all the other ones.
lang_checks_parallelized += check-objc
check_objc_parallelize = gnu-encoding.exp execute.exp exceptions.exp
check_objc_parallelize = 6
#
# Install hooks:
......
gcc/testsuite/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* lib/gcc-defs.exp (gcc_parallel_test_run_p,
gcc_parallel_test_enable): New procedures. If
GCC_RUNTEST_PARALLELIZE_DIR is set in environment, override
runtest_file_p to invoke also gcc_parallel_test_run_p.
* g++.dg/guality/guality.exp (check_guality): Save/restore
test_counts array around the body of the procedure.
* gcc.dg/guality/guality.exp (check_guality): Likewise.
* g++.dg/plugin/plugin.exp: Run all the tests serially
by the first parallel runtest encountering it.
* gcc.dg/plugin/plugin.exp: Likewise.
* gcc.misc-tests/matrix1.exp: Likewise.
* gcc.misc-tests/dhry.exp: Likewise.
* gcc.misc-tests/acker1.exp: Likewise.
* gcc.misc-tests/linkage.exp: Likewise.
* gcc.misc-tests/mg.exp: Likewise.
* gcc.misc-tests/mg-2.exp: Likewise.
* gcc.misc-tests/sort2.exp: Likewise.
* gcc.misc-tests/sieve.exp: Likewise.
* gcc.misc-tests/options.exp: Likewise.
* gcc.misc-tests/help.exp: Likewise.
* go.test/go-test.exp (go-gc-tests): Use
gcc_parallel_test_enable {0, 1} around all handling of
each test.
* objc.dg/gnu-encoding/gnu-encoding.exp: Likewise.
* ada/acats/run_all.sh: Parallelize using mkdir inside of
a shared directory. Avoid forking and expr uses if
shell supports $(()).
2014-09-14 David Sherwood <david.sherwood@arm.com>
* gcc.target/aarch64/vdup_lane_2.c (force_simd): Emit simd mov.
......
gcc/testsuite/ada/acats/run_all.sh
......@@ -18,6 +18,21 @@ target_run () {
# End of customization section.
# Perform arithmetic evaluation on the ARGs, and store the result in the
# global $as_val. Take advantage of shells that can avoid forks. The arguments
# must be portable across $(()) and expr.
if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
eval 'as_fn_arith ()
{
as_val=$(( $* ))
}'
else
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
}
fi # as_fn_arith
display_noeol () {
printf "$@"
printf "$@" >> $dir/acats.sum
......@@ -90,6 +105,18 @@ display `type gnatmake`
gnatls -v >> $dir/acats.log
display ""
if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
dir_support=$dir/../acats/support
rm -rf $dir/run
mv $dir/tests $dir/tests.$$ 2> /dev/null
rm -rf $dir/tests.$$ &
mkdir -p $dir/run
cp -pr $dir/../acats/tests $dir/
else
dir_support=$dir/support
display " === acats support ==="
display_noeol "Generating support files..."
......@@ -186,6 +213,9 @@ target_gnatmake -c -gnato -gnatE *.adb >> $dir/acats.log 2>&1
display " done."
display ""
fi
display " === acats tests ==="
if [ $# -eq 0 ]; then
......@@ -197,8 +227,14 @@ fi
glob_countn=0
glob_countok=0
glob_countu=0
par_count=0
par_countm=0
par_last=
for chapter in $chapters; do
# Used to generate support once and finish after that.
[ "$chapter" = "NONE" ] && continue
display Running chapter $chapter ...
if [ ! -d $dir/tests/$chapter ]; then
......@@ -209,13 +245,43 @@ for chapter in $chapters; do
cd $dir/tests/$chapter
ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \
cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \
cut -c1-7 | sort | uniq | comm -23 - $dir_support/norun.lst \
> $dir/tests/$chapter/${chapter}.lst
countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
glob_countn=`expr $glob_countn + $countn`
counti=0
as_fn_arith $glob_countn + $countn
glob_countn=$as_val
for i in `cat $dir/tests/$chapter/${chapter}.lst`; do
counti=`expr $counti + 1`
# If running multiple run_all.sh jobs in parallel, decide
# if we should run this test in the current instance.
if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
case "$i" in
# Ugh, some tests have inter-test dependencies, those
# tests have to be scheduled on the same parallel instance
# as previous test.
ce2108f | ce2108h | ce3112d) ;;
# All others can be hopefully scheduled freely.
*)
as_fn_arith $par_countm + 1
par_countm=$as_val
[ $par_countm -eq 10 ] && par_countm=0
if [ $par_countm -eq 1 ]; then
as_fn_arith $par_count + 1
par_count=$as_val
if mkdir $GCC_RUNTEST_PARALLELIZE_DIR/$par_count; then
par_last=1
else
par_last=
fi
fi;;
esac
if [ -z "$par_last" ]; then
as_fn_arith $glob_countn - 1
glob_countn=$as_val
continue
fi
fi
extraflags="-gnat95"
grep $i $testdir/overflow.lst > /dev/null 2>&1
if [ $? -eq 0 ]; then
......@@ -254,7 +320,7 @@ for chapter in $chapters; do
echo "BUILD $main" >> $dir/acats.log
EXTERNAL_OBJECTS=""
case $i in
cxb30*) EXTERNAL_OBJECTS="$dir/support/cxb30040.o $dir/support/cxb30060.o $dir/support/cxb30130.o $dir/support/cxb30131.o";;
cxb30*) EXTERNAL_OBJECTS="$dir_support/cxb30040.o $dir_support/cxb30060.o $dir_support/cxb30130.o $dir_support/cxb30131.o";;
ca1020e) rm -f ca1020e_func1.adb ca1020e_func2.adb ca1020e_proc1.adb ca1020e_proc2.adb > /dev/null 2>&1;;
ca14028) rm -f ca14028_func2.ads ca14028_func3.ads ca14028_proc1.ads ca14028_proc3.ads > /dev/null 2>&1;;
esac
......@@ -265,7 +331,7 @@ for chapter in $chapters; do
continue
fi
target_gnatmake $extraflags -I$dir/support $main >> $dir/acats.log 2>&1
target_gnatmake $extraflags -I$dir_support $main >> $dir/acats.log 2>&1
if [ $? -ne 0 ]; then
display "FAIL: $i"
failed="${failed}${i} "
......@@ -290,12 +356,15 @@ for chapter in $chapters; do
failed="${failed}${i} "
else
log "UNSUPPORTED: $i"
glob_countn=`expr $glob_countn - 1`
glob_countu=`expr $glob_countu + 1`
as_fn_arith $glob_countn - 1
glob_countn=$as_val
as_fn_arith $glob_countu + 1
glob_countu=$as_val
fi
else
log "PASS: $i"
glob_countok=`expr $glob_countok + 1`
as_fn_arith $glob_countok + 1
glob_countok=$as_val
fi
clean_dir
done
......
gcc/testsuite/g++.dg/guality/guality.exp
......@@ -14,6 +14,11 @@ if { [istarget "powerpc-ibm-aix*"] } {
}
proc check_guality {args} {
# Don't count check_guality as PASS, or FAIL etc., that would make
# the total PASS count dependent on how many parallel runtest invocations
# ran guality.exp. So save the counts first and restore them afterwards.
global test_counts
array set saved_test_counts [array get test_counts]
set result [eval check_compile guality_check executable $args "-g -O0"]
set lines [lindex $result 0]
set output [lindex $result 1]
......@@ -23,6 +28,7 @@ proc check_guality {args} {
set ret [string match "*1 PASS, 0 FAIL, 0 UNRESOLVED*" $execout]
}
remote_file build delete $output
array get test_counts [array get saved_test_counts]
return $ret
}
......
gcc/testsuite/g++.dg/plugin/plugin.exp
......@@ -44,6 +44,15 @@ if $tracelevel then {
# Load support procs.
load_lib plugin-support.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p plugin] {
return
}
gcc_parallel_test_enable 0
# Specify the plugin source file and the associated test files in a list.
# plugin_test_list={ {plugin1 test1 test2 ...} {plugin2 test1 ...} ... }
set plugin_test_list [list \
......@@ -68,3 +77,5 @@ foreach plugin_test $plugin_test_list {
set plugin_input_tests [lreplace $plugin_test 0 0]
plugin-test-execute $plugin_src $plugin_input_tests
}
gcc_parallel_test_enable 1
gcc/testsuite/gcc.dg/guality/guality.exp
......@@ -14,6 +14,11 @@ if { [istarget "powerpc-ibm-aix*"] } {
}
proc check_guality {args} {
# Don't count check_guality as PASS, or FAIL etc., that would make
# the total PASS count dependent on how many parallel runtest invocations
# ran guality.exp. So save the counts first and restore them afterwards.
global test_counts
array set saved_test_counts [array get test_counts]
set result [eval check_compile guality_check executable $args "-g -O0"]
set lines [lindex $result 0]
set output [lindex $result 1]
......@@ -23,6 +28,7 @@ proc check_guality {args} {
set ret [string match "*1 PASS, 0 FAIL, 0 UNRESOLVED*" $execout]
}
remote_file build delete $output
array set test_counts [array get saved_test_counts]
return $ret
}
......
gcc/testsuite/gcc.dg/plugin/plugin.exp
......@@ -44,6 +44,15 @@ if $tracelevel then {
# Load support procs.
load_lib plugin-support.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p plugin] {
return
}
gcc_parallel_test_enable 0
# Specify the plugin source file and the associated test files in a list.
# plugin_test_list={ {plugin1 test1 test2 ...} {plugin2 test1 ...} ... }
set plugin_test_list [list \
......@@ -80,3 +89,5 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/plugindir*.\[cSi\]]] \
# All done.
dg-finish
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/acker1.exp
......@@ -20,9 +20,21 @@ if { ![info exists PERF_TEST] || "$PERF_TEST" != "yes" } {
}
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p acker1] {
return
}
gcc_parallel_test_enable 0
prebase
set actions run
set compiler_output "^$"
set program_output "^$"
postbase acker1.c $run $groups
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/dhry.exp
......@@ -20,9 +20,21 @@ if { ![info exists PERF_TEST] || "$PERF_TEST" != "yes" } {
}
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p dhry] {
return
}
gcc_parallel_test_enable 0
prebase
set actions run
set compiler_output "^$"
set program_output "^$"
postbase dhry.c $run $groups
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/help.exp
......@@ -18,6 +18,16 @@
# documented in --help, and that the various --help* options work.
load_lib options.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p help] {
return
}
gcc_parallel_test_enable 0
# Document --version. Ideally, there should be no undocumented switches
# in --help.
......@@ -78,3 +88,5 @@ check_for_options c "--help=joined,^separate" "--help=" "" ""
check_for_options c "--help=joined,undocumented" "" "" ""
# Listing only excludes gives empty results.
check_for_options c "--help=^joined,^separate" "" "" ""
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/linkage.exp
......@@ -18,6 +18,17 @@
# was written by Rob Savoye. (rob@cygnus.com)
# All the other tests driven by that file have since been moved elsewhere.
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p linkage] {
return
}
gcc_parallel_test_enable 0
if { [isnative] && ![is_remote host] } then {
set lines [gcc_target_compile "$srcdir/$subdir/linkage-x.c" "linkage-x.o" object {additional_flags="-w"}]
if ![string match "" $lines] then {
......@@ -117,3 +128,5 @@ if { [isnative] && ![is_remote host] } then {
file delete "linkage-x.o"
}
}
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/matrix1.exp
......@@ -20,9 +20,21 @@ if { ![info exists PERF_TEST] || "$PERF_TEST" != "yes" } {
}
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p matrix1] {
return
}
gcc_parallel_test_enable 0
prebase
set actions run
set compiler_output "^$"
set program_output "^$"
postbase matrix1.c $run $groups
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/mg-2.exp
......@@ -17,8 +17,20 @@
# Test the -MG flag with a system header file.
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p mg-2] {
return
}
gcc_parallel_test_enable 0
prebase
set actions none-of-the-above
set compiler_output "mg-2.o ?: .*mg-2.c \[ \\\\\n\]*nonexist.h"
postbase mg-2.c "" "" "-MM -MG"
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/mg.exp
......@@ -17,8 +17,20 @@
# Test the -MG flag.
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p mg] {
return
}
gcc_parallel_test_enable 0
prebase
set actions none-of-the-above
set compiler_output "mg.o ?: .*mg.c \[ \\\\\n\]*nonexist.h"
postbase mg.c "" "" "-MM -MG"
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/options.exp
......@@ -19,6 +19,17 @@
# match the patterns COMPILER_PATTERN, AS_PATTERN and LD_PATTERN,
# respectively.
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p options] {
return
}
gcc_parallel_test_enable 0
proc check_for_all_options {language gcc_options compiler_pattern as_pattern ld_pattern} {
set filename test-[pid]
set fd [open $filename.c w]
......@@ -52,3 +63,5 @@ proc check_for_all_options {language gcc_options compiler_pattern as_pattern ld_
}
check_for_all_options c {--coverage} {-fprofile-arcs -ftest-coverage} {} {-lgcov}
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/sieve.exp
......@@ -20,9 +20,21 @@ if { ![info exists PERF_TEST] || "$PERF_TEST" != "yes" } {
}
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p sieve] {
return
}
gcc_parallel_test_enable 0
prebase
set actions run
set compiler_output "^$"
set program_output "^$"
postbase sieve.c $run $groups
gcc_parallel_test_enable 1
gcc/testsuite/gcc.misc-tests/sort2.exp
......@@ -20,9 +20,21 @@ if { ![info exists PERF_TEST] || "$PERF_TEST" != "yes" } {
}
load_lib mike-gcc.exp
load_lib gcc-defs.exp
# These tests don't run runtest_file_p consistently if it
# doesn't return the same values, so disable parallelization
# of this *.exp file. The first parallel runtest to reach
# this will run all the tests serially.
if ![gcc_parallel_test_run_p sort2] {
return
}
gcc_parallel_test_enable 0
prebase
set actions run
set compiler_output "^$"
set program_output "^$"
postbase sort2.c $run $groups
gcc_parallel_test_enable 1
gcc/testsuite/go.test/go-test.exp
......@@ -489,6 +489,12 @@ proc go-gc-tests { } {
close $fd
# runtest_file_p is already run above, and the code below can run
# runtest_file_p again, make sure everything for this test is
# performed if the above runtest_file_p decided this runtest
# instance should execute the test
gcc_parallel_test_enable 0
set go_compile_args ""
set go_execute_args ""
if { [regexp "// run (\[^|&>2\].*)\$" $test_line match progargs] \
......@@ -1164,6 +1170,7 @@ proc go-gc-tests { } {
set go_compile_args ""
set go_execute_args ""
set TORTURE_OPTIONS [list { -O2 -g }]
gcc_parallel_test_enable 1
}
set dg-do-what-default ${saved-dg-do-what-default}
......
gcc/testsuite/lib/gcc-defs.exp
......@@ -188,6 +188,81 @@ if { [info procs runtest_file_p] == "" } then {
}
}
if { [info exists env(GCC_RUNTEST_PARALLELIZE_DIR)] \
&& [info procs runtest_file_p] != [list] \
&& [info procs gcc_parallelize_saved_runtest_file_p] == [list] } then {
global gcc_runtest_parallelize_counter
global gcc_runtest_parallelize_counter_minor
global gcc_runtest_parallelize_enable
global gcc_runtest_parallelize_dir
global gcc_runtest_parallelize_last
set gcc_runtest_parallelize_counter 0
set gcc_runtest_parallelize_counter_minor 0
set gcc_runtest_parallelize_enable 1
set gcc_runtest_parallelize_dir [getenv GCC_RUNTEST_PARALLELIZE_DIR]
set gcc_runtest_parallelize_last 0
proc gcc_parallel_test_run_p { testcase } {
global gcc_runtest_parallelize_counter
global gcc_runtest_parallelize_counter_minor
global gcc_runtest_parallelize_enable
global gcc_runtest_parallelize_dir
global gcc_runtest_parallelize_last
if { $gcc_runtest_parallelize_enable == 0 } {
return 1
}
# Only test the filesystem every 10th iteration
incr gcc_runtest_parallelize_counter_minor
if { $gcc_runtest_parallelize_counter_minor == 10 } {
set gcc_runtest_parallelize_counter_minor 0
}
if { $gcc_runtest_parallelize_counter_minor != 1 } {
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter $gcc_runtest_parallelize_last"
return $gcc_runtest_parallelize_last
}
set path $gcc_runtest_parallelize_dir/$gcc_runtest_parallelize_counter
if {![catch {open $path {RDWR CREAT EXCL} 0600} fd]} {
close $fd
set gcc_runtest_parallelize_last 1
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter 1"
incr gcc_runtest_parallelize_counter
return 1
}
set gcc_runtest_parallelize_last 0
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter 0"
incr gcc_runtest_parallelize_counter
return 0
}
proc gcc_parallel_test_enable { val } {
global gcc_runtest_parallelize_enable
set gcc_runtest_parallelize_enable $val
}
rename runtest_file_p gcc_parallelize_saved_runtest_file_p
proc runtest_file_p { runtests testcase } {
if ![gcc_parallelize_saved_runtest_file_p $runtests $testcase] {
return 0
}
return [gcc_parallel_test_run_p $testcase]
}
} else {
proc gcc_parallel_test_run_p { testcase } {
return 1
}
proc gcc_parallel_test_enable { val } {
}
}
# Like dg-options, but adds to the default options rather than replacing them.
proc dg-additional-options { args } {
......
gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp
......@@ -58,7 +58,9 @@ if { $status == 0 } then {
continue
}
gcc_parallel_test_enable 0
dg-runtest $src "" $DEFAULT_CFLAGS
gcc_parallel_test_enable 1
}
} else {
warning "Could not execute objc.dg/gnu-encoding/struct-layout-encoding-1 generator"
......
libstdc++-v3/ChangeLog
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* testsuite/Makefile.am (check_p_numbers0, check_p_numbers1,
check_p_numbers2, check_p_numbers3, check_p_numbers4,
check_p_numbers5, check_p_numbers6, check_p_numbers,
check_p_subdirs): New variables.
(check_DEJAGNU_normal_targets): Use check_p_subdirs.
(check-DEJAGNU): Rewritten so that for parallelized
testing each job runs all the *.exp files, with
GCC_RUNTEST_PARALLELIZE_DIR set in environment.
* testsuite/Makefile.in: Regenerated.
* testsuite/lib/libstdc++.exp (gcc_parallel_test_run_p,
gcc_parallel_test_enable): New procedures. If
GCC_RUNTEST_PARALLELIZE_DIR is set in environment, override
runtest_file_p to invoke also gcc_parallel_test_run_p.
* testsuite/libstdc++-abi/abi.exp: Run all the tests serially
by the first parallel runtest encountering it. Fix up path
of the extract_symvers script.
* testsuite/libstdc++-xmethods/xmethods.exp: Run all the tests
serially by the first parallel runtest encountering it. Run
dg-finish even in case of error.
2014-09-15 Jonathan Wakely <jwakely@redhat.com>
* include/bits/regex.h (basic_regex): Rename _Ch_typeraits template
......
libstdc++-v3/testsuite/Makefile.am
......@@ -101,26 +101,37 @@ new-abi-baseline:
@test ! -f $*/site.exp || mv $*/site.exp $*/site.bak
@mv $*/site.exp.tmp $*/site.exp
check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9 10)
check_p_numbers0:=1 2 3 4 5 6 7 8 9
check_p_numbers1:=0 $(check_p_numbers0)
check_p_numbers2:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1)))
check_p_numbers3:=$(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2)
check_p_numbers4:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3)))
check_p_numbers5:=$(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4)
check_p_numbers6:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5)))
check_p_numbers:=$(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6)
check_p_subdirs=$(wordlist 1,$(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128),$(check_p_numbers))
check_DEJAGNU_normal_targets = $(addprefix check-DEJAGNUnormal,$(check_p_subdirs))
$(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
# Run the testsuite in normal mode.
check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
AR="$(AR)"; export AR; \
RANLIB="$(RANLIB)"; export RANLIB; \
if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
&& [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
rm -rf normal-parallel || true; \
mkdir normal-parallel; \
$(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
for idx in 0 1 2 3 4 5 6 7 8 9 10; do \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
rm -rf normal-parallel || true; \
for idx in $(check_p_subdirs); do \
if [ -d normal$$idx ]; then \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
fi; \
done; \
mv -f libstdc++.sum libstdc++.sum.sep; \
mv -f libstdc++.log libstdc++.log.sep; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
libstdc++.sum.sep normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \
normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
libstdc++.log.sep normal[0-9]*/libstdc++.log.sep > libstdc++.log; \
normal[0-9]*/libstdc++.log.sep > libstdc++.log; \
exit 0; \
fi; \
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
......@@ -128,47 +139,20 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
runtest=$(RUNTEST); \
if [ -z "$$runtest" ]; then runtest=runtest; fi; \
tool=libstdc++; \
dirs=; \
case "$*" in \
normal0) \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
normal1) \
dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \
normal2) \
dirs="`cd $$srcdir; echo 2[01]_*/*`";; \
normal3) \
dirs="`cd $$srcdir; echo 22_*/*`";; \
normal4) \
dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \
normal5) \
dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \
normal6) \
dirs="`cd $$srcdir; echo 2[459]_*/*`";; \
normal7) \
dirs="`cd $$srcdir; echo 26_*/* 28_*/[c-z]*`";; \
normal8) \
dirs="`cd $$srcdir; echo 27_*/*`";; \
normal9) \
dirs="`cd $$srcdir; echo 28_*/[ab]*`";; \
normal10) \
dirs="`cd $$srcdir; echo t*/*`";; \
esac; \
if [ -n "$*" ]; then cd "$*"; fi; \
if [ -n "$*" ]; then \
if [ -f normal-parallel/finished ]; then rm -rf "$*"; exit 0; fi; \
GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/normal-parallel; \
export GCC_RUNTEST_PARALLELIZE_DIR; \
cd "$*"; \
fi; \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
if [ -n "$$dirs" ]; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS) \
"conformance.exp=`echo $$dirs | sed 's/ /* /g;s/$$/*/'`"; \
else \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS); \
if [ -n "$*" ]; then \
touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished; \
fi; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
else \
echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi
check-am:
......
libstdc++-v3/testsuite/Makefile.in
......@@ -301,7 +301,16 @@ lists_of_files = \
extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers
baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch))
check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9 10)
check_p_numbers0:=1 2 3 4 5 6 7 8 9
check_p_numbers1:=0 $(check_p_numbers0)
check_p_numbers2:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1)))
check_p_numbers3:=$(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2)
check_p_numbers4:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3)))
check_p_numbers5:=$(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4)
check_p_numbers6:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5)))
check_p_numbers:=$(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6)
check_p_subdirs=$(wordlist 1,$(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128),$(check_p_numbers))
check_DEJAGNU_normal_targets = $(addprefix check-DEJAGNUnormal,$(check_p_subdirs))
# Runs the testsuite, but in compile only mode.
# Can be used to test sources with non-GNU FE's at various warning
......@@ -559,19 +568,21 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
AR="$(AR)"; export AR; \
RANLIB="$(RANLIB)"; export RANLIB; \
if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
&& [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
rm -rf normal-parallel || true; \
mkdir normal-parallel; \
$(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
for idx in 0 1 2 3 4 5 6 7 8 9 10; do \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
rm -rf normal-parallel || true; \
for idx in $(check_p_subdirs); do \
if [ -d normal$$idx ]; then \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
fi; \
done; \
mv -f libstdc++.sum libstdc++.sum.sep; \
mv -f libstdc++.log libstdc++.log.sep; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
libstdc++.sum.sep normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \
normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
libstdc++.log.sep normal[0-9]*/libstdc++.log.sep > libstdc++.log; \
normal[0-9]*/libstdc++.log.sep > libstdc++.log; \
exit 0; \
fi; \
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
......@@ -579,47 +590,20 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
runtest=$(RUNTEST); \
if [ -z "$$runtest" ]; then runtest=runtest; fi; \
tool=libstdc++; \
dirs=; \
case "$*" in \
normal0) \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
normal1) \
dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \
normal2) \
dirs="`cd $$srcdir; echo 2[01]_*/*`";; \
normal3) \
dirs="`cd $$srcdir; echo 22_*/*`";; \
normal4) \
dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \
normal5) \
dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \
normal6) \
dirs="`cd $$srcdir; echo 2[459]_*/*`";; \
normal7) \
dirs="`cd $$srcdir; echo 26_*/* 28_*/[c-z]*`";; \
normal8) \
dirs="`cd $$srcdir; echo 27_*/*`";; \
normal9) \
dirs="`cd $$srcdir; echo 28_*/[ab]*`";; \
normal10) \
dirs="`cd $$srcdir; echo t*/*`";; \
esac; \
if [ -n "$*" ]; then cd "$*"; fi; \
if [ -n "$*" ]; then \
if [ -f normal-parallel/finished ]; then rm -rf "$*"; exit 0; fi; \
GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/normal-parallel; \
export GCC_RUNTEST_PARALLELIZE_DIR; \
cd "$*"; \
fi; \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
if [ -n "$$dirs" ]; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS) \
"conformance.exp=`echo $$dirs | sed 's/ /* /g;s/$$/*/'`"; \
else \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
$(RUNTESTFLAGS); \
if [ -n "$*" ]; then \
touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished; \
fi; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
else \
echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi
check-am:
......
libstdc++-v3/testsuite/lib/libstdc++.exp
......@@ -1823,3 +1823,78 @@ proc check_v3_target_little_endian { } {
}
set additional_prunes ""
if { [info exists env(GCC_RUNTEST_PARALLELIZE_DIR)] \
&& [info procs runtest_file_p] != [list] \
&& [info procs gcc_parallelize_saved_runtest_file_p] == [list] } then {
global gcc_runtest_parallelize_counter
global gcc_runtest_parallelize_counter_minor
global gcc_runtest_parallelize_enable
global gcc_runtest_parallelize_dir
global gcc_runtest_parallelize_last
set gcc_runtest_parallelize_counter 0
set gcc_runtest_parallelize_counter_minor 0
set gcc_runtest_parallelize_enable 1
set gcc_runtest_parallelize_dir [getenv GCC_RUNTEST_PARALLELIZE_DIR]
set gcc_runtest_parallelize_last 0
proc gcc_parallel_test_run_p { testcase } {
global gcc_runtest_parallelize_counter
global gcc_runtest_parallelize_counter_minor
global gcc_runtest_parallelize_enable
global gcc_runtest_parallelize_dir
global gcc_runtest_parallelize_last
if { $gcc_runtest_parallelize_enable == 0 } {
return 1
}
# Only test the filesystem every 10th iteration
incr gcc_runtest_parallelize_counter_minor
if { $gcc_runtest_parallelize_counter_minor == 10 } {
set gcc_runtest_parallelize_counter_minor 0
}
if { $gcc_runtest_parallelize_counter_minor != 1 } {
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter $gcc_runtest_parallelize_last"
return $gcc_runtest_parallelize_last
}
set path $gcc_runtest_parallelize_dir/$gcc_runtest_parallelize_counter
if {![catch {open $path {RDWR CREAT EXCL} 0600} fd]} {
close $fd
set gcc_runtest_parallelize_last 1
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter 1"
incr gcc_runtest_parallelize_counter
return 1
}
set gcc_runtest_parallelize_last 0
#verbose -log "gcc_parallel_test_run_p $testcase $gcc_runtest_parallelize_counter 0"
incr gcc_runtest_parallelize_counter
return 0
}
proc gcc_parallel_test_enable { val } {
global gcc_runtest_parallelize_enable
set gcc_runtest_parallelize_enable $val
}
rename runtest_file_p gcc_parallelize_saved_runtest_file_p
proc runtest_file_p { runtests testcase } {
if ![gcc_parallelize_saved_runtest_file_p $runtests $testcase] {
return 0
}
return [gcc_parallel_test_run_p $testcase]
}
} else {
proc gcc_parallel_test_run_p { testcase } {
return 1
}
proc gcc_parallel_test_enable { val } {
}
}
libstdc++-v3/testsuite/libstdc++-abi/abi.exp
......@@ -18,6 +18,12 @@
# this test. Or, hey, if we don't support this kind of symbol
# versioning test: don't run it.
# Only run whole abi.exp in one instance, serially.
if ![gcc_parallel_test_run_p abi] {
return
}
gcc_parallel_test_enable 0
if { [string match "*-*-darwin*" $target_triplet] } {
set lib $blddir/src/.libs/libstdc++.dylib
} else {
......@@ -30,6 +36,7 @@ v3-build_support
if { (${v3-symver} == 0) || ![info exists baseline_dir] \
|| ![file exists $baseline_dir] \
|| ![file exists $lib] } {
gcc_parallel_test_enable 1
return
}
......@@ -42,12 +49,13 @@ if ![file exists $baseline_file] {
set baseline_file [file join $baseline_dir "baseline_symbols.txt"]
}
if ![file exists $baseline_file] {
gcc_parallel_test_enable 1
return
}
send_log "Checking $lib against $baseline_file\n"
# Figure out what symbols are defined by the active build of the library.
remote_exec "build" "$objdir/../scripts/extract_symvers" \
remote_exec "build" "$blddir/scripts/extract_symvers" \
[list $lib "current_symbols.txt"]
# Build the abi_check program.
......@@ -62,3 +70,5 @@ set result [${tool}_load "./abi_check" \
[list "--check-verbose" "current_symbols.txt" \
"baseline_symbols.txt"]]
[lindex $result 0] "libstdc++-abi/abi_check"
gcc_parallel_test_enable 1
libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp
......@@ -16,6 +16,12 @@
load_lib gdb-test.exp
# Only run whole xmethods.exp in one instance, serially.
if ![gcc_parallel_test_run_p xmethods] {
return
}
gcc_parallel_test_enable 0
dg-init
v3-build_support
......@@ -30,7 +36,9 @@ if ![info exists ::env(GUALITY_GDB_NAME)] {
}
if {! [gdb_version_check_xmethods]} {
dg-finish
unsupported "xmethods.exp"
gcc_parallel_test_enable 1
return
}
......@@ -49,3 +57,4 @@ if [info exists guality_gdb_name] {
}
dg-finish
gcc_parallel_test_enable 1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment