Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unit test framework #4007

Merged
merged 8 commits into from
Jul 9, 2024
Merged

Unit test framework #4007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1bf3c2e
Merged unit-test and argparse features from unittest-framework branch
bennylp Jul 3, 2024
7fd1fd5
Further merge from unittest-framework branch and tested on Visial Stu…
bennylp Jul 3, 2024
7e2e50c
Fix accidental typo in test.h
bennylp Jul 3, 2024
385fd04
Another typo fix to test.h
bennylp Jul 3, 2024
e243b1e
Remove argparse (into separate PR)
bennylp Jul 3, 2024
45ad168
Remove argparse from old VC project
bennylp Jul 3, 2024
7bd99ec
Remove pj_fifobuf_unalloc(), improve doc, improve error codes
bennylp Jul 9, 2024
d8a1442
Merge branch 'master' into unittest-argparse
bennylp Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pjlib/build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
os_info.o pool.o pool_buf.o pool_caching.o pool_dbg.o rand.o \
rbtree.o sock_common.o sock_qos_common.o \
ssl_sock_common.o ssl_sock_ossl.o ssl_sock_gtls.o ssl_sock_dump.o \
ssl_sock_darwin.o string.o timer.o types.o
ssl_sock_darwin.o string.o timer.o types.o unittest.o
export PJLIB_CFLAGS += $(_CFLAGS)
export PJLIB_CXXFLAGS += $(_CXXFLAGS)
export PJLIB_LDFLAGS += $(_LDFLAGS)
Expand All @@ -52,7 +52,7 @@ export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \
select.o sleep.o sock.o sock_perf.o ssl_sock.o \
string.o test.o thread.o timer.o timestamp.o \
udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \
util.o
unittest_test.o util.o
export TEST_CFLAGS += $(_CFLAGS)
export TEST_CXXFLAGS += $(_CXXFLAGS)
export TEST_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS)
Expand Down
116 changes: 116 additions & 0 deletions pjlib/build/pjlib.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8420,6 +8420,118 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\pj\unittest.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Static|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Static|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Dynamic|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Dynamic|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Dynamic|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Dynamic|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Static|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Static|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<Filter
Name="Other Targets"
>
Expand Down Expand Up @@ -12681,6 +12793,10 @@
RelativePath="..\include\pj\unicode.h"
>
</File>
<File
RelativePath="..\include\pj\unittest.h"
>
</File>
<Filter
Name="compat"
>
Expand Down
4 changes: 3 additions & 1 deletion pjlib/build/pjlib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-Dynamic|ARM">
Expand Down Expand Up @@ -1029,6 +1029,7 @@
<ClCompile Include="..\src\pj\timer.c" />
<ClCompile Include="..\src\pj\types.c" />
<ClCompile Include="..\src\pj\unicode_win32.c" />
<ClCompile Include="..\src\pj\unittest.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\third_party\threademulation\include\ThreadEmulation.h" />
Expand Down Expand Up @@ -1100,6 +1101,7 @@
<ClInclude Include="..\include\pj\timer.h" />
<ClInclude Include="..\include\pj\types.h" />
<ClInclude Include="..\include\pj\unicode.h" />
<ClInclude Include="..\include\pj\unittest.h" />
<ClInclude Include="..\src\pj\ioqueue_common_abs.h" />
<ClInclude Include="..\src\pj\ssl_sock_imp_common.h" />
</ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions pjlib/build/pjlib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
<ClCompile Include="..\src\pj\unicode_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pj\unittest.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pj\addr_resolv_linux_kernel.c">
<Filter>Source Files\Other Targets</Filter>
</ClCompile>
Expand Down Expand Up @@ -337,6 +340,9 @@
<ClInclude Include="..\include\pj\unicode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\pj\unittest.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\pj\compat\assert.h">
<Filter>Header Files\compat</Filter>
</ClInclude>
Expand Down
112 changes: 112 additions & 0 deletions pjlib/build/pjlib_test.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7334,6 +7334,118 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\pjlib-test\unittest_test.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Static|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Static|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Dynamic|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Dynamic|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Dynamic|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-Dynamic|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Static|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release-Static|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\pjlib-test\util.c"
>
Expand Down
1 change: 1 addition & 0 deletions pjlib/build/pjlib_test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@
<ClCompile Include="..\src\pjlib-test\timestamp.c" />
<ClCompile Include="..\src\pjlib-test\udp_echo_srv_ioqueue.c" />
<ClCompile Include="..\src\pjlib-test\udp_echo_srv_sync.c" />
<ClCompile Include="..\src\pjlib-test\unittest_test.c" />
<ClCompile Include="..\src\pjlib-test\util.c" />
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions pjlib/build/pjlib_test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
<ClCompile Include="..\src\pjlib-test\udp_echo_srv_sync.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pjlib-test\unittest_test.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pjlib-test\util.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
Loading
Loading