Skip to content

Commit ab204b2

Browse files
end2endzoneend2endzone
committed
Fixed issue #10: Move test file generation script to output dir
1 parent aabecfc commit ab204b2

File tree

4 files changed

+77
-56
lines changed

4 files changed

+77
-56
lines changed

‎msvc/bin2cpp_unittest.vcxproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,15 @@
117117
<ItemGroup>
118118
<None Include="bin2cppTest.x86.debug.xml" />
119119
<None Include="bin2cppTest.x86.release.xml" />
120+
<CustomBuild Include="generate_test_files.bat">
121+
<FileType>Document</FileType>
122+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(OutDir)"</Command>
123+
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Identity)...</Message>
124+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)%(Identity)</Outputs>
125+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" "$(OutDir)"</Command>
126+
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Identity)...</Message>
127+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)%(Identity)</Outputs>
128+
</CustomBuild>
120129
<None Include="prebuild.bat" />
121130
</ItemGroup>
122131
<ItemGroup>

‎msvc/bin2cpp_unittest.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,7 @@
9393
<Filter>Generated Files</Filter>
9494
</ClInclude>
9595
</ItemGroup>
96+
<ItemGroup>
97+
<CustomBuild Include="generate_test_files.bat" />
98+
</ItemGroup>
9699
</Project>

‎msvc/generate_test_files.bat‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
@echo off
2+
3+
set TEST_NAME=testSmall10
4+
set OUTDIR=.\generated_files\%TEST_NAME%
5+
mkdir %OUTDIR% 1>NUL 2>NUL
6+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
7+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
8+
9+
set TEST_NAME=testPredictable1000
10+
set OUTDIR=.\generated_files\%TEST_NAME%
11+
mkdir %OUTDIR% 1>NUL 2>NUL
12+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
13+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
14+
15+
set TEST_NAME=testRandom100000
16+
set OUTDIR=.\generated_files\%TEST_NAME%
17+
mkdir %OUTDIR% 1>NUL 2>NUL
18+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random
19+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
20+
21+
set TEST_NAME=testPredictable100000
22+
set OUTDIR=.\generated_files\%TEST_NAME%
23+
mkdir %OUTDIR% 1>NUL 2>NUL
24+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=predictable
25+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
26+
27+
set TEST_NAME=testHtml100000
28+
set OUTDIR=.\generated_files\%TEST_NAME%
29+
mkdir %OUTDIR% 1>NUL 2>NUL
30+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=html
31+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
32+
33+
set TEST_NAME=testText100000
34+
set OUTDIR=.\generated_files\%TEST_NAME%
35+
mkdir %OUTDIR% 1>NUL 2>NUL
36+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=text
37+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
38+
39+
set TEST_NAME=testSequential10MB
40+
set OUTDIR=.\generated_files\%TEST_NAME%
41+
mkdir %OUTDIR% 1>NUL 2>NUL
42+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10485760 --fill=sequential
43+
bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
44+
45+
REM set TEST_NAME=testSequential20MB
46+
REM set OUTDIR=.\generated_files\%TEST_NAME%
47+
REM mkdir %OUTDIR% 1>NUL 2>NUL
48+
REM testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=20971520 --fill=sequential
49+
REM bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
50+
REM
51+
REM set TEST_NAME=testSequential30MB
52+
REM set OUTDIR=.\generated_files\%TEST_NAME%
53+
REM mkdir %OUTDIR% 1>NUL 2>NUL
54+
REM testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=31457280 --fill=sequential
55+
REM bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
56+
57+
dir >NUL

‎msvc/prebuild.bat‎

Lines changed: 8 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,13 @@
22
:: %1 is $(ConfigurationName)
33
:: %2 is $(Platform)
44

5-
set BIN2CPP_EXE=.\%2\%1\bin2cpp.exe
6-
set TESTFILEGENERATOR_EXE=.\%2\%1\testfilegenerator.exe
5+
echo =============================================================================
6+
echo Generating test files in project directory...
7+
echo =============================================================================
8+
set PATH=.\%2\%1;%PATH%
79

8-
set TEST_NAME=testSmall10
9-
set OUTDIR=.\generated_files\%TEST_NAME%
10-
mkdir %OUTDIR% 1>NUL 2>NUL
11-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
12-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
10+
call generate_test_files.bat
1311

14-
set TEST_NAME=testPredictable1000
15-
set OUTDIR=.\generated_files\%TEST_NAME%
16-
mkdir %OUTDIR% 1>NUL 2>NUL
17-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
18-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
19-
20-
set TEST_NAME=testRandom100000
21-
set OUTDIR=.\generated_files\%TEST_NAME%
22-
mkdir %OUTDIR% 1>NUL 2>NUL
23-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random
24-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
25-
26-
set TEST_NAME=testPredictable100000
27-
set OUTDIR=.\generated_files\%TEST_NAME%
28-
mkdir %OUTDIR% 1>NUL 2>NUL
29-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=predictable
30-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
31-
32-
set TEST_NAME=testHtml100000
33-
set OUTDIR=.\generated_files\%TEST_NAME%
34-
mkdir %OUTDIR% 1>NUL 2>NUL
35-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=html
36-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
37-
38-
set TEST_NAME=testText100000
39-
set OUTDIR=.\generated_files\%TEST_NAME%
40-
mkdir %OUTDIR% 1>NUL 2>NUL
41-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=text
42-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
43-
44-
set TEST_NAME=testSequential10MB
45-
set OUTDIR=.\generated_files\%TEST_NAME%
46-
mkdir %OUTDIR% 1>NUL 2>NUL
47-
%TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=10485760 --fill=sequential
48-
%BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
49-
50-
REM set TEST_NAME=testSequential20MB
51-
REM set OUTDIR=.\generated_files\%TEST_NAME%
52-
REM mkdir %OUTDIR% 1>NUL 2>NUL
53-
REM %TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=20971520 --fill=sequential
54-
REM %BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
55-
REM
56-
REM set TEST_NAME=testSequential30MB
57-
REM set OUTDIR=.\generated_files\%TEST_NAME%
58-
REM mkdir %OUTDIR% 1>NUL 2>NUL
59-
REM %TESTFILEGENERATOR_EXE% --file=%OUTDIR%\%TEST_NAME%.bin --size=31457280 --fill=sequential
60-
REM %BIN2CPP_EXE% %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
61-
62-
dir >NUL
12+
echo =============================================================================
13+
echo done
14+
echo =============================================================================

0 commit comments

Comments
 (0)