Add machine info detection

[ci skip]
Signed-off-by: lanxia <[email protected]>

Author: llxia

test/TestConfig/src/build_envInfo.xml

@@ -46,26 +46,27 @@
 		<jar jarfile="./EnvDetector.jar" filesonly="true">
 			<fileset dir="${build}"/>
 			<manifest>
-				<attribute name="Main-Class" value="org.openj9.java.EnvDetector"/>
+				<attribute name="Main-Class" value="org.openj9.envInfo.EnvDetector"/>
 			</manifest>
 		</jar>
 	</target>
 
 	<target name="run" depends="dist">
 		<property name="javaexecutable.java" value="${JAVA_BIN}/java" />
-		<java jar="./EnvDetector.jar" fork="true" failonerror="true" jvm="${javaexecutable.java}"/>
+		<java jar="./EnvDetector.jar" fork="true" failonerror="true" jvm="${javaexecutable.java}">
+			<arg value="JavaInfo"/>
+		</java>
 	</target>
 
 	<target name="clean" description="clean up">
+		<delete file="../autoGenEnv.mk" />
 		<delete dir="${build}" />
-		<delete file="EnvDetector.jar" />		
+		<delete file="EnvDetector.jar" />
 	</target>
 
 	<target name="build">
-		<delete file="../autoGenEnv.mk" />
 		<antcall target="clean" inheritall="true" />
 		<antcall target="run" inheritall="true" />
-		<antcall target="clean" inheritall="true" />
 	</target>
 
 </project>

test/TestConfig/src/org/openj9/envInfo/EnvDetector.java

@@ -20,43 +20,77 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
-package org.openj9.java;
+package org.openj9.envInfo;
 
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-
+import java.io.BufferedWriter;
 
 public class EnvDetector {
-    /** 
-     * This method create autoGenEnv.mk file for auto detecting environment.
-     */
-     public static void main(String[] args) {
-        
-        JavaInfo envDetection = new JavaInfo();
-        String SPECInfo = envDetection.getSPEC(); 
-        int javaVersionInfo = envDetection.getJDKVersion(); 
-        String javaImplInfo = envDetection.getJDKImpl();
-        if (SPECInfo == null || javaVersionInfo == -1 || javaImplInfo == null) {
-            System.exit(1);
-        }
-        String SPECvalue = "DETECTED_SPEC=" + SPECInfo + "\n";
-        String JDKVERSIONvalue = "DETECTED_JDK_VERSION="+ javaVersionInfo + "\n";
-        String JDKIMPLvalue = "DETECTED_JDK_IMPL=" + javaImplInfo + "\n";
-
-        BufferedWriter output = null;
-        try { 
-            output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("../autoGenEnv.mk")));
-            output.write("########################################################\n");
-            output.write("# This is an auto generated file. Please do NOT modify!\n");
-            output.write("########################################################\n");
-            output.write(SPECvalue);
-            output.write(JDKVERSIONvalue);
-            output.write(JDKIMPLvalue);
-            output.close(); 
-        } catch ( IOException e ) {
-            e.printStackTrace(); 
-        }
-    }
+	static boolean isMachineInfo = false;
+	static boolean isJavaInfo = false;
+
+	public static void main(String[] args) {
+		parseArgs(args);
+	}
+
+	private static void parseArgs(String[] args) {
+		for (int i = 0; i < args.length; i++) {
+			String option = args[i].toLowerCase();
+			if (option.equals("machineinfo")) {
+				getMachineInfo();
+			} else if (option.equals("javainfo")) {
+				getJavaInfo();
+			}
+		}
+	}
+
+	/*
+	 * getJavaInfo() is used for AUTO_DETECT
+	 */
+	private static void getJavaInfo() {
+		JavaInfo envDetection = new JavaInfo();
+		String SPECInfo = envDetection.getSPEC();
+		int javaVersionInfo = envDetection.getJDKVersion();
+		String javaImplInfo = envDetection.getJDKImpl();
+		if (SPECInfo == null || javaVersionInfo == -1 || javaImplInfo == null) {
+			System.exit(1);
+		}
+		String SPECvalue = "DETECTED_SPEC=" + SPECInfo + "\n";
+		String JDKVERSIONvalue = "DETECTED_JDK_VERSION=" + javaVersionInfo + "\n";
+		String JDKIMPLvalue = "DETECTED_JDK_IMPL=" + javaImplInfo + "\n";
+
+		/**
+		 * autoGenEnv.mk file will be created to store auto detected java info.
+		 */
+		BufferedWriter output = null;
+		try {
+			output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("../autoGenEnv.mk")));
+			output.write("########################################################\n");
+			output.write("# This is an auto generated file. Please do NOT modify!\n");
+			output.write("########################################################\n");
+			output.write(SPECvalue);
+			output.write(JDKVERSIONvalue);
+			output.write(JDKIMPLvalue);
+			output.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	private static void getMachineInfo() {
+		MachineInfo machineInfo = new MachineInfo();
+
+		machineInfo.getMachineInfo(MachineInfo.UNAME_CMD);
+		machineInfo.getMachineInfo(MachineInfo.SYS_ARCH_CMD);
+		machineInfo.getMachineInfo(MachineInfo.PROC_ARCH_CMD);
+		machineInfo.getMachineInfo(MachineInfo.SYS_OS_CMD);
+		machineInfo.getMachineInfo(MachineInfo.CPU_CORES_CMD);
+
+		machineInfo.getRuntimeInfo();
+		machineInfo.getSpaceInfo("");
+		System.out.println(machineInfo);
+	}
 }

test/TestConfig/src/org/openj9/envInfo/JavaInfo.java

@@ -20,7 +20,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
-package org.openj9.java;
+package org.openj9.envInfo;
 
 import java.io.*;
 import java.io.IOException;