Backed out changeset 7c4360f398ff (bug 1064002) for causing Bug 1102115
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 20 Nov 2014 14:30:54 +0100
changeset 216588 7d17b594834f9fe5b538161241f9868c84a54529
parent 216587 6ce1b906c690fd60abfbf4c7dea60d9e405f0ad8
child 216652 8d3f59b2b614681b8a2983dfbfb898868373f892
child 216726 48479862f200c928db45d0c070eba31d1325a06b
child 216755 f6b77efb9db555bb9d7da9edde8da78b85527960
push idunknown
push userunknown
push dateunknown
bugs1064002, 1102115
milestone36.0a1
backs out7c4360f398ffaf8455f179c56f5103cd9f1fd39e
Backed out changeset 7c4360f398ff (bug 1064002) for causing Bug 1102115
testing/config/mozharness/android_arm_config.py
--- a/testing/config/mozharness/android_arm_config.py
+++ b/testing/config/mozharness/android_arm_config.py
@@ -1,107 +1,40 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 config = {
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
-                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
-                "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
-                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
-                "--quiet", "--log-raw=%(raw_log_file)s",
-                "--total-chunks=16",
-                "--run-only-tests=android23.json"
-            ],
-        },
-        "mochitest-gl": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
                 "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
-                "--quiet", "--log-raw=%(raw_log_file)s",
-                "--total-chunks=2",
-                "--test-manifest=gl.json"
-            ],
-        },
-        "robocop": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
-                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
-                "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
-                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
-                "--quiet", "--log-raw=%(raw_log_file)s",
-                "--total-chunks=4",
-                "--robocop-path=../..",
-                "--robocop-ids=fennec_ids.txt",
-                "--robocop=robocop.ini",
+                "--quiet", "--log-raw=%(raw_log_file)s"
             ],
         },
         "reftest": {
             "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
             "options": [ "--app=%(app)s", "--ignore-window-size",
                 "--bootstrap",
                 "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s",
                 "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
                 "--symbols-path=%(symbols_path)s",
-                "--total-chunks=16",
-                "tests/layout/reftests/reftest.list",
-            ],
-        },
-        "crashtest": {
-            "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
-            "options": [ "--app=%(app)s", "--ignore-window-size",
-                "--bootstrap",
-                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s",
-                "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
-                "--symbols-path=%(symbols_path)s",
-                "--total-chunks=2",
-                "tests/testing/crashtest/crashtests.list"
-            ],
-        },
-        "jsreftest": {
-            "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
-            "options": [ "--app=%(app)s", "--ignore-window-size",
-                "--bootstrap",
-                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s",
-                "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
-                "--symbols-path=%(symbols_path)s",
-                "../jsreftest/tests/jstests.list",
-                "--total-chunks=6",
-                "--extra-profile-file=jsreftest/tests/user.js",
             ],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
-            "testsdir": "xpcshell",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
                 "--manifest=tests/xpcshell.ini",
                 "--log-raw=%(raw_log_file)s",
-                "--total-chunks=3",
             ],
         },
     }, # end suite_definitions
 }