diff options
author | Refael Ackermann <refack@gmail.com> | 2014-09-29 13:20:04 +0400 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2014-10-08 15:35:57 +0400 |
commit | 939278ac059b44439d41aab12bf552c8ae3c52d0 (patch) | |
tree | 86c586915a96d308b1b04de679a8ae293caf3e41 /deps/v8/test/cctest/test-log.cc | |
parent | 4412a71d76a0fa002f627ec21d2337e089da6764 (diff) | |
download | node-new-939278ac059b44439d41aab12bf552c8ae3c52d0.tar.gz |
deps: update v8 to 3.28.73
Reviewed-By: Fedor Indutny <fedor@indutny.com>
PR-URL: https://github.com/joyent/node/pull/8476
Diffstat (limited to 'deps/v8/test/cctest/test-log.cc')
-rw-r--r-- | deps/v8/test/cctest/test-log.cc | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/deps/v8/test/cctest/test-log.cc b/deps/v8/test/cctest/test-log.cc index e6ed75e64d..d72e6f0e1e 100644 --- a/deps/v8/test/cctest/test-log.cc +++ b/deps/v8/test/cctest/test-log.cc @@ -34,15 +34,16 @@ #include <cmath> #endif // __linux__ -#include "v8.h" -#include "log.h" -#include "log-utils.h" -#include "cpu-profiler.h" -#include "natives.h" -#include "utils.h" -#include "v8threads.h" -#include "cctest.h" -#include "vm-state-inl.h" +#include "src/v8.h" + +#include "src/cpu-profiler.h" +#include "src/log.h" +#include "src/log-utils.h" +#include "src/natives.h" +#include "src/utils.h" +#include "src/v8threads.h" +#include "src/vm-state-inl.h" +#include "test/cctest/cctest.h" using v8::internal::Address; using v8::internal::EmbeddedVector; @@ -112,7 +113,7 @@ class ScopedLoggerInitializer { static const char* StrNStr(const char* s1, const char* s2, int n) { if (s1[n] == '\0') return strstr(s1, s2); i::ScopedVector<char> str(n + 1); - i::OS::StrNCpy(str, s1, static_cast<size_t>(n)); + i::StrNCpy(str, s1, static_cast<size_t>(n)); str[n] = '\0'; char* found = strstr(str.start(), s2); return found != NULL ? s1 + (found - str.start()) : NULL; @@ -358,9 +359,9 @@ TEST(LogCallbacks) { CHECK(exists); i::EmbeddedVector<char, 100> ref_data; - i::OS::SNPrintF(ref_data, - "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"method1\"\0", - ObjMethod1); + i::SNPrintF(ref_data, + "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"method1\"", + reinterpret_cast<intptr_t>(ObjMethod1)); CHECK_NE(NULL, StrNStr(log.start(), ref_data.start(), log.length())); log.Dispose(); @@ -402,23 +403,23 @@ TEST(LogAccessorCallbacks) { CHECK(exists); EmbeddedVector<char, 100> prop1_getter_record; - i::OS::SNPrintF(prop1_getter_record, - "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"get prop1\"", - Prop1Getter); + i::SNPrintF(prop1_getter_record, + "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"get prop1\"", + reinterpret_cast<intptr_t>(Prop1Getter)); CHECK_NE(NULL, StrNStr(log.start(), prop1_getter_record.start(), log.length())); EmbeddedVector<char, 100> prop1_setter_record; - i::OS::SNPrintF(prop1_setter_record, - "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"set prop1\"", - Prop1Setter); + i::SNPrintF(prop1_setter_record, + "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"set prop1\"", + reinterpret_cast<intptr_t>(Prop1Setter)); CHECK_NE(NULL, StrNStr(log.start(), prop1_setter_record.start(), log.length())); EmbeddedVector<char, 100> prop2_getter_record; - i::OS::SNPrintF(prop2_getter_record, - "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"get prop2\"", - Prop2Getter); + i::SNPrintF(prop2_getter_record, + "code-creation,Callback,-2,0x%" V8PRIxPTR ",1,\"get prop2\"", + reinterpret_cast<intptr_t>(Prop2Getter)); CHECK_NE(NULL, StrNStr(log.start(), prop2_getter_record.start(), log.length())); log.Dispose(); |