Bug 468913 - Need a Makefile target to run reftest; (Bv1-191) Resync' runreftest.py with m-c, after bug 472706; r=ted.mielczarek
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 09 Mar 2009 14:09:02 +0100
changeset 23708 f0ad22379ffcf516e07291fff095ffe9905f94b8
parent 23707 b3dafbeb0e9962c4710e0a7ce0f5fdc70b4e2865
child 23709 587ef00fc422a9f1c8f9e20721576d1dc71dceab
push id867
push usersgautherie.bz@free.fr
push dateMon, 09 Mar 2009 13:11:28 +0000
reviewersted
bugs468913, 472706
milestone1.9.1b4pre
Bug 468913 - Need a Makefile target to run reftest; (Bv1-191) Resync' runreftest.py with m-c, after bug 472706; r=ted.mielczarek
layout/tools/reftest/runreftest.py
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -112,27 +112,28 @@ Are you executing $objdir/_tests/reftest
     appDir = os.path.dirname(options.app)
     if automation.UNIXISH:
       browserEnv["LD_LIBRARY_PATH"] = appDir
       browserEnv["MOZILLA_FIVE_HOME"] = appDir
       browserEnv["GNOME_DISABLE_CRASH_DIALOG"] = "1"
 
     # run once with -silent to let the extension manager do its thing
     # and then exit the app
-    start = automation.runApp(None, browserEnv, options.app,
-                              profileDir,
-                              extraArgs = ["-silent"])
+    (status, start) = automation.runApp(None, browserEnv, options.app,
+                                        profileDir,
+                                        extraArgs = ["-silent"])
     # then again to actually run reftest
     reftestlist = getFullPath(args[0])
-    start = automation.runApp(None, browserEnv, options.app,
-                              profileDir,
-                              extraArgs = ["-reftest", reftestlist])
+    (status, start) = automation.runApp(None, browserEnv, options.app,
+                                        profileDir,
+                                        extraArgs = ["-reftest", reftestlist])
   finally:
     if profileDir is not None:
       shutil.rmtree(profileDir)
+  sys.exit(status)
 
 def copyExtraFilesToProfile(options, profileDir):
   "Copy extra files or dirs specified on the command line to the testing profile."
   for f in options.extraProfileFiles:
     abspath = getFullPath(f)
     dest = os.path.join(profileDir, os.path.basename(abspath))
     if os.path.isdir(abspath):
       shutil.copytree(abspath, dest)