Merge bleeding edge into the GC branch up to 7948. The asserts

test/cctest/cctest.gyp

 # Copyright 2010 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 24 matching lines @@
           ['v8_target_arch=="arm"', {
             'defines': [
               'V8_TARGET_ARCH_ARM',
             ],
           }],
           ['v8_target_arch=="ia32"', {
             'defines': [
               'V8_TARGET_ARCH_IA32',
             ],
           }],
+          ['v8_target_arch=="mips"', {
+            'defines': [
+              'V8_TARGET_ARCH_MIPS',
+            ],
+          }],
           ['v8_target_arch=="x64"', {
             'defines': [
               'V8_TARGET_ARCH_X64',
             ],
           }],
         ],
       }],
     ],
   },
   'targets': [
@@ skipping 31 matching lines @@
         'test-fast-dtoa.cc',
         'test-fixed-dtoa.cc',
         'test-flags.cc',
         'test-func-name-inference.cc',
         'test-hashmap.cc',
         'test-heap.cc',
         'test-heap-profiler.cc',
         'test-list.cc',
         'test-liveedit.cc',
         'test-lock.cc',
+        'test-lockers.cc',
         'test-log.cc',
         'test-log-utils.cc',
         'test-mark-compact.cc',
         'test-parsing.cc',
         'test-profile-generator.cc',
         'test-regexp.cc',
         'test-reloc-info.cc',
         'test-serialize.cc',
         'test-sockets.cc',
         'test-spaces.cc',
         'test-strings.cc',
         'test-strtod.cc',
         'test-thread-termination.cc',
         'test-threads.cc',
-        'test-type-info.cc',
         'test-unbound-queue.cc',
         'test-utils.cc',
         'test-version.cc'
       ],
       'conditions': [
         ['v8_target_arch=="ia32"', {
           'sources': [
             'test-assembler-ia32.cc',
             'test-disasm-ia32.cc',
             'test-log-stack-tracer.cc'
           ],
         }],
         ['v8_target_arch=="x64"', {
           'sources': [
             'test-assembler-x64.cc',
             'test-macro-assembler-x64.cc',
             'test-log-stack-tracer.cc'
           ],
         }],
         ['v8_target_arch=="arm"', {
           'sources': [
             'test-assembler-arm.cc',
             'test-disasm-arm.cc'
           ],
         }],
         ['v8_target_arch=="mips"', {
           'sources': [
             'test-assembler-mips.cc',
-            'test-mips.cc',
+            'test-disasm-mips.cc',
           ],
         }],
         [ 'OS=="linux"', {
           'sources': [
             'test-platform-linux.cc',
           ],
         }],
         [ 'OS=="mac"', {
           'sources': [
             'test-platform-macos.cc',
           ],
         }],
         [ 'OS=="win"', {
           'sources': [
             'test-platform-win32.cc',
           ],
         }],
       ],
     },
   ],
 }