From 0e6c2fdae503cfe7c138a35fd48547d233fedfc9 Mon Sep 17 00:00:00 2001 From: fanasina Date: Sat, 7 Oct 2023 00:14:17 +0200 Subject: [PATCH] update makefile --- Makefile | 16 ++++++++++------ src/ftest/ftest.c | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b1dbc8c..5308cc6 100644 --- a/Makefile +++ b/Makefile @@ -12,14 +12,16 @@ OBJ=$(SRC:.c=.o) TEST_DIR=$(ROOT_DIR)/test EXECSRC=$(TEST_DIR)/$(NAME_TEST).c EXEC=$(ROOT_DIR)/launch_$(NAME_TEST)_m -PERMSRC=$(wildcard */**perm*.c) +PERMSRC=src/permutation_t/permutation_t.c PERMSRC_O=$(PERMSRC:.c=.o) -SETTSRC=$(wildcard */**set*.c) +SETTSRC=src/set_theoric_t/set_theoric_t.c SETTSRC_O=$(SETTSRC:.c=.o) -TOOLSRC=$(wildcard */**tool*.c) +TOOLSRC=src/tools_t/tools_t.c TOOLSRC_O=$(TOOLSRC:.c=.o) -TESTSRC=$(wildcard */**test*.c) -TESTSRC_O=$(TESTSRC:.c=.o) +FTESTSRC=src/ftest/ftest.c +FTESTSRC_O=$(FTESTSRC:.c=.o) +FMOCKSRC=src/fmock/fmock.c +FMOCKSRC_O=$(FMOCKSRC:.c=.o) all: $(EXEC) @@ -27,8 +29,10 @@ all: $(EXEC) $(EXEC): $(EXECSRC) $(OBJ) $(CC) -o $@ $^ -I$(INCLUDE_DIR) $(LDFLAGS) +$(FMOCKSRC_O): $(FMOCKSRC) $(FTESTSRC_O) + $(CC) -o $@ -c $< $(CFLAGS) -$(TESTSRC_O): $(TESTSRC) $(TOOLSRC_O) +$(FTESTSRC_O): $(FTESTSRC) $(TOOLSRC_O) $(CC) -o $@ -c $< $(CFLAGS) $(PERMSRC_O): $(PERMSRC) $(SETTSRC_O) diff --git a/src/ftest/ftest.c b/src/ftest/ftest.c index d5b2eed..6eb7b0c 100644 --- a/src/ftest/ftest.c +++ b/src/ftest/ftest.c @@ -1225,7 +1225,7 @@ init_parallel_test_() //progress = ordered; - signal(SIGSEGV, final_parallel_test_); + signal(SIGSEGV, final_parallel_test_); /* to clear logs files! */ is_parallel_nb = 1; @@ -1331,13 +1331,13 @@ final_parallel_test_() } } - /* if SIGSEGV */ + /* if SIGSEGV , added for PRINTF, but no longer use!! if(!dir_empty("/dev/shm")){ system("rm /dev/shm/*"); PRINT_DEBUG(" cleanup %s \n", "/dev/shm"); } else - PRINT_DEBUG(" %s already empty \n", "/dev/shm"); + PRINT_DEBUG(" %s already empty \n", "/dev/shm");*/ } void run_all_tests_parallel(size_t parallel /*, int max_col*/)