jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1351178 - in /jackrabbit/oak/trunk: ./ oak-bench/ oak-bench/oak03/ oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/ oak-bench/parent/
Date Sun, 17 Jun 2012 22:54:49 GMT
Author: jukka
Date: Sun Jun 17 22:54:49 2012
New Revision: 1351178

URL: http://svn.apache.org/viewvc?rev=1351178&view=rev
Log:
OAK-119: Oak performance benchmark

Include oak-bench components in default build, but enable the actual tests only when using
the benchmark profile.

Added:
    jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceBenchmark.java
      - copied, changed from r1351172, jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceTest.java
Removed:
    jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceTest.java
Modified:
    jackrabbit/oak/trunk/oak-bench/oak03/pom.xml
    jackrabbit/oak/trunk/oak-bench/parent/pom.xml
    jackrabbit/oak/trunk/oak-bench/pom.xml
    jackrabbit/oak/trunk/pom.xml

Modified: jackrabbit/oak/trunk/oak-bench/oak03/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/oak03/pom.xml?rev=1351178&r1=1351177&r2=1351178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/oak03/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/oak03/pom.xml Sun Jun 17 22:54:49 2012
@@ -33,6 +33,10 @@
   <artifactId>oak-bench-oak03</artifactId>
   <name>Oak 0.3 Performance Test</name>
 
+  <properties>
+    <skip.deployment>true</skip.deployment>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>

Copied: jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceBenchmark.java
(from r1351172, jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceBenchmark.java?p2=jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceBenchmark.java&p1=jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceTest.java&r1=1351172&r2=1351178&rev=1351178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceTest.java
(original)
+++ jackrabbit/oak/trunk/oak-bench/oak03/src/test/java/org/apache/jackrabbit/oak/performance/PerformanceBenchmark.java
Sun Jun 17 22:54:49 2012
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.perfor
 
 import org.testng.annotations.Test;
 
-public class PerformanceTest extends AbstractPerformanceTest {
+public class PerformanceBenchmark extends AbstractPerformanceTest {
 
     @Test
     public void testPerformance() throws Exception {

Modified: jackrabbit/oak/trunk/oak-bench/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/parent/pom.xml?rev=1351178&r1=1351177&r2=1351178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/parent/pom.xml Sun Jun 17 22:54:49 2012
@@ -93,6 +93,30 @@
         </pluginManagement>
       </build>
     </profile>
+    <profile>
+      <id>benchmark</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>2.12</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <includes>
+                    <include>**/*Benchmark.java</include>
+                  </includes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>

Modified: jackrabbit/oak/trunk/oak-bench/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/pom.xml?rev=1351178&r1=1351177&r2=1351178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/pom.xml Sun Jun 17 22:54:49 2012
@@ -35,9 +35,13 @@
   </parent>
 
   <artifactId>oak-bench</artifactId>
-  <name>Oak Performance Tests</name>
+  <name>Oak Performance Benchmark</name>
   <packaging>pom</packaging>
 
+  <properties>
+    <skip.deployment>true</skip.deployment>
+  </properties>
+
   <modules>
     <module>parent</module>
     <module>base</module>

Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1351178&r1=1351177&r2=1351178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Sun Jun 17 22:54:49 2012
@@ -44,10 +44,7 @@
     <module>oak-sling</module>
     <module>oak-run</module>
     <module>oak-it</module>
-    <!--
-       TODO: include in the build but prevent performance tests from running on the default
profile. See OAK-119
-      <module>oak-bench</module>
-    -->
+    <module>oak-bench</module>
   </modules>
 
   <scm>
@@ -68,7 +65,7 @@
               <exclude>.git/**</exclude>
               <exclude>.idea/**</exclude>
               <exclude>.gitignore</exclude>
-			  <exclude>oak-js/package.json</exclude>
+              <exclude>oak-js/package.json</exclude>
             </excludes>
           </configuration>
         </plugin>



Mime
View raw message