[PATCH 2/2] sim: testsuite: merge into toplevel automake

[Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org>]

This allows us to delete most of our custom test logic,
and avoids a recursive make for minor speed up.

sim/:
	* configure.ac (AC_CONFIG_FILES): Delete testsuite/Makefile.
	* Makefile.am: Include testsuite/local.mk.
	* aclocal.m4, configure, Makefile.in: Regenerated.

sim/common/:
	* Make-common.in (check): Delete body.

sim/testsuite/:
	* Makefile.in: Delete.
	* lib/sim-defs.exp (sim): Update default path.
	* local.mk: New file based on Makefile.in.
---
 sim/Makefile.am                |   4 +-
 sim/Makefile.in                | 102 +++++++++++++++----
 sim/common/Make-common.in      |   1 -
 sim/configure                  |   3 +-
 sim/configure.ac               |   2 +-
 sim/testsuite/Makefile.in      | 178 ---------------------------------
 sim/testsuite/lib/sim-defs.exp |   2 +-
 sim/testsuite/local.mk         |  34 +++++++
 8 files changed, 125 insertions(+), 201 deletions(-)
 delete mode 100644 sim/testsuite/Makefile.in
 create mode 100644 sim/testsuite/local.mk

diff --git a/sim/Makefile.am b/sim/Makefile.am
index bcca70623e9a..c6e2d04f33ae 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AUTOMAKE_OPTIONS = foreign no-dist subdir-objects
+AUTOMAKE_OPTIONS = dejagnu foreign no-dist subdir-objects
 ACLOCAL_AMFLAGS = -I.. -I../config
 
 srcroot = $(srcdir)/..
@@ -34,3 +34,5 @@ MOSTLYCLEANFILES = core
 nltvals:
 	$(abs_srcdir)/common/gennltvals.py --cpp "$(CPP)" --output nltvals.def --srcroot $(srcroot)
 	$(SHELL) $(srcroot)/move-if-change nltvals.def $(abs_srcdir)/common/nltvals.def
+
+include testsuite/local.mk
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 3f16dc476ef5..cf92e94993c5 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -471,7 +471,6 @@ installdirs:
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
 
 check:
-	cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"
 
 info:
 clean-info:
diff --git a/sim/configure.ac b/sim/configure.ac
index de5779642c50..23478521e94c 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -152,5 +152,5 @@ if test "${enable_sim}" != no; then
   fi
 fi
 
-AC_CONFIG_FILES([Makefile testsuite/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 43a07050f508..0157f9bb2834 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -106,7 +106,7 @@ proc sim_run { prog sim_opts prog_opts redir options } {
 	# These global variables come from generated site.exp.
 	global objdir
 	global arch
-	set sim "$objdir/../$arch/run"
+	set sim "$objdir/$arch/run"
     }
 
     if [is_remote host] {
diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk
new file mode 100644
index 000000000000..bd8a20696434
--- /dev/null
+++ b/sim/testsuite/local.mk
@@ -0,0 +1,34 @@
+## See sim/Makefile.am.
+#
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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
+
+site-srcdir.exp: Makefile
+	echo "set srcdir \"$(srcdir)/testsuite\"" > $@
+
+check-DEJAGNU: site.exp
+	LC_ALL=C; export LC_ALL; \
+	EXPECT=${EXPECT} ; export EXPECT ; \
+	runtest=$(RUNTEST); \
+	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+	  $$runtest $(RUNTESTFLAGS); \
+	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+	fi
+
+MOSTLYCLEANFILES += \
+	site-srcdir.exp testrun.log testrun.sum
-- 
2.30.0