X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2Fsrc%2Ftest_script;h=3753da40b644ded15a3319ff6a8d3c343d8ed1af;hb=2ccfaedef455b54f53d9da0936f1a0539d22bfd4;hp=2053507fc87a3f00071dd3a38e562ce61d5d7754;hpb=b7fa4322a902c5d0647ca5f0ad469a98cd599046;p=gedcom-parse.git

diff --git a/t/src/test_script b/t/src/test_script
index 2053507..3753da4 100755
--- a/t/src/test_script
+++ b/t/src/test_script
@@ -2,82 +2,28 @@
 # $Id$
 # $Name$
 
-options="-q"
-extra_options=
+builddir=`pwd`
+if [ -z "$srcdir" ]
+then
+  srcdir=.
+fi
 
-while [ $# -gt 0 ]
-do
-  case "$1" in
-    -*) extra_options="$extra_options $1";;
-    *)  break;;
-  esac
-  shift
-done
+. $srcdir/src/test_prologue.sh
 
 file=$1
-test_name=$2
-expected_result=$3
-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
   testfile=$file
-  srcdir=.
-  options=$extra_options
 else
-  testfile=$srcdir/input/$file
-  options="$options $extra_options"
+  case $file in
+    ./*) testfile=$file ;;
+    *)   testfile=$srcdir/input/$file ;;
+  esac
 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
-  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