[svn-r8469] Purpose:

bug fix

Description:
1.  windows cannot recongize long long. We agree to use long_long to represent all "long long" compatible data types.

2. windows test can not check error code, it depends on error messages to be returned. This will be fixed in the future. In odhr.c, somehow only error value1 is generated, there are no error message even if some tests are missing. So just add an error message when error code is 1.
Solution:
change long long to long_long in dtypes.c;
Add an error message when error code is not 0 in ohdr.c

Platforms tested:
eirene(fortran),
arabica(fortran)

Misc. update:

2 files changed, 5 insertions, 4 deletions

diff --git a/test/dtypes.c b/test/dtypes.c
index d10a070..705bdb5 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -4521,10 +4521,10 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst)
                 if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
                     continue; /*no error*/
             } /* end if */
-            else if (dst_size==sizeof(unsigned long long)) {
-                unsigned long long tmp_s, tmp_h;
-                HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long long));
-                HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long long));
+            else if (dst_size==sizeof(unsigned long_long)) {
+                unsigned long_long tmp_s, tmp_h;
+                HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long_long));
+                HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long_long));
                 if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
                     continue; /*no error*/
             } /* end if */
diff --git a/test/ohdr.c b/test/ohdr.c
index 5ddabe6..a893d08 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -406,6 +406,7 @@ main(void)
     return 0;
 
  error:
+     puts("*** TESTS FAILED ***");
     H5E_BEGIN_TRY {
 	H5Fclose(file);
     } H5E_END_TRY;