gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-443-ge1c8817)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  e1c88171f997c8cfa6033f54a6d7877374cde228 (commit)
       via  e92680deb2e9a4c87eae77df5f1cfc2b0d2529b6 (commit)
      from  7289597377b3a0efd00c29b5da08956b25dffafc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 utils/tests/gxyrs/run_tests.sh |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


=================
 Commit Messages
=================

commit e1c88171f997c8cfa6033f54a6d7877374cde228
Author: Carlos Nieves Onega <cnieves@xxxxxxxxxx>
Date:   Sun Dec 21 16:18:47 2008 +0100

    Check if gxyrs.pm exists in gxyrs's run_tests.sh.
    
    Check if gxyrs module exists in gxyrs's run_tests.sh and output
    and meaningful error message if it is not found.

:100755 100755 7e049fb... de2954d... M	utils/tests/gxyrs/run_tests.sh

commit e92680deb2e9a4c87eae77df5f1cfc2b0d2529b6
Author: Carlos Nieves Onega <cnieves@xxxxxxxxxx>
Date:   Sun Dec 21 15:49:38 2008 +0100

    Fixed up gxyrs run_tests.sh to work with both make distcheck.
    
    Add gxyrs source directory to perl's include variable, so gxyrs.pm
    file could be found when make distcheck is executed.

:100755 100755 575700e... 7e049fb... M	utils/tests/gxyrs/run_tests.sh

=========
 Changes
=========

commit e1c88171f997c8cfa6033f54a6d7877374cde228
Author: Carlos Nieves Onega <cnieves@xxxxxxxxxx>
Date:   Sun Dec 21 16:18:47 2008 +0100

    Check if gxyrs.pm exists in gxyrs's run_tests.sh.
    
    Check if gxyrs module exists in gxyrs's run_tests.sh and output
    and meaningful error message if it is not found.

diff --git a/utils/tests/gxyrs/run_tests.sh b/utils/tests/gxyrs/run_tests.sh
index 7e049fb..de2954d 100755
--- a/utils/tests/gxyrs/run_tests.sh
+++ b/utils/tests/gxyrs/run_tests.sh
@@ -120,6 +120,13 @@ if test ! -f $GXYRS_SCRIPT ; then
     exit 1
 fi
 
+# Check if gxyrs.pm module exists
+eval "${PERL} -I${gxyrs_srcdir} -Mgxyrs -e 1"
+if test $? -ne 0; then
+    echo "ERROR: ($0)  gxyrs module gxyrs.pm does not exist"
+    exit 1
+fi
+
 
 # fail/pass/total counts
 fail=0

commit e92680deb2e9a4c87eae77df5f1cfc2b0d2529b6
Author: Carlos Nieves Onega <cnieves@xxxxxxxxxx>
Date:   Sun Dec 21 15:49:38 2008 +0100

    Fixed up gxyrs run_tests.sh to work with both make distcheck.
    
    Add gxyrs source directory to perl's include variable, so gxyrs.pm
    file could be found when make distcheck is executed.

diff --git a/utils/tests/gxyrs/run_tests.sh b/utils/tests/gxyrs/run_tests.sh
index 575700e..7e049fb 100755
--- a/utils/tests/gxyrs/run_tests.sh
+++ b/utils/tests/gxyrs/run_tests.sh
@@ -96,6 +96,7 @@ top_srcdir=${top_srcdir:-$here/../..}
 top_srcdir=`cd $top_srcdir && pwd`
 top_builddir=${top_builddir:-$here/../..}
 top_builddir=`cd $top_builddir && pwd`
+gxyrs_srcdir=`cd $top_srcdir/gxyrs && pwd`
 
 # the perl program
 PERL=${PERL:-perl}
@@ -137,6 +138,7 @@ cat << EOF
 Starting tests in $here
 srcdir:     $srcdir
 top_srcdir: $top_srcdir
+gxyrs srcdir: $gxyrs_srcdir
 INPUT_DIR:  ${INPUT_DIR}
 GOLDEN_DIR: ${GOLDEN_DIR}
 script to test: ${top_srcdir}/gxyrs/gxyrs
@@ -183,9 +185,9 @@ for t in $all_tests ; do
     #
     
     if test "X$adjust_file" = "X" -o "X$adjust_file" = "X " ; then
-	command="cd ${rundir} && ${PERL} -w ${GXYRS_SCRIPT} $args $files --output $out_file 2> $error_file"
+	command="cd ${rundir} && ${PERL} -I${gxyrs_srcdir} -w ${GXYRS_SCRIPT} $args $files --output $out_file 2> $error_file"
     else
-	command="cd ${rundir} && ${PERL} -w ${GXYRS_SCRIPT} $args $files --adjust $adjust_file --output $out_file 2> $error_file"
+	command="cd ${rundir} && ${PERL} -I${gxyrs_srcdir} -w ${GXYRS_SCRIPT} $args $files --adjust $adjust_file --output $out_file 2> $error_file"
     fi
     echo "Running test ${t}"
     echo $command




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs