Bug 907552 - Mochitests should use __file__ for determining location, r=gps

testing/mochitest/mochitest_options.py

@@ -4,7 +4,6 @@
 
 import optparse
 import os
-import sys
 import tempfile
 
 from automation import Automation
@@ -12,7 +11,7 @@ from automationutils import addCommonOptions, isURL
 from mozprofile import DEFAULT_PORTS
 import moznetwork
 
-here = os.path.abspath(os.path.dirname(sys.argv[0]))
+here = os.path.abspath(os.path.dirname(__file__))
 
 try:
     from mozbuild.base import MozbuildObject
@@ -652,7 +651,7 @@ class B2GOptions(MochitestOptions):
     def verifyOptions(self, options, mochitest):
         # since we are reusing verifyOptions, it will exit if App is not found
         temp = options.app
-        options.app = sys.argv[0]
+        options.app = __file__
         tempPort = options.httpPort
         tempSSL = options.sslPort
         tempIP = options.webServer

testing/mochitest/runtestsb2g.py

@@ -15,7 +15,7 @@ try:
 except ImportError:
     import simplejson as json
 
-here = os.path.abspath(os.path.dirname(sys.argv[0]))
+here = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, here)
 
 from b2gautomation import B2GDesktopAutomation

testing/mochitest/runtestsremote.py

@@ -12,7 +12,7 @@ import shutil
 import math
 import base64
 
-sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
+sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(__file__))))
 
 from automation import Automation
 from remoteautomation import RemoteAutomation, fennecLogcatFilters
@@ -209,7 +209,7 @@ class RemoteOptions(MochitestOptions):
     def verifyOptions(self, options, mochitest):
         # since we are reusing verifyOptions, it will exit if App is not found
         temp = options.app
-        options.app = sys.argv[0]
+        options.app = __file__
         tempPort = options.httpPort
         tempSSL = options.sslPort
         tempIP = options.webServer