GraphicsMagick: VisualMagick/tests/runtest.bat Make binary direc...

changeset c960d477342d in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=c960d477342d
summary: VisualMagick/tests/runtest.bat Make binary directory configurable on one place. Report error when rwblob.exe does not exist.

diffstat:

 ChangeLog                             |   4 ++++
 VisualMagick/tests/run_constitute.bat |   2 +-
 VisualMagick/tests/run_rwblob.bat     |   2 +-
 VisualMagick/tests/run_rwfile.bat     |   2 +-
 VisualMagick/tests/runtest.bat        |  19 +++++++++++++------
 5 files changed, 20 insertions(+), 9 deletions(-)

diffs (90 lines):

diff -r 3605c291d167 -r c960d477342d ChangeLog
--- a/ChangeLog	Thu Dec 22 01:27:34 2022 +0100
+++ b/ChangeLog	Thu Dec 22 01:59:44 2022 +0100
@@ -1,3 +1,7 @@
+2022-12-22 Fojtik Jaroslav  <[email protected]>
+	* VisualMagick/tests/runtest.bat Make binary directory configurable
+	on one place. Report error when rwblob.exe does not exist.
+
 2022-12-22 Fojtik Jaroslav  <[email protected]>
 
 	* jp2/* Update lib jasper from 1.900.1 to 1.900.2.
diff -r 3605c291d167 -r c960d477342d VisualMagick/tests/run_constitute.bat
--- a/VisualMagick/tests/run_constitute.bat	Thu Dec 22 01:27:34 2022 +0100
+++ b/VisualMagick/tests/run_constitute.bat	Thu Dec 22 01:59:44 2022 +0100
@@ -1,5 +1,5 @@
 @echo off
-set exedir=..\binmt\
+set exedir=..\bin\
 set srcdir=..\..\tests\
 %exedir%constitute.exe -storagetype char %srcdir%input_truecolor.miff RGB 
 %exedir%constitute.exe -storagetype char %srcdir%input_truecolor.miff rgb 
diff -r 3605c291d167 -r c960d477342d VisualMagick/tests/run_rwblob.bat
--- a/VisualMagick/tests/run_rwblob.bat	Thu Dec 22 01:27:34 2022 +0100
+++ b/VisualMagick/tests/run_rwblob.bat	Thu Dec 22 01:59:44 2022 +0100
@@ -1,5 +1,5 @@
 @echo off
-set exedir=..\binmt\
+set exedir=..\bin\
 set srcdir=..\..\tests\
 set events="exception"
 set bilevel_file=%srcdir%input_bilevel.miff
diff -r 3605c291d167 -r c960d477342d VisualMagick/tests/run_rwfile.bat
--- a/VisualMagick/tests/run_rwfile.bat	Thu Dec 22 01:27:34 2022 +0100
+++ b/VisualMagick/tests/run_rwfile.bat	Thu Dec 22 01:59:44 2022 +0100
@@ -1,5 +1,5 @@
 @echo off
-set exedir=..\binmt\
+set exedir=..\bin\
 set srcdir=..\..\tests\
 set events="exception"
 set bilevel_file=%srcdir%input_bilevel.miff
diff -r 3605c291d167 -r c960d477342d VisualMagick/tests/runtest.bat
--- a/VisualMagick/tests/runtest.bat	Thu Dec 22 01:27:34 2022 +0100
+++ b/VisualMagick/tests/runtest.bat	Thu Dec 22 01:59:44 2022 +0100
@@ -1,7 +1,14 @@
 @echo off
 set TESTS=0
 set TYPE=NONE
+set exedir=..\bin\
 
+if exist %exedir%rwblob.exe goto _binaryexists
+@echo Missing rwblob in a directory %exedir%
+goto _exit
+
+
+:_binaryexists
 if not {%1}=={} (
   (if {%1}=={all} goto :_testall)
   if not {%2}=={} (
@@ -140,24 +147,24 @@
 if {%1}=={blob} goto :_doblob
 if {%1}=={file} goto :_dofile
 :_dofile
-..\binmt\rwfile ..\..\PerlMagick\t\input_p4.pbm %TYPE%
+%exedir%rwfile ..\..\PerlMagick\t\input_p4.pbm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
-..\binmt\rwfile ..\..\PerlMagick\t\input_p5.pgm %TYPE%
+%exedir%rwfile ..\..\PerlMagick\t\input_p5.pgm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
-..\binmt\rwfile ..\..\PerlMagick\t\input_p6.ppm %TYPE%
+%exedir%rwfile ..\..\PerlMagick\t\input_p6.ppm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
 if not {%1}=={both} goto :EOF
 :_doblob
-..\binmt\rwblob ..\..\PerlMagick\t\input_p4.pbm %TYPE%
+%exedir%rwblob ..\..\PerlMagick\t\input_p4.pbm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
-..\binmt\rwblob ..\..\PerlMagick\t\input_p5.pgm %TYPE%
+%exedir%rwblob ..\..\PerlMagick\t\input_p5.pgm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
-..\binmt\rwblob ..\..\PerlMagick\t\input_p6.ppm %TYPE%
+%exedir%rwblob ..\..\PerlMagick\t\input_p6.ppm %TYPE%
 if not %ERRORLEVEL% EQU 0 goto :_problem
 set /a COUNT += 1
 goto :EOF