Merge bleeding_edge.

test/cctest/cctest.status

 # Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 38 matching lines @@
   # TODO(gc): Temporarily disabled in the GC branch.
   'test-log/EquivalenceOfLoggingAndTraversal': [PASS, FAIL],
 
   # We do not yet shrink weak maps after they have been emptied by the GC
   'test-weakmaps/Shrinking': [FAIL],
   'test-weaksets/WeakSet_Shrinking': [FAIL],
 
   # Boot up memory use is bloated in debug mode.
   'test-mark-compact/BootUpMemoryUse': [PASS, PASS, ['mode == debug', FAIL]],
 
-  # Some CPU profiler tests are flaky.
-  'test-cpu-profiler/*': [PASS, FLAKY],
+  # This tests only that the preparser and parser agree, so there is no point in
+  # running several variants. Note that this still takes ages, because there
+  # are actually 13 * 38 * 5 * 128 = 316160 individual tests hidden here.
+  'test-parsing/ParserSync': [PASS, NO_VARIANTS],
 }],  # ALWAYS
 
 ##############################################################################
 ['arch == arm', {
 
   # We cannot assume that we can throw OutOfMemory exceptions in all situations.
   # Apparently our ARM box is in such a state. Skip the test as it also runs for
   # a long time.
   'test-api/OutOfMemory': [SKIP],
   'test-api/OutOfMemoryNested': [SKIP],
@@ skipping 54 matching lines @@
   'test-debug/DebuggerAgentProtocolOverflowHeader': [SKIP],
   'test-socket/Socket': [SKIP],
 
   # Profiling doesn't work on Native Client.
   'test-cpu-profiler/*': [SKIP],
 
   # Fails since 16322 (new test).
   'test-code-stubs-arm/ConvertDToI': [SKIP],
 }],  # 'arch == nacl_ia32 or arch == nacl_x64'
 ]