aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorOriol Brufau <obrufau@igalia.com>2023-07-27 07:04:55 +0200
committerGitHub <noreply@github.com>2023-07-27 05:04:55 +0000
commite38d21d33d2a13f52e281f60dd9cd31200e8a5f4 (patch)
treea93f3663df5bebcae0cebbd615c447736b9d1239 /python/servo
parente0e970af31b42995bee8d40a40c1b143f6d22b87 (diff)
downloadservo-e38d21d33d2a13f52e281f60dd9cd31200e8a5f4.tar.gz
servo-e38d21d33d2a13f52e281f60dd9cd31200e8a5f4.zip
Run unit tests with both layout 2013 and layout 2020 (#30032)
Since #29950, unit tests were only running with the legacy layout, and there was no way to run them for layout 2020. This patch makes './mach test-unit' run unit tests for both. Also doing some changes so that the layout 2020 floats.rs tests compile.
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/command_base.py1
-rw-r--r--python/servo/testing_commands.py9
2 files changed, 3 insertions, 7 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index afc0856767a..e712b92412d 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -927,7 +927,6 @@ class CommandBase(object):
libsimpleservo=False,
debug_mozjs=False, with_debug_assertions=False,
with_frame_pointer=False, without_wgl=False,
- with_layout_2020=False, with_layout_2013=False,
**_kwargs
):
env = env or self.build_env()
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 81d84a4a896..799e5ff6ac5 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -167,7 +167,7 @@ class MachCommands(CommandBase):
@CommandArgument('--nocapture', default=False, action="store_true",
help="Run tests with nocapture ( show test stdout )")
@CommandBase.build_like_command_arguments
- def test_unit(self, test_name=None, package=None, bench=False, nocapture=False, with_layout_2020=False, **kwargs):
+ def test_unit(self, test_name=None, package=None, bench=False, nocapture=False, **kwargs):
if test_name is None:
test_name = []
@@ -200,6 +200,8 @@ class MachCommands(CommandBase):
self_contained_tests = [
"background_hang_monitor",
"gfx",
+ "layout_2013",
+ "layout_2020",
"msg",
"net",
"net_traits",
@@ -208,10 +210,6 @@ class MachCommands(CommandBase):
"servo_config",
"servo_remutex",
]
- if with_layout_2020:
- self_contained_tests.append("layout_2020")
- else:
- self_contained_tests.append("layout_2013")
if not packages:
packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
packages |= set(self_contained_tests)
@@ -255,7 +253,6 @@ class MachCommands(CommandBase):
"bench" if bench else "test",
args,
env=env,
- with_layout_2020=with_layout_2020,
**kwargs)
@Command('test-content',