diff options
| author | Andzs Auders <andzs.auders@zabbix.com> | 2017-12-04 16:23:36 +0300 |
|---|---|---|
| committer | Andzs Auders <andzs.auders@zabbix.com> | 2017-12-04 16:23:36 +0300 |
| commit | 3c1a2dd4abd6b9717bbc9dd0550dae90231f6261 (patch) | |
| tree | 3934e2974e36226371e3ba5755a6eec2966cf1f7 /Makefile.am | |
| parent | 6da1bc2398c563e1805a509c5779b93bf0333c94 (diff) | |
| parent | 231ddf611333ac3f8b40cad69f715b4352169605 (diff) | |
..F....... [ZBXNEXT-4139] updated to latest from trunk; resolved conflict in:
- sass/img_source/icons-sprite.ai
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c3a075a0898..9f00c8b58d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,10 +116,30 @@ WRAP_DB_FUNCS = \ -Wl,--wrap=DBexecute_multiple_query \ -Wl,--wrap=DBfree_result +WRAP_IO_FUNCS = \ + -Wl,--wrap=fopen \ + -Wl,--wrap=fclose \ + -Wl,--wrap=fgets + +WRAP_FS_FUNCS = \ + -Wl,--wrap=opendir \ + -Wl,--wrap=readdir \ + -Wl,--wrap=stat \ + -Wl,--wrap=__xstat + +WRAP_EXIT = \ + -Wl,--wrap=exit + +COMMON_WRAP_FUNCS = \ + $(WRAP_DB_FUNCS) \ + $(WRAP_IO_FUNCS) \ + $(WRAP_FS_FUNCS) \ + $(WRAP_EXIT) + tests: $(MAKE) $(AM_MAKEFLAGS) && \ cd tests && \ - $(MAKE) $(AM_MAKEFLAGS) LDFLAGS="$(LDFLAGS) $(WRAP_DB_FUNCS)" LIBS="$(LIBS) -lcmocka" && \ + $(MAKE) $(AM_MAKEFLAGS) LDFLAGS="$(LDFLAGS) $(COMMON_WRAP_FUNCS)" LIBS="$(LIBS) -lcmocka -lyaml" && \ ./tests_run.pl endif |