[svn-r13140] Added a new batch file to test error APIs

Tested 1.6 compatibility feature: work for vs studio 6.0
Corrected several small bugs inside tool batch files
Add a few project files to test error APIs

2 files changed, 111 insertions, 63 deletions

diff --git a/windows/tools/jamtest.bat b/windows/tools/jamtest.bat
index fb0fc1e..8ba7a04 100644
--- a/windows/tools/jamtest.bat
+++ b/windows/tools/jamtest.bat
@@ -2,8 +2,8 @@
 @REM Should copy all testing files to this directory

 @REM This batch file only tests the validation of h5jam and h5unjam tools on windows,

 @REM It will not check the correctedness of jammed/unjammed user-block.

+@echo off

 cd h5jam%2\%1 

-echo off

 copy /Y ..\..\testfiles\tall.h5 tall.h5 >temp.txt

 copy /Y ..\..\testfiles\twithub.h5 twithub.h5 >temp.txt

 copy /Y ..\..\testfiles\twithub513.h5 twithub513.h5 >temp.txt

@@ -11,82 +11,126 @@ copy /Y ..\..\testfiles\u10.txt u10.txt >temp.txt
 copy /Y ..\..\testfiles\u511.txt u511.txt >temp.txt

 copy /Y ..\..\testfiles\u512.txt u512.txt >temp.txt

 copy /Y ..\..\testfiles\u513.txt u513.txt >temp.txt

-

-h5jam -u u10.txt -i tall.h5 -o ta2.h5             

-echo h5jam -u u10.txt -i tall.h5 -o ta2.h5                                    PASSED             

-h5jam -u u511.txt -i tall.h5 -o ta3.h5     

-echo h5jam -u u511.txt -i tall.h5 -o ta3.h5                                   PASSED                    

+@REM the reason to set environment variables is to make sure it is consistent with other batch files.

+set p1=%1

+set p2=%2

+echo.

+echo.****************************************************

+echo.       H5jam%2 %1   T E S T S            

+echo.****************************************************

+echo. 

+set tempResult=jamtest%p2%_%p1%.txt

+h5jam -u u10.txt -i tall.h5 -o ta2.h5   

+echo h5jam -u u10.txt -i tall.h5 -o ta2.h5                                    PASSED          

+echo h5jam -u u10.txt -i tall.h5 -o ta2.h5                                    PASSED >> ..\..\%tempResult%          

+h5jam -u u511.txt -i tall.h5 -o ta3.h5  

+echo h5jam -u u511.txt -i tall.h5 -o ta3.h5                                   PASSED   

+echo h5jam -u u511.txt -i tall.h5 -o ta3.h5                                   PASSED >> ..\..\%tempResult%                    

 h5jam -u u512.txt -i tall.h5 -o ta4.h5  

-echo h5jam -u u512.txt -i tall.h5 -o ta4.h5                                   PASSED                       

+echo h5jam -u u512.txt -i tall.h5 -o ta4.h5                                   PASSED

+echo h5jam -u u512.txt -i tall.h5 -o ta4.h5                                   PASSED >> ..\..\%tempResult%                      

 h5jam -u u513.txt -i tall.h5 -o ta5.h5    

-echo h5jam -u u513.txt -i tall.h5 -o ta5.h5                                   PASSED    

+echo h5jam -u u513.txt -i tall.h5 -o ta5.h5                                   PASSED

+echo h5jam -u u513.txt -i tall.h5 -o ta5.h5                                   PASSED >> ..\..\%tempResult%   

 copy /Y tall.h5 ta.h5 >temp.txt             

 h5jam -u u10.txt -i ta.h5  

 echo h5jam -u u10.txt -i ta.h5                                                PASSED

+echo h5jam -u u10.txt -i ta.h5                                                PASSED >> ..\..\%tempResult% 

 copy /Y tall.h5 ta.h5 >temp.txt                                      

-h5jam -u u511.txt -i ta.h5                                                    

-echo h5jam -u u511.txt -i ta.h5	                                         PASSED

+h5jam -u u511.txt -i ta.h5   

+echo h5jam -u u511.txt -i ta.h5	                                         PASSED                                                 

+echo h5jam -u u511.txt -i ta.h5	                                         PASSED >> ..\..\%tempResult% 

 copy /Y tall.h5 ta.h5 >temp.txt                                      

-h5jam -u u512.txt -i ta.h5                                                    

-echo h5jam -u u512.txt -i ta.h5                                               PASSED

+h5jam -u u512.txt -i ta.h5                  

+echo h5jam -u u512.txt -i ta.h5                                               PASSED                                  

+echo h5jam -u u512.txt -i ta.h5                                               PASSED >> ..\..\%tempResult% 

 copy /Y tall.h5 ta.h5 >temp.txt                                     

-h5jam -u u513.txt -i ta.h5                                                    

-echo h5jam -u u513.txt -i ta.h5                                               PASSED                                   

-h5jam -u u10.txt -i twithub.h5 -o tax2.h5   	                              

-echo h5jam -u u10.txt -i twithub.h5 -o tax2.h5                                PASSED                  

-h5jam -u u511.txt -i twithub.h5 -o tax3.h5                                    

-echo h5jam -u u511.txt -i twithub.h5 -o tax3.h5                               PASSED            

-h5jam -u u512.txt -i twithub.h5 -o tax4.h5                                    

-echo h5jam -u u512.txt -i twithub.h5 -o tax4.h5                               PASSED              

-h5jam -u u513.txt -i twithub.h5 -o tax5.h5                                    

-echo h5jam -u u513.txt -i twithub.h5 -o tax5.h5                               PASSED

-h5jam -u u10.txt -i twithub513.h5 -o tax6.h5                                  

-echo h5jam -u u10.txt -i twithub513.h5 -o tax6.h5                             PASSED           

-h5jam -u u511.txt -i twithub513.h5 -o tax7.h5                                 

-echo h5jam -u u511.txt -i twithub513.h5 -o tax7.h5                            PASSED 

-h5jam -u u512.txt -i twithub513.h5 -o tax8.h5                                 

-echo h5jam -u u512.txt -i twithub513.h5 -o tax8.h5                            PASSED

-h5jam -u u513.txt -i twithub513.h5 -o tax9.h5                                 

-echo h5jam -u u513.txt -i twithub513.h5 -o tax9.h5                            PASSED

-h5jam -u u10.txt -i twithub.h5 -o taz2.h5 --clobber                           

-echo h5jam -u u10.txt -i twithub.h5 -o taz2.h5 --clobber                      PASSED

-h5jam -u u511.txt -i twithub.h5 -o taz3.h5 --clobber                          

-echo h5jam -u u511.txt -i twithub.h5 -o taz3.h5 --clobber                     PASSED

-h5jam -u u512.txt -i twithub.h5 -o taz4.h5 --clobber                          

-echo h5jam -u u512.txt -i twithub.h5 -o taz4.h5 --clobber                     PASSED

-h5jam -u u513.txt -i twithub.h5 -o taz5.h5 --clobber                          

-echo h5jam -u u513.txt -i twithub.h5 -o taz5.h5 --clobber                     PASSED

-h5jam -u u10.txt -i twithub513.h5 -o taz6.h5 --clobber                        

-echo h5jam -u u10.txt -i twithub513.h5 -o taz6.h5 --clobber                   PASSED

-h5jam -u u511.txt -i twithub513.h5 -o taz7.h5 --clobber                       

-echo h5jam -u u511.txt -i twithub513.h5 -o taz7.h5 --clobber                  PASSED

-h5jam -u u512.txt -i twithub513.h5 -o taz8.h5 --clobber                       

-echo h5jam -u u512.txt -i twithub513.h5 -o taz8.h5 --clobber                  PASSED

-h5jam -u u513.txt -i twithub513.h5 -o taz9.h5 --clobber                       

-echo h5jam -u u513.txt -i twithub513.h5 -o taz9.h5 --clobber                  PASSED

+h5jam -u u513.txt -i ta.h5       

+echo h5jam -u u513.txt -i ta.h5                                               PASSED                                             

+echo h5jam -u u513.txt -i ta.h5                                               PASSED >> ..\..\%tempResult%                                  

+h5jam -u u10.txt -i twithub.h5 -o tax2.h5   

+echo h5jam -u u10.txt -i twithub.h5 -o tax2.h5                                PASSED	                              

+echo h5jam -u u10.txt -i twithub.h5 -o tax2.h5                                PASSED >> ..\..\%tempResult%                  

+h5jam -u u511.txt -i twithub.h5 -o tax3.h5        

+echo h5jam -u u511.txt -i twithub.h5 -o tax3.h5                               PASSED                            

+echo h5jam -u u511.txt -i twithub.h5 -o tax3.h5                               PASSED >> ..\..\%tempResult%            

+h5jam -u u512.txt -i twithub.h5 -o tax4.h5                

+echo h5jam -u u512.txt -i twithub.h5 -o tax4.h5                               PASSED                    

+echo h5jam -u u512.txt -i twithub.h5 -o tax4.h5                               PASSED >> ..\..\%tempResult%             

+h5jam -u u513.txt -i twithub.h5 -o tax5.h5         

+echo h5jam -u u513.txt -i twithub.h5 -o tax5.h5                               PASSED                           

+echo h5jam -u u513.txt -i twithub.h5 -o tax5.h5                               PASSED >> ..\..\%tempResult% 

+h5jam -u u10.txt -i twithub513.h5 -o tax6.h5    

+echo h5jam -u u10.txt -i twithub513.h5 -o tax6.h5                             PASSED                              

+echo h5jam -u u10.txt -i twithub513.h5 -o tax6.h5                             PASSED >> ..\..\%tempResult%           

+h5jam -u u511.txt -i twithub513.h5 -o tax7.h5  

+echo h5jam -u u511.txt -i twithub513.h5 -o tax7.h5                            PASSED                               

+echo h5jam -u u511.txt -i twithub513.h5 -o tax7.h5                            PASSED >> ..\..\%tempResult% 

+h5jam -u u512.txt -i twithub513.h5 -o tax8.h5           

+echo h5jam -u u512.txt -i twithub513.h5 -o tax8.h5                            PASSED                      

+echo h5jam -u u512.txt -i twithub513.h5 -o tax8.h5                            PASSED >> ..\..\%tempResult% 

+h5jam -u u513.txt -i twithub513.h5 -o tax9.h5  

+echo h5jam -u u513.txt -i twithub513.h5 -o tax9.h5                            PASSED                               

+echo h5jam -u u513.txt -i twithub513.h5 -o tax9.h5                            PASSED >> ..\..\%tempResult% 

+h5jam -u u10.txt -i twithub.h5 -o taz2.h5 --clobber   

+echo h5jam -u u10.txt -i twithub.h5 -o taz2.h5 --clobber                      PASSED                        

+echo h5jam -u u10.txt -i twithub.h5 -o taz2.h5 --clobber                      PASSED >> ..\..\%tempResult% 

+h5jam -u u511.txt -i twithub.h5 -o taz3.h5 --clobber 

+echo h5jam -u u511.txt -i twithub.h5 -o taz3.h5 --clobber                     PASSED                         

+echo h5jam -u u511.txt -i twithub.h5 -o taz3.h5 --clobber                     PASSED >> ..\..\%tempResult% 

+h5jam -u u512.txt -i twithub.h5 -o taz4.h5 --clobber 

+echo h5jam -u u512.txt -i twithub.h5 -o taz4.h5 --clobber                     PASSED                         

+echo h5jam -u u512.txt -i twithub.h5 -o taz4.h5 --clobber                     PASSED >> ..\..\%tempResult% 

+h5jam -u u513.txt -i twithub.h5 -o taz5.h5 --clobber 

+echo h5jam -u u513.txt -i twithub.h5 -o taz5.h5 --clobber                     PASSED                         

+echo h5jam -u u513.txt -i twithub.h5 -o taz5.h5 --clobber                     PASSED >> ..\..\%tempResult% 

+h5jam -u u10.txt -i twithub513.h5 -o taz6.h5 --clobber

+echo h5jam -u u10.txt -i twithub513.h5 -o taz6.h5 --clobber                   PASSED                        

+echo h5jam -u u10.txt -i twithub513.h5 -o taz6.h5 --clobber                   PASSED >> ..\..\%tempResult% 

+h5jam -u u511.txt -i twithub513.h5 -o taz7.h5 --clobber   

+echo h5jam -u u511.txt -i twithub513.h5 -o taz7.h5 --clobber                  PASSED                    

+echo h5jam -u u511.txt -i twithub513.h5 -o taz7.h5 --clobber                  PASSED >> ..\..\%tempResult% 

+h5jam -u u512.txt -i twithub513.h5 -o taz8.h5 --clobber

+echo h5jam -u u512.txt -i twithub513.h5 -o taz8.h5 --clobber                  PASSED                       

+echo h5jam -u u512.txt -i twithub513.h5 -o taz8.h5 --clobber                  PASSED >> ..\..\%tempResult% 

+h5jam -u u513.txt -i twithub513.h5 -o taz9.h5 --clobber

+echo h5jam -u u513.txt -i twithub513.h5 -o taz9.h5 --clobber                  PASSED                       

+echo h5jam -u u513.txt -i twithub513.h5 -o taz9.h5 --clobber                  PASSED >> ..\..\%tempResult% 

 copy /Y twithub.h5 tay2.h5 >temp.txt   

-h5jam -u u10.txt -i tay2.h5 --clobber                                         

-echo h5jam -u u10.txt -i tay2.h5 --clobber                                    PASSED

+h5jam -u u10.txt -i tay2.h5 --clobber 

+echo h5jam -u u10.txt -i tay2.h5 --clobber                                    PASSED                                        

+echo h5jam -u u10.txt -i tay2.h5 --clobber                                    PASSED >> ..\..\%tempResult% 

 copy /Y twithub.h5 tay3.h5 >temp.txt                          

-h5jam -u u511.txt -i tay3.h5 --clobber                                        

-echo h5jam -u u511.txt -i tay3.h5 --clobber                                   PASSED

+h5jam -u u511.txt -i tay3.h5 --clobber

+echo h5jam -u u511.txt -i tay3.h5 --clobber                                   PASSED                                        

+echo h5jam -u u511.txt -i tay3.h5 --clobber                                   PASSED >> ..\..\%tempResult% 

 copy /Y twithub.h5 tay4.h5 >temp.txt                        

-h5jam -u u512.txt -i tay4.h5 --clobber                                        

-echo h5jam -u u512.txt -i tay4.h5 --clobber                                   PASSED

+h5jam -u u512.txt -i tay4.h5 --clobber

+echo h5jam -u u512.txt -i tay4.h5 --clobber                                   PASSED                                        

+echo h5jam -u u512.txt -i tay4.h5 --clobber                                   PASSED >> ..\..\%tempResult% 

 copy /Y twithub.h5 tay5.h5 >temp.txt                        

-h5jam -u u513.txt -i tay5.h5 --clobber                                        

-echo h5jam -u u513.txt -i tay5.h5 --clobber                                   PASSED

+h5jam -u u513.txt -i tay5.h5 --clobber

+echo h5jam -u u513.txt -i tay5.h5 --clobber                                   PASSED                                        

+echo h5jam -u u513.txt -i tay5.h5 --clobber                                   PASSED >> ..\..\%tempResult% 

 copy /Y twithub513.h5 tay6.h5 >temp.txt                       

-h5jam -u u10.txt -i tay6.h5 --clobber                                         

-echo h5jam -u u10.txt -i tay6.h5 --clobber                                    PASSED

+h5jam -u u10.txt -i tay6.h5 --clobber

+echo h5jam -u u10.txt -i tay6.h5 --clobber                                    PASSED                                         

+echo h5jam -u u10.txt -i tay6.h5 --clobber                                    PASSED >> ..\..\%tempResult% 

 copy /Y twithub513.h5 tay7.h5 >temp.txt                           

-h5jam -u u511.txt -i tay7.h5 --clobber                                        

-echo h5jam -u u511.txt -i tay7.h5 --clobber                                   PASSED

+h5jam -u u511.txt -i tay7.h5 --clobber

+echo h5jam -u u511.txt -i tay7.h5 --clobber                                   PASSED                                        

+echo h5jam -u u511.txt -i tay7.h5 --clobber                                   PASSED >> ..\..\%tempResult% 

 copy /Y twithub513.h5 tay8.h5 >temp.txt                         

-h5jam -u u512.txt -i tay8.h5 --clobber                                        

-echo h5jam -u u512.txt -i tay8.h5 --clobber                                   PASSED

+h5jam -u u512.txt -i tay8.h5 --clobber

+echo h5jam -u u512.txt -i tay8.h5 --clobber                                   PASSED                                        

+echo h5jam -u u512.txt -i tay8.h5 --clobber                                   PASSED >> ..\..\%tempResult% 

 copy /Y twithub513.h5 tay9.h5 >temp.txt                         

-h5jam -u u513.txt -i tay9.h5 --clobber                                        

-echo h5jam -u u513.txt -i tay9.h5 --clobber                                   PASSED                         

+h5jam -u u513.txt -i tay9.h5 --clobber

+echo h5jam -u u513.txt -i tay9.h5 --clobber                                   PASSED                                        

+echo h5jam -u u513.txt -i tay9.h5 --clobber                                   PASSED >> ..\..\%tempResult%                         

 del temp.txt

+del *.h5

+set tempResult=

+set p1=

+set p2=

 cd ../..

diff --git a/windows/tools/testhdf5tools.BAT b/windows/tools/testhdf5tools.BAT
index 2c19474..112b543 100755
--- a/windows/tools/testhdf5tools.BAT
+++ b/windows/tools/testhdf5tools.BAT
@@ -53,9 +53,13 @@ call stattest %1 %2
 

 set p2=%2

 if "%2"=="dll" (

-echo "DLL version is not available for h5copy,h5jam or h5unjam, SKIP the test"

+echo "DLL version is not available for h5copy,h5jam or h5unjam, SKIP the test" >>toolstest_%1%2.txt

 )	else (

 	call jamtest %1 %2

+        @more jamtest%2_%1.txt >> toolstest_%1%2.txt

+        @del jamtest%2_%1.txt

 	call copytest %1 %2

+        @more copytest%2_%1.txt >> toolstest_%1%2.txt

+        @del copytest%2_%1.txt

 )