[java-idp-integration-tests] branch main updated: Improve creating start.sh

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=98a6969df104e66b977ed0a8d83a1a97cc07fd93

The following commit(s) were added to refs/heads/main by this push:
     new 98a6969  Improve creating start.sh
98a6969 is described below

commit 98a6969df104e66b977ed0a8d83a1a97cc07fd93
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Mar 14 18:45:39 2023 -0500

    Improve creating start.sh
---
 .../idp/integration/tests/AbstractServerProcess.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java b/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
index 5069d36..fe83d74 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.integration.tests;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.ProcessBuilder.Redirect;
 import java.net.ConnectException;
@@ -286,12 +287,11 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
     public void start() {
         try {
             processBuilder.command(buildCommands());
-            log.debug("Will start server using command '{}'", processBuilder.command());
-            log.debug("Writing command to start server to '{}'", pathToContainerBase.resolve("start.sh"));
-            Files.write(pathToContainerBase.resolve("start.sh"), String.join(" ", processBuilder.command()).getBytes());
 
-            // Write command to start server to file to help debugging tests
-            log.debug("Writing command to start server to '{}'", pathToContainerBase.resolve("start.sh"));
+            // Write command used to start server to a file for troubleshooting
+            final File fileToStartServer = pathToContainerBase.resolve("start.sh").toFile();
+            log.debug("Writing command to start server to '{}'", fileToStartServer);
+            // Include environment in command to start server
             String commandToStartServer = "";
             for (final String envVar : new String[] {
                     "JETTY_BASE",
@@ -299,11 +299,13 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
                     "CATALINA_HOME",
                     "CATALINA_BASE" }) {
                 if (processBuilder.environment().containsKey(envVar)) {
-                    commandToStartServer += envVar + "=" + processBuilder.environment().get(envVar) + " ";
+                    commandToStartServer += envVar + "=" + processBuilder.environment().get(envVar) + " \\\n";
                 }
             }
-            commandToStartServer += String.join(" ", processBuilder.command());
-            Files.write(pathToContainerBase.resolve("start.sh"), commandToStartServer.getBytes());
+            commandToStartServer += String.join(" \\\n", processBuilder.command());
+            log.debug("Will start server using command :\n{}", commandToStartServer);
+            Files.write(fileToStartServer.toPath(), commandToStartServer.getBytes());
+            fileToStartServer.setExecutable(true);
 
             final Stopwatch stopwatch = Stopwatch.createStarted();
             // Workaround Maven Surefire Plugin freeze if Jetty 10 writes to stdout or stderr

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.