sim: testsuite: expand arch specific toolchain settings

[binutils-gdb.git] / sim / testsuite / local.mk

diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk
index 82eb70de72aa5247da5006851da7ece6ab76f908..977d12f5d282007eac94469a7cc8b5e20409dabb 100644 (file)
--- a/sim/testsuite/local.mk
+++ b/sim/testsuite/local.mk
@@ -16,13 +16,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Tweak the site.exp so it works with plain `runtest` from user.
-EXTRA_DEJAGNU_SITE_CONFIG = site-srcdir.exp
+EXTRA_DEJAGNU_SITE_CONFIG = site-sim-config.exp
 
-site-srcdir.exp: Makefile
-       echo "set srcdir \"$(srcdir)/testsuite\"" > $@
+# Custom verbose test variables that automake doesn't provide (yet?).
+AM_V_RUNTEST = $(AM_V_RUNTEST_@AM_V@)
+AM_V_RUNTEST_ = $(AM_V_RUNTEST_@AM_DEFAULT_V@)
+AM_V_RUNTEST_0 =  @echo "  RUNTEST  $(RUNTESTFLAGS)";
+AM_V_RUNTEST_1 =
+
+site-sim-config.exp: Makefile
+       $(AM_V_GEN)( \
+       echo "set SIM_PRIMARY_TARGET \"$(SIM_PRIMARY_TARGET)\""; \
+       echo "set builddir \"$(builddir)\""; \
+       echo "set srcdir \"$(srcdir)/testsuite\""; \
+       $(foreach V,$(SIM_TOOLCHAIN_VARS),echo "set $(V) \"$($(V))\"";) \
+       ) > $@
 
 check-DEJAGNU: site.exp
-       LC_ALL=C; export LC_ALL; \
+       $(AM_V_RUNTEST)LC_ALL=C; export LC_ALL; \
        EXPECT=${EXPECT} ; export EXPECT ; \
        runtest=$(RUNTEST); \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
@@ -31,6 +42,6 @@ check-DEJAGNU: site.exp
        fi
 
 MOSTLYCLEANFILES += \
-       site-srcdir.exp testrun.log testrun.sum
+       site-sim-config.exp testrun.log testrun.sum
 
 include %D%/common/local.mk