lkml.org 
[lkml]   [2015]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/7] tools build: Add test for missing include
Em Wed, Sep 23, 2015 at 12:33:57PM +0200, Jiri Olsa escreveu:
> The current build framework fails to cope with header file
> removal. The reason is the removed header file stays in the
> .cmd file target rule and force the build to fail.

So, where is this test hooked up, is the way to test this to do:

cd tools/build/tests/
./run.sh
less ex.out

?

> This issue is fixed and explained in following patches.
>
> Adding new build test that simulates header removal.
>
> Link: http://lkml.kernel.org/n/tip-580lv21jts6t9j15cosxggdc@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/build/tests/ex/Build | 1 +
> tools/build/tests/ex/Makefile | 2 +-
> tools/build/tests/ex/ex.c | 2 ++
> tools/build/tests/ex/inc.c | 8 ++++++++
> tools/build/tests/run.sh | 27 +++++++++++++++++++++++++++
> 5 files changed, 39 insertions(+), 1 deletion(-)
> create mode 100644 tools/build/tests/ex/inc.c
>
> diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build
> index 429c7d452101..4d502f9b1a50 100644
> --- a/tools/build/tests/ex/Build
> +++ b/tools/build/tests/ex/Build
> @@ -4,6 +4,7 @@ ex-y += b.o
> ex-y += b.o
> ex-y += empty/
> ex-y += empty2/
> +ex-y += inc.o
>
> libex-y += c.o
> libex-y += d.o
> diff --git a/tools/build/tests/ex/Makefile b/tools/build/tests/ex/Makefile
> index a8f596e37fd2..f279b84cb859 100644
> --- a/tools/build/tests/ex/Makefile
> +++ b/tools/build/tests/ex/Makefile
> @@ -1,4 +1,4 @@
> -export srctree := ../../../..
> +export srctree := $(abspath ../../../..)
> export CC := gcc
> export LD := ld
> export AR := ar
> diff --git a/tools/build/tests/ex/ex.c b/tools/build/tests/ex/ex.c
> index dc42eb2e1a67..57de6074d252 100644
> --- a/tools/build/tests/ex/ex.c
> +++ b/tools/build/tests/ex/ex.c
> @@ -5,6 +5,7 @@ int c(void);
> int d(void);
> int e(void);
> int f(void);
> +int inc(void);
>
> int main(void)
> {
> @@ -14,6 +15,7 @@ int main(void)
> d();
> e();
> f();
> + inc();
>
> return 0;
> }
> diff --git a/tools/build/tests/ex/inc.c b/tools/build/tests/ex/inc.c
> new file mode 100644
> index 000000000000..c20f1e9033a3
> --- /dev/null
> +++ b/tools/build/tests/ex/inc.c
> @@ -0,0 +1,8 @@
> +#ifdef INCLUDE
> +#include "krava.h"
> +#endif
> +
> +int inc(void)
> +{
> + return 0;
> +}
> diff --git a/tools/build/tests/run.sh b/tools/build/tests/run.sh
> index 5494f8ea7567..44d2a0fade67 100755
> --- a/tools/build/tests/run.sh
> +++ b/tools/build/tests/run.sh
> @@ -34,9 +34,36 @@ function test_ex_suffix {
> make -C ex V=1 clean > /dev/null 2>&1
> rm -f ex.out
> }
> +
> +function test_ex_include {
> + make -C ex V=1 clean > ex.out 2>&1
> +
> + # build with krava.h include
> + touch ex/krava.h
> + make -C ex V=1 CFLAGS=-DINCLUDE >> ex.out 2>&1
> +
> + if [ ! -x ./ex/ex ]; then
> + echo FAILED
> + exit -1
> + fi
> +
> + # build without the include
> + rm -f ex/krava.h ex/ex
> + make -C ex V=1 >> ex.out 2>&1
> +
> + if [ ! -x ./ex/ex ]; then
> + echo FAILED
> + exit -1
> + fi
> +
> + make -C ex V=1 clean > /dev/null 2>&1
> + rm -f ex.out
> +}
> +
> echo -n Testing..
>
> test_ex
> test_ex_suffix
> +test_ex_include
>
> echo OK
> --
> 2.4.3


\
 
 \ /
  Last update: 2015-09-25 20:01    [W:0.226 / U:0.024 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site