Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Unity
提交
376480a4
T
Third Party Unity
项目概览
OpenHarmony
/
Third Party Unity
1 年多 前同步成功
通知
36
Star
144
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Unity
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
376480a4
编写于
8月 16, 2014
作者:
M
Mark VanderVoord
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make fixtures and examples compatible with new UnityBegin method.
上级
14b07433
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
23 addition
and
27 deletion
+23
-27
examples/example_1/test/test_runners/TestProductionCode2_Runner.c
.../example_1/test/test_runners/TestProductionCode2_Runner.c
+1
-2
examples/example_1/test/test_runners/TestProductionCode_Runner.c
...s/example_1/test/test_runners/TestProductionCode_Runner.c
+1
-2
examples/example_3/test/no_ruby/TestProductionCode2_Runner.c
examples/example_3/test/no_ruby/TestProductionCode2_Runner.c
+1
-2
examples/example_3/test/no_ruby/TestProductionCode_Runner.c
examples/example_3/test/no_ruby/TestProductionCode_Runner.c
+1
-2
extras/fixture/rakefile_helper.rb
extras/fixture/rakefile_helper.rb
+18
-18
extras/fixture/src/unity_fixture.c
extras/fixture/src/unity_fixture.c
+1
-1
未找到文件。
examples/example_1/test/test_runners/TestProductionCode2_Runner.c
浏览文件 @
376480a4
...
...
@@ -33,8 +33,7 @@ void resetTest()
int
main
(
void
)
{
Unity
.
TestFile
=
"test/TestProductionCode2.c"
;
UnityBegin
();
UnityBegin
(
"test/TestProductionCode2.c"
);
// RUN_TEST calls runTest
RUN_TEST
(
test_IgnoredTest
,
13
);
...
...
examples/example_1/test/test_runners/TestProductionCode_Runner.c
浏览文件 @
376480a4
...
...
@@ -35,8 +35,7 @@ void resetTest()
int
main
(
void
)
{
Unity
.
TestFile
=
"test/TestProductionCode.c"
;
UnityBegin
();
UnityBegin
(
"test/TestProductionCode.c"
);
// RUN_TEST calls runTest
RUN_TEST
(
test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode
,
20
);
...
...
examples/example_3/test/no_ruby/TestProductionCode2_Runner.c
浏览文件 @
376480a4
...
...
@@ -33,8 +33,7 @@ void resetTest()
int
main
(
void
)
{
Unity
.
TestFile
=
"test/TestProductionCode2.c"
;
UnityBegin
();
UnityBegin
(
"test/TestProductionCode2.c"
);
// RUN_TEST calls runTest
RUN_TEST
(
test_IgnoredTest
,
13
);
...
...
examples/example_3/test/no_ruby/TestProductionCode_Runner.c
浏览文件 @
376480a4
...
...
@@ -35,8 +35,7 @@ void resetTest()
int
main
(
void
)
{
Unity
.
TestFile
=
"test/TestProductionCode.c"
;
UnityBegin
();
UnityBegin
(
"test/TestProductionCode.c"
);
// RUN_TEST calls runTest
RUN_TEST
(
test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode
,
20
);
...
...
extras/fixture/rakefile_helper.rb
浏览文件 @
376480a4
...
...
@@ -2,7 +2,7 @@
# Unity Project - A Test Framework for C
# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
# [Released under MIT License. Please refer to license.txt for details]
# ==========================================
# ==========================================
require
'yaml'
require
'fileutils'
...
...
@@ -13,27 +13,27 @@ require HERE+'../../auto/colour_reporter'
module
RakefileHelpers
C_EXTENSION
=
'.c'
def
load_configuration
(
config_file
)
unless
(
$configured
)
$cfg_file
=
HERE
+
"../../targets/
#{
config_file
}
"
unless
(
config_file
=~
/[\\|\/]/
)
$cfg_file
=
HERE
+
"../../t
est/t
argets/
#{
config_file
}
"
unless
(
config_file
=~
/[\\|\/]/
)
$cfg
=
YAML
.
load
(
File
.
read
(
$cfg_file
))
$colour_output
=
false
unless
$cfg
[
'colour'
]
$configured
=
true
if
(
config_file
!=
DEFAULT_CONFIG_FILE
)
end
end
def
configure_clean
CLEAN
.
include
(
$cfg
[
'compiler'
][
'build_path'
]
+
'*.*'
)
unless
$cfg
[
'compiler'
][
'build_path'
].
nil?
end
def
configure_toolchain
(
config_file
=
DEFAULT_CONFIG_FILE
)
config_file
+=
'.yml'
unless
config_file
=~
/\.yml$/
config_file
=
config_file
unless
config_file
=~
/[\\|\/]/
load_configuration
(
config_file
)
configure_clean
end
def
tackit
(
strings
)
if
strings
.
is_a?
(
Array
)
result
=
"
\"
#{
strings
.
join
}
\"
"
...
...
@@ -42,7 +42,7 @@ module RakefileHelpers
end
return
result
end
def
squash
(
prefix
,
items
)
result
=
''
items
.
each
{
|
item
|
result
+=
"
#{
prefix
}#{
tackit
(
item
)
}
"
}
...
...
@@ -70,7 +70,7 @@ module RakefileHelpers
"
#{
File
.
basename
(
file
,
C_EXTENSION
)
}#{
$cfg
[
'compiler'
][
'object_files'
][
'extension'
]
}
"
execute
(
cmd_str
)
end
def
build_linker_fields
command
=
tackit
(
$cfg
[
'linker'
][
'path'
])
if
$cfg
[
'linker'
][
'options'
].
nil?
...
...
@@ -86,7 +86,7 @@ module RakefileHelpers
includes
=
includes
.
gsub
(
/\\ /
,
' '
).
gsub
(
/\\\"/
,
'"'
).
gsub
(
/\\$/
,
''
)
# Remove trailing slashes (for IAR)
return
{
:command
=>
command
,
:options
=>
options
,
:includes
=>
includes
}
end
def
link_it
(
exe_name
,
obj_list
)
linker
=
build_linker_fields
cmd_str
=
"
#{
linker
[
:command
]
}#{
linker
[
:options
]
}#{
linker
[
:includes
]
}
"
+
...
...
@@ -96,7 +96,7 @@ module RakefileHelpers
exe_name
+
$cfg
[
'linker'
][
'bin_files'
][
'extension'
]
execute
(
cmd_str
)
end
def
build_simulator_fields
return
nil
if
$cfg
[
'simulator'
].
nil?
if
$cfg
[
'simulator'
][
'path'
].
nil?
...
...
@@ -116,7 +116,7 @@ module RakefileHelpers
end
return
{
:command
=>
command
,
:pre_support
=>
pre_support
,
:post_support
=>
post_support
}
end
def
execute
(
command_string
,
verbose
=
true
)
report
command_string
output
=
`
#{
command_string
}
`
.
chomp
...
...
@@ -126,7 +126,7 @@ module RakefileHelpers
end
return
output
end
def
report_summary
summary
=
UnityTestSummary
.
new
summary
.
set_root_path
(
HERE
)
...
...
@@ -136,29 +136,29 @@ module RakefileHelpers
summary
.
set_targets
(
results
)
summary
.
run
end
def
run_tests
report
'Running Unity system tests...'
# Tack on TEST define for compiling unit tests
load_configuration
(
$cfg_file
)
test_defines
=
[
'TEST'
]
$cfg
[
'compiler'
][
'defines'
][
'items'
]
=
[]
if
$cfg
[
'compiler'
][
'defines'
][
'items'
].
nil?
# Get a list of all source files needed
src_files
=
Dir
[
HERE
+
'src/*.c'
]
src_files
+=
Dir
[
HERE
+
'test/*.c'
]
src_files
+=
Dir
[
HERE
+
'test/main/*.c'
]
src_files
<<
'../../src/unity.c'
# Build object files
src_files
.
each
{
|
f
|
compile
(
f
,
test_defines
)
}
obj_list
=
src_files
.
map
{
|
f
|
File
.
basename
(
f
.
ext
(
$cfg
[
'compiler'
][
'object_files'
][
'extension'
]))
}
# Link the test executable
test_base
=
"framework_test"
link_it
(
test_base
,
obj_list
)
# Execute unit test and generate results file
simulator
=
build_simulator_fields
executable
=
$cfg
[
'linker'
][
'bin_files'
][
'destination'
]
+
test_base
+
$cfg
[
'linker'
][
'bin_files'
][
'extension'
]
...
...
extras/fixture/src/unity_fixture.c
浏览文件 @
376480a4
...
...
@@ -38,7 +38,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void))
for
(
r
=
0
;
r
<
UnityFixture
.
RepeatCount
;
r
++
)
{
announceTestRun
(
r
);
UnityBegin
();
UnityBegin
(
argv
[
0
]
);
runAllTests
();
UNITY_OUTPUT_CHAR
(
'\n'
);
UnityEnd
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录