Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-04 12:24:22 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
983ab8fb898e2df331cd7ce8632e8959b8285abd
983ab8fb
1 parent
e7fd733d
pass all utest for 2.0
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
5 行删除
trunk/src/core/srs_core.hpp
trunk/src/utest/srs_utest_config.cpp
trunk/src/utest/srs_utest_reload.cpp
trunk/src/core/srs_core.hpp
查看文件 @
983ab8f
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 1
29
#define VERSION_REVISION 1
30
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/utest/srs_utest_config.cpp
查看文件 @
983ab8f
此 diff 太大无法显示。
trunk/src/utest/srs_utest_reload.cpp
查看文件 @
983ab8f
...
...
@@ -460,17 +460,17 @@ VOID TEST(ConfigReloadTest, ReloadPithyPrint)
MockSrsReloadConfig
conf
;
conf
.
subscribe
(
&
handler
);
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
parse
(
_MIN_OK_CONF
"pithy_print {publish 1000;}"
));
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print {publish 1000;}"
));
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
parse
(
_MIN_OK_CONF
"pithy_print_ms 1000;"
));
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print_ms 1000;"
));
EXPECT_TRUE
(
handler
.
all_false
());
handler
.
reset
();
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print
{publish 2000;}
"
));
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print
_ms 2000;
"
));
EXPECT_TRUE
(
handler
.
pithy_print_reloaded
);
EXPECT_EQ
(
1
,
handler
.
count_true
());
handler
.
reset
();
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print
{publish 1000;}
"
));
EXPECT_TRUE
(
ERROR_SUCCESS
==
conf
.
reload
(
_MIN_OK_CONF
"pithy_print
_ms 1000;
"
));
EXPECT_EQ
(
1
,
handler
.
count_true
());
handler
.
reset
();
}
...
...
请
注册
或
登录
后发表评论