diff options
author | Vladimir Tsanev | 2018-04-25 17:35:49 +0300 |
---|---|---|
committer | Vladimir Tsanev | 2018-04-25 17:35:49 +0300 |
commit | 4745863bf5ec290f00bc61abbb2ce4ca31e1338b (patch) | |
tree | a6c31857fade171fd8b0f0eecfd5cad00979ce6c | |
download | aur-4745863bf5ec290f00bc61abbb2ce4ca31e1338b.tar.gz |
initial commit
-rw-r--r-- | .SRCINFO | 25 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 95 | ||||
-rw-r--r-- | jtreg.patch | 24 | ||||
-rwxr-xr-x | jtreg.sh | 2 |
5 files changed, 147 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..6b5a1c72e89a --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,25 @@ +pkgbase = jtreg + pkgdesc = Regression Test Harness for the JDK + pkgver = 4.2+b12+7b1496d2790e + pkgrel = 1 + url = http://openjdk.java.net/jtreg/ + arch = any + license = GPL2 + makedepends = apache-ant + makedepends = java-environment-openjdk=7 + makedepends = jcov + makedepends = java-testng + makedepends = jcommander + makedepends = junit + depends = java-runtime>=7 + depends = jtharness + depends = asmtools + source = http://hg.openjdk.java.net/code-tools/jtreg/archive/7b1496d2790e.tar.gz + source = jtreg.sh + source = jtreg.patch + sha256sums = adaf360354a6573802cd6c5f46cd6bcd07829e190189044102a03278a3dbad3a + sha256sums = 49a4a58ff76e2e9989122d0aa0e5064f9797198789a851f21ed0b36484253c9f + sha256sums = 84a77930e1bfbd75c9643d78b0b5d60c38693fb9266409e37f50c42d40fecf29 + +pkgname = jtreg + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..468cd87d3ce8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pkg.tar.xz diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..680326f82c3c --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,95 @@ +# Maintainer: Vladimir Tsanev <tsachev@gmail.com> +pkgname=jtreg +# generate version executing on the tip (or latest working build) +# +# hg log --limit=1 --template "{latesttag}.{node|short}" |sed -e "s/^jtreg//" |sed -e "s/-/+/"` +# +_version=4.2 +_build=b12 +_tag=${pkgname}${_version}-${_build} +#_commit=_tag +#pkgver=${_version}+${_build} +_commit=7b1496d2790e +pkgver=${_version}+${_build}+${_commit} +pkgrel=1 +pkgdesc="Regression Test Harness for the JDK" +arch=('any') +url="http://openjdk.java.net/jtreg/" +license=('GPL2') +groups=() +depends=('java-runtime>=7' 'jtharness' 'asmtools') +makedepends=('apache-ant' 'java-environment-openjdk=7' 'jcov' 'java-testng' 'jcommander' 'junit') +optdepends=() +checkdepends=() +provides=() +conflicts=() +install= +source=("http://hg.openjdk.java.net/code-tools/jtreg/archive/${_commit}.tar.gz" "${pkgname}.sh" "${pkgname}.patch") +sha256sums=('adaf360354a6573802cd6c5f46cd6bcd07829e190189044102a03278a3dbad3a' + '49a4a58ff76e2e9989122d0aa0e5064f9797198789a851f21ed0b36484253c9f' + '84a77930e1bfbd75c9643d78b0b5d60c38693fb9266409e37f50c42d40fecf29') + +_jtregdir=${pkgname}-${_commit} + +prepare() { + cd $srcdir/${_jtregdir} + patch -p1 -i ${srcdir}/${pkgname}.patch +} + +build() { + cd ${srcdir}/${_jtregdir} + + # build fails when extracting jquery from testng + mkdir -p build/org/testng + + JDKHOME=/usr/lib/jvm/java-7-openjdk \ + JTHARNESS_HOME=/usr/share/jtharness \ + JCOV_HOME=/usr/share/jcov \ + ASMTOOLS_JAR=/usr/share/java/asmtools/asmtools.jar \ + ANTHOME=/usr/share/apache-ant \ + JUNIT_JAR=/usr/share/java/junit.jar \ + TESTNG_JAR=/usr/share/java/testng/testng-6.14.3.jar \ + JCOMMANDER_JAR=/usr/share/java/jcommander/jcommander.jar \ + make -C make + +} + +check() { + cd ${srcdir}/${_jtregdir} + + cp /usr/share/java/hamcrest-core.jar build/images/${pkgname}/lib + # todo find a way to set use vnc and enable tests + + # JDKHOME=/usr/lib/jvm/java-7-openjdk \ + # JTHARNESS_HOME=/usr/share/jtharness \ + # JCOV_HOME=/usr/share/jcov \ + # ASMTOOLS_JAR=/usr/share/java/asmtools/asmtools.jar \ + # ANTHOME=/usr/share/apache-ant \ + # JUNIT_JAR=/usr/share/java/junit.jar \ + # TESTNG_JAR=/usr/share/java/testng/testng-6.14.3.jar \ + # JCOMMANDER_JAR=/usr/share/java/jcommander/jcommander.jar \ + # HAMCREST_JAR=/usr/share/java/hamcrest-core.jar \ + # make -C make quick-test +} + +package() { + install -d -m755 ${pkgdir}/usr/share/java/${pkgname} + install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname} + install -d -m755 ${pkgdir}/usr/bin + + cp -a ${srcdir}/${_jtregdir}/build/images/${pkgname} ${pkgdir}/usr/share/${pkgname} + mv ${pkgdir}/usr/share/${pkgname}/lib/${pkgname}.jar ${pkgdir}/usr/share/java/${pkgname}/ + rm -rf ${pkgdir}/usr/share/${pkgname}/lib/ + + ln -sf /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib + ln -sf /usr/share/java/jtharness/javatest.jar ${pkgdir}/usr/share/java/${pkgname}/javatest.jar + ln -sf /usr/share/java/asmtools/asmtools.jar ${pkgdir}/usr/share/java/${pkgname}/asmtools.jar + ln -sf /usr/share/${pkgname}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + ln -sf /usr/share/${pkgname}/bin/jtreg ${pkgdir}/usr/bin/jtreg + ln -sf /usr/share/${pkgname}/bin/jtdiff ${pkgdir}/usr/bin/jtdiff + + # install profile.d script + install -Dm 755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/${pkgname}.sh +} + +# vim:set ts=2 sw=2 et: diff --git a/jtreg.patch b/jtreg.patch new file mode 100644 index 000000000000..b10c9adc01f4 --- /dev/null +++ b/jtreg.patch @@ -0,0 +1,24 @@ +diff -r 7b1496d2790e src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java +--- a/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java Mon Apr 23 16:46:17 2018 -0700 ++++ b/src/share/classes/com/sun/javatest/regtest/agent/TestNGRunner.java Wed Apr 25 16:56:01 2018 +0300 +@@ -89,7 +89,7 @@ + testng.setDefaultSuiteName(testName); + testng.setTestClasses(new Class<?>[]{mainClass}); + testng.addListener((ITestNGListener) listener); // recognizes both ITestListener and IConfigurationListener +- testng.addListener(new XMLReporter()); ++ testng.addListener((ITestNGListener) new XMLReporter()); + testng.setOutputDirectory(new File(".").getPath()); // current dir, i.e. scratch dir + testng.run(); + if (listener.configFailureCount > 0 || listener.failureCount > 0) { +diff -r 7b1496d2790e src/share/classes/com/sun/javatest/regtest/tool/Tool.java +--- a/src/share/classes/com/sun/javatest/regtest/tool/Tool.java Mon Apr 23 16:46:17 2018 -0700 ++++ b/src/share/classes/com/sun/javatest/regtest/tool/Tool.java Wed Apr 25 16:56:01 2018 +0300 +@@ -1494,7 +1494,7 @@ + + File libDir = jtreg_jar.getParentFile(); + +- junitPath = new JarFinder("junit.jar") ++ junitPath = new JarFinder("junit.jar", "hamcrest-core.jar") + .classes("org.junit.runner.JUnitCore") + .libDir(libDir) + .getPath(); diff --git a/jtreg.sh b/jtreg.sh new file mode 100755 index 000000000000..8c15a29bc3c6 --- /dev/null +++ b/jtreg.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +export JT_HOME=/usr/share/jtreg |