Revert "#22876 2nd attempt to print jps output"
This reverts commit 2600a8469d930e60d182edc7fc712d96b7bb0c67.
diff --git a/appserver/tests/appserv-tests/config/run.xml b/appserver/tests/appserv-tests/config/run.xml
index d146829..d8af9e1 100644
--- a/appserver/tests/appserv-tests/config/run.xml
+++ b/appserver/tests/appserv-tests/config/run.xml
@@ -109,8 +109,7 @@
</then>
<else>
<loadfile srcfile="pid.out.file" property="jps.out"/>
- <echo>Attempt to dump AS threads stack, but no Appserver instance with PID found.</echo>
- <echo message="${jps.out}"/>
+ <echo>Attempt to dump AS threads stack, but no Appserver instance with PID found in - "${jps.out}" </echo>
</else>
</if>
diff --git a/appserver/tests/appserv-tests/devtests/batch/run_test.sh b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
index 3d8a345..825f417 100755
--- a/appserver/tests/appserv-tests/devtests/batch/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
@@ -36,7 +36,7 @@
echo "ANT_OPTS=${ANT_OPTS}"
ant ${TARGET} | tee ${TEST_RUN_LOG}
${S1AS_HOME}/bin/asadmin stop-database
- ${S1AS_HOME}/bin/asadmin stop-domain || true
+ ${S1AS_HOME}/bin/asadmin stop-domain
}
run_test_id(){
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
index 206b0e9..c7a3fa0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
@@ -24,8 +24,8 @@
${S1AS_HOME}/bin/asadmin start-database
cd ${APS_HOME}/devtests/jdbc
ant ${TARGET} | tee ${TEST_RUN_LOG}
- ${S1AS_HOME}/bin/asadmin stop-domain domain1 || true
- ${S1AS_HOME}/bin/asadmin stop-database
+ ${S1AS_HOME}/bin/asadmin stop-domain domain1
+ ${S1AS_HOME}/bin/asadmin stop-database
}
run_test_id(){
diff --git a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
index c3787c2..e5c82f9 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
@@ -25,7 +25,7 @@
cd ${APS_HOME}/devtests/persistence/tests/packaging
ant ${TARGET} | tee ${TEST_RUN_LOG}
${S1AS_HOME}/bin/asadmin stop-database
- ${S1AS_HOME}/bin/asadmin stop-domain || true
+ ${S1AS_HOME}/bin/asadmin stop-domain
}
run_test_id(){
