Bug 1257099 - Normalize the path of extensions for reftest. draft
authorXidorn Quan <quanxunzhen@gmail.com>
Wed, 16 Mar 2016 14:26:27 +0800
changeset 340895 8afc3ac10154851dbe3bfff7348057104f9f04ae
parent 340894 700f782a846fa0402ff38a5d95ecbc3e162bd722
child 340896 f8747e753482751ffb0bbf5ce31a491cd2f0d035
push id13094
push userxquan@mozilla.com
push dateWed, 16 Mar 2016 06:27:26 +0000
bugs1257099
milestone48.0a1
Bug 1257099 - Normalize the path of extensions for reftest. MozReview-Commit-ID: 7nTx3uniJik
layout/tools/reftest/reftestcommandline.py
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -273,29 +273,30 @@ class ReftestArgumentsParser(argparse.Ar
                 self.error("--xre-path '%s' not found" % options.xrePath)
             if not os.path.isdir(options.xrePath):
                 self.error("--xre-path '%s' is not a directory" %
                            options.xrePath)
             options.xrePath = reftest.getFullPath(options.xrePath)
 
         if options.reftestExtensionPath is None:
             if self.build_obj is not None:
-                options.reftestExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
-                                                            "reftest", "reftest")
+                reftestExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
+                                                    "reftest", "reftest")
             else:
-                options.reftestExtensionPath = os.path.join(here, "reftest")
+                reftestExtensionPath = os.path.join(here, "reftest")
+            options.reftestExtensionPath = os.path.normpath(reftestExtensionPath)
 
         if (options.specialPowersExtensionPath is None and
             options.suite in ["crashtest", "jstestbrowser"]):
             if self.build_obj is not None:
-                options.specialPowersExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
-                                                                  "reftest", "specialpowers")
+                specialPowersExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
+                                                          "reftest", "specialpowers")
             else:
-                options.specialPowersExtensionPath = os.path.join(
-                    here, "specialpowers")
+                specialPowersExtensionPath = os.path.join(here, "specialpowers")
+            options.specialPowersExtensionPath = os.path.normpath(specialPowersExtensionPath)
 
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": 5000,  # See dependencies of bug 1051230.
         }
 
 
 class DesktopArgumentsParser(ReftestArgumentsParser):