diff options
Diffstat (limited to 'windows/tools/h5import/h5importtestutil.bat')
| -rw-r--r-- | windows/tools/h5import/h5importtestutil.bat | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/windows/tools/h5import/h5importtestutil.bat b/windows/tools/h5import/h5importtestutil.bat index 5307473..ed9c63a 100644 --- a/windows/tools/h5import/h5importtestutil.bat +++ b/windows/tools/h5import/h5importtestutil.bat @@ -37,6 +37,9 @@ set h5dump=..\h5dump%2\%1\h5dump%2 rem The path of the h5dump tool binary
set h5dump_bin=%CD%\%h5dump%
+rem source directory (this is already defined in the Linux script)
+set srcdir=%CD%
+
rem initialize errors variables
set errors=0
@@ -67,7 +70,7 @@ goto main %h5dump_bin% %5 > log1
popd
- fc /w tmp_testfiles\log1 log2 | find "FC: no diff" > nul
+ fc /w tmp_testfiles\log1 log2 > nul
if %errorlevel% neq 0 set err=1
del /f log2 tmp_testfiles\log1
if "%err%"=="1" (
@@ -101,49 +104,65 @@ goto main rem On Windows, echo gives a carriage return, so we store the TESTING params
rem and call TESTING from TOOLTEST. --SJW 8/27/07
set testing=ASCII I32 rank 3 - Output BE
- call :tooltest txtin32 -c %CD%\testfiles\textin32 -o test1.h5
+ rem call :tooltest txtin32 -c %CD%\testfiles\textin32 -o test1.h5
+ call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin32.conf -o txtin32.h5
set testing=ASCII I16 rank 3 - Output LE - CHUNKED - extended
- call :tooltest txtin16 -c %CD%\testfiles\textin16 -o test2.h5
+ rem call :tooltest txtin16 -c %CD%\testfiles\textin16 -o test2.h5
+ call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin16.conf -o txtin16.h5
set testing=ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed
- call :tooltest txtin16 -c %CD%\testfiles\textin8 -o test3.h5
+ rem call :tooltest txtin16 -c %CD%\testfiles\textin8 -o test3.h5
+ call :tooltest %srcdir%\testfiles\txtin16.txt -c %srcdir%\testfiles\txtin8.conf -o txtin8.h5
set testing=ASCII UI32 - rank 3 - Output BE
- call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin32 -o test4.h5
+ rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin32 -o test4.h5
+ call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin32.conf -o txtuin32.h5
set testing=ASCII UI16 - rank 2 - Output LE+Chunked+Compressed
- call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin16 -o test5.h5
+ rem call :tooltest %CD%\testfiles\in1 -c %CD%\testfiles\textuin16 -o test5.h5
+ call :tooltest %srcdir%\testfiles\txtuin32.txt -c %srcdir%\testfiles\txtuin16.conf -o txtuin16.h5
set testing=ASCII F32 - rank 3 - Output LE
- call :tooltest %CD%\testfiles\fp1 -c %CD%\testfiles\textfp32 -o test6.h5
+ rem call :tooltest %CD%\testfiles\fp1 -c %CD%\testfiles\textfp32 -o test6.h5
+ call :tooltest %srcdir%\testfiles\txtfp32.txt -c %srcdir%\testfiles\txtfp32.conf -o txtfp32.h5
set testing=ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed
- call :tooltest %CD%\testfiles\fp2 -c %CD%\testfiles\textfp64 -o test7.h5
+ rem call :tooltest %CD%\testfiles\fp2 -c %CD%\testfiles\textfp64 -o test7.h5
+ call :tooltest %srcdir%\testfiles\txtfp64.txt -c %srcdir%\testfiles\txtfp64.conf -o txtfp64.h5
set testing=BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed
- call :tooltest bfp64 -c %CD%\testfiles\conbfp64 -o test8.h5
+ rem call :tooltest bfp64 -c %CD%\testfiles\conbfp64 -o test8.h5
+ call :tooltest binfp64.bin -c %srcdir%\testfiles\binfp64.conf -o binfp64.h5
set testing=BINARY I16 - rank 3 - Output order LE + CHUNKED + extended
- call :tooltest bin16 -c %CD%\testfiles\conbin16 -o test9.h5
+ rem call :tooltest bin16 -c %CD%\testfiles\conbin16 -o test9.h5
+ call :tooltest binin16.bin -c %srcdir%\testfiles\binin16.conf -o binin16.h5
set testing=BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed
- call :tooltest bin8 -c %CD%\testfiles\conbin8 -o test10.h5
+ rem call :tooltest bin8 -c %CD%\testfiles\conbin8 -o test10.h5
+ call :tooltest binin8.bin -c %srcdir%\testfiles\binin8.conf -o binin8.h5
set testing=BINARY I32 - rank 3 - Output BE + CHUNKED
- call :tooltest bin32 -c %CD%\testfiles\conbin32 -o test11.h5
+ rem call :tooltest bin32 -c %CD%\testfiles\conbin32 -o test11.h5
+ call :tooltest binin32.bin -c %srcdir%\testfiles\binin32.conf -o binin32.h5
set testing=BINARY UI16 - rank 3 - Output byte BE + CHUNKED
- call :tooltest buin16 -c %CD%\testfiles\conbuin16 -o test12.h5
+ rem call :tooltest buin16 -c %CD%\testfiles\conbuin16 -o test12.h5
+ call :tooltest binuin16.bin -c %srcdir%\testfiles\binuin16.conf -o binuin16.h5
set testing=BINARY UI32 - rank 3 - Output LE + CHUNKED
- call :tooltest buin32 -c %CD%\testfiles\conbuin32 -o test13.h5
+ rem call :tooltest buin32 -c %CD%\testfiles\conbuin32 -o test13.h5
+ call :tooltest binuin32.bin -c %srcdir%\testfiles\binuin32.conf -o binuin32.h5
set testing=STR
- call :tooltest %CD%\testfiles\txtstr -c %CD%\testfiles\textstr -o teststr.h5
+ rem call :tooltest %CD%\testfiles\txtstr -c %CD%\testfiles\textstr -o teststr.h5
+ call :tooltest %srcdir%\testfiles\txtstr.txt -c %srcdir%\testfiles\txtstr.conf -o txtstr.h5
+
+ set testing=BINARY I8 CR LF EOF
+ call :tooltest binin8w.bin -c %srcdir%\testfiles\binin8w.conf -o binin8w.h5
- del /f tx* b* *.dat
- del /f test*.h5
+ del /f *.txt *.bin *.h5
rmdir /s /q tmp_testfiles
) else (
@@ -168,5 +187,5 @@ goto main )
popd
- endlocal & exit /b %nerrors%
-
\ No newline at end of file + endlocal & exit /b %errors%
+
|