Revert of [test] Split TurboFan mjsunit expectations for variants.

test/mjsunit/mjsunit.status

Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index eca427197e6df8a4ac917d4cd6e320580667fc71..318398890da3761cbe4fd24ae57c9eddabeff30b 100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -55,12 +55,45 @@
   'es6/debug-promises/reject-with-undefined-reject': [FAIL],
   'es6/debug-promises/reject-with-invalid-reject': [FAIL],
 
+  ##############################################################################
+  # TurboFan compiler failures.
+
+  # Some tests are just too slow to run for now.
+  'big-object-literal': [PASS, NO_VARIANTS],
+  'json2': [PASS, NO_VARIANTS],
+  'packed-elements': [PASS, NO_VARIANTS],
+  'unicode-test': [PASS, NO_VARIANTS],
+  'whitespaces': [PASS, NO_VARIANTS],
+  'ignition/regress-599001-verifyheap': [PASS, NO_VARIANTS],
+  'es6/string-fromcodepoint': [PASS, NO_VARIANTS],
+  'regress/regress-2612': [PASS, NO_VARIANTS],
+
   # Issue 3660: Replacing activated TurboFan frames by unoptimized code does
   # not work, but we expect it to not crash.
-  'debug-step-turbofan': [FAIL],
+  'debug-step-turbofan': [PASS, FAIL],
+
+  # TODO(jarin/mstarzinger): Investigate debugger issues with TurboFan.
+  'debug-evaluate-closure': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-capturing': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-optimized': [PASS, NO_VARIANTS],
+  'debug-evaluate-locals-optimized-double': [PASS, NO_VARIANTS],
+  'debug-evaluate-recursive': [PASS, NO_VARIANTS],  # only in no-snap debug.
+  'debug-liveedit-check-stack': [PASS, NO_VARIANTS],  # only in no-snap mode.
+  'debug-liveedit-double-call': [PASS, NO_VARIANTS],
+  'debug-set-variable-value': [PASS, NO_VARIANTS],
+  'es6/debug-evaluate-blockscopes': [PASS, NO_VARIANTS],
+
+  # Assumptions about optimization need investigation in TurboFan.
+  'regress-sync-optimized-lists': [PASS, NO_VARIANTS],
+
+  # Fails in --turbo --always-opt mode.
+  'regress/regress-105': [PASS, NO_VARIANTS],
 
   ##############################################################################
   # Too slow in debug mode with --stress-opt mode.
+  'compiler/regress-stacktrace-methods': [PASS, ['mode == debug', SKIP]],
+  'compiler/regress-funcaller': [PASS, ['mode == debug', SKIP]],
   'regress/regress-2318': [PASS, ['mode == debug', SKIP]],
   'regress/regress-create-exception': [PASS, ['mode == debug', SKIP]],
 
@@ -541,6 +574,7 @@
 }],  # 'arch == mips'
 
 ##############################################################################
+
 ['arch == mips64el or arch == mips64', {
 
   # Slow tests which times out in debug mode.
@@ -661,50 +695,6 @@
 }],  # 'arch == ppc64'
 
 ##############################################################################
-['variant == stress', {
-  'debug-evaluate-locals-optimized': [FAIL],
-  'debug-evaluate-locals-optimized-double': [FAIL],
-  'ignition/regress-599001-verifyheap': [SKIP],
-  'unicode-test': [SKIP],
-}],  # variant == stress
-
-##############################################################################
-['variant == turbofan', {
-
-  # Assumptions about optimization need investigation in TurboFan.
-  'regress-sync-optimized-lists': [FAIL],
-
-}],  # variant == turbofan
-
-##############################################################################
-['variant == turbofan_opt', {
-
-  # TODO(jarin/mstarzinger): Investigate debugger issues with TurboFan.
-  'debug-evaluate-closure': [FAIL],
-  'debug-evaluate-locals': [FAIL],
-  'debug-set-variable-value': [FAIL],
-  'debug-evaluate-locals-optimized': [FAIL],
-  'debug-evaluate-locals-optimized-double': [FAIL],
-  'debug-liveedit-double-call': [FAIL],
-  'es6/debug-evaluate-blockscopes': [FAIL],
-
-  # TODO(jgruber): Fails in --turbo --always-opt mode.
-  'regress/regress-105': [FAIL],
-
-  # Too slow.
-  'big-object-literal': [SKIP],
-  'ignition/regress-599001-verifyheap': [SKIP],
-  'unicode-test': [SKIP],
-
-}],  # variant == turbofan_opt
-
-##############################################################################
-['variant == ignition', {
-  'debug-liveedit-double-call': [FAIL],
-  'regress-sync-optimized-lists': [FAIL],
-}],  # variant == ignition
-
-##############################################################################
 ['variant == ignition_staging', {
   'allocation-site-info': [FAIL],
   'array-constructor-feedback': [FAIL],
@@ -716,7 +706,6 @@
   'compiler/manual-concurrent-recompile': [FAIL],
   'constant-folding-2': [FAIL],
   'debug-is-active': [FAIL],
-  'debug-liveedit-double-call': [FAIL],
   'deopt-with-fp-regs': [FAIL],
   'deserialize-optimize-inner': [FAIL],
   'div-mul-minus-one': [FAIL],
@@ -737,7 +726,6 @@
   'regress/regress-map-invalidation-2': [FAIL],
   'regress/regress-param-local-type': [FAIL],
   'regress/regress-prepare-break-while-recompile': [FAIL],
-  'regress-sync-optimized-lists': [FAIL],
   'shift-for-integer-div': [FAIL],
   'sin-cos': [FAIL],
   'smi-mul-const': [FAIL],
@@ -750,18 +738,10 @@
   'compiler/uint32': [SKIP],
   'regress/regress-454725': [SKIP],
 
-  # Might trigger stack overflow.
-  'unicode-test': [SKIP],
-
 }],  # variant == ignition_staging
 
 ##############################################################################
 ['variant == ignition_turbofan', {
-  'debug-liveedit-double-call': [FAIL],
-
-  # Might trigger stack overflow.
-  'unicode-test': [SKIP],
-
   # TODO(mythria, 4780): Related to type feedback for calls in interpreter.
   'array-literal-feedback': [FAIL],
   'regress/regress-4121': [FAIL],