Author: [email protected]
Date: Mon Mar 28 11:53:39 2011
New Revision: 901
Log:
[AMDATU-332] Added support for -tmpdir option
Modified:
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
Modified:
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
==============================================================================
---
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
(original)
+++
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
Mon Mar 28 11:53:39 2011
@@ -48,6 +48,7 @@
public static String AMDATU_Y_ARG = "-amdatuVersionY";
public static String JMETERPLANSDIR_ARG = "-jmeterplansdir";
public static String RESULTSDIR_ARG = "-resultsdir";
+ public static String TMPDIR_ARG = "-tmpdir";
public static String TESTLOOPS_ARG = "-testloops";
public static String OMIT_ARG = "-omit";
@@ -73,6 +74,7 @@
static {
DIR_ARGS.add(JMETERPLANSDIR_ARG);
DIR_ARGS.add(RESULTSDIR_ARG);
+ DIR_ARGS.add(TMPDIR_ARG);
}
// Other arguments
Modified:
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
==============================================================================
---
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
(original)
+++
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
Mon Mar 28 11:53:39 2011
@@ -44,7 +44,7 @@
resultsDir = arguments.get(Main.RESULTSDIR_ARG).toString();
noExamples = Boolean.TRUE.equals(arguments.get(Main.NOEXAMPLES_ARG));
omit = arguments.containsKey(Main.OMIT_ARG) ?
Integer.parseInt(arguments.get(Main.OMIT_ARG).toString()) : 0;
- rootTmpDir = getRootTmpDir();
+ rootTmpDir = getRootTmpDir(arguments.get(Main.TMPDIR_ARG));
testLoops = arguments.containsKey(Main.TESTLOOPS_ARG) ?
Integer.parseInt(arguments.get(Main.TESTLOOPS_ARG).toString()) : 1;
}
@@ -70,8 +70,12 @@
return "_" + contextX.label + "-vs-" + contextY.label + "_samples";
}
- private File getRootTmpDir() {
+ private File getRootTmpDir(Object tmpDirArg) {
+ // If no -tmpdir is provided, use java.io.tmpdir
String javaTmpDir = System.getProperty("java.io.tmpdir");
+ if (tmpDirArg != null) {
+ javaTmpDir = tmpDirArg.toString();
+ }
File tmpDir = new File(javaTmpDir, "amdatu-performancetest");
tmpDir.mkdir();
return tmpDir;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
