From 422d41dd537743267aed7630a8dc2e9572126f2c Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Fri, 11 Dec 2020 13:38:34 -0500
Subject: [PATCH] Fixed test failing due to Front End status panel change to
 turn newline characters to spaces

---
 .../java/ghidra/app/merge/datatypes/DataTypeMerge8Test.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge8Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge8Test.java
index 0747b8e996..45c208f5d3 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge8Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge8Test.java
@@ -163,7 +163,7 @@ public class DataTypeMerge8Test extends AbstractDataTypeMergeTest {
 		String statusText = label.getText();
 		String expectedText =
 			"Structure Merge: Not enough undefined bytes to fit /XYZ in structure " +
-				"/MISC/ABC at offset 0x4.\nIt needs 3 more byte(s) to be able to fit.";
-		assertTrue(statusText.contains(expectedText));
+				"/MISC/ABC at offset 0x4. It needs 3 more byte(s) to be able to fit.";
+		assertTrue("Wrong status text: " + statusText, statusText.contains(expectedText));
 	}
 }