diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-07 18:38:38 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-07 22:11:18 +0100 |
commit | dad73f645cde6920e79db956e7ef82ed640d7615 (patch) | |
tree | 7ba3f3fc7e0722c5f130065461b7c56f571af383 /deps/v8/test/cctest/test-log.cc | |
parent | 53ba494537259b18b346dc6150d6a100c557e08f (diff) | |
download | node-new-dad73f645cde6920e79db956e7ef82ed640d7615.tar.gz |
deps: upgrade v8 to 3.31.74.1
PR-URL: https://github.com/iojs/io.js/pull/243
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/v8/test/cctest/test-log.cc')
-rw-r--r-- | deps/v8/test/cctest/test-log.cc | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/deps/v8/test/cctest/test-log.cc b/deps/v8/test/cctest/test-log.cc index 482f89f9c4..eee3e1341a 100644 --- a/deps/v8/test/cctest/test-log.cc +++ b/deps/v8/test/cctest/test-log.cc @@ -42,6 +42,7 @@ #include "src/natives.h" #include "src/utils.h" #include "src/v8threads.h" +#include "src/version.h" #include "src/vm-state-inl.h" #include "test/cctest/cctest.h" @@ -477,10 +478,9 @@ TEST(EquivalenceOfLoggingAndTraversal) { 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(); + i::Vector<const char> source = TestSources::GetScriptsSource(); v8::Handle<v8::String> source_str = v8::String::NewFromUtf8( - isolate, reinterpret_cast<const char*>(source.start()), - v8::String::kNormalString, source.length()); + isolate, source.start(), v8::String::kNormalString, source.length()); v8::TryCatch try_catch; v8::Handle<v8::Script> script = CompileWithOrigin(source_str, ""); if (script.IsEmpty()) { @@ -496,7 +496,7 @@ TEST(EquivalenceOfLoggingAndTraversal) { } // The result either be a "true" literal or problem description. if (!result->IsTrue()) { - v8::Local<v8::String> s = result->ToString(); + v8::Local<v8::String> s = result->ToString(isolate); i::ScopedVector<char> data(s->Utf8Length() + 1); CHECK_NE(NULL, data.start()); s->WriteUtf8(data.start()); @@ -508,3 +508,23 @@ TEST(EquivalenceOfLoggingAndTraversal) { } isolate->Dispose(); } + + +TEST(LogVersion) { + v8::Isolate* isolate; + { + ScopedLoggerInitializer initialize_logger; + isolate = initialize_logger.isolate(); + bool exists = false; + i::Vector<const char> log( + i::ReadFile(initialize_logger.StopLoggingGetTempFile(), &exists, true)); + CHECK(exists); + i::EmbeddedVector<char, 100> ref_data; + i::SNPrintF(ref_data, "v8-version,%d,%d,%d,%d,%d", i::Version::GetMajor(), + i::Version::GetMinor(), i::Version::GetBuild(), + i::Version::GetPatch(), i::Version::IsCandidate()); + CHECK_NE(NULL, StrNStr(log.start(), ref_data.start(), log.length())); + log.Dispose(); + } + isolate->Dispose(); +} |