Backed out changeset f8b29993a76c (bug 1089771) for breaking desktop mochitests.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 29 Oct 2014 12:24:01 -0400
changeset 212951 1acb63b9d6c6b1c456b2c1a2bd86c68543531428
parent 212950 c48116c4a5681e366db0679ebcdb8506fc93866b
child 212952 a542bd0c39e734ca47df7bf608df2eb8a64c8f4e
push id27736
push userryanvm@gmail.com
push dateWed, 29 Oct 2014 20:49:13 +0000
treeherdermozilla-central@80e18ff7c7b2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1089771
milestone36.0a1
backs outf8b29993a76c60544955a1bc6519af8bb3f38470
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
Backed out changeset f8b29993a76c (bug 1089771) for breaking desktop mochitests.
testing/mochitest/chunkifyTests.js
--- a/testing/mochitest/chunkifyTests.js
+++ b/testing/mochitest/chunkifyTests.js
@@ -10,20 +10,20 @@ function chunkifyTests(tests, totalChunk
 
   // We want to split the tests up into chunks according to which directory
   // they're in
   if (chunkByDir) {
     chunkByDir = parseInt(chunkByDir);
     var tests_by_dir = {};
     var test_dirs = []
     for (var i = 0; i < tests.length; ++i) {
-      if ((tests[i] instanceof Object) && ('test' in tests[i])) {
+      if ('test' in tests[i]) {
         var test_path = tests[i]['test']['url'];
       } else {
-        var test_path = tests[i];
+        var test_path = tests[i]['url'];
       }
       if (test_path[0] == '/') {
         test_path = test_path.substr(1);
       }
       // mochitest-chrome and mochitest-browser-chrome pass an array of chrome://
       // URIs
       var protocolRegexp = /^[a-zA-Z]+:\/\//;
       if (protocolRegexp.test(test_path)) {