Muevo calgary tests a la barra. Mejoro el script para pruebas.

diff --git a/src/calgary/calgary.tar.bz2 b/calgary_tests/calgary.tar.bz2
similarity index 100%
rename from src/calgary/calgary.tar.bz2
rename to calgary_tests/calgary.tar.bz2

diff --git a/calgary_tests/test_calgary.sh b/calgary_tests/test_calgary.sh
new file mode 100755 (executable)
index 0000000..bf0d083
--- /dev/null
+++ b/calgary_tests/test_calgary.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+jacu=../src/jacu
+
+if [ ! -x $jacu ]; then
+       cd `dirname $jacu` && make && cd $OLDPWD || echo "No se pudo compilar jacu!!!"
+fi
+
+if [ ! -e bib ] ; then
+       echo "Descomprimiendo Calgary Corpus Suite ..."
+       if [ ! -e calgary.tar.bz2 ] ; then
+               echo "NO EXISTE cagary.tar.gz ... abortando"
+       fi
+tar -xjf calgary.tar.bz2
+fi
+
+for file in bib book1 book2 geo news obj1 obj2 paper1 paper2 paper3 paper4 \
+       paper5  paper6 pic progc progl progp trans; do
+       echo "===================================="
+       time $jacu -c $@ $file $file.j 2> /dev/null
+done
+echo "===================================="
+

diff --git a/src/calgary/test_calgary.sh b/src/calgary/test_calgary.sh
deleted file mode 100755 (executable)
index 8e19d1b..0000000
--- a/src/calgary/test_calgary.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-if [ ! -e bib ] ; then
-       echo "Descomprimiendo Calgary Corpus Suite ..."
-       if [ ! -e calgary.tar.bz2 ] ; then
-               echo "NO EXISTE cagary.tar.gz ... abortando"
-       fi
-tar -xjf calgary.tar.bz2
-fi
-
-echo "===================================="
-time ../jacu -c $@ bib bib.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ book1 book1.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ book2 book2.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ geo geo.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ news news.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ obj1 obj1.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ obj2 obj2.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper1 paper1.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper2 paper2.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper3 paper3.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper4 paper4.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper5 paper5.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ paper6 paper6.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ pic pic.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ progc progc.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ progl progl.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ progp progp.z 2> /dev/null
-echo "===================================="
-time ../jacu -c $@ trans trans.z 2> /dev/null
-echo "===================================="
-