summaryrefslogtreecommitdiffstats
path: root/windows
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-18 18:20:31 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-18 18:20:31 (GMT)
commit8a75f17670000b64440890e710b2f9053d2ae31e (patch)
tree6b705b544427f7cbb82ed15fda7a121fdb1e6428 /windows
parent3c3a1388df917a17e863a59675e2d4ba4606af15 (diff)
downloadhdf5-8a75f17670000b64440890e710b2f9053d2ae31e.zip
hdf5-8a75f17670000b64440890e710b2f9053d2ae31e.tar.gz
hdf5-8a75f17670000b64440890e710b2f9053d2ae31e.tar.bz2
[svn-r15232] Description:
Bring back revisions 14700:14800 from the trunk Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.2 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'windows')
-rw-r--r--windows/tools/h5dump/testh5dump.bat5
-rw-r--r--windows/tools/h5repack/h5repack.vcproj4
2 files changed, 4 insertions, 5 deletions
diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
index f26a5d9..9f202c5 100644
--- a/windows/tools/h5dump/testh5dump.bat
+++ b/windows/tools/h5dump/testh5dump.bat
@@ -16,7 +16,7 @@ rem
rem Tests for the h5dump tool
rem
rem Created: Scott Wegner, 8/23/07
-rem Modified: Scott Wegner, 8/27/07
+rem Modified: Scott Wegner, 3/10/08
rem
setlocal enabledelayedexpansion
@@ -405,8 +405,7 @@ rem ############################################################################
call :tooltest tall-4s.ddl --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5
call :tooltest tall-5s.ddl -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5
call :tooltest tdset-3s.ddl -d "/dset1[1,1;;;]" tdset.h5
- rem block
- rem call :tooltest tdset2-1s.ddl -d "/dset1[;3,2;4,4;1,4]" tdset2.h5
+
rem test printing characters in ASCII instead of decimal
call :tooltest tchar1.ddl -r tchar.h5
diff --git a/windows/tools/h5repack/h5repack.vcproj b/windows/tools/h5repack/h5repack.vcproj
index 9896209..802e797 100644
--- a/windows/tools/h5repack/h5repack.vcproj
+++ b/windows/tools/h5repack/h5repack.vcproj
@@ -263,7 +263,7 @@
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="D:\szip\all\lib\Debug"
+ AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"
@@ -358,7 +358,7 @@
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="D:\szip\all\lib\Debug"
+ AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"