debian/0000755000000000000000000000000011605227262007171 5ustar debian/watch0000644000000000000000000000015111605226021010207 0ustar version=3 http://download.java.net/openjdk/jtreg/ \ .*/jtreg-(.*)-src-.*.zip debian debian/orig-tar.sh debian/jtreg.manpages0000644000000000000000000000002111605226021012002 0ustar jtreg.1 jtdiff.1 debian/rules0000755000000000000000000000101411605226021010235 0ustar #!/usr/bin/make -f JAVA_HOME = /usr/lib/jvm/default-java override_dh_auto_build: ant -f make/build.xml dh_auto_build JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \ --help-option="-help" ./dist/jtreg/linux/bin/jtdiff > jtdiff.1 JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \ --help-option="-help" ./dist/jtreg/linux/bin/jtreg > jtreg.1 override_dh_auto_clean: rm -rf dist rm -rf build rm -f jtdiff.1 rm -f jtreg.1 dh_auto_clean %: dh $@ --with javahelper debian/docs0000644000000000000000000000003611605226021010033 0ustar README COPYRIGHT CONTRIBUTORS debian/control0000644000000000000000000000205611605226332010574 0ustar Source: jtreg Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: Guillaume Mazoyer Build-Depends: debhelper (>= 7.0.50~), javahelper, help2man Build-Depends-Indep: default-jdk, libjtharness-java, ant, javahelp2, libxalan2-java Standards-Version: 3.9.2 Homepage: http://openjdk.java.net/jtreg/index.html Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jtreg/ Package: jtreg Architecture: all Depends: ${java:Depends}, ${misc:Depends}, libjtharness-java, javahelp2, libxalan2-java Description: Regression Test Harness for the OpenJDK platform jtreg is the test harness used by the OpenJDK test framework. This framework is intended primarily for regression tests. It can also be used for unit tests, functional tests, and even simple product tests -- in other words, just about any type of test except a conformance test, which belong in a TCK. debian/jtreg.install0000644000000000000000000000042011605226021011660 0ustar dist/jtreg/lib/jtreg.jar /usr/share/java dist/jtreg/doc/jtreg/faq.html /usr/share/doc/jtreg dist/jtreg/doc/jtreg/tag-spec.txt /usr/share/doc/jtreg dist/jtreg/doc/jtreg/usage.txt /usr/share/doc/jtreg dist/jtreg/linux/bin/jtdiff /usr/bin dist/jtreg/linux/bin/jtreg /usr/bin debian/copyright0000644000000000000000000000657011605226021011124 0ustar Format: http://dep.debian.net/deps/dep5 Upstream-Name: jtreg Source: http://download.java.net/openjdk/jtreg/ Files: * Copyright: 1996-2008 Sun Microsystems, Inc. All Rights Reserved. License: This code is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 only, as published by the Free Software Foundation. . This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more details (a copy is included in the LICENSE file that accompanied this code). . You should have received a copy of the GNU General Public License version 2 along with this work; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. . Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, CA 95054 USA or visit www.sun.com if you need additional information or have any questions. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. ' "CLASSPATH" EXCEPTION TO THE GPL . Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL, but only where Sun has expressly included in the particular source file's header the words "Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the LICENSE file that accompanied this code." . Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. . As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. Files: debian/* Copyright: 2011 Guillaume Mazoyer License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". debian/compat0000644000000000000000000000000211605226021010357 0ustar 7 debian/source/0000755000000000000000000000000011605227064010471 5ustar debian/source/format0000644000000000000000000000001411605226021011667 0ustar 3.0 (quilt) debian/orig-tar.sh0000755000000000000000000000116011605226021011242 0ustar #!/bin/sh -e # called by uscan with '--upstream-version' VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p') SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p') DIR=jtreg-${VERSION} TAR=../${SOURCE}_${VERSION}.orig.tar.bz2 # clean up the upstream tarball # Export to the $DIR directory since there is no directory in # the archive unzip $3 -d $DIR tar -c -j -f $TAR $DIR # -X debian/orig-tar.exclude $DIR rm -rf $DIR $3 # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout mv $TAR $origDir echo "moved $TAR to $origDir" fi exit 0 debian/changelog0000644000000000000000000000075011605226447011051 0ustar jtreg (4.1-2) unstable; urgency=low [Guillaume Mazoyer] * debian/patches/launchers.patch: Fixed typo in a variable name. * debian/rules: Removed extra spaces and use rm -f instead of ||:. [tony mancill] * debian/control: Add Vcs-Svn: field -- Guillaume Mazoyer Sat, 02 Jul 2011 07:13:54 -0500 jtreg (4.1-1) unstable; urgency=low * Initial release (Closes: #629577) -- Guillaume Mazoyer Tue, 07 Jun 2011 15:11:38 -0500 debian/patches/0000755000000000000000000000000011605227064010620 5ustar debian/patches/launchers.patch0000644000000000000000000001422411605226021013620 0ustar ## Description: add some description ## Origin/Author: add some origin or author ## Bug: bug URL Index: jtreg-4.1/src/share/bin/jtdiff.sh =================================================================== --- jtreg-4.1.orig/src/share/bin/jtdiff.sh 2011-07-02 07:12:29.290992102 -0500 +++ jtreg-4.1/src/share/bin/jtdiff.sh 2011-07-02 07:13:22.678992112 -0500 @@ -38,32 +38,25 @@ # # jtdiff also provides an Ant task for direct invocation from Ant. -# Determine jtdiff/JavaTest installation directory -if [ -z "$JT_HOME" ]; then - # Deduce where script is installed - # - should work on most derivatives of Bourne shell, like ash, bash, ksh, - # sh, zsh, etc, including on Windows, MKS (ksh) and Cygwin (ash or bash) - if type -p type 1>/dev/null 2>&1 && test -z "`type -p type`" ; then - myname=`type -p "$0"` - elif type type 1>/dev/null 2>&1 ; then - myname=`type "$0" | sed -e 's/^.* is a tracked alias for //' -e 's/^.* is //'` - elif whence whence 1>/dev/null 2>&1 ; then - myname=`whence "$0"` - fi - mydir=`dirname "$myname"` - p=`cd "$mydir" ; pwd` - while [ -n "$p" -a "$p" != "/" ]; do - if [ -r "$p"/lib/jtreg.jar ]; then JT_HOME="$p" ; break; fi - p=`dirname "$p"` - done - if [ -z "$JT_HOME" ]; then - echo "Cannot determine JT_HOME; please set it explicitly"; exit 1 - fi - case "`uname -s`" in - CYGWIN* ) JT_HOME=`cygpath -m "$JT_HOME"` ;; - esac +# Java home directory +if [ -z "${JAVA_HOME}" ]; then + JAVA_HOME="/usr/lib/jvm/default-java" +fi + +# Directory where jtreg is +if [ -z "${JTREG_HOME}" ]; then + JTREG_HOME="/usr/share/java" fi +# Directory where jtharness is +if [ -z "${JTHAR_HOME}" ]; then + JTHAR_HOME="/usr/share/java" +fi + +# Directory where other JAR are +if [ -z "${JAR_HOME}" ]; then + JAR_HOME="/usr/share/java" +fi # Separate out -J* options for the JVM # Unset IFS and use newline as arg separator to preserve spaces in args @@ -81,19 +74,13 @@ done unset DUALCASE -# Determine java for jtdiff, from JT_JAVA, JAVA_HOME, java -if [ -n "$JT_JAVA" ]; then - if [ -d "$JT_JAVA" ]; then - JT_JAVA="$JT_JAVA/bin/java" - fi -elif [ -n "$JAVA_HOME" ]; then - JT_JAVA="$JAVA_HOME/bin/java" -else - JT_JAVA=java -fi +# Determine java for jtdiff, JAVA_HOME, java +JT_JAVA="${JAVA_HOME}/bin/java" +# Determine class path +JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar" # Verify java version (1.)5 or newer used to run jtdiff -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | +version=`"${JT_JAVA}" -classpath "${JT_CLASSPATH}" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'` if [ -z "$version" ]; then @@ -108,9 +95,9 @@ IFS=$nl -"${JT_JAVA:-${JAVA_HOME:+$JAVA_HOME/bin/}java}" \ +"${JT_JAVA}" \ $javaOpts \ -Dprogram=`basename "$0"` \ - -cp "${JT_HOME}/lib/jtreg.jar" \ + -cp "${JT_CLASSPATH}" \ com.sun.javatest.diff.Main \ $jtdiffOpts Index: jtreg-4.1/src/share/bin/jtreg.sh =================================================================== --- jtreg-4.1.orig/src/share/bin/jtreg.sh 2011-07-02 07:12:29.270992102 -0500 +++ jtreg-4.1/src/share/bin/jtreg.sh 2011-07-02 07:13:49.818992118 -0500 @@ -57,32 +57,25 @@ # jtreg also provides Ant tasks; see the online help for details. # E.g. jtreg -onlineHelp ant -# Determine jtreg/JavaTest installation directory -if [ -z "$JT_HOME" ]; then - # Deduce where script is installed - # - should work on most derivatives of Bourne shell, like ash, bash, ksh, - # sh, zsh, etc, including on Windows, MKS (ksh) and Cygwin (ash or bash) - if type -p type 1>/dev/null 2>&1 && test -z "`type -p type`" ; then - myname=`type -p "$0"` - elif type type 1>/dev/null 2>&1 ; then - myname=`type "$0" | sed -e 's/^.* is a tracked alias for //' -e 's/^.* is //'` - elif whence whence 1>/dev/null 2>&1 ; then - myname=`whence "$0"` - fi - mydir=`dirname "$myname"` - p=`cd "$mydir" ; pwd` - while [ -n "$p" -a "$p" != "/" ]; do - if [ -r "$p"/lib/jtreg.jar ]; then JT_HOME="$p" ; break; fi - p=`dirname "$p"` - done - if [ -z "$JT_HOME" ]; then - echo "Cannot determine JT_HOME; please set it explicitly"; exit 1 - fi - case "`uname -s`" in - CYGWIN* ) JT_HOME=`cygpath -m "$JT_HOME"` ;; - esac +# Java home directory +if [ -z "${JAVA_HOME}" ]; then + JAVA_HOME="/usr/lib/jvm/default-java" +fi + +# Directory where jtreg is +if [ -z "${JTREG_HOME}" ]; then + JTREG_HOME="/usr/share/java" fi +# Directory where jtharness is +if [ -z "${JTHAR_HOME}" ]; then + JTHAR_HOME="/usr/share/java" +fi + +# Directory where other JAR are +if [ -z "${JAR_HOME}" ]; then + JAR_HOME="/usr/share/java" +fi # Separate out -J* options for the JVM # Note jdk as possible default to run jtreg @@ -103,21 +96,13 @@ done unset DUALCASE -# Determine java for jtreg, from JT_JAVA, JAVA_HOME, jdk, java -if [ -n "$JT_JAVA" ]; then - if [ -d "$JT_JAVA" ]; then - JT_JAVA="$JT_JAVA/bin/java" - fi -elif [ -n "$JAVA_HOME" ]; then - JT_JAVA="$JAVA_HOME/bin/java" -elif [ -n "$jdk" ]; then - JT_JAVA="$jdk/bin/java" -else - JT_JAVA=java -fi +# Determine java for jtdiff, JAVA_HOME, java +JT_JAVA="${JAVA_HOME}/bin/java" +# Determine class path +JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar" # Verify java version (1.)5 or newer used to run jtreg -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | +version=`"$JT_JAVA" -classpath "${JT_CLASSPATH}" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'` if [ -z "$version" ]; then @@ -135,5 +120,6 @@ "${JT_JAVA}" \ $javaOpts \ -Dprogram=`basename "$0"` \ - -jar "${JT_HOME}/lib/jtreg.jar" \ + -cp "${JT_CLASSPATH}" \ + com.sun.javatest.regtest.Main \ $jtregOpts debian/patches/dependencies.patch0000644000000000000000000000350111605226021014256 0ustar ## Description: Locate dependencies to /usr/share/java ## Origin/Author: Guillaume Mazoyer ## Bug: bug URL Index: jtreg-4.1/make/build.properties =================================================================== --- jtreg-4.1.orig/make/build.properties 2011-06-20 09:54:18.362805148 -0500 +++ jtreg-4.1/make/build.properties 2011-06-20 09:56:54.486805175 -0500 @@ -26,29 +26,29 @@ # set locations here, or in ${root}/build.properties, or set on the # ant command line -jtreg.build.resources = /w/jjg/work/jtreg +jtreg.build.resources = /usr/share/java # FIXME # JTHarness or JavaTest (should be should be 4.1.3 or better) #javatest.home = /w/jjg/work/os-jtreg/jtharness-4_1_2-MR1-Rel-b07/JTHarness-build/binaries/ -javatest.home = ${jtreg.build.resources}/jtharness-4_1_3-MR1-Rel-b08/JTHarness-build/binaries/ -javatest.jar = ${javatest.home}/lib/javatest.jar +javatest.home = ${jtreg.build.resources} +javatest.jar = ${javatest.home}/javatest.jar # the following is only true for older versions of JavaTest. # can't use to set it automatically for some reason #javatest.includes.javahelp.ok = true # JavaHelp (should be version 2.0 or better) -javahelp.home = ${jtreg.build.resources}/javahelp/javahelp_nbproject/dist -jhall.jar = ${javahelp.home}/lib/jhall.jar -jh.jar = ${javahelp.home}/lib/jh.jar +javahelp.home = ${jtreg.build.resources} +jhall.jar = ${javahelp.home}/jhall.jar +jh.jar = ${javahelp.home}/jh.jar # JUnit (should be 4.5 or better) -junit.jar = ${jtreg.build.resources}/junit-4.5.jar +junit.jar = ${jtreg.build.resources}/junit4.jar # Ant ((should be version 1.6.5 or better) #ant.home = -ant.jar = /usr/share/java/ant.jar +ant.jar = ${jtreg.build.resources}/ant.jar -build.version = 4.0 -build.milestone = dev -build.number = b00 +build.version = 4.1 +build.milestone = src +build.number = b02 debian/patches/series0000644000000000000000000000004311605226021012022 0ustar dependencies.patch launchers.patch