Merge branch '1.5.x'

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java

@@ -215,8 +215,10 @@ public void addLogFileProperty() {
 		this.initializer.initialize(this.context.getEnvironment(),
 				this.context.getClassLoader());
 		Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
+		String existingOutput = this.outputCapture.toString();
 		logger.info("Hello world");
-		String output = this.outputCapture.toString().trim();
+		String output = this.outputCapture.toString().substring(existingOutput.length())
+				.trim();
 		assertThat(output).startsWith("target/foo.log");
 	}
 
@@ -240,8 +242,10 @@ public void addLogPathProperty() {
 		this.initializer.initialize(this.context.getEnvironment(),
 				this.context.getClassLoader());
 		Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
+		String existingOutput = this.outputCapture.toString();
 		logger.info("Hello world");
-		String output = this.outputCapture.toString().trim();
+		String output = this.outputCapture.toString().substring(existingOutput.length())
+				.trim();
 		assertThat(output).startsWith("target/foo/spring.log");
 	}