fix framework leaks

Author: yyang42

testframework/v3/includes/mt.h

@@ -14,6 +14,7 @@ typedef struct				s_mt
 }							t_mt;
 
 t_mt			*mt_create(char *name);
+void			mt_del(t_mt *mt);
 int				mt_exec(t_mt *mt);
 size_t			mt_count_failed_suites(t_mt *mt);
 size_t			mt_count_tests(t_mt *mt);

testframework/v3/includes/suite.h

@@ -15,12 +15,13 @@ typedef struct				s_suite
 {
 	char					*name;
 	t_suite_fn				*fn;
-	t_mt_lst					*tests;
+	t_mt_lst				*tests;
 	int						x_success_count;
 	int						x_warning_count;
 }							t_suite;
 
 t_suite			*suite_create(char *name, t_suite_fn *fn);
+void			suite_del(t_suite *suite);
 void			suite_add_test(t_suite *suite, t_test	*test);
 void			suite_exec(t_mt_lst_elem *elem);
 size_t			suite_count_failed_tests(t_suite *suite);

testframework/v3/includes/test.h

@@ -24,11 +24,12 @@ typedef struct				s_test
 }							t_test;
 
 t_test						*test_create(char *name, t_test_fn *fn, int timeout);
+void						test_del(t_test *test);
 void						test_print(t_mt_lst_elem *elem);
 void						test_exec(t_mt_lst_elem *elem);
 void						test_assert(t_test	*test, int is_fail);
 void						test_assert_prep(t_test	*test, char *cond, char *msg, int expected_signum);
 int							test_filter_failed(t_test *test);
 char						*test_get_failure_type(t_test *test);
 
-#endif
+#endif

testframework/v3/srcs/mt/mt_create.c

@@ -7,7 +7,7 @@
 
 t_mt			*mt_create(char *name)
 {
-	t_mt	*mt;	
+	t_mt	*mt;
 
 	mt = (t_mt *)malloc(sizeof(t_mt));
 	mt->name = name;

testframework/v3/srcs/mt/mt_del.c

@@ -0,0 +1,12 @@
+#include <mt.h>
+#include <fw.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <mt_lst.h>
+
+void				mt_del(t_mt *mt)
+{
+	mt_lst_del(mt->suites, suite_del);
+	free(mt);
+}

testframework/v3/srcs/mt_lst/mt_lst_create_elem.c

@@ -17,7 +17,7 @@ t_mt_lst_elem	*mt_lst_create_elem(void *data)
 {
 	t_mt_lst_elem *elem;
 
-	elem = (t_mt_lst_elem *)malloc(sizeof(t_mt_lst_elem));
+	elem = malloc(sizeof(t_mt_lst_elem));
 	elem->data = data;
 	elem->next = NULL;
 	elem->prev = NULL;

testframework/v3/srcs/mt_lst/mt_lst_del.c

@@ -16,12 +16,14 @@
 void	mt_lst_del(t_mt_lst *lst, void (*delfn)(void *))
 {
 	t_mt_lst_elem *elem;
+	t_mt_lst_elem *next;
 
 	elem = lst->elems;
 	while (elem)
 	{
+		next = elem->next;
 		mt_lstelem_del(elem, delfn);
-		elem = elem->next;
+		elem = next;
 	}
 	free(lst);
 }

testframework/v3/srcs/mt_lst/mt_lstelem_del.c

@@ -15,7 +15,9 @@
 
 void	mt_lstelem_del(t_mt_lst_elem *elem, void (*delfn)())
 {
-	delfn(elem->data);
+	if (delfn)
+		delfn(elem->data);
+	(void)delfn;
 	if (elem->key)
 		free(elem->key);
 	elem->data = NULL;

testframework/v3/srcs/suite/suite_create.c

@@ -4,7 +4,7 @@ t_suite			*suite_create(char *name, t_suite_fn *fn)
 {
 	t_suite	*suite;
 
-	suite = (t_suite *)malloc(sizeof(t_suite));
+	suite = malloc(sizeof(t_suite));
 	suite->name = strdup(name);
 
 	suite->tests = mt_lst_init();

testframework/v3/srcs/suite/suite_del.c

@@ -0,0 +1,8 @@
+#include <suite.h>
+
+void				suite_del(t_suite *suite)
+{
+	mt_lst_del(suite->tests, test_del);
+	free(suite->name);
+	free(suite);
+}

testframework/v3/srcs/test/test_del.c

@@ -0,0 +1,8 @@
+#include <test.h>
+#include <stdio.h>
+
+void				test_del(t_test *test)
+{
+	free(test->name);
+	free(test);
+}

testframework/v3_templates/Makefile_template.mk

@@ -72,7 +72,7 @@ ifneq ("$(wildcard $(RENDU_PATH)/Makefile)","")
 endif
 	make -k -C $(FRAMEWORK_PATH)
 	gcc $(CC_FLAGS) $(CC_DEBUG) $(CC_INCLUDES) $(CC_DEFINES) $(CC_SOURCE) $(RENDU_SOURCE) -o $(NAME) $(CC_FRAMEWORK_LIB) $(CC_LIBS)
-	./$(NAME)
+	$(shell pwd)/$(NAME)
 
 clean:
 	rm -f $(OBJECTS)