procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR testsuite/49741 (make -k check-c++0x not multilib aware)

Browse source 
PR testsuite/49741
gcc/
	* Makefile.in ($(lang_checks_parallelized)): Allow --extra_opts
	rather than --tool_opts.
gcc/cp/
	* Make-lang.in (check-c++0x): Use --extra_opts instead of--tool_opts.
gcc/testsuite/
	* lib/g++.exp (${tool}_option_help, ${tool}_option_proc): Restore.
	Use --extra_opts instead of --additional_options.

	* Makefile.in (check-c++): Move check-gcc-c++0x after
	check-target-libstdc++-v3.

From-SVN: r176332
This commit is contained in:
Jason Merrill 2011-07-15 17:29:57 -04:00 • committed by Jason Merrill
parent 4476205585
commit 6feeed065c
8 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-15 Jason Merrill <jason@redhat.com>
* Makefile.in (check-c++): Move check-gcc-c++0x after
check-target-libstdc++-v3.
2011-07-15 Bernd Schmidt <bernds@codesourcery.com>
* MAINTAINERS (c6x port): New entry.

2
Makefile.in
View file

@ -40157,7 +40157,7 @@ check-gcc-c++0x:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++0x);
check-c++: check-gcc-c++ check-gcc-c++0x check-target-libstdc++-v3
check-c++: check-gcc-c++ check-target-libstdc++-v3 check-gcc-c++0x
.PHONY: check-gcc-fortran check-fortran
check-gcc-fortran:

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
2011-07-15 Jason Merrill <jason@redhat.com>
PR testsuite/49741
* Makefile.in ($(lang_checks_parallelized)): Allow --extra_opts
rather than --tool_opts.
2011-07-15 Basile Starynkevitch <basile@starynkevitch.net>
* doc/plugins.texi (Building GCC plugins): gengtype needs its

4
gcc/Makefile.in
View file

@ -5019,7 +5019,7 @@ check_p_subdirs=$(wordlist 1,$(words $(check_$*_parallelize)),$(check_p_numbers)
# For parallelized check-% targets, this decides whether parallelization
# is desirable (if -jN is used and RUNTESTFLAGS doesn't contain anything
# but optional --target_board or --tool_opts arguments). If it is desirable,
# but optional --target_board or --extra_opts arguments). If desirable,
# recursive make is run with check-parallel-$lang{,1,2,3,4,5} etc. goals,
# which can be executed in parallel, as they are run in separate directories.
# check-parallel-$lang{1,2,3,4,5} etc. goals invoke runtest with the longest
@ -5036,7 +5036,7 @@ check_p_subdirs=$(wordlist 1,$(words $(check_$*_parallelize)),$(check_p_numbers)
# to lang_checks_parallelized variable and define check_$lang_parallelize
# variable (see above check_gcc_parallelize description).
$(lang_checks_parallelized): check-% : site.exp
@if [ -z "$(filter-out --target_board=%,$(filter-out --tool_opts%,$(RUNTESTFLAGS)))" ] \
@if [ -z "$(filter-out --target_board=%,$(filter-out --extra_opts%,$(RUNTESTFLAGS)))" ] \
&& [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
$(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \
check-parallel-$* \

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-15 Jason Merrill <jason@redhat.com>
PR testsuite/49741
* Make-lang.in (check-c++0x): Use --extra_opts instead of--tool_opts.
2011-07-13 Jason Merrill <jason@redhat.com>
* Make-lang.in (check-c++0x): New.

2
gcc/cp/Make-lang.in
View file

@ -151,7 +151,7 @@ c++.srcman: doc/g++.1
check-c++ : check-g++
# Run the testsute in C++0x mode.
check-c++0x:
$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts=-std=gnu++0x" \
$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) --extra_opts,-std=gnu++0x" \
TESTSUITEDIR="$(TESTSUITEDIR).c++0x" check-g++
check-c++-subtargets : check-g++-subtargets
# List of targets that can use the generic check- rule and its // variant.

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2011-07-15 Jason Merrill <jason@redhat.com>
PR testsuite/49741
* lib/g++.exp (${tool}_option_help, ${tool}_option_proc): Restore.
Use --extra_opts instead of --additional_options.
2011-07-15 Jakub Jelinek <jakub@redhat.com>
PR testsuite/49753

31
gcc/testsuite/lib/g++.exp
View file

@ -307,3 +307,34 @@ proc g++_target_compile { source dest type options } {
return $result
}
#
# ${tool}_option_help
#
# Changed "additional" to "extra" because runtest.exp treats --a* as --all.
#
# This shouldn't be necessary at all; it should be entirely redundant with
# --tool_opts, except that --tool_opts currently breaks multilib: see
# http://lists.gnu.org/archive/html/dejagnu/2002-10/msg00007.html
proc ${tool}_option_help { } {
send_user " --extra_opts,OPTIONS\t\tUse OPTIONS to compile the testcase files. OPTIONS should be comma-separated.\n"
}
#
# ${tool}_option_proc
#
proc ${tool}_option_proc { option } {
if [regexp "^--extra_opts," $option] {
global gpp_compile_options
regsub "^--extra_opts," $option "" option
foreach x [split $option ","] {
lappend gpp_compile_options "additional_flags=$x"
}
verbose -log "gpp_compile_options set to $gpp_compile_options"
return 1
} else {
return 0
}
}