summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/sparc/erc32/tools
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/Makefile.am18
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/runtest.in6
2 files changed, 15 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
index 5da84d4455..a8f75c6c9e 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
@@ -5,11 +5,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-noinst_SCRIPTS=runtest
+noinst_SCRIPTS = runtest
-#HACK: install to build-tree
-all-local: $(SCRIPTS)
- $(mkinstalldirs) $(PROJECT_ROOT)/erc32/tests
- $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/erc32/tests/runtest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/erc32/tests \
+ $(PROJECT_ROOT)/erc32/tests/runtest
-include $(top_srcdir)/../../../../../../../automake/local.am
+$(PROJECT_ROOT)/erc32/tests:
+ $(mkinstalldirs) $@
+
+$(PROJECT_ROOT)/erc32/tests/runtest: runtest
+ $(INSTALL_SCRIPT) $< $@
+
+all-local: $(TMPINSTALL_FILES)
+
+include $(top_srcdir)/../../../../../../../automake/host.am
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
index 3f9ffa73fe..b7c6f723c2 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
@@ -142,13 +142,13 @@ do
fatal "MP tests not supported"
warn "Skipping $tname; 'runtest' runs both nodes when for *-node1"
continue;;
- *-node1*)
- fatal "MP tests not supported"
+ *-node1*)
warn "Running both nodes associated with $tname"
+ variant=`echo $tname | sed 's/.*-node[12]//' | sed 's/\.exe//'`
tname=`echo $tname | sed 's/-node.*//'`
TEST_TYPE="mp"
;;
- minimum*|stackchk*|spfatal*|malloctest*|termio*)
+ minimum*|stackchk*|spfatal*|termio*)
warn "Skipping $tname; it locks up or takes a VERY long time to run"
continue
;;