[test] Run more variants on no-CM builder

This additionally combines --future with all other standard testing
variants.

This also enables using concurrent_marking in status files to skip
tests in this variant.

This also marks a slow test that times out in the new config.

Bug: v8:10875
Change-Id: Id904f6a2c51b814eecfccb523a897de2f5d96f56
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2423719
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70180}

BUILD.gn

@@ -1666,12 +1666,13 @@ action("v8_dump_build_config") {
     "is_ubsan_vptr=$is_ubsan_vptr",
     "target_cpu=\"$target_cpu\"",
     "v8_current_cpu=\"$v8_current_cpu\"",
+    "v8_enable_concurrent_marking=$v8_enable_concurrent_marking",
     "v8_enable_i18n_support=$v8_enable_i18n_support",
     "v8_enable_verify_predictable=$v8_enable_verify_predictable",
-    "v8_target_cpu=\"$v8_target_cpu\"",
     "v8_enable_verify_csa=$v8_enable_verify_csa",
     "v8_enable_lite_mode=$v8_enable_lite_mode",
     "v8_enable_pointer_compression=$v8_enable_pointer_compression",
+    "v8_target_cpu=\"$v8_target_cpu\"",
   ]
 
   if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||

infra/testing/builders.pyl

@@ -430,7 +430,16 @@
       'os': 'Ubuntu-16.04',
     },
     'tests': [
-      {'name': 'v8testing', 'variant': 'future', 'shards': 3},
+      {
+        'name': 'v8testing',
+        'shards': 6,
+      },
+      {
+        'name': 'v8testing',
+        'suffix': 'future',
+        'test_args': ['--extra-flags=--future'],
+        'shards': 6,
+      },
     ],
   },
   'v8_linux64_tsan_isolates_rel_ng_triggered': {
@@ -1205,7 +1214,16 @@
       'os': 'Ubuntu-16.04',
     },
     'tests': [
-      {'name': 'v8testing', 'variant': 'future', 'shards': 3},
+      {
+        'name': 'v8testing',
+        'shards': 6,
+      },
+      {
+        'name': 'v8testing',
+        'suffix': 'future',
+        'test_args': ['--extra-flags=--future'],
+        'shards': 6,
+      },
     ],
   },
   'V8 Linux64 UBSan': {

test/mjsunit/mjsunit.status

@@ -129,10 +129,11 @@
   'asm/poppler/*': [PASS, SLOW, NO_VARIANTS],
   'asm/sqlite3/*': [PASS, SLOW, NO_VARIANTS],
   'compiler/regress-9017': [PASS, SLOW],
-  'es6/promise-all-overflow-2': [PASS, SLOW, ['arch != x64', SKIP]],
-  'harmony/promise-any-overflow-2': [PASS, SLOW, ['arch != x64', SKIP]],
   'copy-on-write-assert': [PASS, SLOW],
+  'es6/promise-all-overflow-2': [PASS, SLOW, ['arch != x64', SKIP]],
   'es6/typedarray-construct-offset-not-smi': [PASS, SLOW],
+  'harmony/promise-any-overflow-2': [PASS, SLOW, ['arch != x64', SKIP]],
+  'harmony/sharedarraybuffer-worker-gc-stress': [PASS, SLOW],
   'harmony/futex': [PASS, SLOW],
   'harmony/regexp-property-script-extensions': [PASS, SLOW],
   'ignition/regress-672027': [PASS, SLOW],
@@ -308,7 +309,6 @@
   # Slow tests.
   'array-constructor': [PASS, SLOW],
   'json': [PASS, SLOW],
-  'harmony/sharedarraybuffer-worker-gc-stress': [PASS, SLOW],
 
   # BUG(v8:4779): Crashes flakily with stress mode on arm64.
   'array-splice': [PASS, SLOW, ['arch == arm64', NO_VARIANTS]],
@@ -1446,11 +1446,6 @@
   'regress/wasm/regress-10831': [SKIP],
 }],  # ((arch == mipsel or arch == mips64el or arch == mips or arch == mips64) and not simd_mips) or (arch in [ppc64, s390x])
 
-##############################################################################
-['variant == stress_concurrent_allocation', {
-  'harmony/sharedarraybuffer-worker-gc-stress': [PASS, SLOW],
-}],  # variant == stress_concurrent_allocation
-
 ##############################################################################
 ['variant == stress_sampling', {
   # https://bugs.chromium.org/p/v8/issues/detail?id=10915

tools/testrunner/base_runner.py

@@ -186,6 +186,7 @@ class BuildConfig(object):
 
     self.asan = build_config['is_asan']
     self.cfi_vptr = build_config['is_cfi']
+    self.concurrent_marking = build_config['v8_enable_concurrent_marking']
     self.dcheck_always_on = build_config['dcheck_always_on']
     self.gcov_coverage = build_config['is_gcov_coverage']
     self.is_android = build_config['is_android']
@@ -686,6 +687,7 @@ class BaseTestRunner(object):
       "asan": self.build_config.asan,
       "byteorder": sys.byteorder,
       "cfi_vptr": self.build_config.cfi_vptr,
+      "concurrent_marking": self.build_config.concurrent_marking,
       "dcheck_always_on": self.build_config.dcheck_always_on,
       "deopt_fuzzer": False,
       "endurance_fuzzer": False,

tools/unittests/testdata/testroot1/v8_build_config.json

@@ -17,6 +17,7 @@
   "v8_enable_i18n_support": true,
   "v8_enable_verify_predictable": false,
   "v8_target_cpu": "x64",
+  "v8_enable_concurrent_marking": true,
   "v8_enable_verify_csa": false,
   "v8_enable_lite_mode": false,
   "v8_enable_pointer_compression": true

tools/unittests/testdata/testroot2/v8_build_config.json

@@ -17,6 +17,7 @@
   "v8_enable_i18n_support": true,
   "v8_enable_verify_predictable": false,
   "v8_target_cpu": "x64",
+  "v8_enable_concurrent_marking": true,
   "v8_enable_verify_csa": false,
   "v8_enable_lite_mode": false,
   "v8_enable_pointer_compression": false