[svn-r19978] Patched in a temporary fix so that:

When $HDF5ExpressTest is NOT set or when it is set to 1 or 0, it does not
  skip test.
When $HDF5ExpressTest is set other than values above, it may skip tests.
  The following message is printed:
  Test skipped
  when some tests are really skipped.

This is a temporary patch so that v186 can be tested. A more permanent fix
is needed, later.

Tested: h5committest.
This commit is contained in:
Albert Cheng 2011-01-21 15:42:22 -05:00
parent 1a212e80ce
commit 831427aeb8

View File

@ -1718,7 +1718,7 @@ contig_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[ind_contig_idx]++; skip_counters[ind_contig_idx]++;
tests_skiped[ind_contig_idx]++; tests_skiped[ind_contig_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[ind_contig_idx] = 0; skip_counters[ind_contig_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(0) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(0) succeeds.");
@ -1745,7 +1745,7 @@ contig_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[col_contig_idx]++; skip_counters[col_contig_idx]++;
tests_skiped[col_contig_idx]++; tests_skiped[col_contig_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[col_contig_idx] = 0; skip_counters[col_contig_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(2) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(2) succeeds.");
@ -1772,7 +1772,7 @@ contig_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[ind_chunked_idx]++; skip_counters[ind_chunked_idx]++;
tests_skiped[ind_chunked_idx]++; tests_skiped[ind_chunked_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[ind_chunked_idx] = 0; skip_counters[ind_chunked_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(4) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(4) succeeds.");
@ -1799,7 +1799,7 @@ contig_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[col_chunked_idx]++; skip_counters[col_chunked_idx]++;
tests_skiped[col_chunked_idx]++; tests_skiped[col_chunked_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[col_chunked_idx] = 0; skip_counters[col_chunked_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(6) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(6) succeeds.");
@ -4191,6 +4191,9 @@ int m;
* if two or more processes are banging on the same * if two or more processes are banging on the same
* block of memory. * block of memory.
* JRM -- 9/10/10 * JRM -- 9/10/10
* Break this one big test into 4 smaller tests according
* to {independent,collective}x{contigous,chunked} datasets.
* AKC -- 2010/01/17
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4266,7 +4269,7 @@ checker_board_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[ind_contig_idx]++; skip_counters[ind_contig_idx]++;
tests_skiped[ind_contig_idx]++; tests_skiped[ind_contig_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[ind_contig_idx] = 0; skip_counters[ind_contig_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(0) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(0) succeeds.");
@ -4296,7 +4299,7 @@ checker_board_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[col_contig_idx]++; skip_counters[col_contig_idx]++;
tests_skiped[col_contig_idx]++; tests_skiped[col_contig_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[col_contig_idx] = 0; skip_counters[col_contig_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(2) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(2) succeeds.");
@ -4326,7 +4329,7 @@ checker_board_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[ind_chunked_idx]++; skip_counters[ind_chunked_idx]++;
tests_skiped[ind_chunked_idx]++; tests_skiped[ind_chunked_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[ind_chunked_idx] = 0; skip_counters[ind_chunked_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(4) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(4) succeeds.");
@ -4356,7 +4359,7 @@ checker_board_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type)
skip_counters[col_chunked_idx]++; skip_counters[col_chunked_idx]++;
tests_skiped[col_chunked_idx]++; tests_skiped[col_chunked_idx]++;
printf("Test skipped\n");
} else { } else {
skip_counters[col_chunked_idx] = 0; skip_counters[col_chunked_idx] = 0;
START_TIMER(time_tests, timeval_a, "HDgettimeofday(6) succeeds."); START_TIMER(time_tests, timeval_a, "HDgettimeofday(6) succeeds.");