diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-11-21 03:06:20 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-11-26 19:27:21 -0500 |
| commit | e1e1ae6e9b5e76daed22c8b2eb79fa3b5ade3335 (patch) | |
| tree | 205dafa026bd39afbe1d4d2897ce1300edd3ad83 /sim/Makefile.in | |
| parent | 03c0f9c2057d361a1d9e717624ab94e4b7d67bf2 (diff) | |
| download | binutils-e1e1ae6e9b5e76daed22c8b2eb79fa3b5ade3335.zip binutils-e1e1ae6e9b5e76daed22c8b2eb79fa3b5ade3335.tar.gz binutils-e1e1ae6e9b5e76daed22c8b2eb79fa3b5ade3335.tar.bz2 | |
sim: testsuite: fix objdir handling
The tests assume that the cwd is the objdir directory and write its
intermediates to there all the time. When using runtest's --objdir
setting though, this puts the files in the wrong place. This isn't
a big problem currently as we never change --objdir, but in order to
support parallel test execution, we're going to start setting that
option, so clean up the code ahead of time.
We also have to tweak some of the cris tests which were making
assumptions about the argv[0] value.
Diffstat (limited to 'sim/Makefile.in')
| -rw-r--r-- | sim/Makefile.in | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index 35f807b..671d63c 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1251,12 +1251,12 @@ CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ testsuite/common/bits64m63.c DISTCLEANFILES = -MOSTLYCLEANFILES = core $(am__append_5) site-srcdir.exp testrun.log \ - testrun.sum $(am__append_7) $(am__append_10) $(am__append_12) \ - $(am__append_15) $(am__append_17) $(am__append_19) \ - $(am__append_21) $(am__append_24) $(am__append_26) \ - $(am__append_29) $(am__append_31) $(am__append_33) \ - $(am__append_36) $(am__append_38) +MOSTLYCLEANFILES = core $(am__append_5) site-sim-config.exp \ + testrun.log testrun.sum $(am__append_7) $(am__append_10) \ + $(am__append_12) $(am__append_15) $(am__append_17) \ + $(am__append_19) $(am__append_21) $(am__append_24) \ + $(am__append_26) $(am__append_29) $(am__append_31) \ + $(am__append_33) $(am__append_36) $(am__append_38) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = -I$(srcroot)/include $(SIM_INLINE) -I$(srcdir)/common COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD) @@ -1336,7 +1336,7 @@ common_libcommon_a_SOURCES = \ # 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 # Custom verbose test variables that automake doesn't provide (yet?). AM_V_RUNTEST = $(AM_V_RUNTEST_@AM_V@) @@ -2662,8 +2662,11 @@ common/version.c-stamp: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(src @SIM_ENABLE_IGEN_TRUE@igen/%-main.o: igen/%.c @SIM_ENABLE_IGEN_TRUE@ $(AM_V_CC)$(COMPILE_FOR_BUILD) -DMAIN -c $< -o $@ -site-srcdir.exp: Makefile - $(AM_V_GEN)echo "set srcdir \"$(srcdir)/testsuite\"" > $@ +site-sim-config.exp: Makefile + $(AM_V_GEN)( \ + echo "set builddir \"$(builddir)\""; \ + echo "set srcdir \"$(srcdir)/testsuite\""; \ + ) > $@ check-DEJAGNU: site.exp $(AM_V_RUNTEST)LC_ALL=C; export LC_ALL; \ |