You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/11/07 22:46:27 UTC
[1/3] cassandra git commit: (Eclipse) Re-use test classes from an ant
build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 7920ebebe -> 155eccd66
refs/heads/trunk e9995c9b5 -> 203efd022
(Eclipse) Re-use test classes from an ant build
patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/155eccd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/155eccd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/155eccd6
Branch: refs/heads/cassandra-2.1
Commit: 155eccd66e767db789a6115be2df24290ca166e4
Parents: 7920ebe
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Nov 7 10:32:09 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Nov 7 13:45:36 2014 -0800
----------------------------------------------------------------------
build.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/155eccd6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index b20ca90..43fa531 100644
--- a/build.xml
+++ b/build.xml
@@ -1477,7 +1477,7 @@
</target>
<!-- Generate Eclipse project description files -->
- <target name="generate-eclipse-files" depends="build" description="Generate eclipse files">
+ <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files">
<echo file=".project"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>${eclipse.project.name}</name>
@@ -1499,14 +1499,14 @@
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/resources"/>
<classpathentry kind="src" path="src/gen-java"/>
- <classpathentry kind="src" path="test/unit"/>
- <classpathentry kind="src" path="test/long"/>
- <classpathentry kind="src" path="test/pig"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/unit"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/long"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/pig"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/resources" />
<classpathentry kind="src" path="tools/stress/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes/main"/>
<classpathentry kind="lib" path="build/classes/thrift" sourcepath="interface/thrift/gen-java/"/>
- <classpathentry kind="lib" path="build/test/classes"/>
<classpathentry kind="lib" path="test/conf"/>
]]>
</echo>
[2/3] cassandra git commit: (Eclipse) Re-use test classes from an ant
build
Posted by mi...@apache.org.
(Eclipse) Re-use test classes from an ant build
patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/155eccd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/155eccd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/155eccd6
Branch: refs/heads/trunk
Commit: 155eccd66e767db789a6115be2df24290ca166e4
Parents: 7920ebe
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Nov 7 10:32:09 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Nov 7 13:45:36 2014 -0800
----------------------------------------------------------------------
build.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/155eccd6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index b20ca90..43fa531 100644
--- a/build.xml
+++ b/build.xml
@@ -1477,7 +1477,7 @@
</target>
<!-- Generate Eclipse project description files -->
- <target name="generate-eclipse-files" depends="build" description="Generate eclipse files">
+ <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files">
<echo file=".project"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>${eclipse.project.name}</name>
@@ -1499,14 +1499,14 @@
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/resources"/>
<classpathentry kind="src" path="src/gen-java"/>
- <classpathentry kind="src" path="test/unit"/>
- <classpathentry kind="src" path="test/long"/>
- <classpathentry kind="src" path="test/pig"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/unit"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/long"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/pig"/>
+ <classpathentry kind="src" output="build/test/classes" path="test/resources" />
<classpathentry kind="src" path="tools/stress/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes/main"/>
<classpathentry kind="lib" path="build/classes/thrift" sourcepath="interface/thrift/gen-java/"/>
- <classpathentry kind="lib" path="build/test/classes"/>
<classpathentry kind="lib" path="test/conf"/>
]]>
</echo>
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/203efd02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/203efd02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/203efd02
Branch: refs/heads/trunk
Commit: 203efd0221ba103be85e86d38278a996b31e88ad
Parents: e9995c9 155eccd
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri Nov 7 13:46:10 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Fri Nov 7 13:46:10 2014 -0800
----------------------------------------------------------------------
build.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/203efd02/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 2cb637e,43fa531..5eb1955
--- a/build.xml
+++ b/build.xml
@@@ -1526,26 -1476,8 +1526,26 @@@
]]> </script>
</target>
+ <!-- run microbenchmarks suite -->
+ <target name="microbench" depends="build-test">
+ <java classname="org.openjdk.jmh.Main"
+ fork="true"
+ failonerror="true">
+ <classpath>
+ <path refid="cassandra.classpath" />
+ <pathelement location="${test.classes}"/>
+ <path refid="cobertura.classpath"/>
+ <pathelement location="${test.conf}"/>
+ <fileset dir="${test.lib}">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
+ <arg value=".*microbench.*${benchmark.name}"/>
+ </java>
+ </target>
+
<!-- Generate Eclipse project description files -->
- <target name="generate-eclipse-files" depends="build" description="Generate eclipse files">
+ <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files">
<echo file=".project"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>${eclipse.project.name}</name>