X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fscripts%2Fprofile_cvs.sh;h=dc6c5215b91fd2edf4fdae74bf98e3a2409352aa;hb=16c818b5e9b613e6804345b380c5d20486eb4d8b;hp=7b41cb943505dd5401944be8ed2759f37b1d86fa;hpb=b4f330cf034e930d06aa7bfccb1cecf76f13d069;p=helm.git

diff --git a/helm/matita/scripts/profile_cvs.sh b/helm/matita/scripts/profile_cvs.sh
index 7b41cb943..dc6c5215b 100755
--- a/helm/matita/scripts/profile_cvs.sh
+++ b/helm/matita/scripts/profile_cvs.sh
@@ -7,14 +7,13 @@ function testit {
   MARK=`date +%Y%m%d`
   LOGTOOPT=/dev/null
   LOGTOBYTE=/dev/null
-  export DO_TESTS_EXTRA="$MARK\t$2"
-  ls
-  scripts/do_tests.sh -no-color ./matitac.opt $LOGTOOPT tests/*.ma
-  #scripts/do_tests.sh -nocolor ./matitac $LOGTOBYTE tests/*.ma
+  export DO_TESTS_EXTRA="$MARK\t$@"
+  make tests DO_TESTS_OPTS="-no-color -twice"
+  make tests.opt DO_TESTS_OPTS="-no-color -twice"
 }
 
 function compile {
-  OLD=$PWD
+  LOCALOLD=$PWD
   cd $1
   autoconf 1>/dev/null
   ./configure 1>/dev/null
@@ -22,32 +21,32 @@ function compile {
   cd $2
   autoconf 1>/dev/null
   ./configure 1>/dev/null
-  make matitac matitac.opt updater 1>/dev/null
-  sed "s/@@OWNER@@/profiler/" matita.conf.xml.sample > matita.conf.xml
-  ./updater
-  cd $OLD
+  cp matita.conf.xml.sample matita.conf.xml
+  make all opt 1>/dev/null
+  cd $LOCALOLD
 }
 
 function run_tests {
-  OLD=$PWD
+  LOCALOLD=$PWD
   cd $1
+  ./matitaclean all
+  mkdir .matita
   export OCAMLRUNPARAM='o=1000000'
-  testit $IMPL "gc-off" 1>/dev/null 2>/dev/null
-  testit $IMPL "gc-off"
+  testit "gc-off"
   export OCAMLRUNPARAM=''
-  testit $IMPL "gc-on" 1>/dev/null 2>/dev/null
-  testit $IMPL "gc-on"
-  cd $OLD
+  testit "gc-on"
+  cd $LOCALOLD
 }
 
+OLD=$PWD
 rm -rf $TMPDIRNAME
 mkdir $TMPDIRNAME
 cd $TMPDIRNAME
 cvs -d $CVSROOT co helm/ocaml 1>/dev/null 2>/dev/null
 cvs -d $CVSROOT co helm/matita 1>/dev/null 2>/dev/null
 compile $PWD/helm/ocaml $PWD/helm/matita
-run_tests $PWD/helm/matita > LOG
-cat LOG | awk -f $PWD/helm/matita/scripts/insert.awk > INSERT.sql
-cat INSERT.sql | mysql -u helm matita
-#rm -rf $TMPDIRNAME
-
+run_tests $PWD/helm/matita > LOG 2>/dev/null
+cat LOG | grep -v "^.......Debug:" | grep -v "^make[1]: " | grep -v "TOTAL TIME" | grep -v "WE HAVE NO UNIVERSE" | awk -f $PWD/helm/matita/scripts/insert.awk > INSERT.sql
+cat INSERT.sql | mysql -u helm -h mowgli.cs.unibo.it matita
+cd $OLD
+rm -rf $TMPDIRNAME