From 65f7267326dadc3b66bf998d13541f58b850552f Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Tue, 23 Sep 2014 08:51:08 -0400
Subject: [PATCH] Bug 1067534 - Define android and b2g manifests in the in-tree
 mozharness config, r=chmanchester

---
 testing/config/mozharness/android_arm_config.py  | 1 +
 testing/config/mozharness/android_x86_config.py  | 3 ++-
 testing/config/mozharness/b2g_emulator_config.py | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py
index bd4a07532882..d16d8cb24dbb 100644
--- a/testing/config/mozharness/android_arm_config.py
+++ b/testing/config/mozharness/android_arm_config.py
@@ -32,6 +32,7 @@ config = {
                 "--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_android.ini",
             ],
         },
     }, # end suite_definitions
diff --git a/testing/config/mozharness/android_x86_config.py b/testing/config/mozharness/android_x86_config.py
index bd4a07532882..55323c22107a 100644
--- a/testing/config/mozharness/android_x86_config.py
+++ b/testing/config/mozharness/android_x86_config.py
@@ -12,7 +12,7 @@ config = {
                 "--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"
+                "--quiet", "--log-raw=%(raw_log_file)s",
             ],
         },
         "reftest": {
@@ -32,6 +32,7 @@ config = {
                 "--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_android.ini",
             ],
         },
     }, # end suite_definitions
diff --git a/testing/config/mozharness/b2g_emulator_config.py b/testing/config/mozharness/b2g_emulator_config.py
index fd0629c99395..6976cf940295 100644
--- a/testing/config/mozharness/b2g_emulator_config.py
+++ b/testing/config/mozharness/b2g_emulator_config.py
@@ -10,7 +10,7 @@ config = {
         "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s",
         "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
         "--extra-profile-file=jsreftest/tests/user.js",
-        "%(test_manifest)s",
+        "jsreftest/tests/jstests.list",
     ],
 
     "mochitest_options": [
@@ -30,7 +30,7 @@ config = {
         "--remote-webserver=%(remote_webserver)s", "--ignore-window-size",
         "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s",
         "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", "--enable-oop",
-        "%(test_manifest)s",
+        "tests/layout/reftests/reftest.list",
     ],
 
     "crashtest_options": [
@@ -39,12 +39,12 @@ config = {
         "--remote-webserver=%(remote_webserver)s", "--ignore-window-size",
         "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s",
         "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
-        "%(test_manifest)s",
+        "tests/testing/crashtest/crashtests.list",
     ],
 
     "xpcshell_options": [
         "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s",
-        "--logdir=%(logcat_dir)s", "--manifest=%(test_manifest)s", "--use-device-libs",
+        "--logdir=%(logcat_dir)s", "--manifest=tests/xpcshell_b2g.ini", "--use-device-libs",
         "--testing-modules-dir=%(modules_dir)s", "--symbols-path=%(symbols_path)s",
         "--busybox=%(busybox)s", "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
     ],