Some fixes for the hudson version of gnuplot (I hope)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17681 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 14, 2013 · b19328c · b19328c
1 parent 8a692bd
commit b19328c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Compiler/runtime/SimulationResultsCmp.c b/Compiler/runtime/SimulationResultsCmp.c
@@ -253,7 +253,7 @@ static unsigned int cmpData(int isResultCmp, char* varname, DataField *time, Dat
     sprintf(fname, "%s.%s.csv", prefix, varname);
     fout = fopen(fname,"w");
     if (fout) {
-      fprintf(fout, "time,reference,actual,err,relerr,threshold,\"%s\"\n",varname);
+      fprintf(fout, "time,reference,actual,err,relerr,threshold\n");
     }
   }
   for (i=0;i<refdata->n;i++){

diff --git a/Examples/BuildModelRecursive.mos b/Examples/BuildModelRecursive.mos
@@ -200,4 +200,6 @@ writeFile(log,"</table><hr /><p><a href=\"BuildModelRecursive.tar.xz\">Offline v
 {writeFile("BuildModelRecursive." + phase + ".xml", "<testsuite>\n" + sum(readFile(s + ".stat." + phase) for s in a) + "</testsuite>\n") for phase in {"flat","compile","sim"}};getErrorString();
 
 system("rm -f tidy.err; for f in *.err; do (grep -v 'Duplicate modification of element' $f | sed s,^.*omlibrary/,[, | grep -v 'Error building simulator' | grep -v 'has no value, and is fixed during initialization' | grep -5E '(Warning|Error|Notification):' > tmp.tidy && test -s tmp.tidy && (basename $f && cat tmp.tidy)) >> tidy.err; done");
+system("chmod -R go+r BuildModelRecursive.tar.xz BuildModelRecursive.html files tidy.err");
+system("chmod g+x files");
 system("tar cJf BuildModelRecursive.tar.xz BuildModelRecursive.html files tidy.err");
diff --git a/Examples/LibraryTest.sh b/Examples/LibraryTest.sh
@@ -29,6 +29,6 @@ sed "s/^libraryVersion:=\"default\";/libraryVersion:=\"$LIB_VERSION\";/" "$TESTM
 
 shopt -s nullglob
 cp BuildModelRecursive.tar.xz "$WWW/$LIB_DIR/"
-(cd "$WWW/$LIB_NAME/" && rm -rf files *.err *.sim *.html && tar xJf BuildModelRecursive.tar.xz)
+(cd "$WWW/$LIB_DIR/" && rm -rf files *.err *.sim *.html && tar xJf BuildModelRecursive.tar.xz)
 cp BuildModelRecursive.html "$HISTORY"/`date +${LIB_DIR}-%Y-%m-%d.html`
 bash -e "$TESTMODELS/PlotLibraryTrend.sh" "$HISTORY" "$LIB_NAME"