diff --git a/Makefile b/Makefile index c60debd..28fe819 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ clean: .PHONY: all norme clean .SECONDEXPANSION: -build/c%: $(OFFSHORE_PROJECTS)/c$$*/*.c $$(OFFSHORE_MAINS)/c$$*.c $$(wildcard $(OFFSHORE_MAINS)/common/*.c) +build/c%: $(OFFSHORE_MAINS)/contrib/Unity/src/unity.c $(OFFSHORE_PROJECTS)/c$$*/*.c $$(OFFSHORE_MAINS)/c$$*.c $$(wildcard $(OFFSHORE_MAINS)/common/*.c) mkdir -p $(@D) - $(CC) -o $@ $(CFLAGS_MANDATORY) -Icommon -I contrib/Unity/src $(CFLAGS) $^ + $(CC) -o $@ $(CFLAGS_MANDATORY) -Icommon -Icontrib/Unity/src $(CFLAGS) $^ norme: $$(wildcard $(OFFSHORE_PROJECTS)/c*) norminette $^ || true diff --git a/c00/ex00.c b/c00/ex00.c index f30b674..55e1acd 100644 --- a/c00/ex00.c +++ b/c00/ex00.c @@ -22,3 +22,12 @@ int main() ft_putchar('o'); ft_putchar('\n'); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex01.c b/c00/ex01.c index 82088cf..7494927 100644 --- a/c00/ex01.c +++ b/c00/ex01.c @@ -19,3 +19,12 @@ int main(void) write(1,"%\n", 2); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex02.c b/c00/ex02.c index 58cad25..21494cf 100644 --- a/c00/ex02.c +++ b/c00/ex02.c @@ -8,3 +8,12 @@ int main(void) write(1, "%\n", 2); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex03.c b/c00/ex03.c index b704bcf..cca642c 100644 --- a/c00/ex03.c +++ b/c00/ex03.c @@ -8,3 +8,12 @@ int main(void) write(1, "%\n", 2); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex04.c b/c00/ex04.c index 14aa481..48fba8f 100644 --- a/c00/ex04.c +++ b/c00/ex04.c @@ -18,3 +18,12 @@ int main(void) ft_is_negative(0); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex05.c b/c00/ex05.c index 549d062..0f0e3f3 100644 --- a/c00/ex05.c +++ b/c00/ex05.c @@ -5,3 +5,12 @@ int main(void) ft_print_comb(); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex06.c b/c00/ex06.c index af9ad05..d08f6f7 100644 --- a/c00/ex06.c +++ b/c00/ex06.c @@ -3,3 +3,12 @@ int main(void) { ft_print_comb2(); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex07.c b/c00/ex07.c index 7930d38..f78e7d0 100644 --- a/c00/ex07.c +++ b/c00/ex07.c @@ -26,3 +26,12 @@ int main(void) ft_putnbr(INT_MAX); ft_putchar('\n'); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c00/ex08.c b/c00/ex08.c index 246c754..7e26641 100644 --- a/c00/ex08.c +++ b/c00/ex08.c @@ -20,3 +20,12 @@ int main(void) ft_putchar('%'); ft_putchar('\n'); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex00.c b/c01/ex00.c index 66a1065..58871d7 100644 --- a/c01/ex00.c +++ b/c01/ex00.c @@ -11,3 +11,12 @@ int main() printf("%d\n", *johnny); return (0); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex01.c b/c01/ex01.c index 325c667..d72bd99 100644 --- a/c01/ex01.c +++ b/c01/ex01.c @@ -18,3 +18,12 @@ int main(void) printf("now %d\n", n); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex02.c b/c01/ex02.c index 6eac6fd..09165c5 100644 --- a/c01/ex02.c +++ b/c01/ex02.c @@ -9,3 +9,12 @@ int main(void) ft_swap(&one, &two); printf("now %d %d\n", one, two); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex03.c b/c01/ex03.c index 7d6874b..ef6d43f 100644 --- a/c01/ex03.c +++ b/c01/ex03.c @@ -12,3 +12,12 @@ int main(void) printf("now: %d %d /%d %%%d\n", x, y, d, m); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex04.c b/c01/ex04.c index 94b2cf0..6d08d3f 100644 --- a/c01/ex04.c +++ b/c01/ex04.c @@ -9,3 +9,12 @@ int main() printf("was: /%d %%%d\n", m, n); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex05.c b/c01/ex05.c index 3dcde55..55065df 100644 --- a/c01/ex05.c +++ b/c01/ex05.c @@ -4,3 +4,12 @@ int main(void) { ft_putstr("hello world!\0no!"); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex06.c b/c01/ex06.c index 5d0971a..abe8ca1 100644 --- a/c01/ex06.c +++ b/c01/ex06.c @@ -6,3 +6,12 @@ int main(void) printf("len = %d\n", l); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex07.c b/c01/ex07.c index 2f836aa..bb909a3 100644 --- a/c01/ex07.c +++ b/c01/ex07.c @@ -21,3 +21,12 @@ int main(void) ft_rev_int_tab(a, l); printarr(a, l); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c01/ex08.c b/c01/ex08.c index 058666c..3fee285 100644 --- a/c01/ex08.c +++ b/c01/ex08.c @@ -21,3 +21,12 @@ int main(void) printarr(a, l); return (0); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex00.c b/c02/ex00.c index 9bf26b3..a1e1930 100644 --- a/c02/ex00.c +++ b/c02/ex00.c @@ -23,3 +23,12 @@ int main(void) printf("buffers comparison: s:%i d:%i\n", bufcmp(s1, s2, TEST_SOURCE_LENGHT), bufcmp(d1, d2, TEST_DESTINATION_LENGHT)); printf("return values comparison: %li %li", d1 - r1, d2 - r2); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex01.c b/c02/ex01.c index e4d2feb..2022925 100644 --- a/c02/ex01.c +++ b/c02/ex01.c @@ -50,3 +50,12 @@ int main(void) printf("buffers comparison: s:%i d:%i\n", bufcmp(s3, s4, TEST_SOURCE_LENGHT), bufcmp(d3, d4, TEST_DESTINATION_LENGHT)); printf("return values comparison: %li %li %li %li\n", d1 - r1, d2 -r2, d3 - r3, d4 - r4); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex02.c b/c02/ex02.c index 114fd95..95367de 100644 --- a/c02/ex02.c +++ b/c02/ex02.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%i\n", ft_str_is_alpha(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex03.c b/c02/ex03.c index a912f24..fa8f29d 100644 --- a/c02/ex03.c +++ b/c02/ex03.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%i\n", ft_str_is_numeric(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex04.c b/c02/ex04.c index afce489..ba9a51e 100644 --- a/c02/ex04.c +++ b/c02/ex04.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%i\n", ft_str_is_lowercase(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex05.c b/c02/ex05.c index 997713c..b49c13f 100644 --- a/c02/ex05.c +++ b/c02/ex05.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%i\n", ft_str_is_uppercase(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex06.c b/c02/ex06.c index d538488..cd9ffb4 100644 --- a/c02/ex06.c +++ b/c02/ex06.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%i\n", ft_str_is_printable(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex07.c b/c02/ex07.c index b1ddd16..7addc92 100644 --- a/c02/ex07.c +++ b/c02/ex07.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%s\n", ft_strupcase(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex08.c b/c02/ex08.c index 17730f3..ac0c427 100644 --- a/c02/ex08.c +++ b/c02/ex08.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%s\n", ft_strlowcase(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex09.c b/c02/ex09.c index 8ff9fa7..9edc02a 100644 --- a/c02/ex09.c +++ b/c02/ex09.c @@ -7,3 +7,12 @@ int main(int argc, char **argv) if (argc == 2) printf("%s\n", ft_strcapitalize(argv[1])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex10.c b/c02/ex10.c index 1acbbbf..82a3213 100644 --- a/c02/ex10.c +++ b/c02/ex10.c @@ -82,3 +82,12 @@ int main(void) bufcmp(d1, d2, TEST_DESTINATION_LENGHT)); printf("return values: orig: %lu ft: %lu\n", r1, r2); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex11.c b/c02/ex11.c index cdf28f7..6601428 100644 --- a/c02/ex11.c +++ b/c02/ex11.c @@ -18,3 +18,12 @@ int main(int argc, char **argv) return (1); ft_putstr_non_printable(argv[1]); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c02/ex12.c b/c02/ex12.c index e2ab653..eb7d3b9 100644 --- a/c02/ex12.c +++ b/c02/ex12.c @@ -21,3 +21,12 @@ int main(int argc, char **argv) return (1); ft_print_memory(argv[1], atoi(argv[2])); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c03/ex00.c b/c03/ex00.c index 95e9f9a..2740a27 100644 --- a/c03/ex00.c +++ b/c03/ex00.c @@ -43,3 +43,12 @@ int main(void) printf("return values: orig: %i ft: %i\n", r1, r2); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c03/ex01.c b/c03/ex01.c index a3fb1b1..b018a9a 100644 --- a/c03/ex01.c +++ b/c03/ex01.c @@ -49,3 +49,12 @@ int main(void) printf("return values: orig: %i ft: %i\n", r1, r2); return 0; } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c03/ex02.c b/c03/ex02.c index d42b7fd..59a6b87 100644 --- a/c03/ex02.c +++ b/c03/ex02.c @@ -6,7 +6,7 @@ /* By: achubuko +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/30 19:58:12 by achubuko #+# #+# */ -/* Updated: 2023/11/30 21:14:32 by achubuko ### ########.fr */ +/* Updated: 2023/11/30 23:04:17 by achubuko ### ########.fr */ /* */ /* ************************************************************************** */ #include @@ -16,7 +16,7 @@ char *ft_strcat(char *dest, char *src); int main(void) { - TESTS_SEED(char); + TEST_SEED(char); printf("initial strings:\n"); dump(s, TEST_SOURCE_LENGHT); @@ -24,13 +24,22 @@ int main(void) r1 = strcat(d1, s1); r2 = ft_strcat(d2, s2); - TESTS_SYNOPSIS("strcat(d, s)"); + TEST_SYNOPSIS("strcat(d, s)", s, d, s1, d1, s2, d2); r1 = strcat(d1, s1); r2 = ft_strcat(d2, s2); - TESTS_SYNOPSIS("strcat(d, s)"); + TEST_SYNOPSIS("strcat(d, s)", s, d, s1, d1, s2, d2); r1 = strcat(s1, d1); r2 = ft_strcat(s2, d2); - TESTS_SYNOPSIS("strcat(s, d)"); + TEST_SYNOPSIS("strcat(s, d)", s, d, s1, d1, s2, d2); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c03/ex03.c b/c03/ex03.c index 83efc37..6a0f61f 100644 --- a/c03/ex03.c +++ b/c03/ex03.c @@ -6,10 +6,10 @@ /* By: achubuko +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/30 19:58:12 by achubuko #+# #+# */ -/* Updated: 2023/11/30 21:51:37 by achubuko ### ########.fr */ +/* Updated: 2023/11/30 22:56:42 by achubuko ### ########.fr */ /* */ /* ************************************************************************** */ -#include +#include "tests.h" #define TEST_RETURN_PRINTF "%p" char *ft_strncat(char *dest, char *src, unsigned int nb); @@ -34,3 +34,12 @@ int main(void) r2 = ft_strncat(s2, d2, 5); TEST_SYNOPSIS("strncat(s, d, 5)", s, d, s1, d1, s2, d2); } + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + diff --git a/c03/ex04.c b/c03/ex04.c new file mode 100644 index 0000000..45a5016 --- /dev/null +++ b/c03/ex04.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ex04.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: achubuko +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/11/30 22:27:20 by achubuko #+# #+# */ +/* Updated: 2023/11/30 22:53:40 by achubuko ### ########.fr */ +/* */ +/* ************************************************************************** */ +#include + +char *ft_strstr(char *str, char *to_find); + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + +int main(void) +{ + UNITY_BEGIN(); + return (UNITY_END()); +} diff --git a/r.bash b/r.bash new file mode 100755 index 0000000..2cbbe45 --- /dev/null +++ b/r.bash @@ -0,0 +1,2 @@ +#!/bin/bash +T=build/"$1"; make $T && $T