Bug#30593242 : MTR CLUSTERJ TEST AND THE NDBJTIE UNIT

TESTS FAIL WHEN RUN IN JAVA 10 AND ABOVE

Note: This is a backport of Bug#29009862 to 7.5 and 7.6.

The options -d32 and -d64 can be passed to the JVM to specify the
architecture in which the application has to run. They were required in
Solaris as it used to contain both 32 and 64-bit J2SE implementation
within the same installation of Java. But as of Java 8, it no longer
supports 32 bit in Solaris. So these options have lost their purpose
and they are being removed from Java versions 10 and above. Due to
this, the above mentioned tests fail when they run in Java 10 or above.

This patch fixes that by removing these options from the testcases and
CMakeLists.

Change-Id: I99b2470001731bc419b8185d9a40ca58bfd208a7

Author: lkshminarayanan

mysql-test/suite/ndb/include/have_java.inc

@@ -30,9 +30,7 @@ if(!IS_WINDOWS)
   push(@arch_paths, ('/usr/local/jdk/bin', '/usr/local/java/bin', '/usr/local/java/jdk/bin'));
   push(@arch_paths, ('/usr/jdk-latest/bin', '/usr/bin'));
 
-  $java_args = "-d32";
   if ($bits == 64) {
-    $java_args = "-d64";
     push(@arch_paths, ('/usr/java-local/jdk-64/bin', '/usr/local/jdk-64/bin', '/usr/local/java/jdk-64/bin'));
   }
 }

storage/ndb/src/ndbjtie/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -28,13 +28,6 @@ IF(HAVE_JAVA)
   # the native path to the JVM
   FILE(TO_NATIVE_PATH "${Java_JAVA_EXECUTABLE}" Java_JAVA_EXECUTABLE_PATH)
 
-  # the JVM arch option when loading native libraries
-  IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    SET(Java_JAVA_ARCH_OPT "-d32")
-  ELSE()
-    SET(Java_JAVA_ARCH_OPT "-d64")
-  ENDIF()
-
 ENDIF(HAVE_JAVA)
 
 ADD_SUBDIRECTORY(jtie)

storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt

@@ -79,7 +79,7 @@ ENDIF()
 ADD_TEST(
   NAME test_jtie_myjapi
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${JTIE_MYJAPI_JAR}"
   "-Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${JAVA_SUBDIR}"
   "test.MyJapiTest"

storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt

@@ -43,7 +43,7 @@ ENDIF()
 ADD_TEST(
   NAME test_jtie_unload
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${JTIE_TEST_UNLOAD_JAR}${JAVA_SEPERATOR}${JTIE_MYJAPI_JAR}"
   "-Djava.library.path=${JTIE_MYJAPI_DIR}/${JAVA_SUBDIR}"
   "-Dcom.mysql.jtie.test.MyLoadUnloadTest.target_package_prefixes=test.,myjapi."

storage/ndb/src/ndbjtie/test/CMakeLists.txt

@@ -95,7 +95,7 @@ ENDIF()
 ADD_TEST(
   NAME test_ndbjtie_mutils
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}"
   "test.MySqlUtilsTest"
@@ -104,7 +104,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_constants
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}${JAVA_SEPERATOR}${BIN_DIR}"
   "-Dtest.NdbJTieConstantsTest.ndbjtie_jar_file=${NDBJTIE_JAR}"
@@ -114,7 +114,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_multilib
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}${JAVA_SEPERATOR}${MYJAPI_TEST_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}${JAVA_SEPERATOR}${MYJAPI_TEST_DIR}/${JAVA_SUBDIR}${JAVA_SEPERATOR}${BIN_DIR}"
   "test.NdbJTieMultiLibTest"
@@ -123,7 +123,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_smoke
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}"
   "test.NdbJTieSmokeTest"
@@ -134,7 +134,7 @@ SET(UNLOAD_TEST "com.mysql.jtie.test.MyLoadUnloadTest")
 ADD_TEST(
   NAME test_ndbjtie_unload_mutils
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}${JAVA_SEPERATOR}${UNLOAD_TEST_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}${JAVA_SEPERATOR}${BIN_DIR}"
   "-D${UNLOAD_TEST}.target_package_prefixes=test.,com.mysql.ndbjtie."
@@ -146,7 +146,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_unload_constants
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}${JAVA_SEPERATOR}${UNLOAD_TEST_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}${JAVA_SEPERATOR}${BIN_DIR}"
   "-D${UNLOAD_TEST}.target_package_prefixes=test.,com.mysql.ndbjtie."
@@ -159,7 +159,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_unload_multilib
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}${JAVA_SEPERATOR}${UNLOAD_TEST_JAR}${JAVA_SEPERATOR}${MYJAPI_TEST_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}${JAVA_SEPERATOR}${MYJAPI_TEST_DIR}/${JAVA_SUBDIR}${JAVA_SEPERATOR}${BIN_DIR}"
   "-D${UNLOAD_TEST}.target_package_prefixes=test.,myjapi.,com.mysql.ndbjtie."
@@ -171,7 +171,7 @@ ADD_TEST(
 ADD_TEST(
   NAME test_ndbjtie_unload_smoke
   COMMAND
-  ${Java_JAVA_EXECUTABLE_PATH} ${Java_JAVA_ARCH_OPT} "-ea" "-Xcheck:jni"
+  ${Java_JAVA_EXECUTABLE_PATH} "-ea" "-Xcheck:jni"
   "-classpath" "${TEST_JAR}${JAVA_SEPERATOR}${NDBJTIE_JAR}${JAVA_SEPERATOR}${UNLOAD_TEST_JAR}"
   "-Djava.library.path=${CMAKE_BINARY_DIR}/library_output_directory/${JAVA_SUBDIR}"
   "-D${UNLOAD_TEST}.target_package_prefixes=test.,com.mysql.ndbjtie."