diff --git a/src/d8/d8.cc b/src/d8/d8.cc index ccc6dd07d4..a7c400d642 100644 --- a/src/d8/d8.cc +++ b/src/d8/d8.cc @@ -1511,8 +1511,8 @@ void Shell::LogGetAndStop(const v8::FunctionCallbackInfo& args) { HandleScope handle_scope(isolate); std::string file_name = i_isolate->logger()->file_name(); - if (!i::Log::IsLoggingToTemporaryFile(file_name)) { - Throw(isolate, "Only capturing from temporary files is supported."); + if (i::Log::IsLoggingToConsole(file_name)) { + Throw(isolate, "Logging to console instead of file."); return; } if (!i_isolate->logger()->is_logging()) { diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h index d7fbd96fb9..c691765031 100644 --- a/src/flags/flag-definitions.h +++ b/src/flags/flag-definitions.h @@ -1660,9 +1660,7 @@ DEFINE_BOOL(trace_wasm_gdb_remote, false, "trace Webassembly GDB-remote server") #define FLAG FLAG_FULL // log.cc -DEFINE_STRING(logfile, "v8.log", - "Specify the name of the log file, use '-' for console, '+' for " - "a temporary file.") +DEFINE_STRING(logfile, "v8.log", "Specify the name of the log file.") DEFINE_BOOL(logfile_per_isolate, true, "Separate log files for each isolate.") DEFINE_BOOL(log, false, diff --git a/src/logging/log-utils.cc b/src/logging/log-utils.cc index 6b830ca31d..95a551c05e 100644 --- a/src/logging/log-utils.cc +++ b/src/logging/log-utils.cc @@ -19,7 +19,7 @@ namespace v8 { namespace internal { -const char* const Log::kLogToTemporaryFile = "+"; +const char* const Log::kLogToTemporaryFile = "&"; const char* const Log::kLogToConsole = "-"; // static diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 27040f01ac..cb9d5c15d4 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -182,6 +182,10 @@ # Needs to be adapted after changes to Function constructor. chromium:1065094 'cross-realm-filtering': [SKIP], + + # https://crbug.com/v8/10937 + # https://crbug.com/1129854 + 'tools/log': [SKIP], }], # ALWAYS ############################################################################## diff --git a/test/mjsunit/tools/log.js b/test/mjsunit/tools/log.js index 76a159f6d0..bea27e7e85 100644 --- a/test/mjsunit/tools/log.js +++ b/test/mjsunit/tools/log.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --logfile='+' --log-all --log --no-stress-opt +// Flags: --log-all --log --no-stress-opt function testFunctionWithFunnyName(o) { return o.a;