diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-26 12:02:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-22 00:31:48 +0100 |
commit | fe415144db8eb00fbb407888c9c76b1fea2d8127 (patch) | |
tree | 68c03afe032d724e883c5c0ce6ff7f2ee0e7ab19 /meta/recipes-core/zlib/zlib | |
parent | f1add4b50ea371722eeae82b67522136a460d216 (diff) | |
download | poky-fe415144db8eb00fbb407888c9c76b1fea2d8127.tar.gz |
zlib: clean up ptest
Instead of patching and sedding the makefile, just install test/example and
execute it in run-ptest. example is the bulk of the test suite, as minimal as
it is.
(From OE-Core rev: 9088a78e78f70721b2aa6bdbdf055551d5bd0265)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/zlib/zlib')
-rw-r--r-- | meta/recipes-core/zlib/zlib/Makefile-runtests.patch | 38 | ||||
-rw-r--r-- | meta/recipes-core/zlib/zlib/run-ptest | 7 |
2 files changed, 6 insertions, 39 deletions
diff --git a/meta/recipes-core/zlib/zlib/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib/Makefile-runtests.patch deleted file mode 100644 index 61eea8238a..0000000000 --- a/meta/recipes-core/zlib/zlib/Makefile-runtests.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | ||
2 | |||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | --- | ||
6 | diff -uNr a/Makefile.in b/Makefile.in | ||
7 | --- a/Makefile.in 2013-06-10 13:48:14.321959162 +0200 | ||
8 | +++ b/Makefile.in 2013-06-10 13:49:36.686476448 +0200 | ||
9 | @@ -83,6 +83,9 @@ | ||
10 | test: all teststatic testshared | ||
11 | |||
12 | teststatic: static | ||
13 | + @make runteststatic | ||
14 | + | ||
15 | +runteststatic: | ||
16 | @TMPST=tmpst_$$; \ | ||
17 | if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ | ||
18 | echo ' *** zlib test OK ***'; \ | ||
19 | @@ -92,6 +95,9 @@ | ||
20 | rm -f $$TMPST | ||
21 | |||
22 | testshared: shared | ||
23 | + @make runtestshared | ||
24 | + | ||
25 | +runtestshared: | ||
26 | @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ | ||
27 | LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ | ||
28 | DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ | ||
29 | @@ -105,6 +111,9 @@ | ||
30 | rm -f $$TMPSH | ||
31 | |||
32 | test64: all64 | ||
33 | + @make runtestall64 | ||
34 | + | ||
35 | +runtestall64: | ||
36 | @TMP64=tmp64_$$; \ | ||
37 | if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ | ||
38 | echo ' *** zlib 64-bit test OK ***'; \ | ||
diff --git a/meta/recipes-core/zlib/zlib/run-ptest b/meta/recipes-core/zlib/zlib/run-ptest index 884d9dc699..065863ef75 100644 --- a/meta/recipes-core/zlib/zlib/run-ptest +++ b/meta/recipes-core/zlib/zlib/run-ptest | |||
@@ -1,2 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | make -k runteststatic runtestshared | sed -r -e 's/^(\s+\*+ (.+?) test OK \*+)/\1\nPASS: \2/' -e 's/^(\s+\*+ (.+?) test FAILED \*+)/\1\nFAIL: \2/' | 2 | |
3 | if ./examplesh ; then | ||
4 | echo "PASS: zlib" | ||
5 | else | ||
6 | echo "FAIL: zlib" | ||
7 | fi | ||