2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>

	* psim-shared, psim-top.in, runtest-bottom, runtest-top.in: Now running
	mptests.

5 files changed, 30 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog b/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog
index 3d30b11e0d..20c0cf928a 100644
--- a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-05	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* psim-shared, psim-top.in, runtest-bottom, runtest-top.in: Now running
+	mptests.
+
 2008-09-03	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac: Rework psim scripts to share code for
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-shared b/c/src/lib/libbsp/powerpc/psim/tools/psim-shared
index 0232f30f49..a3b5c062d8 100755
--- a/c/src/lib/libbsp/powerpc/psim/tools/psim-shared
+++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-shared
@@ -51,7 +51,7 @@ EOF
     echo "/sem@0x0c100010/reg 0x0c100010 12"
     echo "/sem@0x0c100010/key ${RTEMS_SHM_SEMAPHORE_KEY}"
     echo "/sem@0x0c100010/value ${value}"
-    $@
+    echo
     echo "##### System V IPC (Shared Memory) 0x0c110000 for 128K"
     echo "/shm@0x0c110000/reg 0x0c110000 0x20000"
     echo "/shm@0x0c110000/key ${RTEMS_SHM_KEY}"
@@ -64,12 +64,17 @@ runone()
 {
   testname=${1}
   max_run_time=${2}
+  if [ $# -eq 3 ] ; then
+    treefile=${3}
+  else
+    treefile=${TREE_FILE}
+  fi
   if [ ${max_run_time} -eq 0 ] ; then
     #echo run ${testname} forever
-    ${RUN} -f ${TREE_FILE} ${RUN_DEBUG} ${testname}
+    ${RUN} -f ${treefile} ${RUN_DEBUG} ${testname}
   else
     #echo run ${testname} for maximum ${max_run_time} seconds
-    ${RUN} -f ${TREE_FILE} ${RUN_DEBUG} ${testname} &
+    ${RUN} -f ${treefile} ${RUN_DEBUG} ${testname} &
     pid=$!
 
     # Make sure it won't run forever...
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in b/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in
index f6d2cced6b..59784f55fd 100755
--- a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in
+++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in
@@ -13,7 +13,9 @@
 #
 
 TREE_FILE=psim_tree.${LOGNAME}
-RUN=@target_alias@-run
+if [ X${RUN} = X ] ; then
+  RUN=@target_alias@-run
+fi
 
 
 progname=${0##*/}        # fast basename hack for ksh, bash
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom b/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom
index 990d879bb3..d67f48fa93 100755
--- a/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom
+++ b/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom
@@ -62,12 +62,18 @@ do
 
        # XXX -c ${instruction_limit} 
 
-       runone ${tname}-node1${variant}.${ext} ${max_run_time} | \
+       gen_device_tree ${tname}-node1${variant}${ext}  >${TREE_FILE}_1
+       gen_device_tree ${tname}-node2${variant}${ext}  >${TREE_FILE}_2
+
+       runone ${tname}-node1${variant}${ext} \
+        ${max_run_time} ${TREE_FILE}_1 | \
          sed -e 's/^M//' -e '/^$/d' > ${logfile1} &
-       runone ${tname}-node2${variant}.${ext} ${max_run_time} | \
+       runone ${tname}-node2${variant}${ext} \
+         ${max_run_time} ${TREE_FILE}_2 | \
          sed -e 's/^M//' -e '/^$/d' > ${logfile2} &
        wait
 
+       #rm -f ${TREE_FILE}_1 ${TREE_FILE}_2
    fi
 
    if [ $TEST_TYPE = "single" ]
@@ -82,8 +88,11 @@ do
 
      # Spin off the simulator in the background
      #   -c could be used to set an instruction limit
+     gen_device_tree ${tfile}  >${TREE_FILE}
      runone ${tfile} ${max_run_time} | \
        sed -e 's/^M//' -e '/^$/d' > ${logfile}
+
+     rm -f ${TREE_FILE}
    fi
 
    # Create the info files
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in b/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in
index 436fc0a9d3..1616b10f2d 100755
--- a/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in
+++ b/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in
@@ -17,7 +17,9 @@
 
 # progname=`basename $0`
 progname=${0##*/}        # fast basename hack for ksh, bash
-RUN=@target_alias@-run 
+if [ X${RUN} = X ] ; then
+  RUN=@target_alias@-run
+fi
 
 USAGE=\
 "usage: $progname [ -opts ] test [ test ... ]