Commit 4e2373ab authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

test: added Genweights.test.in

parent b8527692
......@@ -615,6 +615,7 @@ src/yacc_lex -text
src/zaxis.c -text
test/.checklib_pyunittest -text
test/Cat.test.in -text
test/Genweights.test.in -text
test/Gridarea.test.in -text
test/Makefile.am -text
test/Makefile.in -text
......
......@@ -20442,7 +20442,9 @@ fi
done
 
 
ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Remap.test test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test"
ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test"
ac_config_files="$ac_config_files test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test"
 
ac_config_files="$ac_config_files Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings"
 
......@@ -21583,6 +21585,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"test/Cat.test") CONFIG_FILES="$CONFIG_FILES test/Cat.test" ;;
"test/Gridarea.test") CONFIG_FILES="$CONFIG_FILES test/Gridarea.test" ;;
"test/Genweights.test") CONFIG_FILES="$CONFIG_FILES test/Genweights.test" ;;
"test/Remap.test") CONFIG_FILES="$CONFIG_FILES test/Remap.test" ;;
"test/Select.test") CONFIG_FILES="$CONFIG_FILES test/Select.test" ;;
"test/Spectral.test") CONFIG_FILES="$CONFIG_FILES test/Spectral.test" ;;
......@@ -23082,6 +23085,7 @@ _LT_EOF
;;
"test/Cat.test":F) chmod a+x "$ac_file" ;;
"test/Gridarea.test":F) chmod a+x "$ac_file" ;;
"test/Genweights.test":F) chmod a+x "$ac_file" ;;
"test/Remap.test":F) chmod a+x "$ac_file" ;;
"test/Select.test":F) chmod a+x "$ac_file" ;;
"test/Spectral.test":F) chmod a+x "$ac_file" ;;
......
......@@ -134,7 +134,8 @@ AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
AC_REQUIRE_AUX_FILE([tap-driver.sh])
AC_PROG_AWK
AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Remap.test test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings])
AC_OUTPUT
......
#! @SHELL@
echo 1..20 # Number of tests to be executed.
#
test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data
#
ABSLIM=0.001
CDOOUT=cout
CDOERR=cerr
FORMAT="-f srv -b 32"
GRIDS="n16 n32"
#
IFILE=$DATAPATH/bathy4.grb
NTEST=1
#
for GRIDTYPE in "regular" "curvilinear" "unstructured"; do
SETGRID=""
if [ "$GRIDTYPE" != "regular" ]; then SETGRID="-setgridtype,$GRIDTYPE"; fi
for GRID in $GRIDS; do
# remaplaf: sort could give different results"
RMODS="bil bic nn con"
if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="nn con"; fi
for RMOD in $RMODS; do
RSTAT=0
OFILE=${GRID}_${RMOD}
RFILE=$DATAPATH/${OFILE}_ref
CDOTEST="gen${RMOD} $GRID $GRIDTYPE"
CDOCOMMAND="$CDO $FORMAT gen${RMOD},$GRID $SETGRID $IFILE remapweights"
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
$CDOCOMMAND
test $? -eq 0 || let RSTAT++
$CDO $FORMAT remap,$GRID,remapweights $SETGRID $IFILE ${OFILE}
test $? -eq 0 || let RSTAT++
$CDO diff,$ABSLIM $OFILE $RFILE > $CDOOUT 2> $CDOERR
test $? -eq 0 || let RSTAT++
test -s $CDOOUT && let RSTAT++
cat $CDOOUT $CDOERR
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
let NTEST++
rm -f $OFILE
done
done
done
#
rm -f $CDOOUT $CDOERR
#
exit 0
......@@ -5,7 +5,8 @@ export
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
$(top_srcdir)/config/tap-driver.sh
TESTS = Cat.test Gridarea.test Remap.test Select.test Spectral.test Timstat.test Vertint.test
TESTS = Cat.test Gridarea.test Genweights.test Remap.test \
Select.test Spectral.test Timstat.test Vertint.test
# $(top_srcdir)/test/test_Remap.sh \
# $(top_srcdir)/test/test_info.py
......
......@@ -80,9 +80,10 @@ host_triplet = @host@
subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs $(srcdir)/Cat.test.in \
$(srcdir)/Gridarea.test.in $(srcdir)/Remap.test.in \
$(srcdir)/Select.test.in $(srcdir)/Spectral.test.in \
$(srcdir)/Timstat.test.in $(srcdir)/Vertint.test.in README
$(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \
$(srcdir)/Remap.test.in $(srcdir)/Select.test.in \
$(srcdir)/Spectral.test.in $(srcdir)/Timstat.test.in \
$(srcdir)/Vertint.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
......@@ -93,8 +94,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = Cat.test Gridarea.test Remap.test Select.test \
Spectral.test Timstat.test Vertint.test
CONFIG_CLEAN_FILES = Cat.test Gridarea.test Genweights.test Remap.test \
Select.test Spectral.test Timstat.test Vertint.test
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -490,7 +491,9 @@ CLEANFILES = `ls *.pyc`
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
$(top_srcdir)/config/tap-driver.sh
TESTS = Cat.test Gridarea.test Remap.test Select.test Spectral.test Timstat.test Vertint.test
TESTS = Cat.test Gridarea.test Genweights.test Remap.test \
Select.test Spectral.test Timstat.test Vertint.test
# $(top_srcdir)/test/test_Remap.sh \
# $(top_srcdir)/test/test_info.py
......@@ -542,6 +545,8 @@ Cat.test: $(top_builddir)/config.status $(srcdir)/Cat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Gridarea.test: $(top_builddir)/config.status $(srcdir)/Gridarea.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Genweights.test: $(top_builddir)/config.status $(srcdir)/Genweights.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Remap.test: $(top_builddir)/config.status $(srcdir)/Remap.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Select.test: $(top_builddir)/config.status $(srcdir)/Select.test.in
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment