diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2018-04-27 15:05:49 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2018-04-27 15:05:49 +0300 |
| commit | 348b45117b41972369f6c4d10259ffcc15c01a93 (patch) | |
| tree | 3a81003c8c464c9ce99768dfd6851c301c42782e /Makefile.am | |
| parent | 78f557638f8f1a568ca99fbcf59eb8ea6c961ce7 (diff) | |
| parent | 5b87fd946b29453ac85357c7009f9a7cff8b531f (diff) | |
.......... [ZBX-12390] merged from upstream
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index d90f2763c41..3bcaac357b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ ## "dist-hook" run after the distribution directory is filled, but before the actual tar (or shar) file is created. dist-hook: - @zabbix_revision=`svn info|grep "Last Changed Rev"|awk '{print $$4;}'`; \ + @zabbix_revision=`svn info $(top_srcdir)|sed -n -e "/Last Changed Rev:/s/.*: \([[0-9]]*\)/\1/p"`; \ cat $(top_distdir)/include/version.h|sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" > $(top_distdir)/include/version.h.new; \ mv $(top_distdir)/include/version.h.new $(top_distdir)/include/version.h; \ cat $(top_distdir)/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java|sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" > \ @@ -131,17 +131,28 @@ WRAP_FS_FUNCS = \ WRAP_EXIT = \ -Wl,--wrap=exit +WRAP_COMM_FUNCS = \ + -Wl,--wrap=read \ + -Wl,--wrap=connect + +WRAP_LOG = \ + -Wl,--wrap=__zbx_zabbix_log + COMMON_WRAP_FUNCS = \ $(WRAP_DB_FUNCS) \ $(WRAP_IO_FUNCS) \ $(WRAP_FS_FUNCS) \ - $(WRAP_EXIT) + $(WRAP_EXIT) \ + $(WRAP_COMM_FUNCS) \ + $(WRAP_LOG) -tests: +tests_build: $(MAKE) $(AM_MAKEFLAGS) && \ cd tests && \ - $(MAKE) $(AM_MAKEFLAGS) LDFLAGS="$(LDFLAGS) $(COMMON_WRAP_FUNCS)" LIBS="$(LIBS) -lcmocka -lyaml" && \ - ./tests_run.pl + $(MAKE) $(AM_MAKEFLAGS) LDFLAGS="$(LDFLAGS) $(COMMON_WRAP_FUNCS)" LIBS="$(LIBS) -lcmocka -lyaml" + +tests: tests_build + tests/tests_run.pl endif .PHONY: test tests |