From 157bf519affae05c3c1650ddf5389fb5296137b6 Mon Sep 17 00:00:00 2001
From: Peter Shipton <Peter_Shipton@ca.ibm.com>
Date: Tue, 17 Oct 2023 10:34:53 -0400
Subject: [PATCH] Update VMArgumentTests to provide more info on failure

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
---
 .../test/vmArguments/VmArgumentTests.java     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java
index 578818586d3..497d4a0d814 100644
--- a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java
+++ b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java
@@ -1611,7 +1611,7 @@ private ArrayList<String> runAndGetArgumentList(ProcessBuilder pb) {
 	private ProcessRunner runProcess(ProcessBuilder pb) {
 		List<String> cmd = pb.command();
 
-		dumpStrings(cmd);
+		logStrings(cmd);
 		ProcessRunner pr;
 		try {
 			pr = ProcessRunner.runAndGetOutputs(pb);
@@ -1625,12 +1625,11 @@ private ProcessRunner runProcess(ProcessBuilder pb) {
 			return null;
 		}
 		if (0 != pr.getExitStatus()) {
-			logger.debug("---------------------------------\nstdout");
+			System.out.println("---------------------------------\nstdout");
 			dumpStrings(pr.getStdout());
-			ArrayList<String> errLines = stderrReader.getOutputLines();
-			logger.debug("---------------------------------\nstderr");
+			System.out.println("---------------------------------\nstderr");
 			dumpStrings(pr.getStderr());
-			fail("Target process failed");
+			fail("Target process failed, " + pr.getExitStatus());
 
 		}
 		return pr;
@@ -1640,12 +1639,18 @@ private boolean isNotTag(String l) {
 		return !l.startsWith(USERARG_TAG);
 	}
 
-	private void dumpStrings(List<String> cmd) {
+	private static void logStrings(List<String> cmd) {
 		for (String s: cmd) {
 			logger.debug(s);
 		}
 	}
 
+	private static void dumpStrings(List<String> cmd) {
+		for (String s: cmd) {
+			System.out.println(s);
+		}
+	}
+
 	private void dumpStdoutStderr(PrintStream er) {
 		er.println("\n------------------------------------------------------\nstdout:");
 		er.print(stdoutReader.getStreamOutput());
@@ -1657,7 +1662,7 @@ private int runAndGetExitStatus(ProcessBuilder pb) {
 		try {
 			List<String> cmd = pb.command();
 
-			dumpStrings(cmd);
+			logStrings(cmd);
 			Process p = pb.start();
 			int rc = p.waitFor();
 			return rc;