Bug 1381846 - Fix gecko profiling with talos tpaint on windows; r?jmaher draft
authorRob Wood <rwood@mozilla.com>
Tue, 09 Jan 2018 17:01:55 -0500
changeset 718564 c49d5a297ed379bb1a26d8d823c8e63d9580f3b7
parent 716681 f5ed4ddcc51299bd4de3803d2c3bd227d7606f22
child 745525 2ead4203d439c22b44ad810f57407fce694517cb
push id94971
push userrwood@mozilla.com
push dateWed, 10 Jan 2018 15:01:09 +0000
reviewersjmaher
bugs1381846
milestone59.0a1
Bug 1381846 - Fix gecko profiling with talos tpaint on windows; r?jmaher MozReview-Commit-ID: 9ggb0fbJCjZ
testing/talos/talos/pageloader/chrome/pageloader.js
--- a/testing/talos/talos/pageloader/chrome/pageloader.js
+++ b/testing/talos/talos/pageloader/chrome/pageloader.js
@@ -341,19 +341,25 @@ function getTestName() { // returns tp5n
   let parts = pageName.split("/");
   if (parts.length > 4) {
     return parts[4];
   }
   return "pageloader";
 }
 
 function getCurrentPageShortName() {
+  // this is also used by gecko profiling for the profile
+  // file name; so ensure it is valid on Windows/Linux/OSX
   var pageName = pages[pageIndex].url.spec;
   let parts = pageName.split("/");
   if (parts.length > 5) {
+    if (parts[5].indexOf("?" != -1)) {
+      // page name is something like 'tpaint.html?auto=1'
+      return parts[5].split("?")[0];
+    }
     return parts[5];
   }
   return "page_" + pageIndex;
 }
 
 function loadFail() {
   var pageName = pages[pageIndex].url.spec;
   numRetries++;