You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/09/30 14:21:21 UTC
svn commit: r1003034 - in /jackrabbit/trunk/test/performance:
base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java
parent/pom.xml
Author: jukka
Date: Thu Sep 30 12:21:21 2010
New Revision: 1003034
URL: http://svn.apache.org/viewvc?rev=1003034&view=rev
Log:
JCR-2699: Improve read/write concurrency
Allow the use of both -Donly and -Dscale options at the same time when running the performance test suite
Modified:
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java
jackrabbit/trunk/test/performance/parent/pom.xml
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java?rev=1003034&r1=1003033&r2=1003034&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java Thu Sep 30 12:21:21 2010
@@ -40,7 +40,11 @@ public abstract class AbstractTest {
private volatile boolean running;
protected static int getScale(int def) {
- return Integer.getInteger("scale", def);
+ int scale = Integer.getInteger("scale", 0);
+ if (scale == 0) {
+ scale = def;
+ }
+ return scale;
}
/**
Modified: jackrabbit/trunk/test/performance/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/parent/pom.xml?rev=1003034&r1=1003033&r2=1003034&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/parent/pom.xml (original)
+++ jackrabbit/trunk/test/performance/parent/pom.xml Thu Sep 30 12:21:21 2010
@@ -41,6 +41,7 @@
<properties>
<only>.*:.*</only>
+ <scale>0</scale>
</properties>
<build>
@@ -65,6 +66,10 @@
<name>only</name>
<value>${only}</value>
</property>
+ <property>
+ <name>scale</name>
+ <value>${scale}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -93,31 +98,6 @@
</pluginManagement>
</build>
</profile>
- <profile>
- <id>scaled</id>
- <activation>
- <property>
- <name>scale</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>scale</name>
- <value>${scale}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
</project>