diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-29 13:59:06 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-07-29 13:59:06 +0000 |
commit | d2f490169ee8fe6b23c204713453e7fa1cd6a168 (patch) | |
tree | 17b84c5c739759052791c89fbc2d383c45d00796 /qadevOOo/runner/org | |
parent | 6a839e2cd28d2e31b2b7f0c39fa4d944ad6130be (diff) |
CWS-TOOLING: integrate CWS perftest09b
2009-07-22 08:34:25 +0200 lla r274216 : #i103694# use bash as shell
2009-07-21 12:33:51 +0200 lla r274178 : #160203#
2009-07-20 13:42:20 +0200 lla r274124 : #106358# add helper tool to get access to rpm in the environment for SOI
2009-07-20 12:43:26 +0200 lla r274119 : #i103656# compatiblity
Diffstat (limited to 'qadevOOo/runner/org')
-rw-r--r-- | qadevOOo/runner/org/openoffice/Runner.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 47216ad8d815..dcecca69f0cc 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -48,7 +48,7 @@ public class Runner private static long m_nStartTime; - private static long getStartTime() + public static long getRunnerStartTime() { return m_nStartTime; } @@ -69,7 +69,7 @@ public class Runner /* return the time, which is done until last startTime() */ - private static long meanTime(long _nCurrentTimer) + public static long meanTime(long _nCurrentTimer) { if (_nCurrentTimer == 0) { @@ -109,6 +109,7 @@ public class Runner } return false; } + private static boolean checkPathVariable(String _sPath, String delim) { String sPath = System.getProperty(_sPath); @@ -117,7 +118,7 @@ public class Runner StringTokenizer aTokenEnum = new StringTokenizer(sPath, delim); while (aTokenEnum.hasMoreElements()) { - String sToken = (String)aTokenEnum.nextElement(); + String sToken = (String) aTokenEnum.nextElement(); if (checkVariableForCygwin(sToken)) { System.err.println("ERROR: OOoRunner detect cygwin path in '" + _sPath + "'"); @@ -132,7 +133,7 @@ public class Runner { // ----- check all System.getProperty(key) variables ----- String sOsName = System.getProperty("os.name"); - if (! sOsName.toLowerCase().startsWith("windows")) + if (!sOsName.toLowerCase().startsWith("windows")) { // we need to check only on windows return; @@ -145,7 +146,7 @@ public class Runner while (aEnum.hasMoreElements()) { - String sKey = (String)aEnum.nextElement(); + String sKey = (String) aEnum.nextElement(); String sValue = System.getProperty(sKey); if (checkVariableForCygwin(sValue)) @@ -165,10 +166,10 @@ public class Runner aEnum = _aParams.keys(); while (aEnum.hasMoreElements()) { - String sKey = (String)aEnum.nextElement(); + String sKey = (String) aEnum.nextElement(); if (_aParams.get(sKey) instanceof String) { - String sValue = (String)_aParams.get(sKey); + String sValue = (String) _aParams.get(sKey); if (checkVariableForCygwin(sValue)) { @@ -240,7 +241,7 @@ public class Runner checkAllVariablesForCygwinPath(param); boolean worked = toExecute.executeTest(param); - long nTime = meanTime(getStartTime()); + long nTime = meanTime(getRunnerStartTime()); String sBeautifyTime = beautifyTime(nTime); System.out.println("Job run took: " + nTime + "ms " + " [" + sBeautifyTime + "]"); |