1138 fi
1139
1140 AC_MSG_CHECKING([for jtreg test harness])
1141 if test "x$JT_HOME" != x; then
1142 AC_MSG_RESULT([$JT_HOME])
1143 else
1144 AC_MSG_RESULT([no, not found])
1145
1146 if test "x$with_jtreg" = xyes; then
1147 AC_MSG_ERROR([--with-jtreg was specified, but no jtreg found.])
1148 fi
1149 fi
1150 fi
1151
1152 UTIL_FIXUP_EXECUTABLE(JTREGEXE)
1153 UTIL_FIXUP_PATH(JT_HOME)
1154 AC_SUBST(JT_HOME)
1155 AC_SUBST(JTREGEXE)
1156 ])
1157
1158 # Setup the JIB dependency resolver
1159 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
1160 [
1161 AC_ARG_WITH(jib, [AS_HELP_STRING([--with-jib],
1162 [Jib dependency management tool @<:@not used@:>@])])
1163
1164 if test "x$with_jib" = xno || test "x$with_jib" = x; then
1165 # jib disabled
1166 AC_MSG_CHECKING([for jib])
1167 AC_MSG_RESULT(no)
1168 elif test "x$with_jib" = xyes; then
1169 AC_MSG_ERROR([Must supply a value to --with-jib])
1170 else
1171 JIB_HOME="${with_jib}"
1172 AC_MSG_CHECKING([for jib])
1173 AC_MSG_RESULT(${JIB_HOME})
1174 if test ! -d "${JIB_HOME}"; then
1175 AC_MSG_ERROR([--with-jib must be a directory])
1176 fi
1177 JIB_JAR=$(ls ${JIB_HOME}/lib/jib-*.jar)
|
1138 fi
1139
1140 AC_MSG_CHECKING([for jtreg test harness])
1141 if test "x$JT_HOME" != x; then
1142 AC_MSG_RESULT([$JT_HOME])
1143 else
1144 AC_MSG_RESULT([no, not found])
1145
1146 if test "x$with_jtreg" = xyes; then
1147 AC_MSG_ERROR([--with-jtreg was specified, but no jtreg found.])
1148 fi
1149 fi
1150 fi
1151
1152 UTIL_FIXUP_EXECUTABLE(JTREGEXE)
1153 UTIL_FIXUP_PATH(JT_HOME)
1154 AC_SUBST(JT_HOME)
1155 AC_SUBST(JTREGEXE)
1156 ])
1157
1158 # Setup the JTReg Regression Test Harness.
1159 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG_MW],
1160 [
1161 AC_ARG_WITH(jtregMW, [AS_HELP_STRING([--with-jtregMW],
1162 [Regression Test Harness @<:@probed@:>@])])
1163
1164 if test "x$with_jtregMW" = xno; then
1165 # jtreg disabled
1166 AC_MSG_CHECKING([for jtreg test harness])
1167 AC_MSG_RESULT([no, disabled])
1168 elif test "x$with_jtregMW" != xyes && test "x$with_jtregMW" != x; then
1169 # An explicit path is specified, use it.
1170 JT_HOME_MW="$with_jtregMW"
1171 UTIL_FIXUP_PATH([JT_HOME_MW])
1172 if test ! -d "$JT_HOME_MW"; then
1173 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW does not exist])
1174 fi
1175
1176 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1177 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW is not a valid jtreg home])
1178 fi
1179
1180 JTREGEXE_MW="$JT_HOME_MW/bin/jtreg"
1181 if test ! -x "$JTREGEXE_MW"; then
1182 AC_MSG_ERROR([jtreg home directory from --with-jtregMW=$with_jtregMW does not contain valid jtreg executable])
1183 fi
1184
1185 AC_MSG_CHECKING([for jtreg test harness])
1186 AC_MSG_RESULT([$JT_HOME_MW])
1187 else
1188 # Try to locate jtreg
1189 if test "x$JT_HOME_MW" != x; then
1190 # JT_HOME_MW set in environment, use it
1191 if test ! -d "$JT_HOME_MW"; then
1192 AC_MSG_WARN([Ignoring JT_HOME_MW pointing to invalid directory: $JT_HOME_MW])
1193 JT_HOME_MW=
1194 else
1195 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1196 AC_MSG_WARN([Ignoring JT_HOME_MW which is not a valid jtreg home: $JT_HOME_MW])
1197 JT_HOME_MW=
1198 elif test ! -x "$JT_HOME_MW/bin/jtreg"; then
1199 AC_MSG_WARN([Ignoring JT_HOME_MW which does not contain valid jtreg executable: $JT_HOME_MW])
1200 JT_HOME_MW=
1201 else
1202 JTREGEXE_MW="$JT_HOME_MW/bin/jtreg"
1203 AC_MSG_NOTICE([Located jtreg using JT_HOME_MW from environment])
1204 fi
1205 fi
1206 fi
1207
1208 if test "x$JT_HOME_MW" = x; then
1209 # JT_HOME_MW is not set in environment, or was deemed invalid.
1210 # Try to find jtreg on path
1211 UTIL_PATH_PROGS(JTREGEXE_MW, jtreg)
1212 if test "x$JTREGEXE_MW" != x; then
1213 # That's good, now try to derive JT_HOME_MW
1214 JT_HOME_MW=`(cd $($DIRNAME $JTREGEXE_MW)/.. && pwd)`
1215 if test ! -e "$JT_HOME_MW/lib/jtreg.jar"; then
1216 AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
1217 JT_HOME_MW=
1218 JTREGEXE_MW=
1219 else
1220 AC_MSG_NOTICE([Located jtreg using jtreg executable in path])
1221 fi
1222 fi
1223 fi
1224
1225 AC_MSG_CHECKING([for jtreg test harness])
1226 if test "x$JT_HOME_MW" != x; then
1227 AC_MSG_RESULT([$JT_HOME_MW])
1228 else
1229 AC_MSG_RESULT([no, not found])
1230
1231 if test "x$with_jtregMW" = xyes; then
1232 AC_MSG_ERROR([--with-jtregMW was specified, but no jtreg found.])
1233 fi
1234 fi
1235 fi
1236
1237 UTIL_FIXUP_EXECUTABLE(JTREGEXE_MW)
1238 UTIL_FIXUP_PATH(JT_HOME_MW)
1239 AC_SUBST(JT_HOME_MW)
1240 AC_SUBST(JTREGEXE_MW)
1241 ])
1242
1243
1244
1245 # Setup the JIB dependency resolver
1246 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
1247 [
1248 AC_ARG_WITH(jib, [AS_HELP_STRING([--with-jib],
1249 [Jib dependency management tool @<:@not used@:>@])])
1250
1251 if test "x$with_jib" = xno || test "x$with_jib" = x; then
1252 # jib disabled
1253 AC_MSG_CHECKING([for jib])
1254 AC_MSG_RESULT(no)
1255 elif test "x$with_jib" = xyes; then
1256 AC_MSG_ERROR([Must supply a value to --with-jib])
1257 else
1258 JIB_HOME="${with_jib}"
1259 AC_MSG_CHECKING([for jib])
1260 AC_MSG_RESULT(${JIB_HOME})
1261 if test ! -d "${JIB_HOME}"; then
1262 AC_MSG_ERROR([--with-jib must be a directory])
1263 fi
1264 JIB_JAR=$(ls ${JIB_HOME}/lib/jib-*.jar)
|