From e43e1dcd1740058d91b72448deda2135a7d09afa Mon Sep 17 00:00:00 2001 From: Ulan Degenbaev Date: Wed, 14 Apr 2021 16:09:35 +0200 Subject: [PATCH] [test] Introduce a third_party_heap test flag The flag is useful for disabling tests that are not supported in the third_party_heap build configuration. Example usage in the status files: ['third_party_heap', { 'testname': [SKIP], }], # third_party_heap Bug: v8:11155 Change-Id: I991532bf7cdf89d8c505e4d6cbd7cf9e4d70dd63 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2821960 Commit-Queue: Ulan Degenbaev Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#73957} --- BUILD.gn | 3 ++- tools/testrunner/base_runner.py | 4 ++++ tools/unittests/testdata/testroot1/v8_build_config.json | 1 + tools/unittests/testdata/testroot2/v8_build_config.json | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index ff1944f584..6b63f053fa 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -333,7 +333,7 @@ if (v8_enable_snapshot_native_code_counters == "") { } if (v8_enable_pointer_compression == "") { v8_enable_pointer_compression = - (v8_current_cpu == "arm64" || v8_current_cpu == "x64") + v8_current_cpu == "arm64" || v8_current_cpu == "x64" } if (v8_enable_pointer_compression_shared_cage == "") { v8_enable_pointer_compression_shared_cage = false @@ -1918,6 +1918,7 @@ action("v8_dump_build_config") { "v8_enable_pointer_compression=$v8_enable_pointer_compression", "v8_enable_pointer_compression_shared_cage=" + "$v8_enable_pointer_compression_shared_cage", + "v8_enable_third_party_heap=$v8_enable_third_party_heap", "v8_enable_webassembly=$v8_enable_webassembly", "v8_control_flow_integrity=$v8_control_flow_integrity", "v8_target_cpu=\"$v8_target_cpu\"", diff --git a/tools/testrunner/base_runner.py b/tools/testrunner/base_runner.py index 9d059fe0e9..34d5421f82 100644 --- a/tools/testrunner/base_runner.py +++ b/tools/testrunner/base_runner.py @@ -190,6 +190,7 @@ class BuildConfig(object): self.lite_mode = build_config['v8_enable_lite_mode'] self.pointer_compression = build_config['v8_enable_pointer_compression'] self.pointer_compression_shared_cage = build_config['v8_enable_pointer_compression_shared_cage'] + self.third_party_heap = build_config['v8_enable_third_party_heap'] self.webassembly = build_config['v8_enable_webassembly'] # Export only for MIPS target if self.arch in ['mips', 'mipsel', 'mips64', 'mips64el']: @@ -232,6 +233,8 @@ class BuildConfig(object): detected_options.append('pointer_compression') if self.pointer_compression_shared_cage: detected_options.append('pointer_compression_shared_cage') + if self.third_party_heap: + detected_options.append('third_party_heap') if self.webassembly: detected_options.append('webassembly') @@ -684,6 +687,7 @@ class BaseTestRunner(object): "simulator_run": self.build_config.simulator_run and not options.dont_skip_simulator_slow_tests, "system": self.target_os, + "third_party_heap": self.build_config.third_party_heap, "tsan": self.build_config.tsan, "ubsan_vptr": self.build_config.ubsan_vptr, "verify_csa": self.build_config.verify_csa, diff --git a/tools/unittests/testdata/testroot1/v8_build_config.json b/tools/unittests/testdata/testroot1/v8_build_config.json index bd027dc898..9bf6bd1ee4 100644 --- a/tools/unittests/testdata/testroot1/v8_build_config.json +++ b/tools/unittests/testdata/testroot1/v8_build_config.json @@ -23,5 +23,6 @@ "v8_enable_pointer_compression": true, "v8_enable_pointer_compression_shared_cage": true, "v8_control_flow_integrity": false, + "v8_enable_third_party_heap": false, "v8_enable_webassembly": true } diff --git a/tools/unittests/testdata/testroot2/v8_build_config.json b/tools/unittests/testdata/testroot2/v8_build_config.json index 36a76b6824..50517b3dc8 100644 --- a/tools/unittests/testdata/testroot2/v8_build_config.json +++ b/tools/unittests/testdata/testroot2/v8_build_config.json @@ -23,5 +23,6 @@ "v8_enable_pointer_compression": false, "v8_enable_pointer_compression_shared_cage": false, "v8_control_flow_integrity": false, + "v8_enable_third_party_heap": false, "v8_enable_webassembly": true }