Pushed BuildModelTest.sh into trunk instead of my home directory

- Modified BuildModelTest.sh to be more generic (easy to add new packages)
- Updated the BuildModelRecursive.mos to look for exact revision of the tested library (only works if building with the experimental package collection)


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

Examples/BuildModelRecursive.mos

@@ -10,8 +10,8 @@ ulimitOmc:="1200"; // 20 minutes to generate the C-code
 ulimitExe:="180";  // 3 minutes to initialize and run the simulation
 loadModel(library,{libraryVersion});
 getErrorString();
-libraryVersionTmp:=getVersion(library);
-libraryVersionTmp := if libraryVersionTmp == "" then libraryVersion else libraryVersionTmp;
+libraryVersionRevision:=getVersion(library);
+libraryVersionRevision := (if libraryVersionRevision == "" then libraryVersion else libraryVersionRevision) + (if regularFileExists(dirname(getSourceFile(library))+".last_change") then (" revision " + readFile(dirname(getSourceFile(Modelica))+".last_change")) else "");
 libraryString:=typeNameString(library);
 
 system("date +'%Y-%m-%d %H:%M:%S' > tmp.date");
@@ -108,7 +108,7 @@ str:="<h1>Recursive BuildModel Test</h1>
 <p>Total time taken: "+OpenModelica.Scripting.Internal.Time.readableTime(OpenModelica.Scripting.Internal.Time.timerTock(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED))+"</p>
 <p>OpenModelica Version: "+OpenModelica.Scripting.getVersion()+"</p>
 <p>Test started: "+dateAndTime+"</p>
-<p>Tested Library: "+libraryString+" "+libraryVersionTmp+"</p>
+<p>Tested Library: "+libraryString+" "+libraryVersionRevision+"</p>
 <p>BuildModel time limit: "+ulimitOmc+"s</p>
 <p>Simulation time limit: "+ulimitExe+"s</p>
 <p>Flags: setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\");</p>

Examples/BuildModelTest.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+
+if test "$1" = "--plot-only"; then
+  PLOTONLY="Yes"
+  shift
+fi
+PUB="$1"
+TRUNK="$2"
+OMC=$TRUNK/build/bin/omc
+shift;shift
+if test ! -d "$PUB" -o ! -f "$OMC"; then
+  echo "Usage: $0 [--plot-only] output/dir trunk/dir [SHORTNAME,NAME,VERSION]"
+  exit 1
+fi
+OLD="$PUB/MSL_old"
+mkdir -p "$OLD"
+
+# Build the mos-files
+if test -z "$PLOTONLY"; then
+for lib in "$*"; do
+SHORTNAME=`echo $lib | cut -d, -f1`
+NAME=`echo $lib | cut -d, -f2`
+VERSION=`echo $lib | cut -d, -f3`
+if test -z "$VERSION"; then
+  VERSION="default"
+fi
+mkdir -p "$PUB/$SHORTNAME"
+
+sed "s/^libraryVersion:=\"default\";/libraryVersion:=\"$VERSION\";/" "$TRUNK/Examples/BuildModelRecursive.mos" | sed "s/library:=.*/library:=\$TypeName($NAME);/" > "$NAME.mos"
+
+rm -f *.err BuildModelRecursive.html
+if $OMC +g=MetaModelica "$NAME.mos" > log 2>&1; then
+  rm -f "$PUB/$NAME/"*.err "$PUB/$NAME/"*.sim
+  cp BuildModelRecursive.html "$OLD/$SHORTNAME-`date +%Y-%m-%d`.html"
+  for f in *.err *.sim BuildModelRecursive.html; do mv "$f" "$PUB/$NAME/"; done
+else
+  cat log
+  echo "Subject: BuildModelTest $NAME $VERSION Failed"
+  exit 1
+fi
+done
+fi # --plot-only
+
+for lib in "$*"; do
+SECTION=`echo $lib | cut -d, -f1`
+echo "$SECTION"
+FIRST_DATE=`grep -H "Simulation Results:" $OLD/${SECTION}*.html | head -n1 | cut -d: -f1 | grep -o "20[0-9-]*"`
+LAST_DATE=`grep -H "Simulation Results:" $OLD/${SECTION}*.html | tail -n1 | cut -d: -f1 | grep -o "20[0-9-]*"`
+if test "$FIRST_DATE" = "$LAST_DATE"; then
+  FIRST_DATE="1970-01-01"
+fi
+GOAL=`grep -H "Simulation Results:" $OLD/${SECTION}*.html | tail -n1 | grep -o "[0-9][0-9]*/[0-9][0-9]*" | sed s,.*/,,`
+CURS=`grep -H "Simulation Results:" $OLD/${SECTION}*.html | tail -n1 | grep -o "[0-9][0-9]*/[0-9][0-9]*" | sed s,/.*,,`
+CURC=`grep -H "BuildModel Results:" $OLD/${SECTION}*.html | tail -n1 | grep -o "[0-9][0-9]*/[0-9][0-9]*" | sed s,/.*,,`
+cat > $PUB/MSL_old/${SECTION}-trend.gnuplot <<EOF
+set term svg
+set datafile separator ","
+set xlabel "Date $FIRST_DATE - $LAST_DATE"
+set ylabel "Models"
+set xdata time
+set timefmt "%Y-%m-%d"
+#set xrange ["2012-10-17":"2012-11-22"]
+set format x "%m-%d"
+set xrange ["$FIRST_DATE":"$LAST_DATE"]
+set yrange [0:$(( (($GOAL+9)/10)*10 ))]
+# set ytics 10
+# set xtics rotate by -13 font "Helvetica,8"
+set title '$SECTION Coverage'
+set output "${SECTION}-trend.svg"
+goal(x) = $GOAL
+currentC(x) = $CURC
+currentS(x) = $CURS
+set key right bottom Left title 'Legend'
+set style line 1 linecolor rgb "red"
+set style line 2 linecolor rgb "green"
+set style line 3 linecolor rgb "blue"
+set style line 4 linecolor rgb "#EE82EE" pt 1 ps 1
+set style line 5 linecolor rgb "#00FFEF" pt 1 ps 1
+plot goal(x) t 'Target: $GOAL' ls 1, \
+     currentC(x) t 'Now Compile: $CURC' ls 2, \
+     currentS(x) t 'Now Simulate: $CURS' ls 3, \
+     "${SECTION}-trend.csv" using 1:2 title 'Compile' with lp ls 4, \
+     "${SECTION}-trend.csv" using 1:3 title 'Simulate' with lp ls 5
+EOF
+rm -f $OLD/${SECTION}-trend.csv
+for f in `grep -H "Simulation Results:" $OLD/${SECTION}*.html | cut -d: -f1` ; do
+  DATE=`echo "$f" | grep -o "20[0-9-]*"`
+  BUILD=`grep "BuildModel Results:" "$f" | cut -d: -f2 | cut -d/ -f1 | tr -d \ `
+  SIM=`grep "Simulation Results:" "$f" | cut -d: -f2`
+  SIMSUC=`echo $SIM | cut -d/ -f1`
+  TOT=`echo $SIM | cut -d/ -f2 | cut -d" " -f1`
+  REV=`grep -o "[(]r[0-9]*" "$f" | tr -d "("`
+  #`cut -d / -f1 $f`
+  echo $DATE,$BUILD,$SIMSUC >> $OLD/${SECTION}-trend.csv
+  echo -n $DATE $REV
+  echo -n " - total $TOT"
+  echo -n " - build $BUILD" "($((100 * $BUILD / $TOT))%)"
+  echo " - sim $SIMSUC" "($((100 * $SIMSUC / $TOT))%)"
+done
+(cd $OLD; gnuplot ${SECTION}-trend.gnuplot)
+CUR=`ls $OLD/${SECTION}*.html | tail -n1`
+YDAY=`ls $OLD/${SECTION}*.html | tail -n2 | head -n1`
+WEEK=`ls $OLD/${SECTION}*.html | tail -n7 | head -n1`
+MONTH=`ls $OLD/${SECTION}*.html | tail -n28 | head -n1`
+"$TRUNK"/Examples/BuildModelRecursiveDiff.sh "$YDAY" "$CUR" > $PUB/MSL_old/${SECTION}-diff-yday.txt
+"$TRUNK"/Examples/BuildModelRecursiveDiff.sh "$WEEK" "$CUR" > $PUB/MSL_old/${SECTION}-diff-week.txt
+"$TRUNK"/Examples/BuildModelRecursiveDiff.sh "$MONTH" "$CUR" > $PUB/MSL_old/${SECTION}-diff-month.txt
+done > $PUB/MSL_old/history.txt

Makefile.common

@@ -51,7 +51,7 @@ interactive: .testvariables mkbuilddirs boehm-gc fmil
 	# Depends on libinteractive.a
 	$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget)
 
-docs: mkbuilddirs omlibrary
+docs: mkbuilddirs
 	make -C Compiler/Translation release
 	(cp -p doc/*.pdf doc/OpenModelicaAPI-Howto/*.pdf $(builddir_doc)/omc)
 	(cp -p Examples/*.* $(builddir_doc)/omc/testmodels/)

Makefile.in

@@ -31,7 +31,7 @@ settings:
 
 omc: omc-diff interactive docs fmi fmil opencl_rt
 	(cd Compiler && $(MAKE) -f Makefile release)
-
+	$(MAKE) omlibrary
 omcd: omc-diff interactive docs fmi fmil opencl_rt
 	(cd Compiler && $(MAKE) -f Makefile debug)