Index: test/harness/runone.sh
===================================================================
--- test/harness/runone.sh      (revision 2166)
+++ test/harness/runone.sh      (working copy)
@@ -5,12 +5,32 @@
 #
 export GTK_MODULES=:gail:atk-bridge:
 
+echo runone.sh: $*
+
 debugFile=`basename $1 .keys`
 
 # Number of seconds to wait for test application to start
 FAST_WAIT_TIME=10
 SLOW_WAIT_TIME=20
 
+# Set up our local user settings file for the output format we want.
+#
+# If a <testfilename>.settings file exists, should use that instead of
+# the default user-settings.py.in.
+# We still need to run sed on it, to adjust the debug filename and
+# create a user-settings.py file in the tmp directory.
+#
+# (Orca will look in our local directory first for user-settings.py
+# before looking in ~/.orca)
+#
+SETTINGS_FILE=`dirname $1`/$debugFile.settings
+if [ ! -f $SETTINGS_FILE ]
+then
+    SETTINGS_FILE=`dirname $0`/user-settings.py.in
+fi
+echo "Using settings file:" $SETTINGS_FILE
+sed "s^%debug%^$debugFile.orca^g" $SETTINGS_FILE > user-settings.py
+
 # Run the event listener...
 #
 # python `dirname $0`/event_listener.py > $debugFile.events &
@@ -29,21 +49,23 @@
 
 if [ "$coverageMode" -eq "1" ]
 then
+    APP_WAIT_TIME=$FAST_WAIT_TIME
+else
     APP_WAIT_TIME=$SLOW_WAIT_TIME
-else
-    APP_WAIT_TIME=$FAST_WAIT_TIME
 fi
 
-if [ "$coverageMode" -eq 0 ]    
+if [ "$coverageMode" -eq "0" ]          
 then
     # Run orca and let it settle in.
+    echo starting Orca...
     orca &
     sleep 5
 fi
 
-
+# start the test application and let it settle in
 $APP_NAME &
 APP_PID=$!
+echo starting $APP_NAME pid $APP_PID 
 sleep $APP_WAIT_TIME
 
 # Play the keystrokes.
@@ -51,17 +73,19 @@
 python `dirname $0`/../../src/tools/play_keystrokes.py < $1
 
 # Terminate the running application
+echo killing app $APP_NAME $APP_PID
 kill -9 $APP_PID > /dev/null 2>&1
 
 # Terminate the running application and Orca
 #
-if [ "$coverageMode" -eq 0 ]    
+if [ "$coverageMode" -eq "0" ]          
 then
     # Terminate Orca
+    echo terminating Orca
     orca --quit > /dev/null 2>&1
 fi
 
-if [ "$coverageMode" -eq 0 ]    
+if [ "$coverageMode" -eq "0" ]          
 then
     rm user-settings.py*
 fi
Index: test/harness/runall.sh
===================================================================
--- test/harness/runall.sh      (revision 2166)
+++ test/harness/runall.sh      (working copy)
@@ -16,6 +16,11 @@
 # number of seconds to wait for application to finish shutting down
 SHUT_DOWN_WAIT_TIME=5
 
+# OpenOffice 2.1 executables are installed in 
+# /opt/openoffice.org2.1/program/
+#
+export PATH=$PATH:/opt/openoffice.org2.1/program
+
 coverageMode=0
 
 process_cl () {
@@ -68,11 +73,12 @@
 
 if [ "$coverageMode" -eq 1 ]
 then    
+    echo generating coverage map...
     coverageDir=../coverage/`date +%Y-%m-%d_%H:%M:%S`
-    sed "s^%debug%^$debugFile.orca^g" user-settings.py.in > user-settings.py
     trace2html.py -o $coverageDir -w orca -r runorca.py &
     trace_pid=$!
     sleep 5     
+    echo ...finished generating coverage map.
 fi
 
 # Look in the keystrokes directory for directories.
Index: ChangeLog
===================================================================
--- ChangeLog   (revision 2166)
+++ ChangeLog   (working copy)
@@ -1,3 +1,10 @@
+2007-03-13  Lynn Monsanto <lynn.monsanto@sun.com>
+
+        * test/harness/runone.sh, test/harness/runall.sh: Partial 
+       fix for bug #405061. Fixed merge problem that caused .orca
+       files to not be generated.
+
+
 2007-03-12  Willie Walker <william.walker@sun.com>
 

