Chromium Code Reviews| Index: test/cctest/test-api.cc |
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc |
| index e01e8f19a941824b3e4c244c4d7debda3789ef72..65b87d22f16803b1110b8dcc0610822df4f4599b 100644 |
| --- a/test/cctest/test-api.cc |
| +++ b/test/cctest/test-api.cc |
| @@ -5312,8 +5312,7 @@ void TryCatchMixedNestingCheck(v8::TryCatch* try_catch) { |
| CHECK_EQ(0, |
| strcmp(*v8::String::Utf8Value(message->Get()), "Uncaught Error: a")); |
| CHECK_EQ(1, message->GetLineNumber()); |
| - // TODO(3995): Our compilers disagree about the position. |
| - if (!i::FLAG_always_opt) CHECK_EQ(6, message->GetStartColumn()); |
| + CHECK_EQ(0, message->GetStartColumn()); |
| } |
| @@ -9795,11 +9794,8 @@ THREADED_TEST(ConstructorForObject) { |
| value = CompileRun("new obj2(28)"); |
| CHECK(try_catch.HasCaught()); |
| String::Utf8Value exception_value1(try_catch.Exception()); |
| - // TODO(3995): Our compilers disagree about the position (and message). |
| - if (!i::FLAG_always_opt) { |
| - CHECK_EQ(0, |
| - strcmp("TypeError: obj2 is not a function", *exception_value1)); |
| - } |
| + CHECK_EQ(0, |
| + strcmp("TypeError: object is not a function", *exception_value1)); |
|
Michael Starzinger
2015/04/10 11:49:11
Toon: Can you please advise on this change. Does t
Toon Verwaest
2015/04/10 13:05:58
Yes, this indicates that the position of the error
Michael Starzinger
2015/04/10 14:08:27
Done.
|
| try_catch.Reset(); |
| Local<Value> args[] = {v8_num(29)}; |
| @@ -15005,11 +15001,9 @@ void AnalyzeStackInNativeCode(const v8::FunctionCallbackInfo<v8::Value>& args) { |
| checkStackFrame(origin, "foo", 6, 3, false, false, |
| stackTrace->GetFrame(1)); |
| // This is the source string inside the eval which has the call to foo. |
| - checkStackFrame(NULL, "", 1, 5, false, false, |
| - stackTrace->GetFrame(2)); |
| + checkStackFrame(NULL, "", 1, 1, false, false, stackTrace->GetFrame(2)); |
| // The last frame is an anonymous function which has the initial eval call. |
| - checkStackFrame(origin, "", 8, 7, false, false, |
| - stackTrace->GetFrame(3)); |
| + checkStackFrame(origin, "", 8, 7, false, false, stackTrace->GetFrame(3)); |
| CHECK(stackTrace->AsArray()->IsArray()); |
| } else if (testGroup == kDetailedTest) { |
| @@ -15022,11 +15016,9 @@ void AnalyzeStackInNativeCode(const v8::FunctionCallbackInfo<v8::Value>& args) { |
| stackTrace->GetFrame(1)); |
| bool is_eval = true; |
| // This is the source string inside the eval which has the call to baz. |
| - checkStackFrame(NULL, "", 1, 5, is_eval, false, |
| - stackTrace->GetFrame(2)); |
| + checkStackFrame(NULL, "", 1, 1, is_eval, false, stackTrace->GetFrame(2)); |
| // The last frame is an anonymous function which has the initial eval call. |
| - checkStackFrame(origin, "", 10, 1, false, false, |
| - stackTrace->GetFrame(3)); |
| + checkStackFrame(origin, "", 10, 1, false, false, stackTrace->GetFrame(3)); |
| CHECK(stackTrace->AsArray()->IsArray()); |
| } |