Re-enable failing windows tests

examples/C/bufr_copy_data.sh

@@ -12,11 +12,6 @@
 #Define a common label for all the tmp files
 label="bufr_copy_data_c"
 
-if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
- echo "$0: This test is currently disabled on Windows"
- exit 0
-fi
-
 TEMP_BUFR=$label.out.bufr
 TEMP_TEXT=$label.out.txt
 REF=$label.compare.log.ref

tests/CMakeLists.txt

@@ -299,7 +299,7 @@ endif()
 
 ecbuild_add_test( TARGET eccodes_t_grib_to_netcdf
  TYPE SCRIPT
- CONDITION HAVE_NETCDF AND ENABLE_EXTRA_TESTS AND NOT ECCODES_ON_WINDOWS
+ CONDITION HAVE_NETCDF AND ENABLE_EXTRA_TESTS
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
  TEST_DEPENDS eccodes_download_gribs
 )

tests/Makefile.am

@@ -43,7 +43,6 @@ TESTS = definitions.sh \
  grib_compare.sh \
  grib_level.sh \
  index.sh \
- grib_bitmap.sh \
  grib_list.sh \
  grib_second_order.sh \
  grib_change_scanning.sh \
@@ -61,7 +60,6 @@ TESTS = definitions.sh \
  grib_ccsds.sh \
  md5.sh \
  grib_neg_fctime.sh \
- bufr_ecc-197.sh \
  bufr_ecc-286.sh \
  bufr_ecc-288.sh
 

tests/bufr_ecc-197.sh

@@ -18,13 +18,20 @@
 label="bufr_ecc-197-test"
 
 input=${data_dir}/bufr/vos308014_v3_26.bufr
-if [ ! -f $input ]; then
- echo "Data file $input not available"
- exit 0
-fi
 TEMP=${label}.temp
+LOG=${label}.log
+
+
+# Get expanded descriptors
+cat > $TEMP <<EOF
+ print "expandedDescriptors=[expandedDescriptors%06d!0]";
+EOF
+${tools_dir}/bufr_filter -f $TEMP $input > $LOG 2>&1
+grep -q "ECCODES ERROR.*no match for sequences=308014" $LOG
+
 
 # Create a temporary directory which holds the tables etc
+# This BUFR file uses masterTablesVersionNumber 26
 TEMP_DIR=${label}.temp-dir.$$
 rm -rf $TEMP_DIR
 mkdir -p $TEMP_DIR/definitions/bufr/tables/0/wmo/26
@@ -47,4 +54,4 @@ set `wc -l $TEMP`
 [ $1 -gt 35700 ]
 
 rm -rf $TEMP_DIR
-rm -f $TEMP
+rm -f $TEMP $LOG