From: Keri Harris <keri@gentoo.org>
Date: Thu, 1 Feb 2007 09:19:08 +0000 (+0000)
Subject: Run Prolog Theory testsuite in src_test()
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7de05d18b6a8482b9db49ff1efec5a031585ba25;p=gentoo.git

Run Prolog Theory testsuite in src_test()
Package-Manager: portage-2.1.2-r5
---

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index d62cd756aa1e..1ab0fbdfb5b7 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.9 2007/01/31 07:01:33 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.10 2007/02/01 09:19:08 keri Exp $
+
+  01 Feb 2007; keri <keri@gentoo.org> files/build.xml,
+  tuprolog-2.0.1.ebuild:
+  Run Prolog Theory testsuite in src_test()
 
 *tuprolog-2.0.1 (31 Jan 2007)
 
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 367bda0be523..280ca7e383c8 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,7 +1,7 @@
-AUX build.xml 1542 RMD160 4b61c798a3a932160511e59427b4fce59ab7daec SHA1 23348fe688686d63115e5c54e81d4c9faddfddf4 SHA256 ff1c531c4fd42a21d37fc7eeb4ca02b80b1b5e11643918587fe363347306a7e9
-MD5 d5f4d9427339accf7e7dc79e12167b8d files/build.xml 1542
-RMD160 4b61c798a3a932160511e59427b4fce59ab7daec files/build.xml 1542
-SHA256 ff1c531c4fd42a21d37fc7eeb4ca02b80b1b5e11643918587fe363347306a7e9 files/build.xml 1542
+AUX build.xml 2282 RMD160 f02843d5762be2497b64ae9acbf090c1bc8acf4a SHA1 8ddb9b2e23d85fded8c2fa117716d319896d2f95 SHA256 c9528b5ecd3eaa06a3e3cec75007990dcdf2d7a41c441521f00dc9973a107e1a
+MD5 bdeccebb4c99d138bbe0b7d97a8753c2 files/build.xml 2282
+RMD160 f02843d5762be2497b64ae9acbf090c1bc8acf4a files/build.xml 2282
+SHA256 c9528b5ecd3eaa06a3e3cec75007990dcdf2d7a41c441521f00dc9973a107e1a files/build.xml 2282
 AUX tuprolog-1.3.0-java1.4.patch 3534 RMD160 d6e7673b079257e65d73c34a25a2b07de9a12466 SHA1 82db60676d2129e9fd77d010dfda09b9231e22de SHA256 72abe56c3cbca446143eb8f07156584008a14db98f582f0dfa2c7e3bd56e4bb5
 MD5 02d270bac79145ab3625d39c1c8c043a files/tuprolog-1.3.0-java1.4.patch 3534
 RMD160 d6e7673b079257e65d73c34a25a2b07de9a12466 files/tuprolog-1.3.0-java1.4.patch 3534
@@ -33,18 +33,18 @@ EBUILD tuprolog-1.3.0-r1.ebuild 1063 RMD160 c36f697a5ea4a405f4c26364a77f6592f3a7
 MD5 867c97511274fb2aa073a1f3901b6d8b tuprolog-1.3.0-r1.ebuild 1063
 RMD160 c36f697a5ea4a405f4c26364a77f6592f3a7d1fb tuprolog-1.3.0-r1.ebuild 1063
 SHA256 0d3796d29d430e52eb2b99ed36af63d5c0ff4dfbaf10ac26cc726ce691627a58 tuprolog-1.3.0-r1.ebuild 1063
-EBUILD tuprolog-2.0.1.ebuild 1014 RMD160 9c9b82e153f98ef0c830098cc72835e441dbd175 SHA1 29cad081783bdee6bea0c4d41aa975ba0b48e903 SHA256 49bde828d2963ce5d9082aefd3f67cc7323edb30a5b172a25ebce1583803244e
-MD5 1a708dfc0e2d728353a877dea38fcf4b tuprolog-2.0.1.ebuild 1014
-RMD160 9c9b82e153f98ef0c830098cc72835e441dbd175 tuprolog-2.0.1.ebuild 1014
-SHA256 49bde828d2963ce5d9082aefd3f67cc7323edb30a5b172a25ebce1583803244e tuprolog-2.0.1.ebuild 1014
+EBUILD tuprolog-2.0.1.ebuild 1171 RMD160 60b1425eede102c326952fd00ca90f25df16426a SHA1 ec2d266fd5ac663a6ff56d57c4c8038d6188c5e4 SHA256 dadf648585da3dcea285a2d094b0740c83371fdaf827f39a673e8ebe10f39603
+MD5 d0276cb9117e15ceb5c263520d969783 tuprolog-2.0.1.ebuild 1171
+RMD160 60b1425eede102c326952fd00ca90f25df16426a tuprolog-2.0.1.ebuild 1171
+SHA256 dadf648585da3dcea285a2d094b0740c83371fdaf827f39a673e8ebe10f39603 tuprolog-2.0.1.ebuild 1171
 EBUILD tuprolog-2.0.ebuild 1011 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4 SHA1 dff8d7ca57901cb7b62c0f245cfc965bdfc08a5e SHA256 cd36b7b3a0c2efd36fac741366e048d77f4d9132da38b8e5c821a4ec7c471db3
 MD5 40f654914e4b8c3ccccf8fcca799256e tuprolog-2.0.ebuild 1011
 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4 tuprolog-2.0.ebuild 1011
 SHA256 cd36b7b3a0c2efd36fac741366e048d77f4d9132da38b8e5c821a4ec7c471db3 tuprolog-2.0.ebuild 1011
-MISC ChangeLog 1348 RMD160 c40a1b6845faac47c0f0bb4f26821051292500c8 SHA1 2337efd55f0379c496affab3be70c74fd5d51c6a SHA256 16e132f737066aa29dd969869f8822b75bddd41203ff48511f9a5650e7f65d60
-MD5 c12e720eb4b821e4ff3c36c7267018a1 ChangeLog 1348
-RMD160 c40a1b6845faac47c0f0bb4f26821051292500c8 ChangeLog 1348
-SHA256 16e132f737066aa29dd969869f8822b75bddd41203ff48511f9a5650e7f65d60 ChangeLog 1348
+MISC ChangeLog 1474 RMD160 66385c7d03bf8698e7c73354f9e04cebe04bb82c SHA1 c5dd23221f9209354fa9acb37b71ea4e667ada96 SHA256 0efa018ae70b69c7d02a4db0f0e477f6929f74e6c3cd41065ed99301be488413
+MD5 ea68b8e051c05ca34036f10e265ea902 ChangeLog 1474
+RMD160 66385c7d03bf8698e7c73354f9e04cebe04bb82c ChangeLog 1474
+SHA256 0efa018ae70b69c7d02a4db0f0e477f6929f74e6c3cd41065ed99301be488413 ChangeLog 1474
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
diff --git a/dev-lang/tuprolog/files/build.xml b/dev-lang/tuprolog/files/build.xml
index c2a5eb1c98fd..7362ff40ef83 100644
--- a/dev-lang/tuprolog/files/build.xml
+++ b/dev-lang/tuprolog/files/build.xml
@@ -1,55 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
 
-<project name="tuprolog" default="jar">
 	<!-- some properties -->
-	<property name="src.dir" value="src" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
+	<property name="src.dir" value="src"/>
+	<property name="build.dir" value="build"/>
+	<property name="docs.dir" value="docs"/>
 	<property name="dist.dir" value="dist"/>
-
+	<property name="test.dir" value="test/unit"/>
+	<property name="test.build.dir" value="test.build"/>
 	<property name="jarfile" value="${ant.project.name}.jar"/>
-
-   <property file="build.properties"/>
+	<property file="build.properties"/>
 
 	<!-- init -->
-   <target name="init">
-      <tstamp/>
-	   <mkdir dir="${dist.dir}"/>
-	   <mkdir dir="${build.dir}"/>
-	   <mkdir dir="${docs.dir}"/>
-   </target>	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${docs.dir}"/>
+		<mkdir dir="${test.build.dir}"/>
+	</target>	
 
 	<!-- compile everything -->
-   <target name="compile" depends="init">
-      <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${classpath}" source="1.3" target="1.4" encoding="ISO-8859-1" deprecation="on"/>
-      <copy todir="${build.dir}">
-	      <fileset dir="${src.dir}">
-		      <exclude name="**/*.java" />
-	      </fileset>
-      </copy>
-   </target>
+	<target depends="init" name="compile">
+		<javac classpath="${classpath}" deprecation="on" destdir="${build.dir}" encoding="ISO-8859-1" source="1.4" srcdir="${src.dir}" target="1.4"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
 
 	<!-- build the jar file -->
-   <target name="jar" depends="compile">
-      <jar jarfile="${dist.dir}/${jarfile}" basedir="${build.dir}"/>
-   </target>
+	<target depends="compile" name="jar">
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+	</target>
 
 	<!-- generate javadocs -->
-   <target name="javadoc" depends="init">
-	   <javadoc sourcepath="${src.dir}"
-		    packagenames="alice.*"
-		    destdir="${docs.dir}"
-		    author="true"
-		    version="true"
-		    use="true"
-		    windowtitle="${ant.project.name} API"
-		    encoding="ISO-8859-1" />
-   </target>
+	<target depends="init" name="javadoc">
+		<javadoc author="true" destdir="${docs.dir}" encoding="ISO-8859-1" packagenames="alice.*" source="1.4" sourcepath="${src.dir}" use="true" version="true" windowtitle="${ant.project.name} API"/>
+	</target>
 
 	<!-- clean up -->
-   <target name="clean">
-	   <delete dir="${build.dir}"/>
-	   <delete dir="${dist.dir}"/>
-	   <delete dir="${docs.dir}"/>
-   </target>
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${docs.dir}"/>
+		<delete dir="${test.build.dir}"/>
+	</target>
+
+	<!-- run testsuite -->
+	<target name="test">
+		<path id="dist.classpath">
+			<fileset dir="${dist.dir}">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<javac classpathref="dist.classpath" deprecation="on" destdir="${test.build.dir}" encoding="ISO-8859-1" source="1.4" srcdir="${test.dir}" target="1.4"/>
+		<junit haltonfailure="on" showoutput="no" printsummary="yes">
+			<classpath>
+				<path refid="dist.classpath"/>
+				<pathelement path="${test.build.dir}"/>
+			</classpath>
+			<formatter type="xml"/>
+			<batchtest todir="${test.build.dir}">
+				<fileset dir="${test.build.dir}">
+					<include name="**/*TestCase.class"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
 </project>
diff --git a/dev-lang/tuprolog/tuprolog-2.0.1.ebuild b/dev-lang/tuprolog/tuprolog-2.0.1.ebuild
index 93b7ce89fd23..f562702e3a88 100644
--- a/dev-lang/tuprolog/tuprolog-2.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.0.1.ebuild,v 1.1 2007/01/31 07:01:33 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.0.1.ebuild,v 1.2 2007/02/01 09:19:08 keri Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -14,11 +14,13 @@ SRC_URI="http://www.alice.unibo.it/download/tuprolog/files/core/2p-2.0.1.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
-	dev-java/ant-core"
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks
+		dev-java/junit )"
 RDEPEND=">=virtual/jdk-1.4"
 
 S="${WORKDIR}"
@@ -36,6 +38,13 @@ src_compile() {
 	eant jar $(use_doc)
 }
 
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit
+	cd "${S}"
+	eant test || die "eant test failed"
+}
+
 src_install() {
 	java-pkg_dojar dist/${PN}.jar