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 2011/08/29 18:42:35 UTC
svn commit: r1162896 - in
/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance:
AbstractPerformanceTest.java BigFileReadTest.java
Author: jukka
Date: Mon Aug 29 16:42:34 2011
New Revision: 1162896
URL: http://svn.apache.org/viewvc?rev=1162896&view=rev
Log:
Increase the amount of data in BigFileReadTest from 1GB to 10GB to prevent the whole test set from fitting in memory on the average computer
Modified:
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java?rev=1162896&r1=1162895&r2=1162896&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java Mon Aug 29 16:42:34 2011
@@ -55,9 +55,7 @@ public abstract class AbstractPerformanc
testPattern = Pattern.compile(System.getProperty("only", ".*"));
// Create a repository using the Jackrabbit default configuration
- if (repoPattern.matcher(name).matches()) {
- testPerformance(name, getDefaultConfig());
- }
+ testPerformance(name, getDefaultConfig());
// Create repositories for any special configurations included
File directory = new File(new File("src", "test"), "resources");
@@ -69,11 +67,8 @@ public abstract class AbstractPerformanc
if (file.isFile() && xml.endsWith(".xml")) {
String repositoryName =
name + "-" + xml.substring(0, xml.length() - 4);
- if (repoPattern.matcher(repositoryName).matches()) {
- testPerformance(
- repositoryName,
- FileUtils.openInputStream(file));
- }
+ testPerformance(
+ repositoryName, FileUtils.openInputStream(file));
}
}
}
@@ -121,7 +116,8 @@ public abstract class AbstractPerformanc
}
private void runTest(AbstractTest test, String name, byte[] conf) {
- if (testPattern.matcher(test.toString()).matches()) {
+ if (repoPattern.matcher(name).matches()
+ && testPattern.matcher(test.toString()).matches()) {
// Create the repository directory
File dir = new File(
new File("target", "repository"),
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java?rev=1162896&r1=1162895&r2=1162896&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java Mon Aug 29 16:42:34 2011
@@ -28,7 +28,7 @@ import org.apache.commons.io.output.Null
public class BigFileReadTest extends AbstractTest {
- private static final int FILE_COUNT = 10;
+ private static final int FILE_COUNT = 100;
private static final int FILE_SIZE = 100;