ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/lib-src/build-jtreg
(Generate patch)

Comparing lib-src/build-jtreg (file contents):
Revision 1.5 by jsr166, Sun Aug 20 16:03:05 2017 UTC vs.
Revision 1.7 by jsr166, Mon Oct 23 06:48:07 2017 UTC

# Line 41 | Line 41 | download_maven_jar() {
41  
42   main() {
43    [[ "$PWD" =~ /lib-src$ ]] || { echo Always run as ./build-jtreg; exit 1; }
44 <  TESTNG_VERSION="6.9.8"
44 >  TESTNG_VERSION="6.9.9"
45    rm -rf "/tmp/testng-$TESTNG_VERSION"*; mkdir "/tmp/testng-$TESTNG_VERSION"
46    def_make_dir TESTNG_HOME "/tmp/testng-$TESTNG_VERSION"
47  
# Line 121 | Line 121 | main() {
121    def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release"
122  
123    # hg clone http://hg.openjdk.java.net/code-tools/jtreg
124 <  def_make_var BUILD_NUMBER "b07"
124 >  def_make_var BUILD_NUMBER "b08"
125    JTREG_REV="jtreg4.2-${BUILD_NUMBER}"
126    rm -rf "jtreg" "$JTREG_REV" "$JTREG_REV.tar.gz"
127    wget -q "http://hg.openjdk.java.net/code-tools/jtreg/archive/$JTREG_REV.tar.gz"
128    tar xzf "$JTREG_REV.tar.gz"
129 +  rm "$JTREG_REV.tar.gz"
130    mv "jtreg-$JTREG_REV" "jtreg"
131  
132    def_make_dir JDK17HOME "$HOME/jdk/jdk7"
# Line 138 | Line 139 | main() {
139  
140    cp jtreg/build/images/jtreg/lib/*.jar ../jsr166/lib/.
141  
142 <  # Clean up intermediate artifacts
142 >  # As a side effect, save a general purpose jtreg "distribution".
143 >  rsync -a jtreg/build/images/jtreg/ "${JTREG_REV#jtreg}/"
144 >
145 >  # Clean up intermediate artifacts.
146    # asmtools creates a bogus index.html
147    rm -rf asmtools asmtools-*-build index.html \
148      jtreg extract "${DOWNLOADED_MAVEN_JARS[@]}" \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines