diff --git a/d00/ex02/Account.cpp b/d00/ex02/Account.cpp index 46437e4..169cc77 100644 --- a/d00/ex02/Account.cpp +++ b/d00/ex02/Account.cpp @@ -3,6 +3,8 @@ #include #include +// to compare output : + void Account::displayAccountsInfos( void ) { _displayTimestamp(); diff --git a/d01/ex00/Makefile b/d01/ex00/Makefile index b823351..88c6577 100644 --- a/d01/ex00/Makefile +++ b/d01/ex00/Makefile @@ -52,6 +52,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: rm -f $(OBJS) diff --git a/d01/ex01/Makefile b/d01/ex01/Makefile index be16514..5579a85 100644 --- a/d01/ex01/Makefile +++ b/d01/ex01/Makefile @@ -51,6 +51,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: rm -f $(OBJS) diff --git a/d01/ex02/Makefile b/d01/ex02/Makefile index 305f6b2..b067ae0 100644 --- a/d01/ex02/Makefile +++ b/d01/ex02/Makefile @@ -49,6 +49,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: rm -f $(OBJS) diff --git a/d01/ex03/Makefile b/d01/ex03/Makefile index 6283d26..a6c38b1 100644 --- a/d01/ex03/Makefile +++ b/d01/ex03/Makefile @@ -54,6 +54,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: rm -f $(OBJS) diff --git a/d01/ex04/Makefile b/d01/ex04/Makefile index 92644d4..3f95f8a 100644 --- a/d01/ex04/Makefile +++ b/d01/ex04/Makefile @@ -50,8 +50,12 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) Makefile OBJS BANANE + clean: rm -f $(OBJS) + rm -f *.replace fclean: clean rm -f $(NAME) diff --git a/d01/ex04/Makefile.replace b/d01/ex04/Makefile.replace deleted file mode 100644 index 495c03c..0000000 --- a/d01/ex04/Makefile.replace +++ /dev/null @@ -1,62 +0,0 @@ -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # -# . name = value . name is case sensitive # -# VARIABLES . or name = value \ . use VPATH only for .c # -# . value . or .cpp # -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - -NAME = sed - -CC = clang++ -CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 - -VPATH = $(D_SRCS) - -LIBS = - -INCLUDES = -I$(D_HEADERS) - -D_SRCS = . -SRCS = main.cpp \ - Sed.cpp - -D_HEADERS = . -HEADERS = Sed.hpp - -D_OBJS = builds -OBJS = $(SRCS:%.cpp=$(D_OBJS)/%.o) - -RM_D_OBJS = rm -rf $(D_OBJS) -ifeq "$(D_OBJS)" "." -RM_D_OBJS = -endif - - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # -# . target: prerequisites . $@ : target # -# RULES . recipe . $< : 1st prerequisite # -# . recipe . $^ : all prerequisites # -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - -all: $(NAME) - -$(D_OBJS)/%.o: %.cpp | $(D_OBJS) - $(CC) $(CFLAGS) -c $< -o $@ - -$(D_OBJS): - mkdir $@ - -$(OBJS): $(HEADERS:%=$(D_HEADERS)/%) - -$(NAME): $(OBJS) - $(CC) $(OBJS) -o $@ $(LIBS) - -clean: - rm -f $(OBJS) - -fclean: clean - rm -f $(NAME) - $(RM_D_OBJS) - -re: fclean all - -.PHONY : all clean fclean re bonus run valgrind diff --git a/d01/ex04/test.txt.replace b/d01/ex04/test.txt.replace deleted file mode 100644 index e69de29..0000000 diff --git a/d01/ex04/unitests/test.sh b/d01/ex04/unitests/test.sh index e41091b..9031d4b 100644 --- a/d01/ex04/unitests/test.sh +++ b/d01/ex04/unitests/test.sh @@ -2,7 +2,14 @@ cd $(dirname $0) source ./colors.sh mkdir -p test_log +make -C ../ &> /dev/null + EXECUTABLE="sed" +LEAKS="" +if [ $1 == "leaks" ] || [ $1 == "valgrind" ] +then + LEAKS="valgrind --leak-check=full --show-leak-kinds=all" +fi # RUN TESTS function run_tests @@ -10,7 +17,7 @@ EXECUTABLE="sed" touch $TESTNAME echo "$CONTENT" > $TESTNAME - ../$EXECUTABLE $TESTNAME "$FIND" "$REPLACEMENT" + $LEAKS ../$EXECUTABLE $TESTNAME "$FIND" "$REPLACEMENT" OUTPUT=$( cat $TESTNAME.replace ) if [ "$OUTPUT" == "$RESULT" ] then diff --git a/d01/ex05/Makefile b/d01/ex05/Makefile index 4c739ba..f582a41 100644 --- a/d01/ex05/Makefile +++ b/d01/ex05/Makefile @@ -50,6 +50,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: rm -f $(OBJS) diff --git a/d01/ex06/Makefile b/d01/ex06/Makefile index e849504..ebda0cb 100644 --- a/d01/ex06/Makefile +++ b/d01/ex06/Makefile @@ -50,6 +50,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) DEBUG + clean: rm -f $(OBJS) diff --git a/d01/ex06/karenFilter b/d01/ex06/karenFilter new file mode 100755 index 0000000..a029bab Binary files /dev/null and b/d01/ex06/karenFilter differ diff --git a/d01/ex06/main.cpp b/d01/ex06/main.cpp index cc4f03b..02f0e66 100644 --- a/d01/ex06/main.cpp +++ b/d01/ex06/main.cpp @@ -9,7 +9,10 @@ int main(int ac, char *av[]) int i; if (ac != 2) + { + std::cout << "need 1 argument of type DEBUG, INFO, WARNING or ERROR\n"; return (1); + } for (i = 0; i < 4; i++) if (level[i].compare(av[1]) == 0) @@ -21,14 +24,17 @@ int main(int ac, char *av[]) std::cout << "[ DEBUG ]" << '\n'; karen.complain("DEBUG"); std::cout << '\n'; + /* FALLTHRU */ case (1): std::cout << "[ INFO ]" << '\n'; karen.complain("INFO"); std::cout << '\n'; + /* FALLTHRU */ case (2): std::cout << "[ WARNING ]" << '\n'; karen.complain("WARNING"); std::cout << '\n'; + /* FALLTHRU */ case (3): std::cout << "[ ERROR ]" << '\n'; karen.complain("ERROR");