From e17ae412245ba9afb33ff6a0f1f665b4d66d4da4 Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Thu, 12 Jul 2018 10:59:48 +0200 Subject: coverage and test: Add tests coverage values: - lines: 70.5 % - functions: 76.3 % Change-Id: Iaf802e84bbfa57502bbbac8c3b567b14c01608b6 Signed-off-by: Jose Bollo --- coverage/bin/Makefile | 122 ++++++++++++++--- coverage/bin/bug.c | 270 +++++++++++++++++++++++++++++++++++++ coverage/bin/fake/monitoring | 1 + coverage/bin/loc.txt | 0 coverage/bin/locales/en/loc.txt | 0 coverage/bin/locales/fr-FR/loc.txt | 0 coverage/bin/locales/fr/loc.txt | 0 coverage/bin/locales/jp/loc.txt | 0 8 files changed, 376 insertions(+), 17 deletions(-) create mode 120000 coverage/bin/fake/monitoring create mode 100644 coverage/bin/loc.txt create mode 100644 coverage/bin/locales/en/loc.txt create mode 100644 coverage/bin/locales/fr-FR/loc.txt create mode 100644 coverage/bin/locales/fr/loc.txt create mode 100644 coverage/bin/locales/jp/loc.txt (limited to 'coverage/bin') diff --git a/coverage/bin/Makefile b/coverage/bin/Makefile index 19bf254a..f9d561ed 100644 --- a/coverage/bin/Makefile +++ b/coverage/bin/Makefile @@ -4,41 +4,102 @@ heredir = . basedir = ../.. -targets = afb-daemon-cov afb-client hi3.so hello.so salut.so salam.so shalom.so demat.so bug.so hellov2.so +bindings = \ + hi3.so \ + hello.so \ + salut.so \ + salam.so \ + shalom.so \ + demat.so \ + hellov2.so + +bugs = $(foreach i,\ + 1 2 3 4 5 6 7 8 9 \ + 10 11 12 13 14 15 16 17 18 19 \ + 20 21, \ + bugs/bug$i.so) + +tests = \ + test-apiset \ + test-session \ + test-wrap-json + +targets = \ + afb-daemon-cov \ + afb-client \ + $(tests) \ + $(bindings) \ + $(bugs) binaries: $(targets) clean: - @rm $(targets) *.gcno *.gcda + @echo remove all binaries + @rm $(targets) *.gcno *.gcda *.o 2>/dev/null || true #====================================================================================== -# creates the targets +# definitions #====================================================================================== incdir = $(basedir)/include srcdir = $(basedir)/src +tstdir = $(basedir)/src/tests samdir = $(basedir)/bindings/samples bindir = $(heredir)/bin -cflags = -I$(incdir) \ - $(shell pkg-config --cflags --libs openssl libmicrohttpd json-c libsystemd uuid) \ - -ldl -lrt -lpthread +deps = openssl libmicrohttpd json-c libsystemd uuid + +ccflags = \ + -g \ + -I$(incdir) \ + $(shell pkg-config --cflags $(deps)) + +ldflags = -ldl -lrt -lpthread \ + $(shell pkg-config --libs $(deps)) + +cflags = $(ccflags) $(ldflags) + +defs = -DAGL_DEVEL \ + -DWITH_MONITORING_OPTION \ + -DWITH_SUPERVISION \ + -DAFB_VERSION=\"cov\" \ + -DBINDING_INSTALL_DIR=\"$(shell pwd)/fake\" afb_lib_src = $(shell ls $(srcdir)/*.c | egrep -v '/afs-|/main-' ) -afb_clib_src = $(shell ls $(srcdir)/*.c | egrep -v '/afs-|/main-' ) +afb_lib_obj = $(patsubst $(srcdir)/%.c,%.o,$(afb_lib_src)) +afb_lib = afb-lib.a +afb_lib_defs = $(defs) + +afb_daemon_srcs = $(srcdir)/main-afb-daemon.c $(afb_lib_obj) +afb_daemon_defs = $(afb_lib_defs) -afb_daemon_srcs = $(srcdir)/main-afb-daemon.c $(afb_lib_src) -afb_daemon_defs = '-DAFB_VERSION="cov"' -DAGL_DEVEL -DWITH_MONITORING_OPTION '-DBINDING_INSTALL_DIR="fake"' +afb_client_srcs = $(srcdir)/main-afb-client-demo.c $(afb_lib_src) +afb_client_defs = $(defs) -afb_client_srcs = $(srcdir)/main-afb-client-demo.c $(afb_clib_src) -afb_client_defs = '-DAFB_VERSION="cov"' '-DBINDING_INSTALL_DIR="fake"' +tst_defs = $(defs) +tst_flags = $(cflags) \ + -I$(srcdir) \ + $(shell pkg-config --cflags --libs check) + +tst_defs = '-DAFB_VERSION="cov"' '-DBINDING_INSTALL_DIR="fake"' +tst_flags = $(cflags) \ + -I$(srcdir) \ + $(shell pkg-config --cflags --libs check) hello2_src = $(samdir)/hello2.c hello3_src = $(samdir)/hello3.c hi_src = $(samdir)/hi3.c binding_flags = -shared -fPIC -Wl,--version-script=$(samdir)/export.map +#====================================================================================== +# creates the targets +#====================================================================================== + +%.o: $(srcdir)/%.c + @echo creation of $@ + @gcc -c -o $@ $< --coverage $(afb_lib_defs) $(ccflags) + afb-daemon-cov: $(afb_daemon_srcs) @echo creation of $@ @gcc -o $@ $(afb_daemon_srcs) --coverage $(afb_daemon_defs) $(cflags) @@ -47,21 +108,41 @@ afb-client: $(afb_client_srcs) @echo creation of $@ @gcc -o $@ $(afb_client_srcs) $(afb_client_defs) $(cflags) +#====================================================================================== +# create test +#====================================================================================== + +test-apiset: $(tstdir)/apiset/test-apiset.c $(afb_lib_obj) + @echo creation of $@ + @gcc -o $@ $(tstdir)/apiset/test-apiset.c $(afb_lib_obj) --coverage $(tst_defs) $(tst_flags) + +test-session: $(tstdir)/session/test-session.c $(afb_lib_obj) + @echo creation of $@ + @gcc -o $@ $(tstdir)/session/test-session.c $(afb_lib_obj) --coverage $(tst_defs) $(tst_flags) + +test-wrap-json: $(tstdir)/session/test-session.c $(afb_lib_obj) + @echo creation of $@ + @gcc -o $@ $(tstdir)/wrap-json/test-wrap-json.c $(afb_lib_obj) --coverage $(tst_defs) $(tst_flags) + +#====================================================================================== +# create bindings +#====================================================================================== + hi3.so: $(hi3_src) @echo creation of $@ @gcc -o $@ $(hi3_src) $(binding_flags) $(cflags) hello.so: $(hello3_src) @echo creation of $@ - @gcc -o $@ $(hello3_src) '-DAPINAME="hello"' $(binding_flags) $(cflags) + @gcc -o $@ $(hello3_src) '-DAPINAME="hello"' '-DPREINIT_PROVIDE_CLASS="class1 class2"' $(binding_flags) $(cflags) salut.so: $(hello3_src) @echo creation of $@ - @gcc -o $@ $(hello3_src) '-DAPINAME="salut"' $(binding_flags) $(cflags) + @gcc -o $@ $(hello3_src) '-DAPINAME="salut"' '-DPREINIT_REQUIRE_CLASS="class2"' $(binding_flags) $(cflags) salam.so: $(hello3_src) @echo creation of $@ - @gcc -o $@ $(hello3_src) '-DAPINAME="salam"' $(binding_flags) $(cflags) + @gcc -o $@ $(hello3_src) '-DAPINAME="salam"' '-DINIT_REQUIRE_API="hello salut"' $(binding_flags) $(cflags) shalom.so: $(hello3_src) @echo creation of $@ @@ -75,7 +156,14 @@ hellov2.so: $(hello2_src) @echo creation of $@ @gcc -o $@ $(hello2_src) '-DAPINAME="hello-v2"' $(binding_flags) $(cflags) -bug.so: bug.c - @echo creation of $@ - @gcc -o $@ bug.c $(binding_flags) $(cflags) +#====================================================================================== +# create bugs +#====================================================================================== + +bugs: + @echo creation of directory bugs + @mkdir bugs +bugs/bug%.so: bug.c bugs + @echo creation of $@ + @gcc -o $@ bug.c $(binding_flags) $(cflags) -D$(patsubst bugs/bug%.so,BUG%,$@) diff --git a/coverage/bin/bug.c b/coverage/bin/bug.c index ddebdef7..62646cec 100644 --- a/coverage/bin/bug.c +++ b/coverage/bin/bug.c @@ -1,6 +1,276 @@ +#include +#include +static int ok() +{ + return 0; +} +static int bug() +{ + errno = 0; + return ((int(*)())(intptr_t)0)(); +} +static int err() +{ + errno = EAGAIN; + return -1; +} +/**************************************************************************/ +/**************************************************************************/ +/*** BINDINGS V2 ***/ +/**************************************************************************/ +/**************************************************************************/ +#if defined(BUG1) /* incomplete exports: afbBindingV2data miss */ + +#define AFB_BINDING_VERSION 0 +#include +const struct afb_binding_v2 afbBindingV2; + +#endif +/**************************************************************************/ +#if defined(BUG2) /* incomplete exports: afbBindingV2 miss */ + +#define AFB_BINDING_VERSION 0 +#include +struct afb_binding_data_v2 afbBindingV2data; + +#endif +/**************************************************************************/ +#if defined(BUG3) /* zero filled structure */ + +#define AFB_BINDING_VERSION 0 +#include +const struct afb_binding_v2 afbBindingV2; +struct afb_binding_data_v2 afbBindingV2data; + +#endif +/**************************************************************************/ +#if defined(BUG4) /* no verb definition */ + +#define AFB_BINDING_VERSION 2 +#include + +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug4", + .preinit = (void*)ok, + .init = (void*)ok +}; +#endif +/**************************************************************************/ +#if defined(BUG5) /* preinit buggy */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug5", + .verbs = verbs, + .preinit = (void*)bug, + .init = (void*)ok +}; +#endif +/**************************************************************************/ +#if defined(BUG6) /* buggy init */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug6", + .verbs = verbs, + .preinit = (void*)ok, + .init = (void*)bug +}; +#endif +/**************************************************************************/ +#if defined(BUG7) /* error in preinit */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug7", + .verbs = verbs, + .preinit = (void*)err, + .init = (void*)ok +}; +#endif +/**************************************************************************/ +#if defined(BUG8) /* error in init */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug8", + .verbs = verbs, + .preinit = (void*)ok, + .init = (void*)err +}; +#endif +/**************************************************************************/ +#if defined(BUG9) /* no api name */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .verbs = verbs, + .preinit = (void*)ok, + .init = (void*)ok +}; +#endif +/**************************************************************************/ +#if defined(BUG10) /* bad api name */ + +#define AFB_BINDING_VERSION 2 +#include + +struct afb_verb_v2 verbs[] = { + { NULL } +}; +const struct afb_binding_v2 afbBindingV2 = { + .api = "bug 10", + .verbs = verbs, + .preinit = (void*)ok, + .init = (void*)err +}; +#endif +/**************************************************************************/ +/**************************************************************************/ +/*** BINDINGS V3 ***/ +/**************************************************************************/ +/**************************************************************************/ +#if defined(BUG11) /* make a SEGV */ + #define AFB_BINDING_VERSION 3 #include int afbBindingEntry(afb_api_t api) { return ((int(*)())(intptr_t)0)(); } +#endif +/**************************************************************************/ +#if defined(BUG12) /* no afbBindingV3 nor afbBindingV3entry */ + +#define AFB_BINDING_VERSION 0 +#include +struct afb_api_x3 *afbBindingV3root; + +#endif +/**************************************************************************/ +#if defined(BUG13) /* no afbBindingV3root nor afbBindingV3entry */ + +#define AFB_BINDING_VERSION 0 +#include +const struct afb_binding_v3 afbBindingV3; +int afbBindingV3entry(struct afb_api_x3 *rootapi) { return 0; } + +#endif +/**************************************************************************/ +#if defined(BUG14) /* no api name */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3; + +#endif +/**************************************************************************/ +#if defined(BUG15) /* bad api name */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug 15" +}; + +#endif +/**************************************************************************/ +#if defined(BUG16) /* both entry and preinit */ + +#define AFB_BINDING_VERSION 3 +#include + +int afbBindingV3entry(struct afb_api_x3 *rootapi) { return 0; } +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug16", + .preinit = afbBindingV3entry +}; + +#endif +/**************************************************************************/ +#if defined(BUG17) /* entry fails */ + +#define AFB_BINDING_VERSION 3 +#include + +int afbBindingV3entry(struct afb_api_x3 *rootapi) { errno = EAGAIN; return -1; } +#endif +/**************************************************************************/ +#if defined(BUG18) /* preinit fails */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug18", + .preinit = (void*)err +}; + +#endif +/**************************************************************************/ +#if defined(BUG19) /* preinit SEGV */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug19", + .preinit = (void*)bug +}; + +#endif +/**************************************************************************/ +#if defined(BUG20) /* init fails */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug20", + .init = (void*)err +}; + +#endif +/**************************************************************************/ +#if defined(BUG21) /* init SEGV */ + +#define AFB_BINDING_VERSION 3 +#include + +const struct afb_binding_v3 afbBindingV3 = { + .api = "bug21", + .init = (void*)bug, + .provide_class = "a b c", + .require_class = "x y z", + .require_api = "bug4 bug5", +}; + +#endif +/**************************************************************************/ diff --git a/coverage/bin/fake/monitoring b/coverage/bin/fake/monitoring new file mode 120000 index 00000000..8cdac10f --- /dev/null +++ b/coverage/bin/fake/monitoring @@ -0,0 +1 @@ +../../../test/monitoring \ No newline at end of file diff --git a/coverage/bin/loc.txt b/coverage/bin/loc.txt new file mode 100644 index 00000000..e69de29b diff --git a/coverage/bin/locales/en/loc.txt b/coverage/bin/locales/en/loc.txt new file mode 100644 index 00000000..e69de29b diff --git a/coverage/bin/locales/fr-FR/loc.txt b/coverage/bin/locales/fr-FR/loc.txt new file mode 100644 index 00000000..e69de29b diff --git a/coverage/bin/locales/fr/loc.txt b/coverage/bin/locales/fr/loc.txt new file mode 100644 index 00000000..e69de29b diff --git a/coverage/bin/locales/jp/loc.txt b/coverage/bin/locales/jp/loc.txt new file mode 100644 index 00000000..e69de29b -- cgit 1.2.3-korg