Commit c592bffd authored by Aaron Klotz's avatar Aaron Klotz
Browse files

Bug 1650118: Part 6 - Update test harnesses; r=bc,sparky,perftest-reviewers,jgraham 

e10s is no longer a GeckoView option, so I'd like to remove it from test
harnesses when possible.

Depends on D90934

Differential Revision: https://phabricator.services.mozilla.com/D91640
parent 82852ea9

python/mozbuild/mozbuild/mach_commands.py

+0 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,6 @@ class RunProgram(MachCommandBase): 
            extras["env{}".format(i)] = e

        if args:

            extras["args"] = " ".join(args)

        extras["use_multiprocess"] = True  # Only GVE and TRA process this extra.



        if env or args:

            restart = True

taskcluster/taskgraph/transforms/tests.py

+6 −2
Original line number Diff line number Diff line
@@ -1189,9 +1189,13 @@ def get_mobile_project(task): 




@transforms.add

def disable_fennec_e10s(config, tasks):

def adjust_mobile_e10s(config, tasks):

    for task in tasks:

        if get_mobile_project(task) == "fennec":

        project = get_mobile_project(task)

        if project == "geckoview":

            # Geckoview is always-e10s

            task["e10s"] = True

        elif project == "fennec":

            # Fennec is non-e10s

            task["e10s"] = False

        yield task

testing/mochitest/runjunit.py

+0 −10
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ class JUnitTestRunner(MochitestDesktop): 
        cmd = "am instrument -w -r"

        # profile location

        cmd = cmd + " -e args '-profile %s'" % self.remote_profile

        # multi-process

        e10s = "true" if self.options.e10s else "false"

        cmd = cmd + " -e use_multiprocess %s" % e10s

        # chunks (shards)

        shards = self.options.totalChunks

        shard = self.options.thisChunk
@@ -453,13 +450,6 @@ class JunitArgumentParser(argparse.ArgumentParser): 
            help="Remote directory to use as test root "

            "(eg. /data/local/tmp/test_root).",

        )

        self.add_argument(

            "--disable-e10s",

            action="store_false",

            dest="e10s",

            default=True,

            help="Disable multiprocess mode in test app.",

        )

        self.add_argument(

            "--max-time",

            action="store",

testing/mozharness/scripts/android_emulator_unittest.py

+0 −17
Original line number Diff line number Diff line
@@ -93,17 +93,6 @@ class AndroidEmulatorTest( 
                    "help": "Set log level (debug|info|warning|error|critical|fatal)",

                },

            ],

            [

                [

                    "--disable-e10s",

                ],

                {

                    "action": "store_false",

                    "dest": "e10s",

                    "default": True,

                    "help": "Run tests without multiple processes (e10s).",

                },

            ],

            [

                ["--enable-webrender"],

                {
@@ -175,7 +164,6 @@ class AndroidEmulatorTest( 
        self.device_serial = "emulator-5554"

        self.log_raw_level = c.get("log_raw_level")

        self.log_tbpl_level = c.get("log_tbpl_level")

        self.e10s = c.get("e10s")

        self.enable_webrender = c.get("enable_webrender")

        if self.enable_webrender:

            # AndroidMixin uses this when launching the emulator. We only want
@@ -302,11 +290,6 @@ class AndroidEmulatorTest( 
            category = "reftest"

        else:

            category = self.test_suite

        if category not in SUITE_NO_E10S:

            if category in SUITE_DEFAULT_E10S and not self.e10s:

                cmd.extend(["--disable-e10s"])

            elif category not in SUITE_DEFAULT_E10S and self.e10s:

                cmd.extend(["--e10s"])

        if c.get("repeat"):

            if category in SUITE_REPEATABLE:

                cmd.extend(["--repeat=%s" % c.get("repeat")])

testing/mozharness/scripts/android_hardware_unittest.py

+0 −17
Original line number Diff line number Diff line
@@ -78,17 +78,6 @@ class AndroidHardwareTest( 
                "help": "Set log level (debug|info|warning|error|critical|fatal)",

            },

        ],

        [

            [

                "--disable-e10s",

            ],

            {

                "action": "store_false",

                "dest": "e10s",

                "default": True,

                "help": "Run tests without multiple processes (e10s).",

            },

        ],

        [

            ["--enable-webrender"],

            {
@@ -157,7 +146,6 @@ class AndroidHardwareTest( 
        self.xre_path = None

        self.log_raw_level = c.get("log_raw_level")

        self.log_tbpl_level = c.get("log_tbpl_level")

        self.e10s = c.get("e10s")

        self.enable_webrender = c.get("enable_webrender")

        self.extra_prefs = c.get("extra_prefs")
@@ -272,11 +260,6 @@ class AndroidHardwareTest( 
            category = "reftest"

        else:

            category = self.test_suite

        if category not in SUITE_NO_E10S:

            if category in SUITE_DEFAULT_E10S and not self.e10s:

                cmd.extend(["--disable-e10s"])

            elif category not in SUITE_DEFAULT_E10S and self.e10s:

                cmd.extend(["--e10s"])

        if c.get("repeat"):

            if category in SUITE_REPEATABLE:

                cmd.extend(["--repeat=%s" % c.get("repeat")])