This commit is contained in:
boccioli_m
2017-06-06 14:45:17 +02:00
parent 9cb82a52af
commit 71e3cd2465
2 changed files with 7 additions and 3 deletions

View File

@@ -1875,7 +1875,7 @@ public class TestingList extends Panel {
private HashMap mParameters;
//private HashMap<String,Object> args;
private HashMap<String, HashMap> hTests;
private HashMap<String, HashMap> hTests ;
/**
*
@@ -2014,7 +2014,8 @@ public class TestingList extends Panel {
* @return return value: 0 means ok, <0 means problem
*/
private int executeParallelTestsGroup(int[] rowsToExecute) throws InterruptedException {
System.out.println(Convert.arrayToString(rowsToExecute, " - " , 10));
System.out.println(Convert.arrayToString(rowsToExecute, " - " , 10));
hTests = new HashMap();
int iRet = -1;
HashMap args2 = new HashMap(); //this is the global map that will contain one map per test.
HashMap testArgs; //this is the map for a test.
@@ -2030,6 +2031,7 @@ public class TestingList extends Panel {
mParameters = (HashMap) testArgs.get(testArgNames.PARAMETERS.toString());
sTestID = sDeviceName+"|"+sTestPath;
File f = new File(sTestPath);
System.out.println("Path = " + sTestPath);
if (!f.exists() || f.isDirectory()) {
logger.log(Level.SEVERE, "Cannot find test script: " + sTestPath);
showResult(sDeviceName, sTestPath, "Cannot find test script: " + sTestPath, TestStatus.FAILURE.toString());
@@ -2052,12 +2054,14 @@ public class TestingList extends Panel {
hTests = args2;
iRet = 0;
} catch (Exception ex) {
ex.printStackTrace();
SwingUtils.showMessage(TestingList.this, "executeTest()", ex.toString());
logger.log(Level.SEVERE, ex.toString());
showResult(sDeviceName, sTestPath, ex.toString(), TestStatus.FAILURE.toString());
setToStopped();
}
}
System.out.println(hTests);
try {
int iLastExecutedTestIndex = -1;
final String sParallelizeBegin = "(run,(str('";