summaryrefslogtreecommitdiff
path: root/deps/v8/test/cctest/test-log.cc
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2014-03-13 20:45:44 +0400
committerFedor Indutny <fedor.indutny@gmail.com>2014-03-13 20:56:54 +0400
commit1c7bf245dc2d520c005e01bcb56ecb3275971395 (patch)
tree34d8160c98bd8dd33757252d87a0f6586fea8213 /deps/v8/test/cctest/test-log.cc
parent93c3674ff7115fb2a3dbb5b4ffd22f4d5ed9a472 (diff)
downloadnode-new-1c7bf245dc2d520c005e01bcb56ecb3275971395.tar.gz
deps: update v8 to 3.24.40
Diffstat (limited to 'deps/v8/test/cctest/test-log.cc')
-rw-r--r--deps/v8/test/cctest/test-log.cc34
1 files changed, 22 insertions, 12 deletions
diff --git a/deps/v8/test/cctest/test-log.cc b/deps/v8/test/cctest/test-log.cc
index 2cf2a77445..65310369cb 100644
--- a/deps/v8/test/cctest/test-log.cc
+++ b/deps/v8/test/cctest/test-log.cc
@@ -203,7 +203,7 @@ class LoopingNonJsThread : public LoopingThread {
double i = 10;
SignalRunning();
while (IsRunning()) {
- i = sin(i);
+ i = std::sin(i);
i::OS::Sleep(1);
}
}
@@ -305,9 +305,11 @@ TEST(Issue23768) {
env->Enter();
SimpleExternalString source_ext_str("(function ext() {})();");
- v8::Local<v8::String> source = v8::String::NewExternal(&source_ext_str);
+ v8::Local<v8::String> source =
+ v8::String::NewExternal(CcTest::isolate(), &source_ext_str);
// Script needs to have a name in order to trigger InitLineEnds execution.
- v8::Handle<v8::String> origin = v8::String::New("issue-23768-test");
+ v8::Handle<v8::String> origin =
+ v8::String::NewFromUtf8(CcTest::isolate(), "issue-23768-test");
v8::Handle<v8::Script> evil_script = v8::Script::Compile(source, origin);
CHECK(!evil_script.IsEmpty());
CHECK(!evil_script->Run().IsEmpty());
@@ -327,17 +329,20 @@ static void ObjMethod1(const v8::FunctionCallbackInfo<v8::Value>& args) {
TEST(LogCallbacks) {
+ v8::Isolate* isolate = CcTest::isolate();
ScopedLoggerInitializer initialize_logger;
Logger* logger = initialize_logger.logger();
v8::Local<v8::FunctionTemplate> obj =
- v8::Local<v8::FunctionTemplate>::New(CcTest::isolate(),
- v8::FunctionTemplate::New());
+ v8::Local<v8::FunctionTemplate>::New(isolate,
+ v8::FunctionTemplate::New(isolate));
obj->SetClassName(v8_str("Obj"));
v8::Handle<v8::ObjectTemplate> proto = obj->PrototypeTemplate();
- v8::Local<v8::Signature> signature = v8::Signature::New(obj);
+ v8::Local<v8::Signature> signature =
+ v8::Signature::New(isolate, obj);
proto->Set(v8_str("method1"),
- v8::FunctionTemplate::New(ObjMethod1,
+ v8::FunctionTemplate::New(isolate,
+ ObjMethod1,
v8::Handle<v8::Value>(),
signature),
static_cast<v8::PropertyAttribute>(v8::DontDelete));
@@ -358,6 +363,7 @@ TEST(LogCallbacks) {
ObjMethod1);
CHECK_NE(NULL, StrNStr(log.start(), ref_data.start(), log.length()));
+ log.Dispose();
}
@@ -376,12 +382,13 @@ static void Prop2Getter(v8::Local<v8::String> property,
TEST(LogAccessorCallbacks) {
+ v8::Isolate* isolate = CcTest::isolate();
ScopedLoggerInitializer initialize_logger;
Logger* logger = initialize_logger.logger();
v8::Local<v8::FunctionTemplate> obj =
- v8::Local<v8::FunctionTemplate>::New(CcTest::isolate(),
- v8::FunctionTemplate::New());
+ v8::Local<v8::FunctionTemplate>::New(isolate,
+ v8::FunctionTemplate::New(isolate));
obj->SetClassName(v8_str("Obj"));
v8::Handle<v8::ObjectTemplate> inst = obj->InstanceTemplate();
inst->SetAccessor(v8_str("prop1"), Prop1Getter, Prop1Setter);
@@ -414,6 +421,7 @@ TEST(LogAccessorCallbacks) {
Prop2Getter);
CHECK_NE(NULL,
StrNStr(log.start(), prop2_getter_record.start(), log.length()));
+ log.Dispose();
}
@@ -451,12 +459,14 @@ TEST(EquivalenceOfLoggingAndTraversal) {
i::Vector<const char> log(
i::ReadFile(initialize_logger.StopLoggingGetTempFile(), &exists, true));
CHECK(exists);
- v8::Handle<v8::String> log_str = v8::String::New(log.start(), log.length());
+ v8::Handle<v8::String> log_str = v8::String::NewFromUtf8(
+ CcTest::isolate(), log.start(), v8::String::kNormalString, log.length());
initialize_logger.env()->Global()->Set(v8_str("_log"), log_str);
i::Vector<const unsigned char> source = TestSources::GetScriptsSource();
- v8::Handle<v8::String> source_str = v8::String::New(
- reinterpret_cast<const char*>(source.start()), source.length());
+ v8::Handle<v8::String> source_str = v8::String::NewFromUtf8(
+ CcTest::isolate(), reinterpret_cast<const char*>(source.start()),
+ v8::String::kNormalString, source.length());
v8::TryCatch try_catch;
v8::Handle<v8::Script> script = v8::Script::Compile(source_str, v8_str(""));
if (script.IsEmpty()) {