diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 9ef37d0413f..502eaf33b28 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -100,6 +100,7 @@ abstract class CompilerConfiguration { case Compiler.dartk: if (configuration.architecture == Architecture.simarm || configuration.architecture == Architecture.simarm64 || + configuration.architecture == Architecture.simarm64c || configuration.system == System.android) { return VMKernelCompilerConfiguration(configuration); } @@ -690,13 +691,19 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration bool get _isSimArm => _configuration.architecture == Architecture.simarm; - bool get _isSimArm64 => _configuration.architecture == Architecture.simarm64; + bool get _isSimArm64 => + _configuration.architecture == Architecture.simarm64 || + _configuration.architecture == Architecture.simarm64c; bool get _isArmX64 => _configuration.architecture == Architecture.arm_x64; - bool get _isArm64 => _configuration.architecture == Architecture.arm64; + bool get _isArm64 => + _configuration.architecture == Architecture.arm64 || + _configuration.architecture == Architecture.arm64c; - bool get _isX64 => _configuration.architecture == Architecture.x64; + bool get _isX64 => + _configuration.architecture == Architecture.x64 || + _configuration.architecture == Architecture.x64c; bool get _isIA32 => _configuration.architecture == Architecture.ia32; @@ -864,14 +871,17 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration String ccFlags; switch (_configuration.architecture) { case Architecture.x64: + case Architecture.x64c: ccFlags = "-m64"; break; case Architecture.simarm64: + case Architecture.simarm64c: case Architecture.ia32: case Architecture.simarm: case Architecture.arm: case Architecture.arm_x64: case Architecture.arm64: + case Architecture.arm64c: ccFlags = null; break; default: diff --git a/pkg/test_runner/lib/src/runtime_configuration.dart b/pkg/test_runner/lib/src/runtime_configuration.dart index 342810ae108..e8a4d823235 100644 --- a/pkg/test_runner/lib/src/runtime_configuration.dart +++ b/pkg/test_runner/lib/src/runtime_configuration.dart @@ -244,9 +244,11 @@ class DartVmRuntimeConfiguration extends RuntimeConfiguration { case Architecture.arm: case Architecture.arm_x64: case Architecture.arm64: + case Architecture.arm64c: case Architecture.simarmv6: case Architecture.armv6: case Architecture.simarm64: + case Architecture.simarm64c: multiplier *= 4; break; } diff --git a/pkg/test_runner/lib/src/test_suite.dart b/pkg/test_runner/lib/src/test_suite.dart index 96f273a10f3..c27f66b6eb0 100644 --- a/pkg/test_runner/lib/src/test_suite.dart +++ b/pkg/test_runner/lib/src/test_suite.dart @@ -309,7 +309,8 @@ class VMTestSuite extends TestSuite { hasRuntimeError: testExpectation == Expectation.runtimeError, hasStaticWarning: false, hasCrash: testExpectation == Expectation.crash); - var filename = configuration.architecture == Architecture.x64 + var filename = configuration.architecture == Architecture.x64 || + configuration.architecture == Architecture.x64c ? '$buildDir/gen/kernel-service.dart.snapshot' : '$buildDir/gen/kernel_service.dill'; var dfePath = Path(filename).absolute.toNativePath(); diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 2d58e2bb972..b010541376a 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -1407,7 +1407,9 @@ { "builders": [ "vm-kernel-precomp-linux-debug-x64", - "vm-kernel-precomp-linux-debug-x64c" + "vm-kernel-precomp-linux-debug-x64c", + "vm-kernel-precomp-linux-debug-simarm64", + "vm-kernel-precomp-linux-debug-simarm64c" ], "meta": { "description": "This configuration is used by the vm kernel precomp debug builders. It uses 15 shards for testing to avoid 1 hour shard timeouts." @@ -1624,6 +1626,8 @@ }, { "builders": [ + "vm-kernel-linux-debug-simarm64", + "vm-kernel-linux-debug-simarm64c", "vm-kernel-linux-release-simarm", "vm-kernel-linux-release-simarm64", "vm-kernel-linux-release-simarm64c",