Skip to content

Commit

Permalink
- do not report "Files Equal" if nothing was compared
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14171 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Jens Frenkel committed Nov 30, 2012
1 parent 6cd4a35 commit 0ba3105
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Compiler/runtime/SimulationResultsCmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ void* SimulationResultsCmp_compareResults(const char *filename, const char *reff
char **cmpdiffvars=NULL;
unsigned int vardiffindx=0;
unsigned int ncmpvars = 0;
unsigned int ngetfailedvars = 0;
void *allvars,*cmpvar,*res;
unsigned int i,size,size_ref,len,oldlen,j,k;
char *var,*var1,*var2;
Expand Down Expand Up @@ -703,6 +704,7 @@ void* SimulationResultsCmp_compareResults(const char *filename, const char *reff
if (dataref.n==0) {
fprintf(stderr, "Get Data of Var %s from file %s failed\n",var,reffilename);
c_add_message(-1, ErrorType_scripting, ErrorLevel_warning, gettext("Get Data of Var failed!\n"), msg, 0);
ngetfailedvars++;
continue;
}
}
Expand All @@ -716,6 +718,7 @@ void* SimulationResultsCmp_compareResults(const char *filename, const char *reff
if (data.data) free(data.data);
fprintf(stderr, "Get Data of Var %s from file %s failed\n",var,filename);
c_add_message(-1, ErrorType_scripting, ErrorLevel_warning, gettext("Get Data of Var failed!\n"), msg, 0);
ngetfailedvars++;
continue;
}
}
Expand All @@ -731,7 +734,7 @@ void* SimulationResultsCmp_compareResults(const char *filename, const char *reff
c_add_message(-1, ErrorType_scripting, ErrorLevel_warning, gettext("Cannot write result file!\n"), msg, 0);
}

if (ddf.n > 0){
if ((ddf.n > 0) || (ngetfailedvars > 0)){
/* fprintf(stderr, "diff: %d\n",ddf.n); */
/* for (i=0;i<vardiffindx;i++)
fprintf(stderr, "diffVar: %s\n",cmpdiffvars[i]); */
Expand Down

0 comments on commit 0ba3105

Please sign in to comment.