Changeset e0487ed in rtems

Timestamp:

Sep 5, 2008, 2:42:35 PM (11 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.9, master

Children:

b3bbcdf1

Parents:

7eb312d5

Message:

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

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

Location:

c/src/lib/libbsp/powerpc/psim/tools

Files:

• ChangeLog (modified) (1 diff)
• psim-shared (modified) (2 diffs)
• psim-top.in (modified) (1 diff)
• runtest-bottom (modified) (2 diffs)
• runtest-top.in (modified) (1 diff)

c/src/lib/libbsp/powerpc/psim/tools/ChangeLog

@@ +1 @@
+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>
 

c/src/lib/libbsp/powerpc/psim/tools/psim-shared

@@ -52 +52 @@
     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"
@@ -65 +65 @@
   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=$!
 

c/src/lib/libbsp/powerpc/psim/tools/psim-top.in

@@ -14 +14 @@
 
 TREE_FILE=psim_tree.${LOGNAME}
-RUN=@target_alias@-run
+if [ X${RUN} = X ] ; then
+  RUN=@target_alias@-run
+fi
 
 

c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom

@@ -63 +63 @@
        # 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
 
@@ -83 +89 @@
      # 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
 

c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in

@@ -18 +18 @@
 # 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=\