1067 fi
1068 fi
1069 fi
1070
1071 AC_MSG_CHECKING([for jtreg test harness])
1072 if test "x$JT_HOME" != x; then
1073 AC_MSG_RESULT([$JT_HOME])
1074 else
1075 AC_MSG_RESULT([no, not found])
1076
1077 if test "x$with_jtreg" = xyes; then
1078 AC_MSG_ERROR([--with-jtreg was specified, but no jtreg found.])
1079 fi
1080 fi
1081 fi
1082
1083 UTIL_FIXUP_PATH(JT_HOME)
1084 AC_SUBST(JT_HOME)
1085 ])
1086
1087 # Setup the JIB dependency resolver
1088 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
1089 [
1090 AC_ARG_WITH(jib, [AS_HELP_STRING([--with-jib],
1091 [Jib dependency management tool @<:@not used@:>@])])
1092
1093 if test "x$with_jib" = xno || test "x$with_jib" = x; then
1094 # jib disabled
1095 AC_MSG_CHECKING([for jib])
1096 AC_MSG_RESULT(no)
1097 elif test "x$with_jib" = xyes; then
1098 AC_MSG_ERROR([Must supply a value to --with-jib])
1099 else
1100 JIB_HOME="${with_jib}"
1101 AC_MSG_CHECKING([for jib])
1102 AC_MSG_RESULT(${JIB_HOME})
1103 if test ! -d "${JIB_HOME}"; then
1104 AC_MSG_ERROR([--with-jib must be a directory])
1105 fi
1106 JIB_JAR=$(ls ${JIB_HOME}/lib/jib-*.jar)
|
1067 fi
1068 fi
1069 fi
1070
1071 AC_MSG_CHECKING([for jtreg test harness])
1072 if test "x$JT_HOME" != x; then
1073 AC_MSG_RESULT([$JT_HOME])
1074 else
1075 AC_MSG_RESULT([no, not found])
1076
1077 if test "x$with_jtreg" = xyes; then
1078 AC_MSG_ERROR([--with-jtreg was specified, but no jtreg found.])
1079 fi
1080 fi
1081 fi
1082
1083 UTIL_FIXUP_PATH(JT_HOME)
1084 AC_SUBST(JT_HOME)
1085 ])
1086
1087 # Setup the JTReg Regression Test Harness.
1088 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG_MW],
1089 [
1090 AC_ARG_WITH(jtregMW, [AS_HELP_STRING([--with-jtregMW],
1091 [Regression Test Harness @<:@probed@:>@])])
1092
1093 if test "x$with_jtregMW" = xno; then
1094 # jtreg disabled
1095 AC_MSG_CHECKING([for jtreg test harness])
1096 AC_MSG_RESULT([no, disabled])
1097 elif test "x$with_jtregMW" != xyes && test "x$with_jtregMW" != x; then
1098 # An explicit path is specified, use it.
1099 JT_HOME_MW="$with_jtregMW"
1100 UTIL_FIXUP_PATH([JT_HOME_MW])
1101 if test ! -d "$JT_HOME_MW"; then
1102 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW does not exist])
1103 fi
1104
1105 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1106 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW is not a valid jtreg home])
1107 fi
1108
1109 JTREGEXE_MW="$JT_HOME_MW/bin/jtreg"
1110 if test ! -x "$JTREGEXE_MW"; then
1111 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW does not contain valid jtreg executable])
1112 fi
1113
1114 AC_MSG_CHECKING([for jtreg test harness])
1115 AC_MSG_RESULT([$JT_HOME_MW])
1116 else
1117 # Try to locate jtreg
1118 if test "x$JT_HOME_MW" != x; then
1119 # JT_HOME_MW set in environment, use it
1120 if test ! -d "$JT_HOME_MW"; then
1121 AC_MSG_WARN([Ignoring JT_HOME_MW pointing to invalid directory: $JT_HOME_MW])
1122 JT_HOME_MW=
1123 else
1124 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1125 AC_MSG_WARN([Ignoring JT_HOME_MW which is not a valid jtreg home: $JT_HOME_MW])
1126 JT_HOME_MW=
1127 elif test ! -x "$JT_HOME_MW/bin/jtreg"; then
1128 AC_MSG_WARN([Ignoring JT_HOME_MW which does not contain valid jtreg executable: $JT_HOME_MW])
1129 JT_HOME_MW=
1130 else
1131 JTREGEXE_MW="$JT_HOME_MW/bin/jtreg"
1132 AC_MSG_NOTICE([Located jtreg using JT_HOME_MW from environment])
1133 fi
1134 fi
1135 fi
1136
1137 if test "x$JT_HOME_MW" = x; then
1138 # JT_HOME_MW is not set in environment, or was deemed invalid.
1139 # Try to find jtreg on path
1140 UTIL_LOOKUP_PROGS(JTREGEXE_MW, jtreg)
1141 if test "x$JTREGEXE_MW" != x; then
1142 # That's good, now try to derive JT_HOME_MW
1143 JT_HOME_MW=`(cd $($DIRNAME $JTREGEXE_MW)/.. && pwd)`
1144 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1145 AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
1146 JT_HOME_MW=
1147 JTREGEXE_MW=
1148 else
1149 AC_MSG_NOTICE([Located jtreg using jtreg executable in path])
1150 fi
1151 fi
1152 fi
1153
1154 AC_MSG_CHECKING([for jtreg test harness])
1155 if test "x$JT_HOME_MW" != x; then
1156 AC_MSG_RESULT([$JT_HOME_MW])
1157 else
1158 AC_MSG_RESULT([no, not found])
1159
1160 if test "x$with_jtregMW" = xyes; then
1161 AC_MSG_ERROR([--with-jtregMW was specified, but no jtreg found.])
1162 fi
1163 fi
1164 fi
1165
1166 UTIL_FIXUP_EXECUTABLE(JTREGEXE_MW)
1167 UTIL_FIXUP_PATH(JT_HOME_MW)
1168 AC_SUBST(JT_HOME_MW)
1169 AC_SUBST(JTREGEXE_MW)
1170 ])
1171
1172
1173
1174 # Setup the JIB dependency resolver
1175 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
1176 [
1177 AC_ARG_WITH(jib, [AS_HELP_STRING([--with-jib],
1178 [Jib dependency management tool @<:@not used@:>@])])
1179
1180 if test "x$with_jib" = xno || test "x$with_jib" = x; then
1181 # jib disabled
1182 AC_MSG_CHECKING([for jib])
1183 AC_MSG_RESULT(no)
1184 elif test "x$with_jib" = xyes; then
1185 AC_MSG_ERROR([Must supply a value to --with-jib])
1186 else
1187 JIB_HOME="${with_jib}"
1188 AC_MSG_CHECKING([for jib])
1189 AC_MSG_RESULT(${JIB_HOME})
1190 if test ! -d "${JIB_HOME}"; then
1191 AC_MSG_ERROR([--with-jib must be a directory])
1192 fi
1193 JIB_JAR=$(ls ${JIB_HOME}/lib/jib-*.jar)
|