GRIB-527: Fix the jpeg test issue

This commit is contained in:
Shahram Najm 2015-02-01 16:35:46 +00:00
parent f83cf81a4b
commit 5e659515a7
4 changed files with 42 additions and 2 deletions

View File

@ -12,7 +12,7 @@ TESTS = definitions.sh calendar.sh \
multi_from_message.sh change_scanning.sh \
julian.sh statistics.sh tigge.sh tigge_conversions.sh \
read_any.sh padding.sh lamb_az_eq_area.sh grib_to_netcdf.sh debug.sh \
$(JPEG_TEST) $(CCSDS_TEST)
jpeg.sh ccsds.sh
noinst_PROGRAMS = packing_check gauss_sub read_any double_cmp packing pack_unpack \
multi_from_message julian read_index index gribex_perf\

View File

@ -8,10 +8,29 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.sh
REDIRECT=/dev/null
# First check if Adaptive Entropy Coding (AEC) feature is enabled
skip_test=0
src_config=${src_dir}/config.h
if [ -f ${src_config} ]; then
set +e
grep '#undef HAVE_LIBAEC' ${src_config} >/dev/null
status=$?
set -e
if [ $status -eq 0 ]; then
# Found the string so feature is disabled
skip_test=1
fi
fi
if [ $skip_test -eq 1 ]; then
#echo "AEC feature was not enabled. Skipping this test."
exit 0
fi
echo "AEC feature was enabled."
BLACKLIST="totalLength,section5Length,section7Length,dataRepresentationTemplateNumber,typeOfPacking"
infile=${data_dir}/ccsds.grib2

View File

@ -41,6 +41,7 @@ else
data_dir=$cpath/data
test_dir=$cpath/tests
def_dir=$cpath/definitions
src_dir=$cpath/src
else
tools_dir=""
tigge_dir=""

View File

@ -11,6 +11,26 @@
. ./include.sh
REDIRECT=/dev/null
# First check if jpeg decode/encode feature is enabled
skip_test=0
src_config=${src_dir}/config.h
if [ -f ${src_config} ]; then
set +e
grep '#undef HAVE_JPEG' ${src_config} >/dev/null
status=$?
set -e
if [ $status -eq 0 ]; then
# Found the string so feature is disabled
skip_test=1
fi
fi
if [ $skip_test -eq 1 ]; then
echo "JPEG feature was not enabled. Skipping this test."
exit 0
fi
echo "JPEG feature was enabled."
BLACKLIST="totalLength,section5Length,section7Length,dataRepresentationTemplateNumber,typeOfPacking"
infile=${data_dir}/jpeg.grib2