3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 00:15:58 +01:00
Code Issues Releases Wiki Activity

Fixed issues regarding the example Meson project.

Browse Source
This commit is contained in:
Michael Brockus
2019-07-03 21:03:39 -07:00
parent c7185b3a5a
commit c10f87f1e6
9 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/example_4/meson.build
View File

@@ -10,6 +10,9 @@
###################################################################################
project('example-4')
unity_dep = dependency('unity', fallback : ['unity', 'unity_dep'])
example_dir = include_directories('.', join_paths('.', 'src'))

5
examples/example_4/readme.txt
View File

@@ -2,7 +2,7 @@ Example 4
=========
Close to the simplest possible example of Unity, using only basic features.
to build this example run meson setup <build dir name>.
to build this example run "meson setup <build dir name>".
Meson uses the Ninja build system to actually build the code. To start the
build, simply type the following command.
@@ -11,4 +11,5 @@ build, simply type the following command.
Meson provides native support for running tests. The command to do that is simple.
"meson test -C <build dir name>".
"meson test -C <build dir name>".

22
examples/example_4/src/meson.build
View File

@@ -11,13 +11,21 @@
example_src = files('ProductionCode.c', 'ProductionCode2.c')
example_lib = library(meson.project_name(),
sources: example_src,
a_lib = library(
'production-code-1',
'ProductionCode.c',
include_directories: example_dir)
example_dep = declare_dependency(
version: meson.project_version(),
link_with: example_lib,
b_lib = library(
'production-code-2',
'ProductionCode2.c',
include_directories: example_dir)
a_dep = declare_dependency(
link_with: a_lib,
include_directories: example_dir)
b_dep = declare_dependency(
link_with: b_lib,
include_directories: example_dir)

4
examples/example_4/subprojects/unity.wrap Executable file
View File

@@ -0,0 +1,4 @@
[wrap-git]
directory = unity
url = https://github.com/squidfarts/Unity.git
revision = head

5
examples/example_4/test/TestProductionCode.c
View File

@@ -17,11 +17,6 @@ void tearDown(void)
{
}
void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void);
void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void);
void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void);
void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void);
void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void);
void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void)
{

4
examples/example_4/test/test_runners/meson.build
View File

@@ -20,5 +20,5 @@ test_src_2 = [
join_paths('..' ,'TestProductionCode2.c')
]
test('Test production code one', executable('test-1', test_src_1, dependencies: [ example_dep, unity_dep ]))
test('Test production code two', executable('test-2', test_src_2, dependencies: [ example_dep, unity_dep ]))
test('Test production code one', executable('test-1', test_src_1, dependencies: [ a_dep, unity_dep ]))
test('Test production code two', executable('test-2', test_src_2, dependencies: [ b_dep, unity_dep ]))

14
examples/meson.build
View File

@@ -1,14 +0,0 @@
###################################################################################
# #
# NAME: examples/meson.build #
# #
# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams. #
# WRITTEN BY: Michael Brockus. #
# #
# License: MIT #
# #
###################################################################################
subdir('example_4')

7
meson.build
View File

@@ -77,9 +77,4 @@ subdir('src')
unity_dep = declare_dependency(
version: meson.project_version(),
link_with: unity_lib,
include_directories: unity_dir)
if get_option('with_examples').enabled()
subdir('examples')
endif
include_directories: unity_dir)

17
meson_options.txt
View File

@@ -1,17 +0,0 @@
###################################################################################
# #
# NAME: meson_options.txt #
# #
# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams. #
# WRITTEN BY: Michael Brockus. #
# #
# License: MIT #
# #
###################################################################################
option('with_examples',
type: 'feature', value : 'disabled',
description: 'Enable Unity for unit testing.'
)