Re-enable and adjust skipped VM debugger tests.

runtime/vm/debugger_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/lockers.h"
 #include "vm/unit_test.h"
@@ skipping 235 matching lines @@
   EXPECT(Dart_IsString(func_name));
   const char* func_name_chars;
   Dart_StringToCString(func_name, &func_name_chars);
   if (expected_name != NULL) {
     EXPECT_SUBSTRING(expected_name, func_name_chars);
   }
   EXPECT(Dart_IsFunction(func));
   const char* func_name_chars_from_func_handle;
   Dart_StringToCString(Dart_FunctionName(func),
                        &func_name_chars_from_func_handle);
-  EXPECT_STREQ(func_name_chars, func_name_chars_from_func_handle);
+  EXPECT_SUBSTRING(func_name_chars_from_func_handle, func_name_chars);
 
   if (!Dart_IsNull(expected_locals)) {
     Dart_Handle locals = Dart_GetLocalVariables(frame);
     EXPECT_VALID(locals);
     VerifyListEquals(expected_locals, locals, skip_null_expects);
   }
 }
 
 
 static void VerifyStackTrace(Dart_StackTrace trace,
@@ skipping 1298 matching lines @@
   Dart_ListSetAt(frame0_locals, 0, NewString("i"));
   Dart_ListSetAt(frame0_locals, 1, Dart_NewInteger(76));
   Dart_ListSetAt(frame0_locals, 2, NewString("j"));
   Dart_ListSetAt(frame0_locals, 3, Dart_NewInteger(119));
   Dart_ListSetAt(frame0_locals, 4, NewString("k"));
   Dart_ListSetAt(frame0_locals, 5, Dart_NewInteger(66));
   Dart_ListSetAt(frame0_locals, 6, NewString("l"));
   Dart_ListSetAt(frame0_locals, 7, Dart_NewInteger(99));
 
   // Frame 1 corresponding to "Test.local1_to_func1".
-  Dart_Handle frame1_locals = Dart_NewList(14);
+  Dart_Handle frame1_locals = Dart_NewList(12);
   Dart_ListSetAt(frame1_locals, 0, NewString("i"));
   Dart_ListSetAt(frame1_locals, 1, Dart_NewInteger(11));
   Dart_ListSetAt(frame1_locals, 2, NewString("j"));
   Dart_ListSetAt(frame1_locals, 3, Dart_NewInteger(22));
   Dart_ListSetAt(frame1_locals, 4, NewString("k"));
   Dart_ListSetAt(frame1_locals, 5, Dart_NewInteger(33));
   Dart_ListSetAt(frame1_locals, 6, NewString("l"));
   Dart_ListSetAt(frame1_locals, 7, Dart_NewInteger(44));
   Dart_ListSetAt(frame1_locals, 8, NewString("m"));
   Dart_ListSetAt(frame1_locals, 9, Dart_NewInteger(55));
   Dart_ListSetAt(frame1_locals, 10, NewString("func"));
   Dart_ListSetAt(frame1_locals, 11, Dart_Null());
-  Dart_ListSetAt(frame1_locals, 12, NewString("n"));
-  Dart_ListSetAt(frame1_locals, 13, Dart_Null());
 
   // Frame 2 corresponding to "Test.func1".
   Dart_Handle frame2_locals = Dart_NewList(18);
   Dart_ListSetAt(frame2_locals, 0, NewString("this"));
   Dart_ListSetAt(frame2_locals, 1, Dart_Null());
   Dart_ListSetAt(frame2_locals, 2, NewString("func"));
   Dart_ListSetAt(frame2_locals, 3, Dart_Null());
   Dart_ListSetAt(frame2_locals, 4, NewString("i"));
   Dart_ListSetAt(frame2_locals, 5, Dart_NewInteger(11));
   Dart_ListSetAt(frame2_locals, 6, NewString("j"));
@@ skipping 133 matching lines @@
   Dart_ListSetAt(frame0_locals, 11, Dart_Null());
 
   // Frame 1 corresponding to "Object.noSuchMethod".
   Dart_Handle frame1_locals = Dart_NewList(4);
   Dart_ListSetAt(frame1_locals, 0, NewString("this"));
   Dart_ListSetAt(frame1_locals, 1, Dart_Null());
   Dart_ListSetAt(frame1_locals, 2, NewString("invocation"));
   Dart_ListSetAt(frame1_locals, 3, Dart_Null());
 
   // Frame 2 corresponding to "Test.local1_to_func1".
-  Dart_Handle frame2_locals = Dart_NewList(16);
+  Dart_Handle frame2_locals = Dart_NewList(14);
   Dart_ListSetAt(frame2_locals, 0, NewString("i"));
   Dart_ListSetAt(frame2_locals, 1, Dart_NewInteger(11));
   Dart_ListSetAt(frame2_locals, 2, NewString("j"));
   Dart_ListSetAt(frame2_locals, 3, Dart_NewInteger(22));
   Dart_ListSetAt(frame2_locals, 4, NewString("k"));
   Dart_ListSetAt(frame2_locals, 5, Dart_NewInteger(33));
   Dart_ListSetAt(frame2_locals, 6, NewString("l"));
   Dart_ListSetAt(frame2_locals, 7, Dart_NewInteger(44));
   Dart_ListSetAt(frame2_locals, 8, NewString("m"));
   Dart_ListSetAt(frame2_locals, 9, Dart_NewInteger(55));
   Dart_ListSetAt(frame2_locals, 10, NewString("this"));
   Dart_ListSetAt(frame2_locals, 11, Dart_Null());
   Dart_ListSetAt(frame2_locals, 12, NewString("func"));
   Dart_ListSetAt(frame2_locals, 13, Dart_Null());
-  Dart_ListSetAt(frame2_locals, 14, NewString("n"));
-  Dart_ListSetAt(frame2_locals, 15, Dart_Null());
 
   // Frame 3 corresponding to "Test.func1".
   Dart_Handle frame3_locals = Dart_NewList(18);
   Dart_ListSetAt(frame3_locals, 0, NewString("this"));
   Dart_ListSetAt(frame3_locals, 1, Dart_Null());
   Dart_ListSetAt(frame3_locals, 2, NewString("func"));
   Dart_ListSetAt(frame3_locals, 3, Dart_Null());
   Dart_ListSetAt(frame3_locals, 4, NewString("i"));
   Dart_ListSetAt(frame3_locals, 5, Dart_NewInteger(11));
   Dart_ListSetAt(frame3_locals, 6, NewString("j"));
@@ skipping 543 matching lines @@
       " null, 3, 7, 1, 8, 6, 9, 10, 10, 11, 11, 13,"
       " null, 4, 13, 3, 14, 10,"
       " null, 5, 17, 5, 18, 9, 19, 12,"
       " null, 6, 21, 1,"
       " null, 8, 24, 1, 25, 5, 26, 6, 27, 8,"
       " null, 9, 29, 1]",
       tokens_cstr);
 }
 
 }  // namespace dart