From 05f0c0416fcaa3ef33a108c1d6660773ccb1d350 Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Sun, 3 Nov 2002 15:48:19 +0000 Subject: [PATCH] Refactored common parts into test_prologue.sh and test_bulk.sh. --- t/src/test_bulk.sh | 41 ++++++++++++++++++++++ t/src/test_gom | 80 ++++++------------------------------------ t/src/test_intl | 76 +++------------------------------------ t/src/test_prologue.sh | 50 ++++++++++++++++++++++++++ t/src/test_script | 80 ++++++------------------------------------ t/src/test_update | 76 +++------------------------------------ 6 files changed, 123 insertions(+), 280 deletions(-) create mode 100644 t/src/test_bulk.sh create mode 100644 t/src/test_prologue.sh diff --git a/t/src/test_bulk.sh b/t/src/test_bulk.sh new file mode 100644 index 0000000..c4f29e6 --- /dev/null +++ b/t/src/test_bulk.sh @@ -0,0 +1,41 @@ +# $Id$ +# $Name$ +# Common test part for the test scripts + +ltcmd="$builddir/../libtool --mode=execute" +for lib in $test_libs +do + ltcmd="$ltcmd -dlopen $lib" +done + +echo "======================================================">> $logfile +echo "Performing test '$test_name'" >> $logfile +$ltcmd $GEDCOM_TESTENV $builddir/src/$test_program $options $test_args +result=$? +rm gedcom.enc +rm new.ged +rm ANSI_Z39.47.so +rm gconv-modules + +echo "Result is $result (expected: $expected_result)" >> $logfile +if [ "$result" -ne "$expected_result" ] +then + echo "Not the expected return value!" >> $logfile + exit 1 +else + if [ -r core ] + then + echo "Core file generated!" >> $logfile + exit 1 + else + if diff $outfile $reffile >/dev/null 2>>$logfile + then + echo "Output agrees with reference output" >> $logfile + rm $outfile + exit 0 + else + echo "Differences with reference output detected!" >> $logfile + exit 1 + fi + fi +fi diff --git a/t/src/test_gom b/t/src/test_gom index 90f4b4b..90d859c 100755 --- a/t/src/test_gom +++ b/t/src/test_gom @@ -2,86 +2,28 @@ # $Id$ # $Name$ -options="-q" -extra_options= - -while [ $# -gt 0 ] -do - case "$1" in - -*) extra_options="$extra_options $1";; - *) break;; - esac - shift -done - -test_name=$1 -expected_result=$2 -file=$3 -if [ -z "$test_name" ] -then - test_name=check -fi -if [ -z "$expected_result" ] +builddir=`pwd` +if [ -z "$srcdir" ] then - expected_result=0 + srcdir=. fi -# For use outside Makefile +. $srcdir/src/test_prologue.sh + +file=$1 + if [ -z "$srcdir" ] then testfile=$file - srcdir=. - options=$extra_options else case $file in ./*) testfile=$file ;; *) testfile=$srcdir/input/$file ;; esac - options="$options $extra_options" fi -outfile=$test_name.out -logfile=check.out -reffile=$srcdir/output/$test_name.ref -options="$options -o $outfile" - -builddir=`pwd` -ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la -dlopen $builddir/../gom/libgedcom_gom.la" -GCONV_PATH=.:$GCONV_PATH -export GCONV_PATH -LANG=C -export LANG -ln -s $srcdir/../data/gedcom.enc . -ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . -ln -s $srcdir/../iconv/glibc/gconv-modules . -rm -f core -echo "======================================================">> $logfile -echo "Performing test '$test_name'" >> $logfile -$ltcmd $GEDCOM_TESTENV $builddir/src/gomtest $options $testfile -result=$? -rm gedcom.enc -rm ANSI_Z39.47.so -rm gconv-modules +test_program=gomtest +test_libs="$builddir/../gedcom/libgedcom.la $builddir/../gom/libgedcom_gom.la" +test_args=$testfile -echo "Result is $result (expected: $expected_result)" >> $logfile -if [ "$result" -ne "$expected_result" ] -then - echo "Not the expected return value!" >> $logfile - exit 1 -else - if [ -r core ] - then - echo "Core file generated!" >> $logfile - exit 1 - else - if diff $outfile $reffile >/dev/null 2>>$logfile - then - echo "Output agrees with reference output" >> $logfile - rm $outfile - exit 0 - else - echo "Differences with reference output detected!" >> $logfile - exit 1 - fi - fi -fi +. $srcdir/src/test_bulk.sh diff --git a/t/src/test_intl b/t/src/test_intl index 6706ad9..c604091 100755 --- a/t/src/test_intl +++ b/t/src/test_intl @@ -2,80 +2,14 @@ # $Id$ # $Name$ -options="-q" -extra_options= - -while [ $# -gt 0 ] -do - case "$1" in - -*) extra_options="$extra_options $1";; - *) break;; - esac - shift -done - -test_name=$1 -expected_result=$2 -if [ -z "$test_name" ] -then - test_name=check -fi -if [ -z "$expected_result" ] -then - expected_result=0 -fi - -# For use outside Makefile +builddir=`pwd` if [ -z "$srcdir" ] then srcdir=. - options=$extra_options -else - options="$options $extra_options" fi -outfile=$test_name.out -logfile=check.out -reffile=$srcdir/output/$test_name.ref -options="$options -o $outfile" - -builddir=`pwd` -ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la" -GCONV_PATH=.:$GCONV_PATH -export GCONV_PATH -ln -s $srcdir/../data/gedcom.enc . -ln -s $builddir/../data/new.ged . -ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . -ln -s $srcdir/../iconv/glibc/gconv-modules . -rm -f core -echo "======================================================">> $logfile -echo "Performing test '$test_name'" >> $logfile -$ltcmd $GEDCOM_TESTENV $builddir/src/testintl $options -result=$? -rm gedcom.enc -rm new.ged -rm ANSI_Z39.47.so -rm gconv-modules +test_program=testintl +test_libs=$builddir/../gedcom/libgedcom.la -echo "Result is $result (expected: $expected_result)" >> $logfile -if [ "$result" -ne "$expected_result" ] -then - echo "Not the expected return value!" >> $logfile - exit 1 -else - if [ -r core ] - then - echo "Core file generated!" >> $logfile - exit 1 - else - if diff $outfile $reffile >/dev/null 2>>$logfile - then - echo "Output agrees with reference output" >> $logfile - rm $outfile - exit 0 - else - echo "Differences with reference output detected!" >> $logfile - exit 1 - fi - fi -fi +. $srcdir/src/test_prologue.sh +. $srcdir/src/test_bulk.sh diff --git a/t/src/test_prologue.sh b/t/src/test_prologue.sh new file mode 100644 index 0000000..dfbdb4d --- /dev/null +++ b/t/src/test_prologue.sh @@ -0,0 +1,50 @@ +# $Id$ +# $Name$ +# Common prologue for the test scripts + +extra_options= + +while [ $# -gt 0 ] +do + case "$1" in + -*) extra_options="$extra_options $1";; + *) break;; + esac + shift +done + +test_name=$1 +shift +expected_result=$1 +shift +if [ -z "$test_name" ] +then + test_name=check +fi +if [ -z "$expected_result" ] +then + expected_result=0 +fi + +# For use outside Makefile +if [ -z "$srcdir" ] +then + : +else + options="-q $extra_options" +fi + +outfile=$test_name.out +logfile=check.out +reffile=$srcdir/output/$test_name.ref +options="$options -o $outfile" + +GCONV_PATH=.:$GCONV_PATH +export GCONV_PATH +LANG=C +export LANG +ln -s $srcdir/../data/gedcom.enc . +ln -s $builddir/../data/new.ged . +ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . +ln -s $srcdir/../iconv/glibc/gconv-modules . +rm -f core diff --git a/t/src/test_script b/t/src/test_script index 46804cb..3753da4 100755 --- a/t/src/test_script +++ b/t/src/test_script @@ -2,86 +2,28 @@ # $Id$ # $Name$ -options="-q" -extra_options= - -while [ $# -gt 0 ] -do - case "$1" in - -*) extra_options="$extra_options $1";; - *) break;; - esac - shift -done - -test_name=$1 -expected_result=$2 -file=$3 -if [ -z "$test_name" ] -then - test_name=check -fi -if [ -z "$expected_result" ] +builddir=`pwd` +if [ -z "$srcdir" ] then - expected_result=0 + srcdir=. fi -# For use outside Makefile +. $srcdir/src/test_prologue.sh + +file=$1 + if [ -z "$srcdir" ] then testfile=$file - srcdir=. - options=$extra_options else case $file in ./*) testfile=$file ;; *) testfile=$srcdir/input/$file ;; esac - options="$options $extra_options" fi -outfile=$test_name.out -logfile=check.out -reffile=$srcdir/output/$test_name.ref -options="$options -o $outfile" - -builddir=`pwd` -ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la" -GCONV_PATH=.:$GCONV_PATH -export GCONV_PATH -LANG=C -export LANG -ln -s $srcdir/../data/gedcom.enc . -ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . -ln -s $srcdir/../iconv/glibc/gconv-modules . -rm -f core -echo "======================================================">> $logfile -echo "Performing test '$test_name'" >> $logfile -$ltcmd $GEDCOM_TESTENV $builddir/src/testgedcom $options $testfile -result=$? -rm gedcom.enc -rm ANSI_Z39.47.so -rm gconv-modules +test_program=testgedcom +test_libs=$builddir/../gedcom/libgedcom.la +test_args=$testfile -echo "Result is $result (expected: $expected_result)" >> $logfile -if [ "$result" -ne "$expected_result" ] -then - echo "Not the expected return value!" >> $logfile - exit 1 -else - if [ -r core ] - then - echo "Core file generated!" >> $logfile - exit 1 - else - if diff $outfile $reffile >/dev/null 2>>$logfile - then - echo "Output agrees with reference output" >> $logfile - rm $outfile - exit 0 - else - echo "Differences with reference output detected!" >> $logfile - exit 1 - fi - fi -fi +. $srcdir/src/test_bulk.sh diff --git a/t/src/test_update b/t/src/test_update index 113f6fe..a4c2a9c 100755 --- a/t/src/test_update +++ b/t/src/test_update @@ -2,80 +2,14 @@ # $Id$ # $Name$ -options="-q" -extra_options= - -while [ $# -gt 0 ] -do - case "$1" in - -*) extra_options="$extra_options $1";; - *) break;; - esac - shift -done - -test_name=$1 -expected_result=$2 -if [ -z "$test_name" ] -then - test_name=check -fi -if [ -z "$expected_result" ] -then - expected_result=0 -fi - -# For use outside Makefile +builddir=`pwd` if [ -z "$srcdir" ] then srcdir=. - options=$extra_options -else - options="$options $extra_options" fi -outfile=$test_name.out -logfile=check.out -reffile=$srcdir/output/$test_name.ref -options="$options -o $outfile" - -builddir=`pwd` -ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la" -GCONV_PATH=.:$GCONV_PATH -export GCONV_PATH -ln -s $srcdir/../data/gedcom.enc . -ln -s $builddir/../data/new.ged . -ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . -ln -s $srcdir/../iconv/glibc/gconv-modules . -rm -f core -echo "======================================================">> $logfile -echo "Performing test '$test_name'" >> $logfile -$ltcmd $GEDCOM_TESTENV $builddir/src/updatetest $options -result=$? -rm gedcom.enc -rm new.ged -rm ANSI_Z39.47.so -rm gconv-modules +test_program=updatetest +test_libs=$builddir/../gedcom/libgedcom.la -echo "Result is $result (expected: $expected_result)" >> $logfile -if [ "$result" -ne "$expected_result" ] -then - echo "Not the expected return value!" >> $logfile - exit 1 -else - if [ -r core ] - then - echo "Core file generated!" >> $logfile - exit 1 - else - if diff $outfile $reffile >/dev/null 2>>$logfile - then - echo "Output agrees with reference output" >> $logfile - rm $outfile - exit 0 - else - echo "Differences with reference output detected!" >> $logfile - exit 1 - fi - fi -fi +. $srcdir/src/test_prologue.sh +. $srcdir/src/test_bulk.sh -- 2.30.2