[svn-r18628] Description:

    Bring r18627 from trunk to 1.8 branch:

    More progress toward addressing Bz#1398: add 'volatile' keyword to floating-
point types when detecting their properties.  Also, minor code formatting
cleanups.

Tested on:
    Mac OS X/32 10.6.3 (amazon) w/debug)
    (h5committested on trunk)

1 files changed, 6 insertions, 5 deletions

diff --git a/test/dt_arith.c b/test/dt_arith.c
index ff6b4e0..78a05be 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -2821,6 +2821,10 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
 	    return 0; /*child exit after catching SIGFPE*/
 	} else if (WIFEXITED(status)) {
 	    return WEXITSTATUS(status);
+	} else if (WIFSIGNALED(status)) {
+	    sprintf(str, "   Child caught signal %d.", WTERMSIG(status));
+	    HDputs(str);
+	    return 1; /*child exit after catching non-SIGFPE signal */
 	} else {
 	    HDputs("   Child didn't exit normally.");
 	    return 1;
@@ -3367,10 +3371,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
     if(!fails_all_tests)
         PASSED();
 
- done:
-#ifdef AKCDEBUG
-     printf("uflow=%d, fails_all_tests=%d\n", uflow, fails_all_tests);
-#endif
+done:
     if (buf) aligned_free(buf);
     if (saved) aligned_free(saved);
     if (aligned) HDfree(aligned);
@@ -3391,7 +3392,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
         return 0;
 #endif
 
- error:
+error:
     if (buf) aligned_free(buf);
     if (saved) aligned_free(saved);
     if (aligned) HDfree(aligned);