Bug 1089771 - Fix --chunk-by-dir mode on Android. r=jmaher
authorVaibhav Agrawal <vaibhavmagarwal@gmail.com>
Wed, 29 Oct 2014 21:45:00 -0400
changeset 213123 2ba76e4bc640806a780cd3c6b5c7a372f97d4940
parent 213122 12bba4eb1cef5461a72d49a3360aea612aa9e6c9
child 213124 f0a6dadb9544cdbc7aaa24ffffd0299c4c788cbf
push id51151
push userryanvm@gmail.com
push dateThu, 30 Oct 2014 15:22:08 +0000
treeherdermozilla-inbound@c04dc26e8c0a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1089771
milestone36.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 1089771 - Fix --chunk-by-dir mode on Android. r=jmaher
testing/mochitest/chunkifyTests.js
--- a/testing/mochitest/chunkifyTests.js
+++ b/testing/mochitest/chunkifyTests.js
@@ -10,17 +10,17 @@ 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 ('test' in tests[i]) {
+      if ((tests[i] instanceof Object) && ('test' in tests[i])) {
         var test_path = tests[i]['test']['url'];
       } else {
         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://