From 119da4656825919121f24aac638a7022066ef56c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Apr 2010 16:23:24 +0000 Subject: sim: unify target->subdir handling for default tests The testsuite subdir has a note about unifying the target->subdir logic, so do just that. The end goal here is to have `make check` work out of the box without having to delve into dejagnu internals. The target-specific logic is split out of the top level configure.ac file and into a dedicated configure.tgt similar to other subprojects (gdb and ld and etc...) with the difference that this file has to be included at the m4 level instead of the shell level. This is necessary only because autoconf requires AC_CONFIG_SUBDIRS be given a string literal and not a variable value. Then the toplevel and the testsuite configure files pull this in, the sim subdir gets expanded into testsuite/site.exp, and the default sim run code uses this info to set the sim path to the local compiled run file if it hasn't already been specified. Signed-off-by: Mike Frysinger --- sim/testsuite/configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'sim/testsuite/configure.ac') diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac index ceaf4ff..ba17a33 100644 --- a/sim/testsuite/configure.ac +++ b/sim/testsuite/configure.ac @@ -25,12 +25,6 @@ case ${target} in ;; esac -# Compute the target architecture. -# FIXME: Will need to canonicalize some values. -# FIXME: Should be in generally accessable place. -case $target in - *) arch=${target_cpu} ;; -esac -AC_SUBST(arch) +sinclude(../configure.tgt) AC_OUTPUT(Makefile) -- cgit v1.1