--- lib-src/build-jtreg	2017/01/20 20:29:13	1.2
+++ lib-src/build-jtreg	2017/01/20 21:22:53	1.3
@@ -105,6 +105,16 @@ main() {
   def_make_file JAVATEST_JAR "$(find $EXTRACT/ -name javatest.jar)"
   def_make_file JAVAHELP_JAR "$(find $EXTRACT/ -name jh.jar)"
 
+  # asmtools is optional, but let's build it for completeness.
+  # asmtools project doesn't seem to have releases; we'll grab tip.
+  # hg clone http://hg.openjdk.java.net/code-tools/asmtools
+  rm -rf "asmtools" "asmtools-"*"-build"
+  wget -qO- "http://hg.openjdk.java.net/code-tools/asmtools/archive/tip.tar.gz" > "asmtools.tar.gz"
+  tar xzf "asmtools.tar.gz"
+  mv "asmtools-"*[0-9a-f][0-9a-f][0-9a-f] "asmtools"
+  (cd asmtools/build && ant build)
+  def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release"
+
   # hg clone http://hg.openjdk.java.net/code-tools/jtreg
   def_make_var BUILD_NUMBER "b05"
   JTREG_REV="jtreg4.2-${BUILD_NUMBER}"
@@ -124,7 +134,9 @@ main() {
   cp jtreg/build/images/jtreg/lib/*.jar ../jsr166/lib/.
 
   # Clean up intermediate artifacts
-  rm -rf jtreg extract "${TMP_FILES[@]}" "$JTHARNESS_HOME" "$TESTNG_HOME"
+  # asmtools creates a bogus index.html
+  rm -rf asmtools asmtools-*-build index.html \
+    jtreg extract "${TMP_FILES[@]}" "$JTHARNESS_HOME" "$TESTNG_HOME"
 
   exit 0
 }