- compareSimulationResults: report vars in case of file not equal and…

… print error messages if command failed

- msl31/simulate: delete all generated files

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11843 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/Script/CevalScript.mo

@@ -1828,13 +1828,14 @@ algorithm
         filename_1 = stringAppendList({pwd,pd,filename_1});
         filename2 = stringAppendList({pwd,pd,filename2});
         vars_1 = List.map(cvars, ValuesUtil.valString);
-        {str} = SimulationResults.cmpSimulationResults(filename,filename_1,filename2,x1,x2,vars_1);
-        v = Values.STRING(str);
+        strings = SimulationResults.cmpSimulationResults(filename,filename_1,filename2,x1,x2,vars_1);
+        cvars = List.map(strings,ValuesUtil.makeString);
+        v = Util.if_(intGt(listLength(cvars),1),Values.LIST(cvars),listNth(cvars,0));
       then
         (cache,v,st);
 
     case (cache,env,"compareSimulationResults",_,st,msg)
-      then (cache,Values.STRING(""),st);
+      then (cache,Values.STRING("Error in compareSimulationResults"),st);
 
     case (cache,env,"getPlotSilent",{},st,msg)
       equation

Compiler/runtime/SimulationResultsCmp.c

@@ -537,7 +537,11 @@ void* SimulationResultsCmp_compareResults(const char *filename, const char *reff
     /* fprintf(stderr, "diff: %d\n",ddf.n); */
     /* for (i=0;i<vardiffindx;i++)
       fprintf(stderr, "diffVar: %s\n",cmpdiffvars[i]); */
-    res = mk_cons(mk_scon("Files not Equal!"),mk_nil());
+	res = mk_nil();
+    for (i=0;i<vardiffindx;i++){
+    	res = (void*)mk_cons(mk_scon(cmpdiffvars[i]),res);
+    }
+    res = mk_cons(mk_scon("Files not Equal!"),res);
     c_add_message(-1, ErrorType_scripting, ErrorLevel_warning, "Files not Equal\n", msg, 0);
   }
   else