Testing: Fortran scan/load and GTS compare

examples/F90/codes_load_file.f90

@@ -13,7 +13,7 @@ program codes_load_file
 
    integer           :: ifile, cnt, level, step
    integer           :: i, igrib, iret
-   character(len=32) :: infile_name = '../../data/index.grib' 
+   character(len=32) :: infile_name = '../../data/index.grib'
 
    call codes_open_file(ifile, infile_name, 'r')
 

examples/F90/codes_load_file.sh

@@ -9,4 +9,13 @@
 
 . ./include.ctest.sh
 
-${examples_dir}/eccodes_f_codes_load_file
+label='eccodes_f_codes_load_file'
+temp=temp.$label.txt
+
+# The input file is hard coded => data/index.grib
+${examples_dir}/eccodes_f_codes_load_file > $temp
+
+grep -q "Num messages= *384" $temp
+grep -q "level= *700  step= *60" $temp
+
+rm -f $temp

examples/F90/codes_scan_file.f90

@@ -10,12 +10,10 @@
 program codes_scan_file
    use eccodes
    implicit none
-   integer, parameter          :: max_strsize = 200
-   integer                     :: ifile, cnt, level, step
-   integer                     :: i, igrib, iret
-   character(len=max_strsize)  :: infile_name
 
-   call getarg(1, infile_name)
+   integer           :: ifile, cnt, level, step
+   integer           :: i, igrib, iret
+   character(len=32) :: infile_name = '../../data/index.grib'
 
    call codes_open_file(ifile, infile_name, 'r')
 
@@ -35,7 +33,7 @@ program codes_scan_file
    i = 450
    call codes_any_new_from_scanned_file(ifile, i, igrib, iret)
    if (iret /= GRIB_INVALID_ARGUMENT) then
-      call codes_check(iret, 'codes_any_new_from_scanned_file', 'exit')
+      call codes_check(iret, 'Error', 'codes_any_new_from_scanned_file should have failed')
    else
       print *,'Invalid message index returned error (as expected)'
    end if

examples/F90/codes_scan_file.sh

@@ -9,10 +9,11 @@
 
 . ./include.ctest.sh
 
-temp='temp.eccodes_f_codes_scan_file.txt'
+label='eccodes_f_codes_scan_file'
+temp=temp.$label.txt
 
-input=../../data/index.grib
+# The input file is hard coded => data/index.grib
-${examples_dir}/eccodes_f_codes_scan_file $input > $temp
+${examples_dir}/eccodes_f_codes_scan_file > $temp
 
 grep -q "Num messages= *384" $temp
 grep -q "level= *700  step= *60" $temp

tests/gts_compare.sh

@@ -73,6 +73,20 @@ temp2=temp.$label.2.gts
 ${tools_dir}/gts_copy -w count=1 $gts_file $temp1
 ${tools_dir}/gts_copy -w count=4 $gts_file $temp2
 ${tools_dir}/gts_compare -c theMessage $temp1 $temp2
+${tools_dir}/gts_compare -c theMessage -a $temp1 $temp2
+
+set +e
+${tools_dir}/gts_compare -c ls:n $temp1 $temp2
+status=$?
+set -e
+[ $status -eq 1 ]
+
+set +e
+${tools_dir}/gts_compare -c ls:n -a $temp1 $temp2
+status=$?
+set -e
+[ $status -eq 1 ]
+
 rm -f $temp1 $temp2
 
 #----------------------------------------------------

tools/gts_compare.cc

@@ -395,7 +395,6 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
     int isMissing1 = 0, isMissing2 = 0;
 
     char *sval1 = NULL, *sval2 = NULL;
-    unsigned char *uval1 = NULL, *uval2 = NULL;
     long *lval1 = NULL, *lval2 = NULL;
     grib_context* c = h1->context;
 
@@ -424,23 +423,12 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
         return err;
     }
 
-    /*
-  if(type1 != type2)
-  {
-    printInfo(h1);
-    printf("Warning, [%s] has different types: 1st field: [%s], 2nd field: [%s]\n",
-        name,grib_get_type_name(type1),grib_get_type_name(type2));
-    return GRIB_TYPE_MISMATCH;
-  }
-     */
-
     if (type1 == GRIB_TYPE_LABEL)
         return err;
 
     if (type1 == GRIB_TYPE_SECTION)
         return err;
 
-
     if ((err = grib_get_size(h1, name, &len1)) != GRIB_SUCCESS) {
         printInfo(h1);
         printf("Error: cannot get size of [%s] in 1st field: %s\n", name, grib_get_error_message(err));
@@ -462,16 +450,6 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
         return err;
     }
 
-    /*
-  if(len1 != len2 && type1 != GRIB_TYPE_STRING)
-  {
-    printInfo(h1);
-    printf("[%s] has different size: 1st field: %ld, 2nd field: %ld\n",name,(long)len1,(long)len2);
-    save_error(c,name);
-    return GRIB_COUNT_MISMATCH;
-  }
-     */
-
     if (options->mode != MODE_GTS) {
         /* TODO: Ignore missing values for keys in GTS. Not yet implemented */
         isMissing1 = ((grib_is_missing(h1, name, &err1) == 1) && (err1 == 0)) ? 1 : 0;
@@ -485,8 +463,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
     }
 
     if (isMissing1 == 1) {
-        if (verbose)
+        if (verbose) printf(" is set to missing in 1st field\n");
-            printf(" is set to missing in 1st field\n");
         printInfo(h1);
         printf("%s is set to missing in 1st field but is not missing in 2nd field\n", name);
         err1 = GRIB_VALUE_MISMATCH;
@@ -495,8 +472,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
     }
 
     if (isMissing2 == 1) {
-        if (verbose)
+        if (verbose) printf(" is set to missing in 1st field\n");
-            printf(" is set to missing in 1st field\n");
         printInfo(h1);
         printf("%s is set to missing in 2nd field but is not missing in 1st field\n", name);
         err1 = GRIB_VALUE_MISMATCH;
@@ -506,8 +482,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
 
     switch (type1) {
         case GRIB_TYPE_STRING:
-            if (verbose)
+            if (verbose) printf(" as string\n");
-                printf(" as string\n");
             grib_get_string_length(h1, name, &len1);
             grib_get_string_length(h2, name, &len2);
             sval1 = (char*)grib_context_malloc(h1->context, len1 * sizeof(char));
@@ -548,8 +523,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
             break;
 
         case GRIB_TYPE_LONG:
-            if (verbose)
+            if (verbose) printf(" as long\n");
-                printf(" as long\n");
 
             lval1 = (long*)grib_context_malloc(h1->context, len1 * sizeof(long));
             lval2 = (long*)grib_context_malloc(h2->context, len2 * sizeof(long));
@@ -609,71 +583,19 @@ static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_h
             break;
 
         case GRIB_TYPE_BYTES:
-            if (verbose)
+            if (verbose) printf(" as bytes\n");
-                printf(" as bytes\n");
             if (options->mode == MODE_GTS) {
                 // We do not want to compare the message itself
                 return 0;
             }
-            if (len1 < 2)
-                len1 = 512;
-            if (len2 < 2)
-                len2 = 512;
-            uval1 = (unsigned char*)grib_context_malloc(h1->context, len1 * sizeof(unsigned char));
-            uval2 = (unsigned char*)grib_context_malloc(h2->context, len2 * sizeof(unsigned char));
-
-            if ((err1 = grib_get_bytes(h1, name, uval1, &len1)) != GRIB_SUCCESS) {
-                printInfo(h1);
-                save_error(c, name);
-                printf("Error: cannot get bytes value of [%s] in 1st field: %s\n",
-                       name, grib_get_error_message(err1));
-            }
-
-            if ((err2 = grib_get_bytes(h2, name, uval2, &len2)) != GRIB_SUCCESS) {
-                printInfo(h1);
-                save_error(c, name);
-                printf("Error: cannot get bytes value of [%s] in 2nd field: %s\n",
-                       name, grib_get_error_message(err2));
-            }
-
-            if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS) {
-                if (memcmp(uval1, uval2, len1) != 0) {
-                    size_t i;
-                    for (i = 0; i < len1; i++)
-                        if (uval1[i] != uval2[i]) {
-                            printInfo(h1);
-                            save_error(c, name);
-                            if (len1 == 1)
-                                printf("[%s] byte values are different: [%02x] and [%02x]\n",
-                                       name, uval1[i], uval2[i]);
-                            else
-                                printf("[%s] byte value %zu of %ld are different: [%02x] and [%02x]\n",
-                                       name, i, (long)len1, uval1[i], uval2[i]);
-
-                            err1 = GRIB_VALUE_MISMATCH;
-                            break;
-                        }
-                    err1 = GRIB_VALUE_MISMATCH;
-                }
-            }
-
-            grib_context_free(h1->context, uval1);
-            grib_context_free(h2->context, uval2);
-
-            if (err1)
-                return err1;
-            if (err2)
-                return err2;
             break;
 
         case GRIB_TYPE_LABEL:
-            if (verbose)
+            if (verbose) printf(" as label\n");
-                printf(" as label\n");
             break;
 
         default:
-            if (verbose)
+            if (verbose) printf("\n");
-                printf("\n");
             printInfo(h1);
             save_error(c, name);
             printf("Cannot compare [%s], unsupported type %d\n", name, type1);
@@ -699,7 +621,6 @@ static int compare_all_dump_keys(grib_handle* h1, grib_handle* h2, grib_runtime_
     while (grib_keys_iterator_next(iter)) {
         grib_accessor* xa = grib_keys_iterator_get_accessor(iter);
         name              = grib_keys_iterator_get_name(iter);
-        /* printf("----- comparing %s\n",name); */
 
         if (blocklisted(name))
             continue;
@@ -735,7 +656,6 @@ static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_option
                 }
                 while (grib_keys_iterator_next(iter)) {
                     name = grib_keys_iterator_get_name(iter);
-                    /*printf("----- comparing %s\n",name);*/
 
                     if (blocklisted(name))
                         continue;
@@ -796,7 +716,6 @@ static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_option
                     }
                     while (grib_keys_iterator_next(iter)) {
                         name = grib_keys_iterator_get_name(iter);
-                        /*printf("----- comparing %s\n",name);*/
 
                         if (blocklisted(name))
                             continue;