You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/03/17 18:12:17 UTC
[1/2] incubator-quarks git commit: QUARKS-38 Stop java7 testing if
java7 jars not built
Repository: incubator-quarks
Updated Branches:
refs/heads/master d5464ba00 -> f973d341b
QUARKS-38 Stop java7 testing if java7 jars not built
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3dec045b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3dec045b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3dec045b
Branch: refs/heads/master
Commit: 3dec045b63e921e6dc2cf3185fc58274736227ec
Parents: c5977a7
Author: Dan Debrunner <dj...@debrunners.com>
Authored: Thu Mar 17 09:53:44 2016 -0700
Committer: Dan Debrunner <dj...@debrunners.com>
Committed: Thu Mar 17 09:53:44 2016 -0700
----------------------------------------------------------------------
platform/java7/build.xml | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3dec045b/platform/java7/build.xml
----------------------------------------------------------------------
diff --git a/platform/java7/build.xml b/platform/java7/build.xml
index 1d7de38..380e126 100644
--- a/platform/java7/build.xml
+++ b/platform/java7/build.xml
@@ -158,7 +158,18 @@
</sequential>
</macrodef>
- <target name="test7.setup"
+ <target name="verify.java7.built">
+ <fail message="Java 7 jars not built!">
+ <condition>
+ <not>
+ <available file="${quarks7.target}/lib" type="dir"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
+ <!-- Ensure previous separate build steps built the Java 7 jars -->
+ <target name="test7.setup" depends="verify.java7.built"
description="Setup Quarks tests for the Java 7.Must be run with Java 8 to run retrolambda."
>
<path id="quarks.java7.classpath">
@@ -194,7 +205,7 @@
</target>
<!-- this must be preceeded by test7.setup (run with a Java 8 vm) -->
- <target name="test7.run"
+ <target name="test7.run" depends="verify.java7.built"
description="Run Quarks tests for the Java 7. Should be run with JAVA_HOME pointing to a Java 7 virtual machine, though can also be run with Java 8"
>
<retro7.test.run tdir="api/function"/>
[2/2] incubator-quarks git commit: Merge branch 'pr-22'
Posted by dj...@apache.org.
Merge branch 'pr-22'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/f973d341
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/f973d341
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/f973d341
Branch: refs/heads/master
Commit: f973d341bed768d3436976365b66bb55f18866f0
Parents: d5464ba 3dec045
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Thu Mar 17 10:12:26 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Thu Mar 17 10:12:26 2016 -0700
----------------------------------------------------------------------
platform/java7/build.xml | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------