--- lib-src/build-jtreg	2017/08/20 16:03:05	1.5
+++ lib-src/build-jtreg	2017/10/23 06:48:07	1.7
@@ -41,7 +41,7 @@ download_maven_jar() {
 
 main() {
   [[ "$PWD" =~ /lib-src$ ]] || { echo Always run as ./build-jtreg; exit 1; }
-  TESTNG_VERSION="6.9.8"
+  TESTNG_VERSION="6.9.9"
   rm -rf "/tmp/testng-$TESTNG_VERSION"*; mkdir "/tmp/testng-$TESTNG_VERSION"
   def_make_dir TESTNG_HOME "/tmp/testng-$TESTNG_VERSION"
 
@@ -121,11 +121,12 @@ main() {
   def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release"
 
   # hg clone http://hg.openjdk.java.net/code-tools/jtreg
-  def_make_var BUILD_NUMBER "b07"
+  def_make_var BUILD_NUMBER "b08"
   JTREG_REV="jtreg4.2-${BUILD_NUMBER}"
   rm -rf "jtreg" "$JTREG_REV" "$JTREG_REV.tar.gz"
   wget -q "http://hg.openjdk.java.net/code-tools/jtreg/archive/$JTREG_REV.tar.gz"
   tar xzf "$JTREG_REV.tar.gz"
+  rm "$JTREG_REV.tar.gz"
   mv "jtreg-$JTREG_REV" "jtreg"
 
   def_make_dir JDK17HOME "$HOME/jdk/jdk7"
@@ -138,7 +139,10 @@ main() {
 
   cp jtreg/build/images/jtreg/lib/*.jar ../jsr166/lib/.
 
-  # Clean up intermediate artifacts
+  # As a side effect, save a general purpose jtreg "distribution".
+  rsync -a jtreg/build/images/jtreg/ "${JTREG_REV#jtreg}/"
+
+  # Clean up intermediate artifacts.
   # asmtools creates a bogus index.html
   rm -rf asmtools asmtools-*-build index.html \
     jtreg extract "${DOWNLOADED_MAVEN_JARS[@]}" \