diff options
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | tests/zabbix_server/taskmanager/Makefile.am | 10 | ||||
| -rw-r--r-- | tests/zabbix_server/taskmanager/try_task_closes_problem.json (renamed from tests/zabbix_server/taskmanager/data.json) | 0 |
4 files changed, 14 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index fcd457ef4b9..d29ec646d16 100644 --- a/.gitattributes +++ b/.gitattributes @@ -351,7 +351,7 @@ src/zabbix_server/taskmanager/taskmanager.c -text src/zabbix_server/taskmanager/taskmanager.h -text tests/Makefile -text tests/zabbix_server/escalator/process_escalations.json -text -tests/zabbix_server/taskmanager/data.json -text +tests/zabbix_server/taskmanager/try_task_closes_problem.json -text upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub_small.png -text svneol=unset#image/png upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Network.png -text svneol=unset#image/png diff --git a/.gitignore b/.gitignore index 243a41cc4f0..d7b29048a46 100644 --- a/.gitignore +++ b/.gitignore @@ -356,6 +356,9 @@ src/zabbix_server/zabbix_server tests/zabbix_server/escalator/.deps tests/zabbix_server/escalator/Makefile tests/zabbix_server/escalator/Makefile.in +tests/zabbix_server/taskmanager/.deps +tests/zabbix_server/taskmanager/Makefile +tests/zabbix_server/taskmanager/Makefile.in upgrades/Makefile upgrades/Makefile.in /zabbix-*.tar.gz diff --git a/tests/zabbix_server/taskmanager/Makefile.am b/tests/zabbix_server/taskmanager/Makefile.am new file mode 100644 index 00000000000..185bc7b0951 --- /dev/null +++ b/tests/zabbix_server/taskmanager/Makefile.am @@ -0,0 +1,10 @@ +noinst_PROGRAMS = try_task_closes_problem + +try_task_closes_problem_SOURCES = \ + try_task_closes_problem.json \ + try_task_closes_problem.c + +try_task_closes_problem_LDADD = \ + $(top_srcdir)/tests/libzbxmockdata.a + +try_task_closes_problem_CFLAGS = -I@top_srcdir@/tests diff --git a/tests/zabbix_server/taskmanager/data.json b/tests/zabbix_server/taskmanager/try_task_closes_problem.json index bad831d8990..bad831d8990 100644 --- a/tests/zabbix_server/taskmanager/data.json +++ b/tests/zabbix_server/taskmanager/try_task_closes_problem.json |