Skip to content

Commit

Permalink
Use JavaTestUtil for all tck
Browse files Browse the repository at this point in the history
Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
  • Loading branch information
Mesbah-Alam committed Apr 26, 2023
1 parent 4c168e5 commit 74e80fb
Show file tree
Hide file tree
Showing 14 changed files with 799 additions and 388 deletions.
84 changes: 75 additions & 9 deletions jck/agent-drive.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,80 @@
#!/bin/bash

echo "Starting JCK agent.."
eval $1
if [ $# -eq 2 ]; then
echo "Starting JCK agent.."
eval $1
pid=$!
echo "Agent started with PID $pid"

echo "Starting JCK harness.."
eval $2

pid=$!
echo "Test complete. Stopping JCK Agent.."
kill -9 $pid
elif [ $# -eq 4 ]; then
echo "Starting RMI Registry.."
eval $1
pid1=$!
echo "RMI Registry started with PID $pid1"

echo "Agent started with PID $pid"
echo "Starting RMID.."
eval $2
pid2=$!
echo "RMID started with PID $pid2"

echo "Starting JCK agent.."
eval $3
pid3=$!
echo "Agent started with PID $pid3"

echo "Starting JCK harness.."
eval $4

echo "Test complete."

echo "Stopping RMI Registry.."
kill -9 $pid1

echo "Stopping RMID.."
kill -9 $pid2

echo "Stopping JCK Agent.."
kill -9 $pid3
elif [ $# -eq 5 ]; then
echo "Starting RMI Registry.."
eval $1
pid1=$!
echo "RMI Registry started with PID $pid1"

echo "Starting JCK harness.."
eval $2

echo "Test complete. Stopping JCK Agent.."
kill -9 $pid
echo "Starting RMID.."
eval $2
pid2=$!
echo "RMID started with PID $pid2"

echo "Starting TNAMESERV.."
eval $3
pid3=$!
echo "TNAMESERV started with PID $pid3"

echo "Starting JCK agent.."
eval $4
pid4=$!
echo "Agent started with PID $pid4"

echo "Starting JCK harness.."
eval $5

echo "Test complete."

echo "Stopping RMI Registry.."
kill -9 $pid1

echo "Stopping RMID.."
kill -9 $pid2

echo "Stopping TNAMESERV.."
kill -9 $pid3

echo "Stopping JCK Agent.."
kill -9 $pid4
fi
20 changes: 15 additions & 5 deletions jck/compiler.api/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=api/java_rmi testsuite=COMPILER; \
<command>$(GEN_JTB_GENERIC) tests=api/java_rmi testsuite=COMPILER; \
$(EXEC_COMPILER_TEST); \
$(GEN_SUMMARY_GENERIC) tests=api/java_rmi testsuite=COMPILER; \
$(TEST_STATUS)</command>
<levels>
<level>extended</level>
Expand All @@ -47,7 +49,9 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=api/javax_annotation testsuite=COMPILER; \
<command>$(GEN_JTB_GENERIC) tests=api/javax_annotation testsuite=COMPILER; \
$(EXEC_COMPILER_TEST); \
$(GEN_SUMMARY_GENERIC) tests=api/javax_annotation testsuite=COMPILER; \
$(TEST_STATUS)</command>
<levels>
<level>extended</level>
Expand All @@ -61,7 +65,9 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=api/javax_lang testsuite=COMPILER; \
<command>$(GEN_JTB_GENERIC) tests=api/javax_lang testsuite=COMPILER; \
$(EXEC_COMPILER_TEST); \
$(GEN_SUMMARY_GENERIC) tests=api/javax_lang testsuite=COMPILER; \
$(TEST_STATUS)</command>
<levels>
<level>extended</level>
Expand All @@ -83,7 +89,9 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=api/javax_tools testsuite=COMPILER; \
<command>$(GEN_JTB_GENERIC) tests=api/javax_tools testsuite=COMPILER; \
$(EXEC_COMPILER_TEST); \
$(GEN_SUMMARY_GENERIC) tests=api/javax_tools testsuite=COMPILER; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand All @@ -105,7 +113,9 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JCK_CMD_TEMPLATE) tests=api/signaturetest testsuite=COMPILER; \
<command>$(GEN_JTB_GENERIC) tests=api/signaturetest testsuite=COMPILER; \
$(EXEC_COMPILER_TEST); \
$(GEN_SUMMARY_GENERIC) tests=api/signaturetest testsuite=COMPILER; \
$(TEST_STATUS)</command>
<levels>
<level>sanity</level>
Expand Down
Loading

0 comments on commit 74e80fb

Please sign in to comment.