Bug 1381846 - Fix gecko profiling with talos tpaint on windows; r=jmaher
authorRob Wood <rwood@mozilla.com>
Tue, 09 Jan 2018 17:01:55 -0500
changeset 398585 731b1321ba95
parent 398584 8467a81a2b5b
child 398586 9c586454144b
push id33224
push userdluca@mozilla.com
push dateWed, 10 Jan 2018 21:59:28 +0000
treeherdermozilla-central@57386b58c057 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1381846
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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++;