From 63e9453f1543cfa98dcb9d2b5078bc919f90d9a9 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 20 Mar 2020 21:38:55 +0100 Subject: python3.4 supported (and probably 3.5 aswell) --- Makefile | 9 +++-- generate.py | 6 ++-- generated.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- prettier.py | 10 +++--- save_failed.py | 2 +- saved_tests.c | 4 +-- 6 files changed, 119 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index fe5a84a..38a663d 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,15 @@ LDFLAGS = -L$(FT_PRINTF_PATH) -lftprintf NAME = ft_printf_test CHECK_LEAKS_NAME = check_leaks -PYTHON = python3 RM = rm -f MAKE = make +PYTHON = python3 +# ifeq ($(shell $(PYTHON) --version | cut -d ' ' -f 2 | cut -d '.' -f 1),2) +# PYTHON = python3 +# $(error You must have python3 installed) +# endif + SRC = main.c helper.c tests/pft_tests.c tests/moulitest_tests.c tests/printf_tester_tests.c \ tests/printf_tests_tests.c saved_tests.c generated.c OBJ = $(SRC:.c=.o) @@ -49,7 +54,7 @@ no_clearbonus: allbonus no_clear interactive: all ./$(NAME) | $(PYTHON) prettier.py --interactive -interactivebonus: allbonus interactive +interactivebonus: allbonus interactive raw: all ./$(NAME) diff --git a/generate.py b/generate.py index b727133..ba3b7d1 100644 --- a/generate.py +++ b/generate.py @@ -71,7 +71,7 @@ class Generator: def run(self): if self.check_valid: - os.system(f"touch {self.tmp_filename}") + os.system("touch {}".format(self.tmp_filename)) with open(self.output_filename, "w") as self.output_file: self._write_header() while self.test_nb > 0: @@ -84,7 +84,7 @@ class Generator: print("Generated", self.test_nb) self._write_footer() if self.check_valid: - os.system(f"rm {self.tmp_filename}") + os.system("rm {}".format(self.tmp_filename)) def _compile(self, assert_printf): with open(self.tmp_filename, "w") as tmp_file: @@ -95,7 +95,7 @@ class Generator: def _gen_printf(self): formats, args = self._printf_args() args_str = "".join(["," + str(a) for a in args if a is not None]) - return f"ASSERT_PRINTF(\"{''.join(formats)}\" {args_str});" + return "ASSERT_PRINTF(\"{}\" {});".format(''.join(formats), args_str) def _printf_args(self): args = [] diff --git a/generated.c b/generated.c index 2cea88b..bc98154 100644 --- a/generated.c +++ b/generated.c @@ -2,4 +2,104 @@ void generated_test(void) { -} + ASSERT_PRINTF("%--87.48u%---86.89d%--*.171i" ,575753980u,-1706753103,-61,-1026886559); + ASSERT_PRINTF("%53c%0189.51d%-103.21d%*p%102c" ,-27,231647176,-1119242596,-94,(void*)17541392615378030860lu,80); + ASSERT_PRINTF("%-119.98X%--*.57i" ,3622566783u,-40,1402091020); + ASSERT_PRINTF("%-49.148X%-144c%---47.*x%-140.*X%-115.118s" ,1788014179u,-42,-140,1771987060u,-145,3144147879u,"H\vYsk&|8>-[gth=Kx5_0Qr`*vE@c\fN",4236150522u); + ASSERT_PRINTF("%-144.75d%--78.X%-190p%00041.*x%-23.70%" ,-265040099,1164608268u,(void*)17615309680892657552lu,106,3685356723u); + ASSERT_PRINTF("%--162.153s" ,"R5lGI]=d)JsY%"); + ASSERT_PRINTF("%-84p" ,(void*)4775667885626284982lu); + ASSERT_PRINTF("%0120.60i%--186c%23.91s" ,66904061,123,"+5sL\fbw~DLaeBVx~"); + ASSERT_PRINTF("%--3p%-149.169X" ,(void*)2930828309239637750lu,2340073959u); + ASSERT_PRINTF("%-44.191X%-36.29%%41p%-138c%00052.150X" ,1190215424u,(void*)3018354647187363245lu,46,1472975837u); + ASSERT_PRINTF("%-166.189X%-26.100%" ,207473590u); + ASSERT_PRINTF("%-153.61d%0105.36i%-77.70u%-80p" ,1957997024,1534377111,2603846243u,(void*)17500981794874329626lu); + ASSERT_PRINTF("%-70p%--20p" ,(void*)722858610728296101lu,(void*)4519852823670228835lu); + ASSERT_PRINTF("%---118.103i%--28.47u%88.166s%0123i" ,-704112513,3545495823u,"CUX`\\o",-1784647328); + ASSERT_PRINTF("%-96.78u%32s" ,3598761892u,"^\vHgagCH)m{hy[Q"); + ASSERT_PRINTF("%0196.169i%-32c" ,1040966160,53); + ASSERT_PRINTF("%-c%-32.61i%-78.13s" ,-70,-739803298,"sholGoP@h9#T#PjVsCF+Fx",(void*)604898635787958238lu,27,1458757178,209663612); + ASSERT_PRINTF("%-15.28X%157c%--35.189u%100.62s" ,2052648042u,9,1026341267u,"Cf\t3!DOK[M/t1>t1jC=tLBN:~c"); + ASSERT_PRINTF("%---*c%-14.111u" ,73,72,2447307730u); + ASSERT_PRINTF("%--*.18u%-85c%189.170s%150c%-141.*i" ,143,1032677539u,69,"H.\ni-k",-125,32,-645299566); + ASSERT_PRINTF("%-197p%03.35d%-101.10%" ,(void*)16358200459980665292lu,1110276224); + ASSERT_PRINTF("%00144.60X%--160.157%" ,132210504u); + ASSERT_PRINTF("%0135.*%%--39c%095.16i%0120.39x%8.33s" ,-193,15,143560664,578664161u,"V0_("); + ASSERT_PRINTF("%000*.137X" ,3,2361478588u); + ASSERT_PRINTF("%-138.17%%--*p%-14p%---167p%--47.91u" ,-13,(void*)10740891812216954868lu,(void*)2144050129394666231lu,(void*)11614427029332157430lu,2673098069u); + ASSERT_PRINTF("%-57.*X%-194.116u%-140.134d" ,-70,3949637465u,1974205093u,335572653); + ASSERT_PRINTF("%---77.62s%-46.195i" ,"^CQ{\vkSl[ceD\f,~A-P",-2130843036); + ASSERT_PRINTF("%-*.152u%-78.92s%--44.57u" ,-157,804520638u,"#W|lXhS\\x^i",835290868u); + ASSERT_PRINTF("%--140p%-92.95s%-102.115i" ,(void*)15758905526233078610lu,NULL,-1446158942); + ASSERT_PRINTF("%-157p%-174p%-131.*X%0146.195x%--150p" ,(void*)7878202630734999894lu,(void*)8508579576981908212lu,189,42041319u,694227551u,(void*)1547752975271419156lu); + ASSERT_PRINTF("%--*p%0*.119x%-133.14d%0156.113d%-40c" ,19,(void*)9420508942149040314lu,5,3622177574u,267981691,-545348429,63); + ASSERT_PRINTF("%-190.90x%-117.173%" ,2497145861u); + ASSERT_PRINTF("%00183.%%-44.48d" ,2066635919); + ASSERT_PRINTF("%0*.29u%00079.55u%30.43s%-17.*s" ,-189,2491194593u,1621139216u,"QA`2Any5ew*Fx>\f|\t/",142,"z|:\r$F'+\f"); + ASSERT_PRINTF("%*p%-114.86%%-27.22d" ,-112,(void*)10233099178825149944lu,500193481); + ASSERT_PRINTF("%--74.82s%--127.29X%--153c" ,"T6Hx+%F\t",3836960075u,-25); + ASSERT_PRINTF("%-38.54x%--189c%-21.79s" ,4019235240u,88,"M_",2587710503u,"Ink.<6*#vZA","\nw%@\rd\vw20!\fNM$\f>",4000484419u) @@ -967,4 +967,4 @@ ASSERT_PRINTF("%0147.123x%+0195.0d%+63.*d%-113.46u" ,288767637u,718326765,-22,18 ASSERT_PRINTF("%++80.97d%0#99.x%166p%--104c%-+104.5d" ,-1906533614,2887801045u,(void*)14018399492132222581lu,122,915016948) ASSERT_PRINTF("%51.57u%-81.105d%19p%0*.u%-51.11x" ,2526386784u,-1121272625,(void*)17872886342797110028lu,26,3857909561u,4144482682u) ASSERT_PRINTF("%#180x%0 142.d%+60.d%-122.25i" ,3179607536u,-708729510,1136972737,-769772092) - } +} -- cgit