42/42_INT_12_webserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more script tests

Browse Source 
+ add cgi checks for error in script output
+ fix script_path relative to absolute
+ cgi makefile more efficient
This commit is contained in:
Hugo LAMY
2022-08-16 18:24:49 +02:00
parent ff443c80b1
commit 1ed4128afc
21 changed files with 485 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
srcs/cgi-bin/Makefile
View File

@@ -1,3 +1,4 @@
# - - - - - - #
# #
# COLORS #
@@ -30,11 +31,7 @@ RESET = "\e[0m"
# . name is case sensitive . ?= set if not already set #
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
NAME_1 = $(SRCS_1:.cpp=.out)
NAME_2 = $(SRCS_2:.cpp=.out)
NAME_3 = $(SRCS_3:.cpp=.out)
NAME_4 = $(SRCS_4:.cpp=.out)
NAME_5 = $(SRCS_5:.cpp=.out)
NAME = $(SRCS_X:.cpp=.out)
CXX = c++
CXXFLAGS = -Wall -Wextra #-Werror
@@ -47,19 +44,23 @@ HEADERS_D = .
SRCS_D = .
SRCS = cgi_utils.cpp
SRCS_1 = cgi_cpp.cpp
SRCS_2 = cgi_cpp_len.cpp
SRCS_3 = cgi_cpp_len_big.cpp
SRCS_4 = cgi_cpp_len_small.cpp
SRCS_5 = cgi_cpp_status.cpp
SRCS_X = \
cgi_cpp.cpp \
cgi_cpp_bad_headers.cpp \
cgi_cpp_empty.cpp \
cgi_cpp_empty_lines.cpp \
cgi_cpp_len.cpp \
cgi_cpp_len_big.cpp \
cgi_cpp_len_small.cpp \
cgi_cpp_no_body.cpp \
cgi_cpp_no_headers.cpp \
cgi_cpp_only_crlf.cpp \
cgi_cpp_sleep.cpp \
cgi_cpp_status.cpp \
OBJS_D = builds
OBJS = $(SRCS:%.cpp=$(OBJS_D)/%.o)
OBJS_1 = $(SRCS_1:%.cpp=$(OBJS_D)/%.o)
OBJS_2 = $(SRCS_2:%.cpp=$(OBJS_D)/%.o)
OBJS_3 = $(SRCS_3:%.cpp=$(OBJS_D)/%.o)
OBJS_4 = $(SRCS_4:%.cpp=$(OBJS_D)/%.o)
OBJS_5 = $(SRCS_5:%.cpp=$(OBJS_D)/%.o)
OBJS_X = $(SRCS_X:%.cpp=$(OBJS_D)/%.o)
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
# . target: prerequisites . $@ : target #
@@ -67,36 +68,25 @@ OBJS_5 = $(SRCS_5:%.cpp=$(OBJS_D)/%.o)
# . recipe . $^ : all prerequisites #
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
all: cgi_1 cgi_2 cgi_3 cgi_4 cgi_5
cgi_1: $(NAME_1)
cgi_2: $(NAME_2)
cgi_3: $(NAME_3)
cgi_4: $(NAME_4)
cgi_5: $(NAME_5)
all: $(NAME)
$(OBJS_D)/%.o: %.cpp | $(OBJS_D)
@echo $(B_GREEN)"compilation :" $@ $(RESET)
$(CXX) $(CXXFLAGS) -c $< -o $@
$(OBJS_D):
mkdir $@
$(NAME_1): $(OBJS) $(OBJS_1)
$(NAME_2): $(OBJS) $(OBJS_2)
$(NAME_3): $(OBJS) $(OBJS_3)
$(NAME_4): $(OBJS) $(OBJS_4)
$(NAME_5): $(OBJS) $(OBJS_5)
$(NAME_1) $(NAME_2) $(NAME_3) $(NAME_4) $(NAME_5):
$(CXX) $^ -o $@
$(NAME): $(OBJS) $(OBJS_X)
$(NAME):
@echo $(B_YELLOW)"linkage :" $@ $(RESET)
$(CXX) $(OBJS) $(@:%.out=$(OBJS_D)/%.o) -o $@
clean:
rm -rf $(OBJS_D)
fclean: clean
rm -f $(NAME_1)
rm -f $(NAME_2)
rm -f $(NAME_3)
rm -f $(NAME_4)
rm -f $(NAME_5)
rm -f $(NAME)
re: fclean all