From f9cb7c282cf1a6c3867ce04b9e288ad7ce2c11a4 Mon Sep 17 00:00:00 2001
From: Lei Zhang <antiagainst@google.com>
Date: Fri, 23 Sep 2016 15:13:24 -0400
Subject: Avoid appending EOL in StringifyMessage().

EOL should be appended when outputing to streams by the tool.
---
 source/message.cpp          |  1 -
 test/opt/test_ir_loader.cpp | 16 ++++++++--------
 tools/opt/opt.cpp           |  8 +++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/source/message.cpp b/source/message.cpp
index 329608cd..874c0fb6 100644
--- a/source/message.cpp
+++ b/source/message.cpp
@@ -48,7 +48,6 @@ std::string StringifyMessage(spv_message_level_t level, const char* source,
   oss << position.line << ":" << position.column << ":";
   oss << position.index << ": ";
   if (message) oss << message;
-  oss << "\n";
   return oss.str();
 }
 
diff --git a/test/opt/test_ir_loader.cpp b/test/opt/test_ir_loader.cpp
index 0152297a..854115a3 100644
--- a/test/opt/test_ir_loader.cpp
+++ b/test/opt/test_ir_loader.cpp
@@ -316,13 +316,13 @@ void DoErrorMessageCheck(const std::string& assembly,
 
 TEST(IrBuilder, FunctionInsideFunction) {
   DoErrorMessageCheck("%2 = OpFunction %1 None %3\n%5 = OpFunction %4 None %6",
-                      "error: <instruction>:2:0:0: function inside function\n");
+                      "error: <instruction>:2:0:0: function inside function");
 }
 
 TEST(IrBuilder, MismatchOpFunctionEnd) {
   DoErrorMessageCheck("OpFunctionEnd",
                       "error: <instruction>:1:0:0: OpFunctionEnd without "
-                      "corresponding OpFunction\n");
+                      "corresponding OpFunction");
 }
 
 TEST(IrBuilder, OpFunctionEndInsideBasicBlock) {
@@ -330,12 +330,12 @@ TEST(IrBuilder, OpFunctionEndInsideBasicBlock) {
       "%2 = OpFunction %1 None %3\n"
       "%4 = OpLabel\n"
       "OpFunctionEnd",
-      "error: <instruction>:3:0:0: OpFunctionEnd inside basic block\n");
+      "error: <instruction>:3:0:0: OpFunctionEnd inside basic block");
 }
 
 TEST(IrBuilder, BasicBlockOutsideFunction) {
   DoErrorMessageCheck("OpCapability Shader\n%1 = OpLabel",
-                      "error: <instruction>:2:0:0: OpLabel outside function\n");
+                      "error: <instruction>:2:0:0: OpLabel outside function");
 }
 
 TEST(IrBuilder, OpLabelInsideBasicBlock) {
@@ -343,26 +343,26 @@ TEST(IrBuilder, OpLabelInsideBasicBlock) {
       "%2 = OpFunction %1 None %3\n"
       "%4 = OpLabel\n"
       "%5 = OpLabel",
-      "error: <instruction>:3:0:0: OpLabel inside basic block\n");
+      "error: <instruction>:3:0:0: OpLabel inside basic block");
 }
 
 TEST(IrBuilder, TerminatorOutsideFunction) {
   DoErrorMessageCheck(
       "OpReturn",
-      "error: <instruction>:1:0:0: terminator instruction outside function\n");
+      "error: <instruction>:1:0:0: terminator instruction outside function");
 }
 
 TEST(IrBuilder, TerminatorOutsideBasicBlock) {
   DoErrorMessageCheck("%2 = OpFunction %1 None %3\nOpReturn",
                       "error: <instruction>:2:0:0: terminator instruction "
-                      "outside basic block\n");
+                      "outside basic block");
 }
 
 TEST(IrBuilder, NotAllowedInstAppearingInFunction) {
   DoErrorMessageCheck("%2 = OpFunction %1 None %3\n%5 = OpVariable %4 Function",
                       "error: <instruction>:2:0:0: Non-OpFunctionParameter "
                       "(opcode: 59) found inside function but outside basic "
-                      "block\n");
+                      "block");
 }
 
 }  // anonymous namespace
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index b317f8e3..17328184 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -77,7 +77,8 @@ int main(int argc, char** argv) {
   pass_manager.SetMessageConsumer(
       [](spv_message_level_t level, const char* source,
          const spv_position_t& position, const char* message) {
-        std::cerr << StringifyMessage(level, source, position, message);
+        std::cerr << StringifyMessage(level, source, position, message)
+                  << std::endl;
       });
 
   for (int argi = 1; argi < argc; ++argi) {
@@ -113,8 +114,9 @@ int main(int argc, char** argv) {
           pass_manager.AddPass<opt::SetSpecConstantDefaultValuePass>(
               std::move(*spec_ids_vals));
         } else {
-          fprintf(stderr,
-                  "error: Expected a string of <spec id>:<default value> pairs.");
+          fprintf(
+              stderr,
+              "error: Expected a string of <spec id>:<default value> pairs.");
           return 1;
         }
       } else if (0 == strcmp(cur_arg, "--freeze-spec-const")) {
-- 
cgit v1.2.3