diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
| commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
| tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/lib/libbsp/powerpc/psim/tools | |
| parent | Purged as many egcs references as possible. (diff) | |
| download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 | |
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/lib/libbsp/powerpc/psim/tools')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/Makefile.am | 26 | ||||
| -rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/runtest | 11 |
2 files changed, 25 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am index 704c7c2d31..ff177ddb9d 100644 --- a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am @@ -5,13 +5,25 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_SCRIPTS=psim runtest +noinst_SCRIPTS = psim runtest + +TMPINSTALL_FILES += $(PROJECT_ROOT)/psim/tests \ + $(PROJECT_ROOT)/psim/tests/runtest $(PROJECT_ROOT)/psim/tests/psim \ + $(PROJECT_ROOT)/psim/tests/psim-gdb + +$(PROJECT_ROOT)/psim/tests: + $(mkinstalldirs) $@ + +$(PROJECT_ROOT)/psim/tests/runtest: runtest + $(INSTALL_SCRIPT) $< $@ + +$(PROJECT_ROOT)/psim/tests/psim: psim + $(INSTALL_SCRIPT) $< $@ + +$(PROJECT_ROOT)/psim/tests/psim-gdb: psim + $(INSTALL_SCRIPT) $< $@ ## HACK: install to build-tree -all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/psim/tests - $(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/psim/tests/runtest - $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/psim/tests/psim - $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/psim/tests/psim-gdb +all-local: $(TMPINSTALL_FILES) -include $(top_srcdir)/../../../../../../../automake/local.am +include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest b/c/src/lib/libbsp/powerpc/psim/tools/runtest index 5b53f9080e..8fa385e239 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/runtest +++ b/c/src/lib/libbsp/powerpc/psim/tools/runtest @@ -164,10 +164,11 @@ do continue;; *-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*) + minimum*|stackchk*|spfatal*|termio*) continue ;; esac @@ -176,8 +177,8 @@ do then cpus="1 2" - logfile1=$logdir/${tname}_1 - logfile2=$logdir/${tname}_2 + logfile1=$logdir/${tname}_1${variant} + logfile2=$logdir/${tname}_2${variant} infofile1=$logfile1.info infofile2=$logfile2.info @@ -193,7 +194,7 @@ do -o "/shm@0xc0000000/key 0x1234" \ -o "/sem@0xc0010000/reg 0xc0010000 12" \ -o "/sem@0xc0010000/key 0x1234" \ - -o "/sem@0xc0010000/value 1" ${tname}-node1.exe | \ + -o "/sem@0xc0010000/value 1" ${tname}-node1${variant}.exe | \ sed -e 's/
//' -e '/^$/d' > ${logfile1} & ${simulator} $extra_options -c ${instruction_limit} \ @@ -203,7 +204,7 @@ do -o "/shm@0xc0000000/key 0x1234" \ -o "/sem@0xc0010000/reg 0xc0010000 12" \ -o "/sem@0xc0010000/key 0x1234" \ - -o "/sem@0xc0010000/value -1" ${tname}-node2.exe | \ + -o "/sem@0xc0010000/value -1" ${tname}-node2${variant}.exe | \ sed -e 's/
//' -e '/^$/d' > ${logfile2} & wait |