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
2014-03-19 11:24:25 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e0e451b680e7a5876da5754cb739f9ee8034a96e
e0e451b6
1 parent
d89d16ca
add utest support for arm
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
11 行增加
和
3 行删除
trunk/auto/options.sh
trunk/auto/utest.sh
trunk/configure
trunk/auto/options.sh
查看文件 @
e0e451b
...
...
@@ -217,7 +217,6 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
if
[
$SRS_HTTP_CALLBACK
=
YES
]
;
then
echo
"http-callback for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_BWTC
=
YES
]
;
then
echo
"bwtc for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_RESEARCH
=
YES
]
;
then
echo
"research for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_UTEST
=
YES
]
;
then
echo
"utest for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_GPERF
=
YES
]
;
then
echo
"gperf for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_GPERF_MC
=
YES
]
;
then
echo
"gmc for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_GPERF_MP
=
YES
]
;
then
echo
"gmp for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
...
...
trunk/auto/utest.sh
100644 → 100755
查看文件 @
e0e451b
...
...
@@ -6,6 +6,7 @@
#
# $APP_NAME the app name to output. ie. srs_utest
# $MODULE_DIR the src dir of utest code. ie. src/utest
# $LINK_OPTIONS the link options for utest. ie. -lpthread -ldl
FILE
=
${
SRS_OBJS
}
/utest/
${
SRS_MAKEFILE
}
# create dir for Makefile
...
...
@@ -169,7 +170,7 @@ echo "" >> ${FILE}; echo "" >> ${FILE}
echo
"# generate the utest binary"
>>
${
FILE
}
cat
<< END >> ${FILE}
${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a
\$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES)
-lpthread -ldl
\$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES)
${LINK_OPTIONS}
END
#####################################################################################
...
...
trunk/configure
查看文件 @
e0e451b
...
...
@@ -30,6 +30,10 @@ if [[ -f Makefile ]]; then
fi
# write user options to headers
echo
"#ifndef SRS_AUTO_HEADER_HPP"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_AUTO_HEADER_HPP"
>>
$SRS_AUTO_HEADERS_H
echo
""
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_BUILD_TS
\"
`
date +%s
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_BUILD_DATE
\"
`
date
\"
+%Y-%m-%d %H:%M:%S
\"
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_UNAME
\"
`
uname -a
`
\"
"
>>
$SRS_AUTO_HEADERS_H
...
...
@@ -52,6 +56,10 @@ SrsArmRANDLIB="arm-linux-gnueabi-ranlib"
# apply user options.
. auto/depends.sh
# auto header EOF.
echo
"#endif"
>>
$SRS_AUTO_HEADERS_H
echo
""
>>
$SRS_AUTO_HEADERS_H
#####################################################################################
# generate Makefile.
#####################################################################################
...
...
@@ -398,7 +406,7 @@ ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot})
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"RTMP"
"APP"
)
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
RTMP_OBJS
[@]
}
${
APP_OBJS
[@]
}
"
MODULE_DIR
=
"src/utest"
APP_NAME
=
"srs_utest"
. auto/utest.sh
LINK_OPTIONS
=
"-lpthread
${
SrsLinkOptions
}
"
MODULE_DIR
=
"src/utest"
APP_NAME
=
"srs_utest"
. auto/utest.sh
echo
'configure ok! '
...
...
请
注册
或
登录
后发表评论