Remove maketest.sh

Signed-off-by: Mesbah_Alam@ca.ibm.com <Mesbah_Alam@ca.ibm.com>

buildenv/jenkins/JenkinsfileBase

@@ -13,9 +13,11 @@ def getBuildList() {
 
 def makeTest(testParam) {
 	String tearDownCmd = "if [ `uname` = AIX ] || [ `uname` = SunOS ]; then MAKE=gmake; else MAKE=make; fi; \$MAKE -f ./openjdk-tests/TKG/testEnv.mk testEnvTeardown"
+	String makeTestCmd = "if [ `uname` = AIX ] || [ `uname` = SunOS ] || [ `uname` = *BSD ]; then MAKE=gmake; else MAKE=make; fi; cd ./openjdk-tests/TKG; \$MAKE $testParam"
+
 	try {
 		sh "$tearDownCmd"
-		sh "./openjdk-tests/maketest.sh $testParam"
+		sh "$makeTestCmd"
 	} finally {
 		sh "$tearDownCmd"
 	}
@@ -474,13 +476,14 @@ def get_sources() {
 }
 
 def make_test() {
+	String makeTestCmd = "if [ `uname` = AIX ] || [ `uname` = SunOS ] || [ `uname` = *BSD ]; then MAKE=gmake; else MAKE=make; fi; cd ./openjdk-tests/TKG; \$MAKE compile"
 	// use sshagent with Jenkins credentials ID for all platforms except zOS
 	if (!env.SPEC.startsWith('zos')) {
 		sshagent (credentials: ["$params.SSH_AGENT_CREDENTIAL"], ignoreMissing: true) {
-			sh "./openjdk-tests/maketest.sh ./openjdk-tests";
+			sh "$makeTestCmd";
 		}
 	} else {
-		sh "./openjdk-tests/maketest.sh ./openjdk-tests";
+		sh "$makeTestCmd";
 	}
 }
 
@@ -570,7 +573,7 @@ def runTest( ) {
 					sh "iconv -f iso8859-1 -t ibm-1047 ${parallelList} > ${parallelList}.ebcdic; rm ${parallelList}; mv ${parallelList}.ebcdic ${parallelList}"
 				}
 			}
-			RUNTEST_CMD = "./openjdk-tests ${TARGET} ${CUSTOM_OPTION}"
+			RUNTEST_CMD = "${TARGET} ${CUSTOM_OPTION}"
 			for (int i = 1; i <= ITERATIONS; i++) {
 				echo "ITERATION: ${i}/${ITERATIONS}"
 				if (env.SPEC.startsWith('aix')) {

doc/userGuide.md

@@ -266,8 +266,9 @@ $ export BUILD_ROOT=$TOP_DIR/test-results
 $ export JRE_IMAGE=$OPENJDK_BUILD/../j2re-image
 $ export TEST_JDK_HOME=$OPENJDK_BUILD
 $ ./get.sh -t $TEST_DIR
-$ ./maketest.sh $TEST_DIR
-$ OPENJDK_DIR=$OPENJDK_SOURCES ./maketest.sh $TEST_DIR _sanity.openjdk
+$ cd ./TKG
+$ make compile
+$ make _sanity.openjdk
 $ popd
 $ echo "openjdk-tests located at $tmpdir/openjdk-tests"