From 159fe4b61036011f78e80badf7576a255ac0fee0 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Sun, 15 Apr 2007 11:01:38 -0500 Subject: [svn-r13667] Added Windows hl test script for gif2hf and h52gif testing to bring up to date with Linux. Updated MANIFEST for new file added. Tested: VS6 on Windows XP --- MANIFEST | 1 + windows/hl/test/test_hdf5_hl.BAT | 10 ++++- windows/hl/tools/gif2h5/h52giftest.bat | 67 ++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 windows/hl/tools/gif2h5/h52giftest.bat diff --git a/MANIFEST b/MANIFEST index a03654b..94afe49 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1967,6 +1967,7 @@ ./windows/hl/fortran/examples/ex_litedll/ex_litedll.dsp #Window High Level Tools +./windows/hl/gif2h5/h52giftest.bat ./windows/hl/tools/gifconv/gif2h5.dsp ./windows/hl/tools/gifconv/h52gif.dsp ./windows/hl/tools/gifconvdll/gif2h5dll.dsp diff --git a/windows/hl/test/test_hdf5_hl.BAT b/windows/hl/test/test_hdf5_hl.BAT index 28b2609..d42aa86 100755 --- a/windows/hl/test/test_hdf5_hl.BAT +++ b/windows/hl/test/test_hdf5_hl.BAT @@ -45,4 +45,12 @@ echo. echo =============================================== echo Testing hl_test_packet%2 -- %1 echo =============================================== -hl_test_packet%2\%1\hl_test_packet%2 \ No newline at end of file +hl_test_packet%2\%1\hl_test_packet%2 + +echo. +echo =============================================== +echo Testing h52gif and gif2h5 -- %1 %2 +echo =============================================== +cd ..\tools\gif2h5 +call h52giftest %1 %2 +cd ..\..\test \ No newline at end of file diff --git a/windows/hl/tools/gif2h5/h52giftest.bat b/windows/hl/tools/gif2h5/h52giftest.bat new file mode 100644 index 0000000..a28b484 --- /dev/null +++ b/windows/hl/tools/gif2h5/h52giftest.bat @@ -0,0 +1,67 @@ +@REM Copyright by The HDF Group. +@REM Copyright by the Board of Trustees of the University of Illinois. +@REM All rights reserved. +@REM +@REM This file is part of HDF5. The full HDF5 copyright notice, including +@REM terms governing use, modification, and redistribution, is contained in +@REM the files COPYING and Copyright.html. COPYING can be found at the root +@REM of the source code distribution tree; Copyright.html can be found at the +@REM root level of an installed copy of the electronic HDF5 document set and +@REM is linked from the top-level documents page. It can also be found at +@REM http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +@REM access to either file, you may request a copy from help@hdfgroup.org. + +@echo off + +::This batch file is for h52gif tests. +::Usage +:: h52giftest release -- release static version +:: h52giftest debug -- debug static version +:: h52giftest release dll -- release dll version +:: h52giftest debug dll -- debug dll version +:: Written By: Scott Wegner +:: Date : April 5, 2005 + + +REM Set up our environment + +mkdir temptest + +set TESTFILE1=..\testfiles\h52giftst.h5 +set TESTFILE2=..\testfiles\image1.gif + +set H52GIF=..\gifconv%2\h52gif%2\%1\h52gif%2.exe +set GIF2H5=..\gifconv%2\gif2h5%2\%1\gif2h5%2.exe + + +REM The tests + +REM TOOLTEST1 $TESTFILE1 image1.gif -i image +%H52GIF% %TESTFILE1% image1.gif -i image 2>%1 > temptest\gifconv_1.results +if %ERRORLEVEL% NEQ 0 ( + echo Testing h52gif h52giftst.h5 image1.gif -i image FAILED + type temptest\gifconv_1.results +) else ( + echo Testing h52gif h52giftst.h5 image1.gif -i image PASSED +) +del temptest\gifconv_1.results + +REM TOOLTEST2 $TESTFILE2 image1.h5 +%GIF2H5% %TESTFILE2% image1.h5 2>%1 > temptest\gifconv_2.results +if %ERRORLEVEL% NEQ 0 ( + echo Testing gif2h5 image1.gif image1.h5 FAILED + type temptest\gifconv_2.results +) else ( + echo Testing gif2h5 image1.gif image1.h5 PASSED +) +del temptest\gifconv_2.results + + +REM Cleanup +set TESTFILE1= +set TESTFILE2= + +set H52GIF= +set GIF2H5= + +rmdir /s/q temptest \ No newline at end of file -- cgit v0.12