[svn-r14445] Added code to detect the situation in which a metadata cache entry flush

callback functions modifies the skip list or LRU out from under a partial
or complete flush of the cache.  This is a test for a situation that 
should not occur, but we test anyway.

Also added code to skip longer tests in cache_api in express tests.

Tested serial and parallel on phoenix (debian --x86-32), and commit test.

Elena commit tested as well, and ran a manual test under MacOS X.

1 files changed, 16 insertions, 11 deletions

diff --git a/test/cache_api.c b/test/cache_api.c
index 6a75d11..fcc4664 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -87,7 +87,7 @@ static void check_and_validate_cache_size(hid_t file_id,
                                           int32_t * cur_num_entries_ptr,
                                           hbool_t dump_data);
 
-static void mdc_api_call_smoke_check(void);
+static void mdc_api_call_smoke_check(int express_test);
 
 static void check_fapl_mdc_api_errs(void);
 
@@ -1376,7 +1376,7 @@ check_and_validate_cache_size(hid_t file_id,
 #define NUM_RANDOM_ACCESSES     200000
 
 static void
-mdc_api_call_smoke_check(void)
+mdc_api_call_smoke_check(int express_test)
 {
     const char * fcn_name = "mdc_api_call_smoke_check()";
     char filename[512];
@@ -1504,6 +1504,15 @@ mdc_api_call_smoke_check(void)
 
     TESTING("MDC API smoke check");
 
+    if ( express_test > 0 ) {
+
+        SKIPPED();
+
+        HDfprintf(stdout, "     Long tests disabled.\n");
+
+        return;
+    }
+
     pass = TRUE;
 
     /* Open a file with the default FAPL.  Verify that the cache is
@@ -4022,15 +4031,11 @@ check_file_mdc_api_errs(void)
 int
 main(void)
 {
-    H5open();
+    int express_test;
 
-    skip_long_tests = FALSE;
+    H5open();
 
-#ifdef NDEBUG
-    run_full_test = TRUE;
-#else /* NDEBUG */
-    run_full_test = FALSE;
-#endif /* NDEBUG */
+    express_test = GetTestExpress();
 
 #if 1
     check_fapl_mdc_api_calls();
@@ -4038,8 +4043,8 @@ main(void)
 #if 1
     check_file_mdc_api_calls();
 #endif
-#if 0
-    mdc_api_call_smoke_check();
+#if 1
+    mdc_api_call_smoke_check(express_test);
 #endif
 #if 1
     check_fapl_mdc_api_errs();