Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Run engine unit tests on mac host_debug_unopt_arm64 #50327

Merged
zanderso merged 1 commit into from
Feb 26, 2024
+126 −95
Merged

Run engine unit tests on mac host_debug_unopt_arm64 #50327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Run engine unit tests on mac host_debug_unopt_arm64
  • Loading branch information
@zanderso
zanderso committed Feb 26, 2024
commit 6055d7bbc7ba0556c9f3549df75902ffe9900050
16 changes: 15 additions & 1 deletion ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,21 @@
"$flutter/osx_sdk": {
"sdk_version": "15a240d"
}
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"host_debug_unopt_arm64",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
]
}
]
},
{
"properties": {
Expand Down
2 changes: 2 additions & 0 deletions impeller/renderer/blit_pass_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ TEST_P(BlitPassTest, BlitAcrossDifferentPixelFormatsFails) {
TextureDescriptor src_desc;
src_desc.format = PixelFormat::kA8UNormInt;
src_desc.size = {100, 100};
src_desc.storage_mode = StorageMode::kHostVisible;
auto src = context->GetResourceAllocator()->CreateTexture(src_desc);

TextureDescriptor dst_format;
dst_format.format = PixelFormat::kR8G8B8A8UNormInt;
dst_format.size = {100, 100};
dst_format.storage_mode = StorageMode::kHostVisible;
auto dst = context->GetResourceAllocator()->CreateTexture(dst_format);

EXPECT_FALSE(blit_pass->AddCopy(src, dst));
Expand Down
7 changes: 7 additions & 0 deletions shell/platform/embedder/tests/embedder_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,15 @@ TEST_F(EmbedderTest, VMAndIsolateSnapshotSizesAreRedundantInAOTMode) {
/// Test the layer structure and pixels rendered when using a custom software
/// compositor.
///
// TODO(143940): Convert this test to use SkiaGold.
#if FML_OS_MACOSX && FML_ARCH_CPU_ARM64
TEST_F(EmbedderTest,
DISABLED_CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
#else
TEST_F(EmbedderTest,
CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
#endif // FML_OS_MACOSX && FML_ARCH_CPU_ARM64

auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);

EmbedderConfigBuilder builder(context);
Expand Down
5 changes: 4 additions & 1 deletion testing/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,10 @@ def main():

variants_to_skip = ['host_release', 'host_profile']
if ('engine' in types or 'font-subset' in types) and args.variant not in variants_to_skip:
run_cmd(['python3', 'test.py'], cwd=FONT_SUBSET_DIR)
cmd = ['python3', 'test.py', '--variant', args.variant]
if 'arm64' in args.variant:
cmd += ['--target-cpu', 'arm64']
run_cmd(cmd, cwd=FONT_SUBSET_DIR)

if 'impeller-golden' in types:
run_impeller_golden_tests(build_dir)
Expand Down
191 changes: 98 additions & 93 deletions tools/font_subset/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,17 @@
Tests for font-subset
'''

import argparse
import filecmp
import os
import subprocess
import sys
from zipfile import ZipFile

# Dictionary to map the platform name to the output directory
# of the font artifacts.
PLATFORM_2_PATH = {
'darwin': 'darwin-x64',
'linux': 'linux-x64',
'linux2': 'linux-x64',
'cygwin': 'windows-x64',
'win': 'windows-x64',
'win32': 'windows-x64',
}

SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
SRC_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, '..', '..', '..'))
MATERIAL_TTF = os.path.join(SCRIPT_DIR, 'fixtures', 'MaterialIcons-Regular.ttf')
VARIABLE_MATERIAL_TTF = os.path.join(SCRIPT_DIR, 'fixtures', 'MaterialSymbols-Variable.ttf')
IS_WINDOWS = sys.platform.startswith(('cygwin', 'win'))
EXE = '.exe' if IS_WINDOWS else ''
BAT = '.bat' if IS_WINDOWS else ''
FONT_SUBSET = os.path.join(SRC_DIR, 'out', 'host_debug', 'font-subset' + EXE)
FONT_SUBSET_ZIP = os.path.join(
SRC_DIR, 'out', 'host_debug', 'zip_archives', PLATFORM_2_PATH.get(sys.platform, ''),
'font-subset.zip'
)
if not os.path.isfile(FONT_SUBSET):
FONT_SUBSET = os.path.join(SRC_DIR, 'out', 'host_debug_unopt', 'font-subset' + EXE)
FONT_SUBSET_ZIP = os.path.join(
SRC_DIR, 'out', 'host_debug_unopt', 'zip_archives', PLATFORM_2_PATH.get(sys.platform, ''),
'font-subset.zip'
)
if not os.path.isfile(FONT_SUBSET):
raise Exception(
'Could not locate font-subset%s in host_debug or host_debug_unopt - build before running this script.'
% EXE
)

COMPARE_TESTS = (
(True, '1.ttf', MATERIAL_TTF, [r'57347']),
Expand Down Expand Up @@ -91,59 +62,61 @@
]),
)

FAIL_TESTS = [
([FONT_SUBSET, 'output.ttf', 'does-not-exist.ttf'], [
'1',
]), # non-existent input font
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
'0xFFFFFFFF',
]), # Value too big.
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
'-1',
]), # invalid value
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
'foo',
]), # no valid values
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
'0xE003',
'0x12',
'0xE004',
]), # codepoint not in font
([FONT_SUBSET, 'non-existent-dir/output.ttf', MATERIAL_TTF], [
'0xE003',
]), # dir doesn't exist
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
' ',
]), # empty input
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], []), # empty input
([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], ['']), # empty input
# repeat tests with variable input font
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'0xFFFFFFFF',
]), # Value too big.
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'-1',
]), # invalid value
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'foo',
]), # no valid values
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'0xE003',
'0x12',
'0xE004',
]), # codepoint not in font
([FONT_SUBSET, 'non-existent-dir/output.ttf', VARIABLE_MATERIAL_TTF], [
'0xE003',
]), # dir doesn't exist
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], [
' ',
]), # empty input
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], []), # empty input
([FONT_SUBSET, 'output.ttf', VARIABLE_MATERIAL_TTF], ['']), # empty input
]


def RunCmd(cmd, codepoints, fail=False):

def fail_tests(font_subset):
return [
([font_subset, 'output.ttf', 'does-not-exist.ttf'], [
'1',
]), # non-existent input font
([font_subset, 'output.ttf', MATERIAL_TTF], [
'0xFFFFFFFF',
]), # Value too big.
([font_subset, 'output.ttf', MATERIAL_TTF], [
'-1',
]), # invalid value
([font_subset, 'output.ttf', MATERIAL_TTF], [
'foo',
]), # no valid values
([font_subset, 'output.ttf', MATERIAL_TTF], [
'0xE003',
'0x12',
'0xE004',
]), # codepoint not in font
([font_subset, 'non-existent-dir/output.ttf', MATERIAL_TTF], [
'0xE003',
]), # dir doesn't exist
([font_subset, 'output.ttf', MATERIAL_TTF], [
' ',
]), # empty input
([font_subset, 'output.ttf', MATERIAL_TTF], []), # empty input
([font_subset, 'output.ttf', MATERIAL_TTF], ['']), # empty input
# repeat tests with variable input font
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'0xFFFFFFFF',
]), # Value too big.
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'-1',
]), # invalid value
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'foo',
]), # no valid values
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
'0xE003',
'0x12',
'0xE004',
]), # codepoint not in font
([font_subset, 'non-existent-dir/output.ttf', VARIABLE_MATERIAL_TTF], [
'0xE003',
]), # dir doesn't exist
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
' ',
]), # empty input
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], []), # empty input
([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], ['']), # empty input
]


def run_cmd(cmd, codepoints, fail=False):
print('Running command:')
print(' %s' % ' '.join(cmd))
print('STDIN: "%s"' % ' '.join(codepoints))
Expand All @@ -169,34 +142,66 @@ def RunCmd(cmd, codepoints, fail=False):
return p.returncode


def TestZip():
with ZipFile(FONT_SUBSET_ZIP, 'r') as zip:
def test_zip(font_subset_zip, exe):
with ZipFile(font_subset_zip, 'r') as zip:
files = zip.namelist()
if 'font-subset%s' % EXE not in files:
print('expected %s to contain font-subset%s' % (files, EXE))
if 'font-subset%s' % exe not in files:
print('expected %s to contain font-subset%s' % (files, exe))
return 1
return 0


# Maps the platform name to the output directory of the font artifacts.
def platform_to_path(os, cpu):
d = {
'darwin': 'darwin-',
'linux': 'linux-',
'linux2': 'linux-',
'cygwin': 'windows-',
'win': 'windows-',
'win32': 'windows-',
}
return d[os] + cpu


def main():
print('Using font subset binary at %s (%s)' % (FONT_SUBSET, FONT_SUBSET_ZIP))
parser = argparse.ArgumentParser(description='Runs font-subset tests.')
parser.add_argument('--variant', type=str, required=True)
parser.add_argument('--target-cpu', type=str, default='x64')
args = parser.parse_args()
variant = args.variant

is_windows = sys.platform.startswith(('cygwin', 'win'))
exe = '.exe' if is_windows else ''
font_subset = os.path.join(SRC_DIR, 'out', variant, 'font-subset' + exe)
font_subset_zip = os.path.join(
SRC_DIR, 'out', variant, 'zip_archives', platform_to_path(sys.platform, args.target_cpu),
'font-subset.zip'
)
if not os.path.isfile(font_subset):
raise Exception(
'Could not locate font-subset%s in host_debug or host_debug_unopt - build before running this script.'
% exe
)

print('Using font subset binary at %s (%s)' % (font_subset, font_subset_zip))
failures = 0

failures += TestZip()
failures += test_zip(font_subset_zip, exe)

for should_pass, golden_font, input_font, codepoints in COMPARE_TESTS:
gen_ttf = os.path.join(SCRIPT_DIR, 'gen', golden_font)
golden_ttf = os.path.join(SCRIPT_DIR, 'fixtures', golden_font)
cmd = [FONT_SUBSET, gen_ttf, input_font]
RunCmd(cmd, codepoints)
cmd = [font_subset, gen_ttf, input_font]
run_cmd(cmd, codepoints)
cmp = filecmp.cmp(gen_ttf, golden_ttf, shallow=False)
if (should_pass and not cmp) or (not should_pass and cmp):
print('Test case %s failed.' % cmd)
failures += 1

with open(os.devnull, 'w') as devnull:
for cmd, codepoints in FAIL_TESTS:
if RunCmd(cmd, codepoints, fail=True) == 0:
for cmd, codepoints in fail_tests(font_subset):
if run_cmd(cmd, codepoints, fail=True) == 0:
failures += 1

if failures > 0:
Expand Down