From ba482a0104b5e30b419a47f349c5e8831d830d37 Mon Sep 17 00:00:00 2001 From: gbaconni Date: Sun, 17 Apr 2022 09:59:41 +0200 Subject: [PATCH] Add tests and fix bugs --- Makefile | 5 ++- libftprintf/ft_printf.c | 5 +-- libftprintf/ft_vprintf.c | 2 +- libftprintf/ft_vprintf_decimal.c | 21 +++++++--- libftprintf/ft_vprintf_other.c | 2 +- main.c | 66 +++++++++++++++++++------------- tests/.gitignore | 1 + tests/Makefile | 31 +++++++++++++++ 8 files changed, 94 insertions(+), 39 deletions(-) create mode 100644 tests/.gitignore create mode 100644 tests/Makefile diff --git a/Makefile b/Makefile index a440e32..2b6305a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # -# Updated: 2022/04/15 20:37:26 by gbaconni ### lausanne.ch # +# Updated: 2022/04/16 01:24:13 by gbaconni ### lausanne.ch # # # # **************************************************************************** # # @@ -86,6 +86,9 @@ test: clean $(NAME) @$(PREFIX) ./$(NAME) "%c" C || true @$(PREFIX) ./$(NAME) "%s" "42 Lausanne" || true @$(PREFIX) ./$(NAME) "%d" 42 || true + @$(PREFIX) ./$(NAME) "%i" 2147483647 || true + @$(PREFIX) ./$(NAME) "%i" -2147483646 || true + @$(PREFIX) ./$(NAME) "%u" 4294967295 || true @$(PREFIX) ./$(NAME) "%x" 42 || true @$(PREFIX) ./$(NAME) "%X" 42 || true @$(PREFIX) ./$(NAME) "%%" "" || true diff --git a/libftprintf/ft_printf.c b/libftprintf/ft_printf.c index c48d305..ba853d0 100644 --- a/libftprintf/ft_printf.c +++ b/libftprintf/ft_printf.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/18 16:17:58 by gbaconni #+# #+# */ -/* Updated: 2022/04/13 00:21:03 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/16 03:07:52 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -17,9 +17,8 @@ int ft_printf(const char *format, ...) va_list ap; int ret; - ret = 0; va_start(ap, format); - ret += ft_vprintf(format, ap); + ret = ft_vprintf(format, ap); va_end(ap); return (ret); } diff --git a/libftprintf/ft_vprintf.c b/libftprintf/ft_vprintf.c index b48af54..4d750b2 100644 --- a/libftprintf/ft_vprintf.c +++ b/libftprintf/ft_vprintf.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */ -/* Updated: 2022/04/15 22:15:16 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/16 01:14:44 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ diff --git a/libftprintf/ft_vprintf_decimal.c b/libftprintf/ft_vprintf_decimal.c index d3a9bb4..4612022 100644 --- a/libftprintf/ft_vprintf_decimal.c +++ b/libftprintf/ft_vprintf_decimal.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */ -/* Updated: 2022/04/16 00:29:49 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/16 01:19:09 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -14,13 +14,22 @@ int ft_vprintf_decimal(const char *format, va_list ap) { - int ret; - int d; - char *s; + int ret; + unsigned int u; + int d; + char *s; (void) format; - d = va_arg(ap, int); - s = ft_itoa(d); + if (*format == 'u') + { + u = va_arg(ap, unsigned int); + s = ft_ltoa_base((long) u, "0123456789"); + } + else + { + d = va_arg(ap, int); + s = ft_itoa(d); + } ret = ft_puts(s); free(s); return (ret); diff --git a/libftprintf/ft_vprintf_other.c b/libftprintf/ft_vprintf_other.c index 65f36ca..6f33181 100644 --- a/libftprintf/ft_vprintf_other.c +++ b/libftprintf/ft_vprintf_other.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */ -/* Updated: 2022/04/16 00:36:48 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/16 01:28:02 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ diff --git a/main.c b/main.c index 0371328..a02c388 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: baco +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */ -/* Updated: 2022/04/15 20:48:55 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/17 09:59:04 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -16,10 +16,13 @@ #include // strlen #include // malloc, free #include // isdigit +#include // assert +#include + #include "libftprintf/libftprintf.h" -int isnumber(char *s); -int isstring(char *s); +int isnumber(char *s); +int isstring(char *s); int isnumber(char *s) { @@ -49,34 +52,34 @@ int isstring(char *s) return (1); } -/* -int diff_printf_decimal(const char *format, va_list ap); -int diff_printf_decimal(const char *format, va_list ap) +void ft_begin(int *fd) { - int ret; - int d; - char *s; - - ret = 0; - d = 0; - d = atoi(argv[2]); - ret = printf(format, d); - printf(": %d = printf(\"%s\", %d)\n", ret, format, d); - ret = ft_printf(format, d); - printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); - return (ret); + pipe(fd); + fd[2] = dup(STDOUT_FILENO); + dup2(fd[1], STDOUT_FILENO); +} + +void ft_end(int *fd, char *str) +{ + close(fd[1]); + read(fd[0], str, sizeof(str)); + close(fd[0]); + dup2(fd[2], STDOUT_FILENO); } -*/ int main(int argc, char *argv[]) { + int ft_ret; int ret; + char out[256]; + char ft_out[256]; char *format; int d; char c; char *s; int x; void *ptr; + int fd[3]; d = 0; c = '\0'; @@ -93,17 +96,22 @@ int main(int argc, char *argv[]) { c = argv[2][0]; ret = printf(format, c); - printf(": %d = printf(\"%s\", '%c')\n", ret, format, c); - ret = ft_printf(format, c); - printf(": %d = ft_printf(\"%s\", '%c')\n", ret, format, c); + printf("%d = printf(\"%s\", '%c')\n%s\n", ret, format, c, out); + ft_begin(fd); + ft_ret = ft_printf(format, c); + ft_end(fd, ft_out); + printf("%d = ft_printf(\"%s\", '%c')\n%s\n", ret, format, c, ft_out); + assert(ret == ft_ret); + assert(strcmp(out, ft_out) == 0); } else if (format[1] == 's') { s = argv[2]; ret = printf(format, s); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); - ret = ft_printf(format, s); + ft_ret = ft_printf(format, s); printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s); + assert(ret == ft_ret); } else if (format[1] == 'p') { @@ -115,24 +123,27 @@ int main(int argc, char *argv[]) } ret = printf(format, ptr); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); - ret = ft_printf(format, ptr); + ft_ret = ft_printf(format, ptr); printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s); + assert(ret == ft_ret); } else if (format[1] == 'd' || format[1] == 'i' || format[1] == 'u') { d = atoi(argv[2]); ret = printf(format, d); printf(": %d = printf(\"%s\", %d)\n", ret, format, d); - ret = ft_printf(format, d); + ft_ret = ft_printf(format, d); printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); + assert(ret == ft_ret); } else if (format[1] == 'x' || format[1] == 'X') { d = atoi(argv[2]); ret = printf(format, d); printf(": %d = printf(\"%s\", %d)\n", ret, format, d); - ret = ft_printf(format, d); + ft_ret = ft_printf(format, d); printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); + assert(ret == ft_ret); } } else @@ -140,8 +151,9 @@ int main(int argc, char *argv[]) s = argv[2]; ret = printf(format, s); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); - ret = ft_printf(format, s); + ft_ret = ft_printf(format, s); printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s); + assert(ret == ft_ret); } } return (0); diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..ae20be9 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1 @@ +pft diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..2aad5b3 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,31 @@ +# **************************************************************************** # +# # +# ::: :::::::: # +# Makefile :+: :+: :+: # +# +:+ +:+ +:+ # +# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2022/04/16 20:12:38 by gbaconni #+# #+# # +# Updated: 2022/04/16 20:22:22 by gbaconni ### lausanne.ch # +# # +# **************************************************************************** # + +UNAME_S = $(shell uname -s) + +all: test + +libftprintf.a: + @ln -snf ../libftprintf/libftprintf.a libftprintf.a + +test: test-pft + +test-pft: libftprintf.a + @test -d pft || git clone https://github.com/gavinfielder/pft.git pft +ifeq ($(UNAME_S),Linux) + @which php >/dev/null 2>&1 || sudo apt-get install -qq -y php-cli + @sed -i -r 's/^(INCLUDE_LIBPTHREAD)=.*/\1=1/' pft/options-config.ini +endif + @make -C pft + @cd pft && ./test + +