Commit e2147650 authored by Geoff Brown's avatar Geoff Brown
Browse files

Bug 816630 - Restore use of dist/fennec for Android xpcshell localLib; r=ahal, DONTBUILD

parent fc5b30c3

testing/xpcshell/remotexpcshelltests.py

+11 −12
Original line number Diff line number Diff line
@@ -415,6 +415,17 @@ def main(): 


    parser = RemoteXPCShellOptions()

    options, args = parser.parse_args()

    if not options.localAPK:

      for file in os.listdir(os.path.join(options.objdir, "dist")):

        if (file.endswith(".apk") and file.startswith("fennec")):

          options.localAPK = os.path.join(options.objdir, "dist")

          options.localAPK = os.path.join(options.localAPK, file)

          print >>sys.stderr, "using APK: " + options.localAPK

          break

      else:

        print >>sys.stderr, "Error: please specify an APK"

        sys.exit(1)



    options = parser.verifyRemoteOptions(options)



    if len(args) < 1 and options.manifest is None:
@@ -441,18 +452,6 @@ def main(): 
      print >>sys.stderr, "Error: You must specify an objdir"

      sys.exit(1)



    if not options.localAPK:

      for file in os.listdir(os.path.join(options.objdir, "dist")):

        if (file.endswith(".apk") and file.startswith("fennec")):

          options.localAPK = os.path.join(options.objdir, "dist")

          options.localAPK = os.path.join(options.localAPK, file)

          print >>sys.stderr, "using APK: " + options.localAPK

          break



    if not options.localAPK:

      print >>sys.stderr, "Error: please specify an APK"

      sys.exit(1)



    xpcsh = XPCShellRemote(dm, options, args)



    if not xpcsh.runTests(xpcshell='xpcshell',