X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fscripts%2Fprofile_svn.sh;h=72105b2e0dedd33d08808457be82f87ec7f2e08f;hb=d6082c846d53389e392e90e2a82c4a3036dd1f2d;hp=9254544d5a389f93e6375d03e3580af845d33270;hpb=d5360f7080b817b0fd215da9e1b3f13a82283c93;p=helm.git

diff --git a/helm/software/matita/scripts/profile_svn.sh b/helm/software/matita/scripts/profile_svn.sh
index 9254544d5..72105b2e0 100755
--- a/helm/software/matita/scripts/profile_svn.sh
+++ b/helm/software/matita/scripts/profile_svn.sh
@@ -1,14 +1,19 @@
 #!/bin/bash
+
+#configuration
 MARK=`date +%Y%m%d%H%M`
 TMPDIRNAME=__${MARK}_compilation
 SVNROOT="svn+ssh://mowgli.cs.unibo.it/local/svn/helm/trunk/"
+MYSQL="mysql -u helm -h mowgli.cs.unibo.it matita"
+SVNLOG=LOG.svn
 
+#helpers
 function testit {
   LOGTOOPT=/dev/null
   LOGTOBYTE=/dev/null
-  export DO_TESTS_EXTRA="$MARK\t$@"
-  make tests DO_TESTS_OPTS="-no-color -twice -keep-logs"
-  make tests.opt DO_TESTS_OPTS="-no-color -twice -keep-logs"
+  export BENCH_EXTRA_TEXT="$MARK $@"
+  make tests 
+  make tests.opt 
 }
 
 function compile {
@@ -24,42 +29,51 @@ function run_tests {
   LOCALOLD=$PWD
   cd $1
   ./matitaclean all
-  mkdir .matita
-  export OCAMLRUNPARAM='o=1000000'
-  testit "gc-off"
+  #export OCAMLRUNPARAM='o=100000'
+  #testit "gc-off"
   export OCAMLRUNPARAM=''
   testit "gc-on"
   cd $LOCALOLD
 }
 
+#initialization
 OLD=$PWD
 rm -rf $TMPDIRNAME
 mkdir $TMPDIRNAME
 mkdir $TMPDIRNAME.HOME
 cd $TMPDIRNAME
-SVNLOG=`pwd`/LOG.svn
 
-#svn
+#svn checkout
 svn co -N $SVNROOT > $SVNLOG 2>&1
 cd trunk 
 svn update -N helm >> $SVNLOG 2>&1
 cd helm
-svn update $SVNOPTIONS software/components >> $SVNLOG 2>&1
-svn update $SVNOPTIONS software/matita >> $SVNLOG 2>&1
+svn update -N software >> $SVNLOG 2>&1
+cd software
+svn update $SVNOPTIONS components >> $SVNLOG 2>&1
+svn update $SVNOPTIONS matita >> $SVNLOG 2>&1
+cd ..
 cd ..
 cd ..
 ln -s trunk/helm .
 
 #compile
 export HOME="`pwd`/../$TMPDIRNAME.HOME"
-compile $PWD/helm/
+export USER="bench"
+compile $PWD/helm/software/
 
 #run
-run_tests $PWD/helm/software/matita > LOG 2>/dev/null
+run_tests $PWD/helm/software/matita > LOG 2>LOG.run_tests.err
 
-cat LOG | grep "\(OK\|FAIL\)" | grep "\(gc-on\|gc-off\)" | awk -f $PWD/helm/software/matita/scripts/insert.awk > INSERT.sql
-cat INSERT.sql | mysql -u helm -h mowgli.cs.unibo.it matita
-SVNREVISION=`cat $SVNLOG | grep revision | tail -n 1 | sed "s/.*revision \(\w\+\)./\1/"`
-echo "INSERT INTO bench_svn VALUES ('$MARK','$SVNREVISION')" | mysql -u helm -h mowgli.cs.unibo.it matita
+#insert the db
+cat LOG | grep "\(OK\|FAIL\)" | grep "\(gc-on\|gc-off\)" | grep -v "bad_tests" | grep -v "interactive" |\
+  lua5.1 $PWD/helm/software/matita/scripts/functions.lua log2sql - > INSERT.sql
+cat INSERT.sql | $MYSQL
+
+#save the revision
+SVNREVISION=`svn info $PWD/helm/software/ | grep "^Revision:" | cut -d : -f 2`
+echo "INSERT INTO bench_svn VALUES ('$MARK','$SVNREVISION')" | $MYSQL
 cd $OLD
 #rm -rf $TMPDIRNAME
+
+#eof