[Test] stress-concurrent-inlining and turboprop are incompatible flags.

Adds incompatibility between future/turboprop variants and stress-concurrent-inlining
due to incompatibility from both configs weakly setting --interrupt-budget. Also ensures
we maintain this incompatibility if --future is passed as an extra flag as is done on
some bots.

BUG=v8:9684

Change-Id: I4855b92a64db00da15efc2384e241d4bf0c373c2
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3041677
Auto-Submit: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#75853}

test/mjsunit/mjsunit.status

@@ -1338,43 +1338,8 @@
   'compiler/construct-object': [SKIP],
   'compiler/construct-receiver': [SKIP],
   'compiler/js-create': [SKIP],
-
-  # Incompatible flags that both weakly imply interrupt_budget.
-  'regress/regress-1220974': [SKIP],
-  'compiler/regress-1224277': [SKIP],
 }],  # variant == turboprop or variant = turboprop_as_toptier
 
-
-##############################################################################
-['variant == stress_concurrent_inlining', {
-  # Incompatible flags that both weakly imply interrupt_budget.
-  'regress/regress-1225561': [SKIP],
-  'regress/regress-1201114': [SKIP],
-  'regress/regress-1172797': [SKIP],
-  'regress/regress-1163715': [SKIP],
-  'regress/regress-1084953': [SKIP],
-  'regress/regress-1083763': [SKIP],
-  'regress/regress-1076569': [SKIP],
-  'es6/super-ic-opt-dynamic-map-checks': [SKIP],
-  'compiler/test-dynamic-map-checks-wrong-handler': [SKIP],
-  'compiler/test-dynamic-map-checks-poly-mono': [SKIP],
-  'compiler/test-dynamic-map-check-deprecated-maps': [SKIP],
-  'compiler/test-dynamic-map-check-deprecated-maps2': [SKIP],
-  'compiler/test-dynamic-map-check-deprecated-maps3': [SKIP],
-  'compiler/test-dynamic-map-checks-wrong-handler1': [SKIP],
-  'compiler/test-dynamic-map-check-deprecated-maps-polymorphic': [SKIP],
-  'compiler/test-dynamic-map-checks': [SKIP],
-  'compiler/regress-1226988': [SKIP],
-  'regress/regress-1223733': [SKIP],
-  'regress/regress-1154961': [SKIP],
-  'regress/regress-1137979': [SKIP],
-  'regress/regress-1138075': [SKIP],
-  'regress/regress-1083272': [SKIP],
-  'regress/regress-1079446': [SKIP],
-  'regress/regress-1138611': [SKIP],
-  'const-field-tracking-2': [SKIP],
-}],  # variant == stress_concurrent_inlining
-
 ##############################################################################
 ['variant == top_level_await', {
   # specifically expects to fail on top level await.

tools/testrunner/local/variants.py

@@ -58,7 +58,9 @@ INCOMPATIBLE_FLAGS_PER_VARIANT = {
   "nooptimization": ["--always-opt"],
   "slow_path": ["--no-force-slow-path"],
   "stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"],
-  "stress_concurrent_inlining": ["--single-threaded", "--predictable"],
+  "stress_concurrent_inlining": ["--single-threaded", "--predictable", "--future", "--turboprop"],
+  "future": ["--stress_concurrent_inlining"],
+  "turboprop": ["--stress_concurrent_inlining"],
   # The fast API tests initialize an embedder object that never needs to be
   # serialized to the snapshot, so we don't have a
   # SerializeInternalFieldsCallback for it, so they are incompatible with
@@ -106,6 +108,7 @@ INCOMPATIBLE_FLAGS_PER_EXTRA_FLAG = {
         INCOMPATIBLE_FLAGS_PER_VARIANT["stress_concurrent_allocation"],
   "--stress-concurrent-inlining":
         INCOMPATIBLE_FLAGS_PER_VARIANT["stress_concurrent_inlining"],
+  "--future": INCOMPATIBLE_FLAGS_PER_VARIANT["future"],
 }
 
 SLOW_VARIANTS = set([