From a9376139f85688eca1095d60b67552805826f020 Mon Sep 17 00:00:00 2001
From: "bmlk%gmx.de" <bmlk%gmx.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 15 Oct 2003 19:08:35 +0000
Subject: [PATCH] layout regression test pain relief, bug 221598 r=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@147993 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/html/tests/block/rtest.sh          |  8 ++++----
 mozilla/layout/html/tests/block/runtests.sh       | 14 ++++++++------
 mozilla/webshell/tests/viewer/nsBrowserWindow.cpp |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mozilla/layout/html/tests/block/rtest.sh b/mozilla/layout/html/tests/block/rtest.sh
index f846a221abe..04a0604f5aa 100755
--- a/mozilla/layout/html/tests/block/rtest.sh
+++ b/mozilla/layout/html/tests/block/rtest.sh
@@ -47,6 +47,8 @@ fi
 if [ -n "$MOZ_OBJ" ]
 then
   MOZ_OBJ=`echo $MOZ_OBJ | sed -e"s,@TOPSRCDIR@,$MOZ_TEST_BASE/mozilla,"`
+  CFG_GUESS=`$MOZ_TEST_BASE/mozilla/build/autoconf/config.guess`
+  MOZ_OBJ=`echo $MOZ_OBJ | sed -e"s,@CONFIG_GUESS@,$CFG_GUESS/,"`
 else
   MOZ_OBJ=$MOZ_TEST_BASE/mozilla/
 fi
@@ -56,16 +58,14 @@ if [ "$w1" = "" ]; then
  MOZ_TEST_VIEWER="${MOZ_OBJ}dist/bin/mozilla-viewer.sh -- -d 500"
 else
  MOZ_TEST_VIEWER="${MOZ_OBJ}dist/bin/viewer.exe"
- if test ! -f $MOZ_TEST_VIEWER; then
-  MOZ_TEST_VIEWER="${MOZ_OBJ}dist/win32_d.obj/bin/viewer.exe"
- fi
 fi
 # These are needed by runtests.sh
 MOZ_TEST_VIEWER=`nodots $MOZ_TEST_VIEWER`
 MOZ_TEST_BASE=`nodots $MOZ_TEST_BASE`
 export MOZ_TEST_VIEWER
 export MOZ_TEST_BASE
-
+XPCOM_DEBUG_BREAK="warn"
+export XPCOM_DEBUG_BREAK
 case $1 in
   baseline|verify|clean)
     ;;
diff --git a/mozilla/layout/html/tests/block/runtests.sh b/mozilla/layout/html/tests/block/runtests.sh
index 78a7555a12d..d3ed7fb6482 100755
--- a/mozilla/layout/html/tests/block/runtests.sh
+++ b/mozilla/layout/html/tests/block/runtests.sh
@@ -63,25 +63,27 @@ run_tests() {
         mkdir verify
         echo
         if [ "$w1" = "" ]; then
-          echo $MOZ_TEST_VIEWER $print_flags -o verify/ -f $tests_file
-          $MOZ_TEST_VIEWER $print_flags -o verify/ -rd baseline/ -f $tests_file
+          echo $MOZ_TEST_VIEWER $print_flags -B 1 -o verify/ -f $tests_file
+          $MOZ_TEST_VIEWER $print_flags -B 1 -o verify/ -rd baseline/ -f $tests_file
         else
-          echo $MOZ_TEST_VIEWER $print_flags -o verify\\ -rd baseline\\ -f $tests_file
-          $MOZ_TEST_VIEWER $print_flags -o verify\\ -rd baseline\\ -f $tests_file
+          echo $MOZ_TEST_VIEWER $print_flags -B 1 -o verify\\ -rd baseline\\ -f $tests_file
+          $MOZ_TEST_VIEWER $print_flags -B 1 -o verify\\ -rd baseline\\ -f $tests_file
         fi
     else
         echo "no mode specified to run_tests()"
         exit 1
     fi
 }
+
 w1=`uname | grep WIN`
 if [ "$w1" = "" ]; then
  TESTS_FILE=/tmp/$$-tests.txt
 else
- TESTS_FILE=$TEMP\\$$-tests.txt
+ TESTS_FILE=$TEMP/$$-tests.txt
  TESTS_FILE=`cygpath -w $TESTS_FILE`
- MOZ_TEST_BASE=`cygpath -w $MOZ_TEST_BASE | sed -e 's|\\|/|g'`
+ MOZ_TEST_BASE=`cygpath -m $MOZ_TEST_BASE`
 fi
+
 cp /dev/null $TESTS_FILE
 
 for FILE in `ls file_list.txt file_list[0-9].txt 2> /dev/null`; do
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index 1a108a0f573..d6573ec5c71 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -406,7 +406,7 @@ NS_IMETHODIMP nsBrowserWindow::GetMainWidget(nsIWidget** aMainWidget)
 NS_IMETHODIMP nsBrowserWindow::SetFocus()
 {
    //XXX First Check In
-   NS_WARNING("Not Yet Implemented");
+   //NS_WARNING("Not Yet Implemented");
    return NS_OK;
 }