Skip to content

GitLab

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

Ninfo.test: reduce output.

parent 9ac46931
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 48 deletions
src/grid_search.cc
View file @ 4df69479
......@@ -466,8 +466,8 @@ struct gridsearch *gridsearch_create_nn(size_t n, const double *restrict lons, c
gs->search_radius = cdo_default_search_radius();
cal_bound_box(gs, n, lons, lats);
cal_mask(gs);
// cal_bound_box(gs, n, lons, lats);
// cal_mask(gs);
return gs;
}
......
test/Makefile.am
View file @ 4df69479
......@@ -13,6 +13,7 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
# tests which should pass
TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test \
Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
MapReduce.test Ninfo.test Gradsdes.test \
Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
......@@ -20,7 +21,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Runstat.test Multiyearstat.test Ydrunstat.test \
Mergetime.test EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
Collgrid.test
# tests which should fail
XFAIL_TESTS =
......
test/Makefile.in
View file @ 4df69479
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -14,17 +14,7 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -89,6 +79,29 @@ build_triplet = @build@
host_triplet = @host@
XFAIL_TESTS =
subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs $(srcdir)/File.test.in \
$(srcdir)/Read_grib.test.in $(srcdir)/Read_netcdf.test.in \
$(srcdir)/Copy_netcdf.test.in $(srcdir)/Comp.test.in \
$(srcdir)/Compc.test.in $(srcdir)/Cat.test.in \
$(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \
$(srcdir)/Remap.test.in $(srcdir)/Remap2.test.in \
$(srcdir)/Remapeta.test.in $(srcdir)/EOF.test.in \
$(srcdir)/Select.test.in $(srcdir)/Spectral.test.in \
$(srcdir)/Vertint.test.in $(srcdir)/Timstat.test.in \
$(srcdir)/Timselstat.test.in $(srcdir)/Seasstat.test.in \
$(srcdir)/Runstat.test.in $(srcdir)/Multiyearstat.test.in \
$(srcdir)/Ydrunstat.test.in $(srcdir)/Gridboxstat.test.in \
$(srcdir)/Vertstat.test.in $(srcdir)/Fldstat.test.in \
$(srcdir)/Fldpctl.test.in $(srcdir)/Ensstat.test.in \
$(srcdir)/Enspctl.test.in $(srcdir)/Merstat.test.in \
$(srcdir)/Zonstat.test.in $(srcdir)/Mergetime.test.in \
$(srcdir)/Afterburner.test.in $(srcdir)/Detrend.test.in \
$(srcdir)/Arithc.test.in $(srcdir)/Arith.test.in \
$(srcdir)/Expr.test.in $(srcdir)/Gradsdes.test.in \
$(srcdir)/Collgrid.test.in $(srcdir)/threads.test.in \
$(srcdir)/tsformat.test.in $(srcdir)/wildcard.test.in \
$(srcdir)/MapReduce.test.in $(srcdir)/Ninfo.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
......@@ -101,7 +114,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = File.test Read_grib.test Read_netcdf.test \
......@@ -337,30 +349,6 @@ am__set_b = \
*) \
b='$*';; \
esac
am__DIST_COMMON = $(srcdir)/Afterburner.test.in \
$(srcdir)/Arith.test.in $(srcdir)/Arithc.test.in \
$(srcdir)/Cat.test.in $(srcdir)/Collgrid.test.in \
$(srcdir)/Comp.test.in $(srcdir)/Compc.test.in \
$(srcdir)/Copy_netcdf.test.in $(srcdir)/Detrend.test.in \
$(srcdir)/EOF.test.in $(srcdir)/Enspctl.test.in \
$(srcdir)/Ensstat.test.in $(srcdir)/Expr.test.in \
$(srcdir)/File.test.in $(srcdir)/Fldpctl.test.in \
$(srcdir)/Fldstat.test.in $(srcdir)/Genweights.test.in \
$(srcdir)/Gradsdes.test.in $(srcdir)/Gridarea.test.in \
$(srcdir)/Gridboxstat.test.in $(srcdir)/Makefile.in \
$(srcdir)/MapReduce.test.in $(srcdir)/Mergetime.test.in \
$(srcdir)/Merstat.test.in $(srcdir)/Multiyearstat.test.in \
$(srcdir)/Ninfo.test.in $(srcdir)/Read_grib.test.in \
$(srcdir)/Read_netcdf.test.in $(srcdir)/Remap.test.in \
$(srcdir)/Remap2.test.in $(srcdir)/Remapeta.test.in \
$(srcdir)/Runstat.test.in $(srcdir)/Seasstat.test.in \
$(srcdir)/Select.test.in $(srcdir)/Spectral.test.in \
$(srcdir)/Timselstat.test.in $(srcdir)/Timstat.test.in \
$(srcdir)/Vertint.test.in $(srcdir)/Vertstat.test.in \
$(srcdir)/Ydrunstat.test.in $(srcdir)/Zonstat.test.in \
$(srcdir)/threads.test.in $(srcdir)/tsformat.test.in \
$(srcdir)/wildcard.test.in $(top_srcdir)/config/mkinstalldirs \
README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -557,6 +545,7 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
# tests which should pass
TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test \
Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
MapReduce.test Ninfo.test Gradsdes.test \
Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
......@@ -564,7 +553,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Runstat.test Multiyearstat.test Ydrunstat.test \
Mergetime.test EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
Collgrid.test
# $(top_srcdir)/test/test_Remap.sh \
......@@ -595,6 +584,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign test/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -741,7 +731,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
elif test -n "$$redo_logs"; then \
else \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
......@@ -1017,8 +1007,6 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
uninstall uninstall-am
.PRECIOUS: Makefile
export
......
test/Ninfo.test.in
View file @ 4df69479
......@@ -49,8 +49,8 @@ test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
let NTEST+=1
if test 1 -eq $($CDOCOMMAND -topo,r1x1) ; then echo "ok $NTEST - $CDOCOMMAND -topo,r1x1"; else echo "not ok $NTEST - $CDOCOMMAND -topo,r1x1"; fi; let NTEST+=1
if test 1 -eq $($CDOCOMMAND -topo,global_1) ; then echo "ok $NTEST - $CDOCOMMAND -topo,global_1"; else echo "not ok $NTEST - $CDOCOMMAND -topo,global_1"; fi; let NTEST+=1
if test 1 -eq $($CDOCOMMAND -topo,r1x1) ; then echo "ok $NTEST - $CDOTEST -topo,r1x1"; else echo "not ok $NTEST - $CDOTEST -topo,r1x1"; fi; let NTEST+=1
if test 1 -eq $($CDOCOMMAND -topo,global_1) ; then echo "ok $NTEST - $CDOTEST -topo,global_1"; else echo "not ok $NTEST - $CDOTEST -topo,global_1"; fi; let NTEST+=1
# create temporary data
if [ "@ENABLE_NETCDF@" = yes ] ; then
......@@ -58,7 +58,7 @@ if [ "@ENABLE_NETCDF@" = yes ] ; then
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,r18x9 temp.small
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -temp,global_10 temp.global
$CDO --seperateDebugFromLog Ninfo_tempDataGeneration.debug -O -f nc -merge temp.small temp.global temp.2grids
if test 2 -eq $($CDOCOMMAND temp.2grids) ; then echo "ok $NTEST - $CDOCOMMAND temp.2grids";
if test 2 -eq $($CDOCOMMAND temp.2grids) ; then echo "ok $NTEST - $CDOTEST temp.2grids";
else echo "not ok $NTEST - $CDOCOMMAND temp.2grids"; fi
let NTEST+=1
rm -f temp.small temp.global temp.2grids
......
Markdown is supported
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