Skip to content

Commit 303bc06

Browse files
committed
Added error code verification when executing generate_test_files script.
1 parent 18ab846 commit 303bc06

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

test/bin2cpp_unittest/generate_test_files.bat.in

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,162 +5,189 @@ set OUTDIR=.\generated_files\%TEST_NAME%
55
mkdir %OUTDIR% 1>NUL 2>NUL
66
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
77
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
8+
if %errorlevel% neq 0 exit /b %errorlevel%
89

910
set TEST_NAME=testText1000
1011
set OUTDIR=.\generated_files\%TEST_NAME%
1112
mkdir %OUTDIR% 1>NUL 2>NUL
1213
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=text
1314
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
15+
if %errorlevel% neq 0 exit /b %errorlevel%
1416

1517
set TEST_NAME=testText100000
1618
set OUTDIR=.\generated_files\%TEST_NAME%
1719
mkdir %OUTDIR% 1>NUL 2>NUL
1820
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=text
1921
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
22+
if %errorlevel% neq 0 exit /b %errorlevel%
2023

2124
set TEST_NAME=testRandom1
2225
set OUTDIR=.\generated_files\%TEST_NAME%
2326
mkdir %OUTDIR% 1>NUL 2>NUL
2427
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=1
2528
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
29+
if %errorlevel% neq 0 exit /b %errorlevel%
2630

2731
set TEST_NAME=testRandom2
2832
set OUTDIR=.\generated_files\%TEST_NAME%
2933
mkdir %OUTDIR% 1>NUL 2>NUL
3034
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=2
3135
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
36+
if %errorlevel% neq 0 exit /b %errorlevel%
3237

3338
set TEST_NAME=testRandom3
3439
set OUTDIR=.\generated_files\%TEST_NAME%
3540
mkdir %OUTDIR% 1>NUL 2>NUL
3641
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=3
3742
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
43+
if %errorlevel% neq 0 exit /b %errorlevel%
3844

3945
set TEST_NAME=testRandom4
4046
set OUTDIR=.\generated_files\%TEST_NAME%
4147
mkdir %OUTDIR% 1>NUL 2>NUL
4248
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=4
4349
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
50+
if %errorlevel% neq 0 exit /b %errorlevel%
4451

4552
set TEST_NAME=testRandom5
4653
set OUTDIR=.\generated_files\%TEST_NAME%
4754
mkdir %OUTDIR% 1>NUL 2>NUL
4855
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=5
4956
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
57+
if %errorlevel% neq 0 exit /b %errorlevel%
5058

5159
set TEST_NAME=testRandom6
5260
set OUTDIR=.\generated_files\%TEST_NAME%
5361
mkdir %OUTDIR% 1>NUL 2>NUL
5462
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=6
5563
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
64+
if %errorlevel% neq 0 exit /b %errorlevel%
5665

5766
set TEST_NAME=testRandom7
5867
set OUTDIR=.\generated_files\%TEST_NAME%
5968
mkdir %OUTDIR% 1>NUL 2>NUL
6069
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=7
6170
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
71+
if %errorlevel% neq 0 exit /b %errorlevel%
6272

6373
set TEST_NAME=testRandom8
6474
set OUTDIR=.\generated_files\%TEST_NAME%
6575
mkdir %OUTDIR% 1>NUL 2>NUL
6676
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=8
6777
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
78+
if %errorlevel% neq 0 exit /b %errorlevel%
6879

6980
set TEST_NAME=testHtml100000
7081
set OUTDIR=.\generated_files\%TEST_NAME%
7182
mkdir %OUTDIR% 1>NUL 2>NUL
7283
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=html
7384
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
85+
if %errorlevel% neq 0 exit /b %errorlevel%
7486

7587
set TEST_NAME=testSequential1000
7688
set OUTDIR=.\generated_files\%TEST_NAME%
7789
mkdir %OUTDIR% 1>NUL 2>NUL
7890
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=sequential
7991
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=180 --override
92+
if %errorlevel% neq 0 exit /b %errorlevel%
8093

8194
set TEST_NAME=testSequential10MB
8295
set OUTDIR=.\generated_files\%TEST_NAME%
8396
mkdir %OUTDIR% 1>NUL 2>NUL
8497
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10485760 --fill=sequential
8598
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
99+
if %errorlevel% neq 0 exit /b %errorlevel%
86100

87101
REM set TEST_NAME=testSequential20MB
88102
REM set OUTDIR=.\generated_files\%TEST_NAME%
89103
REM mkdir %OUTDIR% 1>NUL 2>NUL
90104
REM @TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=20971520 --fill=sequential
91105
REM @BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
106+
REM if %errorlevel% neq 0 exit /b %errorlevel%
92107
REM
93108
REM set TEST_NAME=testSequential30MB
94109
REM set OUTDIR=.\generated_files\%TEST_NAME%
95110
REM mkdir %OUTDIR% 1>NUL 2>NUL
96111
REM @TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=31457280 --fill=sequential
97112
REM @BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
113+
REM if %errorlevel% neq 0 exit /b %errorlevel%
98114

99115
set TEST_NAME=testGeneratorArray10000
100116
set OUTDIR=.\generated_files\%TEST_NAME%
101117
mkdir %OUTDIR% 1>NUL 2>NUL
102118
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
103119
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=array --override
120+
if %errorlevel% neq 0 exit /b %errorlevel%
104121

105122
set TEST_NAME=testGeneratorString10000
106123
set OUTDIR=.\generated_files\%TEST_NAME%
107124
mkdir %OUTDIR% 1>NUL 2>NUL
108125
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
109126
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=string --override
127+
if %errorlevel% neq 0 exit /b %errorlevel%
110128

111129
set TEST_NAME=testGeneratorSegment10000
112130
set OUTDIR=.\generated_files\%TEST_NAME%
113131
mkdir %OUTDIR% 1>NUL 2>NUL
114132
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
115133
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override
134+
if %errorlevel% neq 0 exit /b %errorlevel%
116135

117136
set TEST_NAME=testGeneratorWin32
118137
set OUTDIR=.\generated_files\%TEST_NAME%
119138
mkdir %OUTDIR% 1>NUL 2>NUL
120139
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
121140
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=win32 --override
141+
if %errorlevel% neq 0 exit /b %errorlevel%
122142

123143
set TEST_NAME=testNamespace
124144
set OUTDIR=.\generated_files\%TEST_NAME%
125145
mkdir %OUTDIR% 1>NUL 2>NUL
126146
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
127147
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override --namespace=foobar
148+
if %errorlevel% neq 0 exit /b %errorlevel%
128149

129150
set TEST_NAME=testBaseClass
130151
set OUTDIR=.\generated_files\%TEST_NAME%
131152
mkdir %OUTDIR% 1>NUL 2>NUL
132153
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
133154
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override --baseclass=Resource
155+
if %errorlevel% neq 0 exit /b %errorlevel%
134156

135157
set TEST_NAME=testEncodingOct
136158
set OUTDIR=.\generated_files\%TEST_NAME%
137159
mkdir %OUTDIR% 1>NUL 2>NUL
138160
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=300 --fill=sequential
139161
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=40 --generator=segment --override --encoding=OcT
162+
if %errorlevel% neq 0 exit /b %errorlevel%
140163

141164
set TEST_NAME=testEncodingHex
142165
set OUTDIR=.\generated_files\%TEST_NAME%
143166
mkdir %OUTDIR% 1>NUL 2>NUL
144167
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=300 --fill=sequential
145168
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=40 --generator=segment --override --encoding=HeX
169+
if %errorlevel% neq 0 exit /b %errorlevel%
146170

147171
set TEST_NAME=testIssue12
148172
set OUTDIR=.\generated_files\%TEST_NAME%
149173
mkdir %OUTDIR% 1>NUL 2>NUL
150174
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=3
151175
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
176+
if %errorlevel% neq 0 exit /b %errorlevel%
152177

153178
set TEST_NAME=testIssue12Mini
154179
set OUTDIR=.\generated_files\%TEST_NAME%
155180
mkdir %OUTDIR% 1>NUL 2>NUL
156181
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=100 --fill=random --seed=3 --skip=47240
157182
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=10 --override
183+
if %errorlevel% neq 0 exit /b %errorlevel%
158184

159185
set TEST_NAME=testIssue13
160186
set OUTDIR=.\generated_files\%TEST_NAME%
161187
mkdir %OUTDIR% 1>NUL 2>NUL
162188
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=1
163189
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=100 --override
190+
if %errorlevel% neq 0 exit /b %errorlevel%
164191

165192
set TEST_NAME=testDir01
166193
set OUTDIR=.\generated_files\%TEST_NAME%
@@ -173,9 +200,14 @@ mkdir %OUTDIR%\sources 1>NUL 2>NUL
173200
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\images\IMG_0004.jpg --size=1040 --fill=random --seed=4
174201
@TESTFILEGENERATOR_TARGET_FILE@ --file=%OUTDIR%\images\IMG_0005.jpg --size=1050 --fill=random --seed=5
175202
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\images\IMG_0001.jpg --output=%OUTDIR%\sources --headerfile=_img0001.h --identifier=Img0001 --chunksize=200 --override
203+
if %errorlevel% neq 0 exit /b %errorlevel%
176204
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\images\IMG_0002.jpg --output=%OUTDIR%\sources --headerfile=_img0002.h --identifier=Img0002 --chunksize=200 --override
205+
if %errorlevel% neq 0 exit /b %errorlevel%
177206
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\images\IMG_0003.jpg --output=%OUTDIR%\sources --headerfile=_img0003.h --identifier=Img0003 --chunksize=200 --override
207+
if %errorlevel% neq 0 exit /b %errorlevel%
178208
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\images\IMG_0004.jpg --output=%OUTDIR%\sources --headerfile=_img0004.h --identifier=Img0004 --chunksize=200 --override
209+
if %errorlevel% neq 0 exit /b %errorlevel%
179210
@BIN2CPP_TARGET_FILE@ --noheader --file=%OUTDIR%\images\IMG_0005.jpg --output=%OUTDIR%\sources --headerfile=_img0005.h --identifier=Img0005 --chunksize=200 --override
211+
if %errorlevel% neq 0 exit /b %errorlevel%
180212

181213
dir >NUL

test/bin2cpp_unittest/generate_test_files.sh.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Any commands which fail will cause the shell script to exit immediately
2+
set -e
3+
14
export TEST_NAME=testText10
25
export OUTDIR=./generated_files/$TEST_NAME
36
mkdir -p ${OUTDIR}

0 commit comments

Comments
 (0)