[svn-r15235] Bug fix:

The Testing mdj smoke check 00 and Testing mdj smoke check 01 tests would
fail if testfiles/ did not exist. This was because cache2_journal.c
putting its temporary file in testfiles/ which does not always exist.

Fix:
Removed the testfiles/ part from all test file names.
Also, added the temporary file names to be cleaned during "check-clean"
request.

Tested: kagiso.

3 files changed, 24 insertions, 23 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index b5a24db..515bc52 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -117,7 +117,7 @@ CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5
             family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file         \
             new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 err_compat.h5 \
             dtransform.h5 test_filters.h5 get_file_name.h5 tstint[1-2].h5    \
-            unlink_chunked.h5 btree2.h5 \
+            unlink_chunked.h5 btree2.h5 cache2_journal*.jnl \
             objcopy_src.h5 objcopy_dst.h5 objcopy_ext.dat trefer1.h5 trefer2.h5
 
 # Sources for testhdf5 executable
diff --git a/test/Makefile.in b/test/Makefile.in
index c882855..20ab4a2 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -621,8 +621,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	direct_file.h5 family_file000[0-3][0-9].h5 multi_file-[rs].h5 \
 	core_file new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
 	err_compat.h5 dtransform.h5 test_filters.h5 get_file_name.h5 \
-	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 objcopy_src.h5 \
-	objcopy_dst.h5 objcopy_ext.dat trefer1.h5 trefer2.h5
+	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 cache2_journal*.jnl \
+	objcopy_src.h5 objcopy_dst.h5 objcopy_ext.dat trefer1.h5 \
+	trefer2.h5
 INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 # Test script for error_test and err_compat
diff --git a/test/cache2_journal.c b/test/cache2_journal.c
index a8cf7d4..2698a81 100644
--- a/test/cache2_journal.c
+++ b/test/cache2_journal.c
@@ -2621,24 +2621,24 @@ mdj_smoke_check_00(void)
     const char * fcn_name = "mdj_smoke_check_00()";
     const char * testfiles[] = 
     {
-        "testfiles/cache2_journal_sc00_000.jnl",
-        "testfiles/cache2_journal_sc00_001.jnl",
-        "testfiles/cache2_journal_sc00_002.jnl",
-        "testfiles/cache2_journal_sc00_003.jnl",
-        "testfiles/cache2_journal_sc00_004.jnl",
-        "testfiles/cache2_journal_sc00_005.jnl",
-        "testfiles/cache2_journal_sc00_006.jnl",
-        "testfiles/cache2_journal_sc00_007.jnl",
-        "testfiles/cache2_journal_sc00_008.jnl",
-        "testfiles/cache2_journal_sc00_009.jnl",
-        "testfiles/cache2_journal_sc00_010.jnl",
-        "testfiles/cache2_journal_sc00_011.jnl",
-        "testfiles/cache2_journal_sc00_012.jnl",
-        "testfiles/cache2_journal_sc00_013.jnl",
-        "testfiles/cache2_journal_sc00_014.jnl",
-        "testfiles/cache2_journal_sc00_015.jnl",
-        "testfiles/cache2_journal_sc00_016.jnl",
-        "testfiles/cache2_journal_sc00_017.jnl",
+        "cache2_journal_sc00_000.jnl",
+        "cache2_journal_sc00_001.jnl",
+        "cache2_journal_sc00_002.jnl",
+        "cache2_journal_sc00_003.jnl",
+        "cache2_journal_sc00_004.jnl",
+        "cache2_journal_sc00_005.jnl",
+        "cache2_journal_sc00_006.jnl",
+        "cache2_journal_sc00_007.jnl",
+        "cache2_journal_sc00_008.jnl",
+        "cache2_journal_sc00_009.jnl",
+        "cache2_journal_sc00_010.jnl",
+        "cache2_journal_sc00_011.jnl",
+        "cache2_journal_sc00_012.jnl",
+        "cache2_journal_sc00_013.jnl",
+        "cache2_journal_sc00_014.jnl",
+        "cache2_journal_sc00_015.jnl",
+        "cache2_journal_sc00_016.jnl",
+        "cache2_journal_sc00_017.jnl",
 	NULL
     };
     char filename[512];
@@ -3598,8 +3598,8 @@ mdj_smoke_check_01(void)
     const char * fcn_name = "mdj_smoke_check_01()";
     const char * testfiles[] = 
     {
-        "testfiles/cache2_journal_sc01_000.jnl",
-        "testfiles/cache2_journal_sc01_001.jnl",
+        "cache2_journal_sc01_000.jnl",
+        "cache2_journal_sc01_001.jnl",
 	NULL
     };
     char filename[512];