From 79c17d54cc2f66f57f51f578681a35140e2b580e Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Wed, 20 Dec 2006 16:10:06 -0500 Subject: [svn-r13083] Description: VMS maintenance: updated command file with the new source files; sohm test was failing on VMS due to upper case/lower case letters in constant and variable names (i.e. FILENAME vs. filename); modified the test to avoid confusion. Platforms tested: VMS server, kagiso --- test/tsohm.c | 15 +++++++-------- vms/src/make.com | 17 +++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/tsohm.c b/test/tsohm.c index 77a475f..9274ed4 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -206,8 +206,7 @@ static void test_sohm_fcpl(void) /* Create a file with this fcpl and make sure that all the values can be * retrieved. */ - h5_fixname(FILENAME, H5P_DEFAULT, filename, sizeof filename); - fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); CHECK_I(fid, "H5Fcreate"); fcpl2_id = H5Fget_create_plist(fid); @@ -224,7 +223,7 @@ static void test_sohm_fcpl(void) */ ret = H5Fclose(fid); CHECK_I(ret, "H5Fclose"); - fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); + fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT); CHECK_I(fid, "H5Fopen"); fcpl2_id = H5Fget_create_plist(fid); @@ -261,7 +260,7 @@ static void test_sohm_fcpl(void) check_fcpl_values(fcpl_id, TEST_NUM_INDEXES, test_type_flags, test_minsizes, TEST_L2B, TEST_B2L); /* Use the fcpl to create a file and get it back again */ - fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); CHECK_I(fid, "H5Fcreate"); fcpl2_id = H5Fget_create_plist(fid); CHECK_I(fcpl2_id, "H5Fcreate"); @@ -277,7 +276,7 @@ static void test_sohm_fcpl(void) */ ret = H5Fclose(fid); CHECK_I(ret, "H5Fclose"); - fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); + fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT); CHECK_I(fid, "H5Fopen"); fcpl2_id = H5Fget_create_plist(fid); @@ -313,11 +312,11 @@ static void test_sohm_fcpl(void) CHECK_I(ret, "H5Pset_shared_mesg_index"); ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_MESG_FILL_FLAG, 15 /* JAMES */); CHECK_I(ret, "H5Pset_shared_mesg_index"); - fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); VERIFY(fid, -1, "H5Fcreate"); ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_MESG_DTYPE_FLAG | H5O_MESG_FILL_FLAG, 15 /* JAMES */); CHECK_I(ret, "H5Pset_shared_mesg_index"); - fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); VERIFY(fid, -1, "H5Fcreate"); /* Test list/btree cutoffs. We can set these to any positive value, @@ -337,7 +336,7 @@ static void test_sohm_fcpl(void) CHECK_I(ret, "H5Pset_shared_mesg_index"); ret = H5Pset_shared_mesg_phase_change(fcpl_id, 10, 11); CHECK_I(ret, "H5Pset_shared_mesg_phase_change"); - fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); + fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); CHECK_I(fid, "H5Fcreate"); /* Clean up */ diff --git a/vms/src/make.com b/vms/src/make.com index 4c5cfc1..925087a 100644 --- a/vms/src/make.com +++ b/vms/src/make.com @@ -28,7 +28,7 @@ $ type sys$input Creating HDF5 library $! $ cobj= "H5, H5checksum, H5dbg, H5system, H5timer, H5trace,"+- - "H5A, H5Abtree2, H5Adense, H5Adeprec, H5AC, H5B, H5B2, H5B2cache,"+- + "H5A, H5Abtree2, H5Adense, H5Adeprec, H5Aint, H5Atest, H5AC, H5B, H5B2, H5B2cache,"+- "H5Bcache, H5B2dbg, H5B2test, H5B2int, H5B2stat, H5C, H5CS,"+- "H5D, H5Dcontig, H5Dcompact,"+- "H5Defl, H5Dio, H5Distore, H5Doh, H5Dmpio, H5Dselect, H5Dtest ,"+- @@ -44,16 +44,17 @@ $ cobj= "H5, H5checksum, H5dbg, H5system, H5timer, H5trace,"+- "H5HFdblock, H5HFdtable, H5HFhuge, H5HFhdr, H5HFiblock,"+- "H5HFiter, H5HFsection, H5HFspace, H5HFtiny,"+- "H5HG, H5HGdbg, H5HL, H5HLdbg, H5HP, H5I, H5MF, H5MM,"+- - "H5MP, H5MPtest,H5L, H5Lexternal, H5O, H5Oalloc, H5Oattr, H5Obogus, H5Ocache,"+- + "H5MP, H5MPtest,H5L, H5Lexternal, H5O, H5Oalloc, H5Oattr, H5Oattribute,"+- + "H5Obogus, H5Ocache,"+- "H5Ocont, H5Ocopy, H5Odbg, H5Odtype, H5Oefl, H5Ofill, H5Oginfo, H5Olayout,"+- - "H5Olinfo, H5Olink, H5Omessage, H5Omtime,"+- - "H5Oname, H5Onull, H5Opline, H5Osdspace, H5Oshared, H5Ostab, H5Otest, "+- - "H5P, H5Pacpl, H5Pdcpl, H5Pdxpl, H5Pfapl, H5Pfcpl, H5Pfmpl, H5Pgcpl, H5Plapl, "+- - "H5Pocpl, H5Pocpypl, H5Ptest, H5Pstrcpl, H5Plcpl" -$ cobj1= "H5R, H5RC,"+- + "H5Olinfo, H5Olink, H5Omessage, H5Omtime" +$ cobj1= "H5Oname, H5Onull, H5Opline, H5Osdspace, H5Oshared, H5Ostab, H5Otest,"+- + "H5P, H5Pacpl, H5Pdcpl, H5Pdxpl, H5Pfapl, H5Pfcpl, H5Pfmpl, H5Pgcpl, H5Plapl,"+- + "H5Pocpl, H5Pocpypl, H5Ptest, H5Pstrcpl, H5Plcpl,"+- + "H5R, H5RC,"+- "H5RS, H5S, H5Sall, H5Shyper, H5Smpio, H5Snone, H5Spoint,"+- "H5Sselect, H5Stest,"+- - "H5SL, H5SM, H5SMbtree2, H5SMcache," +- + "H5SL, H5SM, H5SMbtree2, H5SMcache, H5SMtest," +- "H5ST, H5T, H5Tarray, H5Tbit, H5Tcommit,"+- "H5Tcompound, H5Tconv, H5Tcset, H5Tenum, H5Tfields, H5Tfixed,"+- "H5Tfloat, H5Tinit, H5Tnative, H5Toffset, H5Toh, H5Topaque, H5Torder,"+- -- cgit v0.12