diff --git a/Makefile b/Makefile index 5308cc6..0b5e161 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,8 @@ FTESTSRC=src/ftest/ftest.c FTESTSRC_O=$(FTESTSRC:.c=.o) FMOCKSRC=src/fmock/fmock.c FMOCKSRC_O=$(FMOCKSRC:.c=.o) - +BPROGRESSRC=src/bar_progress/bar_progress.c +BPROGRESSRC_0=$(BPROGRESSRC:.c=.o) all: $(EXEC) @@ -44,6 +45,9 @@ $(SETTSRC_O) : $(SETTSRC) $(TOOLSRC_O) $(TOOLSRC_O): $(TOOLSRC) $(CC) -o $@ -c $< $(CFLAGS) +$(BPROGRESSRC_0): $(BPROGRESSRC) + $(CC) -o $@ -c $< $(CFLAGS) + .PHONY: clean mrproper clean: @@ -53,4 +57,4 @@ mrproper: clean rm -f $(EXEC) run: $(EXEC) - $(EXEC) -p + $(EXEC) -h diff --git a/src/fmock/fmock.h b/src/fmock/fmock.h index ce324d4..7ef12c0 100644 --- a/src/fmock/fmock.h +++ b/src/fmock/fmock.h @@ -156,9 +156,9 @@ extern struct list_base_fmock *g_list_base_fmock; }\ else if (((tmp_mock->info_mock)->times_left != 0) && ((tmp_mock->info_mock)->times_left != INITSTATE )) {\ size_t len0 = strlen((tmp_mock->info_mock)->str_conditions);\ - size_t len1 = strlen("call check condition: aa");\ - char *msg_call=malloc(len0 + len1);\ - sprintf(msg_call,"call check condition: %s",(tmp_mock->info_mock)->str_conditions);\ + size_t len1 = strlen("when checking condition call: aa");\ + char *msg_call=malloc(len0 + len1 + strlen(__func__));\ + sprintf(msg_call,"when checking %s condition call: %s",__func__,(tmp_mock->info_mock)->str_conditions);\ HANDLE_OP_EXPECT_NAME(EQ,TYPE_INT,1, tmp_mock->call_mock_condition args_call_with_parenthesis, (tmp_mock->info_mock)->str_caller, msg_call); /*LOG("%s\n","failure condition");*/\ free(msg_call);\ }\ diff --git a/src/ftest/ftest.h b/src/ftest/ftest.h index 761647c..8c9fcf2 100644 --- a/src/ftest/ftest.h +++ b/src/ftest/ftest.h @@ -310,26 +310,26 @@ GEN_EXPECTED_OP_TYPE_FUNC(NE, TYPE_STRING) do{ \ if(is_parallel_nb == 0){\ if(expected_##OP##_##type(var1, var2)){ \ - PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 %s passed from %s \n\n",name_f,msg_call); \ + PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 %s passed %s \n\n",name_f,msg_call); \ } \ else{ \ /*PRINT_LOC("Failure\nExpected %s of these values:\n %s\n\tWhich is: %s\n %s\n\tWhich is: %s\n\n"\ ,DESCRIPTION_##OP,#var1, type##_TO_STR(var1), #var2, type##_TO_STR(var2)); */ \ PRINT_LOC("Failure\nExpected: (%s) %s (%s) :\n Value of %s: %s \n Value of %s: %s\n\n"\ ,#var1,STRFY(OP),#var2,#var1, type##_TO_STR(var1), #var2, type##_TO_STR(var2)); \ - PRINT_HK_C(colors_f[k_RED],HK_TR," 1 %s failed from %s \n",name_f,msg_call); \ + PRINT_HK_C(colors_f[k_RED],HK_TR," 1 %s failed %s \n",name_f,msg_call); \ } \ }else { \ if(expected_##OP##_name_##type(var1, var2, name_f)){ \ - PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 %s passed from %s \n\n",name_f,msg_call); \ - /*PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 test passed from %s \n\n",name_f);*/ \ + PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 %s passed %s \n\n",name_f,msg_call); \ + /*PRINT_HK_C(colors_f[k_GREEN],HK_TR," 1 test passed %s \n\n",name_f);*/ \ } \ else{ \ /*PRINT_LOC("Failure\nExpected %s of these values:\n %s\n\tWhich is: %s\n %s\n\tWhich is: %s\n\n"\ ,DESCRIPTION_##OP ,#var1, type##_TO_STR(var1), #var2, type##_TO_STR(var2));*/ \ PRINT_LOC("Failure\nExpected: (%s) %s (%s) :\n Value of %s: %s \n Value of %s: %s\n\n"\ ,#var1,STRFY(OP),#var2,#var1, type##_TO_STR(var1), #var2, type##_TO_STR(var2)); \ - PRINT_HK_C(colors_f[k_RED],HK_TR," 1 %s failed from %s \n",name_f,msg_call); \ + PRINT_HK_C(colors_f[k_RED],HK_TR," 1 %s failed %s \n",name_f,msg_call); \ } \ }\ }while(0);