fix some stuff
This commit is contained in:
2
Makefile
2
Makefile
@@ -4,7 +4,7 @@ CXXFLAGS = -Wall -Wextra -Werror -MMD -MP
|
|||||||
CXXFLAGS += -g3
|
CXXFLAGS += -g3
|
||||||
CXXFLAGS += -I $(LIBFT_DIR)
|
CXXFLAGS += -I $(LIBFT_DIR)
|
||||||
LDFLAGS = -Llibft -lft
|
LDFLAGS = -Llibft -lft
|
||||||
SRC = util_unit.c
|
SRC = util_unit.c util_unit2.c
|
||||||
OBJ = $(SRC:.cpp=.o)
|
OBJ = $(SRC:.cpp=.o)
|
||||||
LIBFT_DIR = libft
|
LIBFT_DIR = libft
|
||||||
LIBFT_A = $(LIBFT_DIR)/libft.a
|
LIBFT_A = $(LIBFT_DIR)/libft.a
|
||||||
|
|||||||
@@ -10,23 +10,16 @@
|
|||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
#include "libunit.h"
|
#include "util_unit.h"
|
||||||
#include "libft.h"
|
#include "util_unit.h"
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
static int test_func(t_unit_test *test_node)
|
static size_t interpret_status(int status, const char *fn_name
|
||||||
|
, char *test_name)
|
||||||
{
|
{
|
||||||
int res;
|
ft_putstr_fd((char *) fn_name, 1);
|
||||||
|
|
||||||
res = test_node->func;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t interpret_status(int status, const char *fn_name, char *test_name)
|
|
||||||
{
|
|
||||||
ft_putstr_fd(fn_name, 1);
|
|
||||||
ft_putstr_fd(" : ", 1);
|
ft_putstr_fd(" : ", 1);
|
||||||
ft_putstr_fd(test_name, 1);
|
ft_putstr_fd(test_name, 1);
|
||||||
ft_putstr_fd(" : ", 1);
|
ft_putstr_fd(" : ", 1);
|
||||||
@@ -54,30 +47,33 @@ static void print_passed_test(size_t ok_tests, t_unit_test *test_list)
|
|||||||
{
|
{
|
||||||
ft_putnbr_fd(ok_tests, 1);
|
ft_putnbr_fd(ok_tests, 1);
|
||||||
ft_putchar_fd('/', 1);
|
ft_putchar_fd('/', 1);
|
||||||
ft_putnbr_fd(total_node(test_list));
|
ft_putnbr_fd((int)count_tests(test_list), 1);
|
||||||
ft_putstr_fd(" tests checked", 1);
|
ft_putstr_fd(" tests checked", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int launch_tests(t_unit_test *test_list, const char *fn_name)
|
int launch_tests(t_unit_test *test_list, const char *fn_name)
|
||||||
{
|
{
|
||||||
size_t ok_tests;
|
size_t ok_tests;
|
||||||
pid_t wpid;
|
pid_t wpid;
|
||||||
int status;
|
int status;
|
||||||
|
int i;
|
||||||
|
|
||||||
ok_tests = 0;
|
ok_tests = 0;
|
||||||
while (1)
|
i = -1;
|
||||||
|
while (i++ < (int)count_tests(test_list))
|
||||||
{
|
{
|
||||||
wpid = fork();
|
wpid = fork();
|
||||||
if (wpid < 0)
|
if (wpid < 0)
|
||||||
return (1);
|
return (1);
|
||||||
else if (wpid == 0)
|
else if (wpid == 0)
|
||||||
test_func(test_func);
|
exit(!get_test_at(test_list, i)->func());
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wpid = wait(&status);
|
wpid = wait(&status);
|
||||||
if (wpid < 0)
|
if (wpid < 0)
|
||||||
return (1);
|
return (1);
|
||||||
ok_tests += interpret_status(status, fn_name, test_node->title);
|
ok_tests += interpret_status(status, fn_name,
|
||||||
|
get_test_at(test_list, i)->title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print_passed_test(ok_tests, test_list);
|
print_passed_test(ok_tests, test_list);
|
||||||
|
|||||||
29
util_unit.c
29
util_unit.c
@@ -13,34 +13,6 @@
|
|||||||
#include "util_unit.h"
|
#include "util_unit.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
int dummy(void)
|
|
||||||
{
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
t_unit_test *testlist;
|
|
||||||
|
|
||||||
testlist = NULL;
|
|
||||||
load_test(&testlist, "hi", &dummy);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* we loop over instead of shifting the pointer to make sure we don't skip
|
|
||||||
unexisting tests and end up in unallocated/invalid memory */
|
|
||||||
t_unit_test *get_test_at(t_unit_test *head, size_t target_idx)
|
|
||||||
{
|
|
||||||
size_t j;
|
|
||||||
|
|
||||||
j = 0;
|
|
||||||
while ((j < target_idx) && head)
|
|
||||||
{
|
|
||||||
head = head->next;
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
return (head);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t count_tests(t_unit_test *head)
|
size_t count_tests(t_unit_test *head)
|
||||||
{
|
{
|
||||||
size_t j;
|
size_t j;
|
||||||
@@ -107,6 +79,7 @@ void clear_tests(t_unit_test **head_ptr)
|
|||||||
t_unit_test *next;
|
t_unit_test *next;
|
||||||
|
|
||||||
next = *head_ptr;
|
next = *head_ptr;
|
||||||
|
head = NULL;
|
||||||
while (head)
|
while (head)
|
||||||
{
|
{
|
||||||
head = *head_ptr;
|
head = *head_ptr;
|
||||||
|
|||||||
16
util_unit2.c
Normal file
16
util_unit2.c
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
#include "util_unit.h"
|
||||||
|
|
||||||
|
/* we loop over instead of shifting the pointer to make sure we don't skip
|
||||||
|
unexisting tests and end up in unallocated/invalid memory */
|
||||||
|
t_unit_test *get_test_at(t_unit_test *head, size_t target_idx)
|
||||||
|
{
|
||||||
|
size_t j;
|
||||||
|
|
||||||
|
j = 0;
|
||||||
|
while ((j < target_idx) && head)
|
||||||
|
{
|
||||||
|
head = head->next;
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
return (head);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user