make SimulationResultsCmp obey runningTestsuite flag to fix test

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20870 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 28, 2014 · 62bedf3 · 62bedf3
1 parent 24626a5
commit 62bedf3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Compiler/runtime/SimulationResults.c b/Compiler/runtime/SimulationResults.c
@@ -297,7 +297,7 @@ static void* SimulationResultsImpl__readVarsFilterAliases(const char *filename,
   }
 }
 
-static void* SimulationResultsImpl__readDataset(const char *filename, void *vars, int dimsize, int suggestReadAllVars, SimulationResult_Globals* simresglob)
+static void* SimulationResultsImpl__readDataset(const char *filename, void *vars, int dimsize, int suggestReadAllVars, SimulationResult_Globals* simresglob, int runningTestsuite)
 {
   const char *msg[2] = {"",""};
   void *res,*col;
@@ -325,9 +325,9 @@ static void* SimulationResultsImpl__readDataset(const char *filename, void *vars
       var = RML_STRINGDATA(RML_CAR(vars));
       vars = RML_CDR(vars);
       mat_var = omc_matlab4_find_var(&simresglob->matReader,var);
-      if (mat_var == NULL) {
+      if (mat_var == NULL) {      
+        msg[0] = runningTestsuite ? SystemImpl__basename(filename) : filename;
         msg[1] = var;
-        msg[0] = filename;
         c_add_message(NULL,-1, ErrorType_scripting, ErrorLevel_error, gettext("Could not read variable %s in file %s."), msg, 2);
         return NULL;
       } else if (mat_var->isParam) {
@@ -352,8 +352,8 @@ static void* SimulationResultsImpl__readDataset(const char *filename, void *vars
       vars = RML_CDR(vars);
       vals = simresglob->csvReader ? read_csv_dataset(simresglob->csvReader,var) : NULL;
       if (vals == NULL) {
+        msg[0] = runningTestsuite ? SystemImpl__basename(filename) : filename;
         msg[1] = var;
-        msg[0] = filename;
         c_add_message(NULL,-1, ErrorType_scripting, ErrorLevel_error, gettext("Could not read variable %s in file %s."), msg, 2);
         return NULL;
       } else {

diff --git a/Compiler/runtime/SimulationResultsCmp.c b/Compiler/runtime/SimulationResultsCmp.c
@@ -160,7 +160,7 @@ static char ** getVars(void *vars, unsigned int* nvars)
   return cmpvars;
 }
 
-static DataField getData(const char *varname,const char *filename, unsigned int size, int suggestRealAll, SimulationResult_Globals* srg)
+static DataField getData(const char *varname,const char *filename, unsigned int size, int suggestRealAll, SimulationResult_Globals* srg, int runningTestsuite)
 {
   DataField res;
   void *cmpvar,*dataset,*lst,*datasetBackup;
@@ -171,7 +171,7 @@ static DataField getData(const char *varname,const char *filename, unsigned int
   /* fprintf(stderr, "getData of Var: %s from file %s\n", varname,filename);  */
   cmpvar = mk_nil();
   cmpvar =  mk_cons(mk_scon(varname),cmpvar);
-  dataset = SimulationResultsImpl__readDataset(filename,cmpvar,size,suggestRealAll,srg);
+  dataset = SimulationResultsImpl__readDataset(filename,cmpvar,size,suggestRealAll,srg,runningTestsuite);
   if (dataset==NULL) {
     /* fprintf(stderr, "getData of Var: %s failed!\n",varname); */
     return res;
@@ -663,12 +663,12 @@ void* SimulationResultsCmp_compareResults(int isResultCmp, int runningTestsuite,
   /* fprintf(stderr, "get time\n"); */
   timeVarName = getTimeVarName(allvars);
   timeVarNameRef = getTimeVarName(allvarsref);
-  time = getData(timeVarName,filename,size,suggestReadAll,&simresglob_c);
+  time = getData(timeVarName,filename,size,suggestReadAll,&simresglob_c,runningTestsuite);
   if (time.n==0) {
     return mk_cons(mk_scon("Error get time!"),mk_nil());
   }
   /* fprintf(stderr, "get reftime\n"); */
-  timeref = getData(timeVarNameRef,reffilename,size_ref,suggestReadAll,&simresglob_ref);
+  timeref = getData(timeVarNameRef,reffilename,size_ref,suggestReadAll,&simresglob_ref,runningTestsuite);
   if (timeref.n==0) {
     return mk_cons(mk_scon("Error get ref time!"),mk_nil());
   }
@@ -704,14 +704,14 @@ void* SimulationResultsCmp_compareResults(int isResultCmp, int runningTestsuite,
     var1[k] = 0;
     /* fprintf(stderr, "compare var: %s\n",var); */
     /* check if in ref_file */
-    dataref = getData(var1,reffilename,size_ref,suggestReadAll,&simresglob_ref);
+    dataref = getData(var1,reffilename,size_ref,suggestReadAll,&simresglob_ref,runningTestsuite);
     if (dataref.n==0) {
       if (var2) free(var2);
       var2 = (char*) malloc(len+10);
       strncpy(var2,var1,len+1);
       fixDerInName(var2,len);
       fixCommaInName(&var2,len);
-      dataref = getData(var2,reffilename,size_ref,suggestReadAll,&simresglob_ref);
+      dataref = getData(var2,reffilename,size_ref,suggestReadAll,&simresglob_ref,runningTestsuite);
       if (dataref.n==0) {
         msg[0] = runningTestsuite ? SystemImpl__basename(reffilename) : reffilename;
         msg[1] = var;
@@ -721,11 +721,11 @@ void* SimulationResultsCmp_compareResults(int isResultCmp, int runningTestsuite,
       }
     }
     /*  check if in file */
-    data = getData(var1,filename,size,suggestReadAll,&simresglob_c);
+    data = getData(var1,filename,size,suggestReadAll,&simresglob_c,runningTestsuite);
     if (data.n==0)  {
       fixDerInName(var1,len);
       fixCommaInName(&var1,len);
-      data = getData(var1,filename,size,suggestReadAll,&simresglob_c);
+      data = getData(var1,filename,size,suggestReadAll,&simresglob_c,runningTestsuite);
       if (data.n==0)  {
         if (data.data) free(data.data);
         msg[0] = runningTestsuite ? SystemImpl__basename(filename) : filename;

diff --git a/Compiler/runtime/SimulationResults_omc.c b/Compiler/runtime/SimulationResults_omc.c
@@ -48,7 +48,7 @@ void* SimulationResults_readVariables(const char *filename, const char *visvars)
 extern void* _ValuesUtil_reverseMatrix(void*);
 void* SimulationResults_readDataset(const char *filename, void *vars, int datasize)
 {
-  void *res = SimulationResultsImpl__readDataset(filename,vars,datasize,0,&simresglob);
+  void *res = SimulationResultsImpl__readDataset(filename,vars,datasize,0,&simresglob,0);
   if (res == NULL) MMC_THROW();
   return res;
 }

diff --git a/Compiler/runtime/SimulationResults_rml.c b/Compiler/runtime/SimulationResults_rml.c
@@ -52,7 +52,7 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(SimulationResults__readDataset)
 {
-  rmlA0 = (void*)SimulationResultsImpl__readDataset(RML_STRINGDATA(rmlA0),rmlA1,RML_UNTAGFIXNUM(rmlA2),0,&simresglob);
+  rmlA0 = (void*)SimulationResultsImpl__readDataset(RML_STRINGDATA(rmlA0),rmlA1,RML_UNTAGFIXNUM(rmlA2),0,&simresglob,0);
 
   if (rmlA0 == NULL) {
     RML_TAILCALLK(rmlFC);