From c2ad7b9b25e3e1794be00bef27e41c6f0b0c9ee5 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 2 Nov 2009 14:01:13 -0500
Subject: [svn-r17805] corrected examples test batch files

---
 windows/examples/testExamples.bat         | 112 +++---------------------------
 windows/hl/examples/test_hl_cexamples.BAT |  12 ++--
 2 files changed, 15 insertions(+), 109 deletions(-)

diff --git a/windows/examples/testExamples.bat b/windows/examples/testExamples.bat
index 57aa19c..e6367ac 100755
--- a/windows/examples/testExamples.bat
+++ b/windows/examples/testExamples.bat
@@ -19,111 +19,17 @@ REM Last Modified: 10/16/2004
 
 if %1.==. GOTO WRONG
 if "%1"=="/?" GOTO HELP
-if %1==release GOTO RELEASE
-if %1==debug GOTO DEBUG
-GOTO WRONG
 
-:RELEASE
-if %2.==. GOTO REL
-if %2==dll GOTO RELDLL
-GOTO WRONG
-
-:REL
-type nul > %1.txt
-cd examplesREL
-attributetest >> ..\%1.txt
-compoundtest >> ..\%1.txt
-extendwritetest >> ..\%1.txt
-grouptest >> ..\%1.txt
-intermgrouptest >> ..\%1.txt
-selectest >> ..\%1.txt
-writetest >> ..\%1.txt
-chunkread >> ..\%1.txt
-readtest >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt  > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo All HDF5 C examples tests passed.
-) else (
-   echo HDF5 C examples tests failed.
-   echo.
-   more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:RELDLL
-type nul > %1.txt
-cd examplesRELDLL
-attributetestdll >> ..\%1.txt
-compoundtestdll >> ..\%1.txt
-extendwritetestdll >> ..\%1.txt
-grouptestdll >> ..\%1.txt
-intermgrouptestdll >> ..\%1.txt
-selectestdll >> ..\%1.txt
-writetestdll >> ..\%1.txt
-chunkreaddll >> ..\%1.txt
-readtestdll >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt  > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo All HDF5 C examples tests passed.
-) else (
-   echo HDF5 C examples tests failed.
-   echo.
-   more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:DEBUG
-if %2.==. GOTO DBG
-if %2==dll GOTO DBGDLL
-GOTO WRONG
-
-:DBG
-type nul > %1.txt
-cd examplesDBG
-attributetest >> ..\%1.txt
-compoundtest >> ..\%1.txt
-extendwritetest >> ..\%1.txt
-grouptest >> ..\%1.txt
-intermgrouptest >> ..\%1.txt
-selectest >> ..\%1.txt
-writetest >> ..\%1.txt
-chunkread >> ..\%1.txt
-readtest >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt  > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo All HDF5 C examples tests passed.
-) else (
-   echo HDF5 C examples tests failed.
-   echo.
-   more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:DBGDLL
 type nul > %1.txt
-cd examplesDBGDLL
-attributetestdll >> ..\%1.txt
-compoundtestdll >> ..\%1.txt
-extendwritetestdll >> ..\%1.txt
-grouptestdll >> ..\%1.txt
-intermgrouptestdll >> ..\%1.txt
-selectestdll >> ..\%1.txt
-writetestdll >> ..\%1.txt
-chunkreaddll >> ..\%1.txt
-readtestdll >> ..\%1.txt
-cd ..
+attributetest%2\%1\attributetest%2 >> %1.txt
+compoundtest%2\%1\compoundtest%2 >> %1.txt
+extendwritetest%2\%1\extendwritetest%2 >> %1.txt
+grouptest%2\%1\grouptest%2 >> %1.txt
+intermgrouptest%2\%1\intermgrouptest%2 >> %1.txt
+selectest%2\%1\selectest%2 >> %1.txt
+writetest%2\%1\writetest%2 >> %1.txt
+chunkread%2\%1\chunkread%2 >> %1.txt
+readtest%2\%1\readtest%2 >> %1.txt
 more /e +3 testExamples_exp_output.txt  > output.txt
 fc %1.txt output.txt >temp.txt
 if %ERRORLEVEL%==0 (
diff --git a/windows/hl/examples/test_hl_cexamples.BAT b/windows/hl/examples/test_hl_cexamples.BAT
index 4fb6309..652a602 100644
--- a/windows/hl/examples/test_hl_cexamples.BAT
+++ b/windows/hl/examples/test_hl_cexamples.BAT
@@ -39,30 +39,30 @@ GOTO WRONG
     echo Testing %1 %2 version of High Level examples 
     echo.
 
-    HLCexamples%1%2\ex_ds1%2.exe HLCexamples%1%2
+    ex_ds1%2\%1\ex_ds1%2.exe ex_ds1%1%2
     
     for /l %%a in (1,1,2) do (
-        HLCexamples%1%2\ex_image%%a%2.exe HLCexamples%1%2
+        ex_image%%a%2\%1\ex_image%%a%2.exe ex_image%%a%1%2
         if not !errorlevel!==0 set /A total_error=!total_error!+1
     )
     
     for /l %%a in (1,1,3) do (
-        HLCexamples%1%2\ex_lite%%a%2.exe HLCexamples%1%2
+        ex_lite%%a%2\%1\ex_lite%%a%2.exe ex_lite%%a%1%2
         if not !errorlevel!==0 set /A total_error=!total_error!+1
     )
 
     for /l %%a in (1,1,9) do (
-        HLCexamples%1%2\ex_table0%%a%2.exe HLCexamples%1%2
+        ex_table0%%a%2\%1\ex_table0%%a%2.exe ex_table0%%a%1%2
         if not !errorlevel!==0 set /A total_error=!total_error!+1
     )
     
     for /l %%a in (10,1,12) do (
-        HLCexamples%1%2\ex_table%%a%2.exe HLCexamples%1%2
+        ex_table%%a%2\%1\ex_table%%a%2.exe ex_table%%a%1%2
         if not !errorlevel!==0 set /A total_error=!total_error!+1
     )
     
     for %%a in (FL VL) do (
-        HLCexamples%1%2\ptExample%%a%2.exe HLCexamples%1%2
+        ptExample%%a%2\%1\ptExample%%a%2.exe ptExample%%a%1%2
         if not !errorlevel!==0 set /A total_error=!total_error!+1
     )
 
-- 
cgit v0.12