From 8207e1fb1b9452bb5660167b2e17d96b259e9fe2 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 12 Oct 2010 05:03:52 +0000 Subject: [PATCH] Fix PR testsuite/45974 by reverting r165323 for now. gcc/: PR testsuite/45974 Revert: * Makefile.in ($(lang_checks_parallel)) ($(lang_checks_parallelized)): Use single quotes for $(RUNTESTFLAGS), to allow passing quoted content. From-SVN: r165350 --- gcc/ChangeLog | 8 ++++++++ gcc/Makefile.in | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 233f62b..2431b0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-10-12 Ralf Wildenhues + + PR testsuite/45974 + Revert: + * Makefile.in ($(lang_checks_parallel)) + ($(lang_checks_parallelized)): Use single quotes for + $(RUNTESTFLAGS), to allow passing quoted content. + 2010-10-11 John David Anglin * config/pa/linux-atomic.c (__sync_val_compare_and_swap_4): Return diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 0dc8214..8405789 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4890,7 +4890,7 @@ $(lang_checks_parallel): site.exp variant=`echo "$@" | sed 's,^[^/]*//,,'`; \ vardots=`echo "$$variant" | sed 's,/,.,g'`; \ $(MAKE) TESTSUITEDIR="testsuite.$$vardots" \ - RUNTESTFLAGS="--target_board=$$variant "'$(RUNTESTFLAGS)' \ + RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \ "$$target" TESTSUITEDIR = testsuite @@ -4949,9 +4949,9 @@ 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=%, $(RUNTESTFLAGS))' ] \ + @if [ -z "$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ - $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS='$(RUNTESTFLAGS)' \ + $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \ check-parallel-$* \ $(patsubst %,check-parallel-$*_%, $(check_p_subdirs)); \ for file in $(TESTSUITEDIR)/$*/$* \ @@ -4968,7 +4968,7 @@ $(lang_checks_parallelized): check-% : site.exp $(patsubst %,$(TESTSUITEDIR)/$*%/$*.log.sep,$(check_p_subdirs)) \ > $(TESTSUITEDIR)/$*/$*.log; \ else \ - $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS='$(RUNTESTFLAGS)' \ + $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \ check_$*_parallelize= check-parallel-$*; \ fi -- 2.7.4