Closedown

plugins/TestingList.java

@@ -380,7 +380,7 @@ public class TestingList extends Panel {
         try {
             if (!configFile.isFile()) configFile.createNewFile();
             FileReader reader = new FileReader(configFile);
-            //System.out.println("save property: "+ key + " = " + val);
+            System.out.println("save property: "+ key + " = " + val);
             properties.setProperty(key, val);
             Properties props = properties;
             
@@ -2476,10 +2476,13 @@ public class TestingList extends Panel {
 
 
     /**
-     * get the parameters from the test config file
+     * get the parameters from the test and device config file.
+     * the test config params are default params. if the same param name
+     * is also in the device config, it will override the test param.
      *
      * @param sTestPath directory where the test files are (directory with the
      * test name)
+     * @param sdevicePath device config file path
      * @return HashMap of the test parameters. See buildParametersMap() for
      * details.
      */
@@ -2504,9 +2507,7 @@ public class TestingList extends Panel {
             System.out.println(pair.getKey() + " = " + pair.getValue());
             // add parameter only if not already on device parameters
             params.putIfAbsent(pair.getKey(), pair.getValue());
-        }          
-       
-   
+        }            
         return params;
     }
     

script/tests/devices/bx84/.config

@@ -2,5 +2,4 @@
 name=bx84
 tests=sad
 description=simulation device in playground
-parameters=setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;
-d
+parameters=setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;bla\:234\:bla bla;

script/tests/tests/sad/rpstry/.config

@@ -1,4 +1,4 @@
-#Wed Aug 30 15:17:16 CEST 2017
+#Thu Aug 31 17:11:52 CEST 2017
 name=rpstry
-parameters=delay\:.2\:delay between 2 steps;setVal\:10\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;
+parameters=delay\:.3\:delay between 2 steps;bla\:234\:bla bla;setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;
 description=try to use pshell for rps test