Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
cb46f512
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
1 年多 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cb46f512
编写于
11月 18, 2021
作者:
些猜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
在runtest.sh文件里增加了判断语句,在runtest.bat里新增了对动态库的传输命令以及临时文件夹的创建命令,在test_tamplate.gni文件修改了对动态库的路径编译
Signed-off-by:
caifuzhou
<
504631861@qq.com
>
上级
a706d104
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
40 addition
and
7 deletion
+40
-7
libc-test/test_template.gni
libc-test/test_template.gni
+5
-3
scripts/runtest.bat
scripts/runtest.bat
+29
-2
scripts/runtest.sh
scripts/runtest.sh
+6
-2
未找到文件。
libc-test/test_template.gni
浏览文件 @
cb46f512
...
...
@@ -97,11 +97,13 @@ template("test_unittest") {
#libs += [ "//${root_out_dir}/${test_lib_dir}/libdlopen_dso.so" ]
}
if (target_name == "tls_align" || target_name == "tls_align_dlopen") {
if (target_name == "tls_align") {
ldflags += [ "-Wl,-rpath=src/functional" ]
libs += [ "//${root_out_dir}/${test_lib_dir}/libtls_align_dso.so" ]
}
if (target_name == "tls_init" || target_name == "tls_init_dlopen") {
if (target_name == "tls_init") {
ldflags += [ "-Wl,-rpath=src/functional" ]
libs += [ "//${root_out_dir}/${test_lib_dir}/libtls_init_dso.so" ]
}
}
...
...
@@ -134,7 +136,7 @@ template("test_unittest") {
]
if (target_name == "tls_get_new-dtv") {
ldflags += [ "-Wl,-rpath=
'\$ORIGIN'
" ]
ldflags += [ "-Wl,-rpath=
./
" ]
libs +=
[ "//${root_out_dir}/${test_lib_dir}/libtls_get_new-dtv_dso.so" ]
}
...
...
scripts/runtest.bat
浏览文件 @
cb46f512
...
...
@@ -10,6 +10,8 @@ set LOCAL=\\wsl$\ubuntu-20.04\home\OHOS\out\ohos-arm-release\tests\unittest\libc
set
REMOTE
=
/data/tests/libc-test/src
@REM runtest脚本所在目录
set
SHDIR
=
\\wsl$\Ubuntu
-
20
.04\home\OHOS\third_party\musl\scripts
@REM 动态链接库所在目录
set
DYNLIB
=
\\wsl$\Ubuntu
-
18
.04\root\openhramony2\out\ohos
-arm-release
\musl\libc
-test
\lib
@REM 检查设备是否连接
echo
HDC
device
checking
...
...
...
@@ -31,6 +33,14 @@ hdc shell mkdir %REMOTE%/functional
hdc
shell
mkdir
%REMOTE%
/math
hdc
shell
mkdir
%REMOTE%
/musl
hdc
shell
mkdir
%REMOTE%
/regression
@REM 创建临时文件夹
hdc
shell
mkdir
/tmp
hdc
shell
mkdir
/dev/shm
@REM 创建存放动态库文件夹
hdc
shell
mkdir
%REMOTE%
/functional/src
hdc
shell
mkdir
%REMOTE%
/functional/src/functional
echo
Done
.
goto
hdcSend
...
...
@@ -40,14 +50,26 @@ for /F %%i in ('dir %LOCAL% /S /B') do (
for
%%b
in
(
"
%%i
\.."
)
do
(
echo
Sending
%%~nb
/
%%~nxi
hdc
file
send
-sync
%%i
%REMOTE%
/
%%~nb
/
%%~nxi
hdc
shell
chmod
777
%REMOTE%
/
%%~nb
/
%%~nxi
hdc
shell
chmod
a
+x
%REMOTE%
/
%%~nb
/
%%~nxi
)
)
@REM 动态库传输
hdc
file
send
%DYNLIB%
\libdlopen_dso.so
%REMOTE%
/functional
hdc
file
send
%DYNLIB%
\libtls_get_new
-dtv
_dso.so
%REMOTE%
/regression
hdc
file
send
%DYNLIB%
\libtls_align_dso.so
%REMOTE%
/functional/src/functional
hdc
file
send
%DYNLIB%
\libtls_init_dso.so
%REMOTE%
/functional/src/functional
@REM 修改动态库权限
hdc
shell
chmod
a
+x
%REMOTE%
/functional/libdlopen
_dso.so
hdc
shell
chmod
a
+x
%REMOTE%
/regression/libtls
_get_new
-dtv
_dso.so
hdc
shell
chmod
a
+x
%REMOTE%
/functional/src/functional/libtls
_align_dso.so
hdc
shell
chmod
a
+x
%REMOTE%
/functional/src/functional/libtls
_init_dso.so
echo
Done
.
echo
.
echo
Sending
run
.sh
hdc
file
send
%SHDIR%
\run.sh
%REMOTE%
/runtest
.sh
hdc
shell
chmod
777
%REMOTE%
/runtest
.sh
hdc
shell
chmod
a
+x
%REMOTE%
/runtest
.sh
echo
.
echo
============================
echo
ALL
files
send
finished
.
...
...
@@ -71,6 +93,11 @@ set /a endM=%time:~3,2%
set
/a
diffS_
=
%endS%
-
%startS%
set
/a
diffM_
=
%endM%
-
%startM%
echo
All
Done
.
Time
cost
:
%diffM_%
m
%diffS_%
s
@REM 删除临时文件夹
hdc
shell
rm
/tmp -rf
hdc
shell
rm
/dev/shm -rf
@REM 完成所用时间
echo
.
pause
...
...
scripts/runtest.sh
浏览文件 @
cb46f512
...
...
@@ -6,8 +6,12 @@ do
cd
/data/tests/libc-test/src/
$filelist
for
file
in
$(
ls
)
do
if
[
"
$file
"
=
"runtest"
]
||
[
"
$file
"
=
"libdlopen_dso.so"
]
||
[
"
$file
"
=
"libtls_get_new-dtv_dso.so"
]
||
[
"
$file
"
=
"src"
]
;
then
continue
else
/data/tests/libc-test/src/common/runtest
-w
''
$file
>>
../REPORT
echo
$filelist
/
$file
fi
done
cd
..
done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录