X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=43c16571c84f582f686f40b12c313fbb33ef40cd;hb=25a7ddd22983c5562fb0d9dffbb7a2eabb371b7d;hp=772c1e27fb2fc755f4f30aa868d04db7939c66ff;hpb=69b20c9293697ef467cd4c0cadcad9cc4bcdc488;p=pdclib

diff --git a/Makefile b/Makefile
index 772c1e2..43c1657 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SRCFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.c")
 # All header files of the project
 HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
 # All .c files in functions/_PDCLIB that do not have a regression test driver
-INTFILES := _Exit atomax digits open print remove rename seed stdinit strtox_main strtox_prelim cleanstream fflush filemode
+INTFILES := _Exit atomax digits open print scan remove rename seed stdinit strtox_main strtox_prelim filemode eol errno seek prepread prepwrite allocpages tmpfilename closeall
 # All object files in the library
 OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
 # All test drivers (.t)
@@ -29,13 +29,27 @@ ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 PATCHFILES1 := $(shell ls platform/$(PLATFORM)/functions/_PDCLIB/*.c)
 # All files in platform/$(PLATFORM)/functions/stdlib (for development only)
 PATCHFILES2 := $(shell ls platform/$(PLATFORM)/functions/stdlib/*.c)
+# All files in platform/$(PLATFORM)/functions/stdio (for development only)
+PATCHFILES3 := $(shell ls platform/$(PLATFORM)/functions/stdio/*.c)
 
-WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wconversion -fno-builtin 
-CFLAGS := -g -std=c99 -I./internals $(WARNINGS) $(USERFLAGS)
+WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -fno-builtin 
+CFLAGS := -g -std=c99 -I./internals -I./testing $(WARNINGS) $(USERFLAGS)
 
 .PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
 
-all: pdclib.a
+all: pdclib.a testdrivers regtestdrivers
+	@echo
+	@echo "========================"
+	@echo "Executing library tests:"
+	@echo "========================"
+	@echo
+	@$(MAKE) tests | grep -v "^ TST" | grep -v "^Failed"
+	@echo
+	@echo "==========================="
+	@echo "Executing regression tests:"
+	@echo "==========================="
+	@echo
+	@$(MAKE) regtests | grep -v "^ RTST" | grep -v "^Failed"
 
 pdclib.a: $(OBJFILES)
 	@echo " AR	$@"
@@ -46,19 +60,21 @@ test: functions/$(FILE)
 	functions/$(FILE)
 
 tests: testdrivers
-	-@rc=0; count=0; failed=""; echo; for file in $(TSTFILES); do echo " TST	$$file"; ./$$file; test=$$?; if [ $$test != 0 ]; then rc=`expr $$rc + $$test`; failed="$$failed $$file"; fi; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking PDCLib): $$count  Tests failed: $$rc"; echo; for file in $$failed; do echo "Failed: $$file"; done;
+	-@rc=0; count=0; failed=""; for file in $(TSTFILES); do echo " TST	$$file"; ./$$file; test=$$?; if [ $$test != 0 ]; then rc=`expr $$rc + $$test`; failed="$$failed $$file"; fi; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking PDCLib): $$count  Tests failed: $$rc"; echo; for file in $$failed; do echo "Failed: $$file"; done; echo
 
 testdrivers: $(TSTFILES)
+	@echo
 
 regtests: regtestdrivers
-	-@rc=0; count=0; failed=""; echo; for file in $(REGFILES); do echo " RTST	$$file"; ./$$file; test=$$?; if [ $$test != 0 ]; then rc=`expr $$rc + $$test`; failed="$$failed $$file"; fi; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking system libc): $$count  Tests failed: $$rc"; echo; for file in $$failed; do echo "Failed: $$file"; done;
+	-@rc=0; count=0; failed=""; for file in $(REGFILES); do echo " RTST	$$file"; ./$$file; test=$$?; if [ $$test != 0 ]; then rc=`expr $$rc + $$test`; failed="$$failed $$file"; fi; count=`expr $$count + 1`; done; echo; echo "Tests executed (linking system libc): $$count  Tests failed: $$rc"; echo; for file in $$failed; do echo "Failed: $$file"; done; echo
 
 regtestdrivers: $(REGFILES)
+	@echo
 
 -include $(DEPFILES)
 
 clean:
-	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz; do if [ -f $$file ]; then rm $$file; fi; done
+	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz scanf_testdata_*; do if [ -f $$file ]; then rm $$file; fi; done
 
 srcdist:
 	@tar czf pdclib.tgz $(ALLFILES)
@@ -70,21 +86,25 @@ fixmes:
 	-@for file in $(ALLFILES); do grep -H FIXME $$file; done; true
 
 find:
-	@find functions/ includes/ internals/ platform/ old_stdio/ -name "*\.[ch]" -type f | xargs grep $$FIND
+	@find functions/ includes/ internals/ platform/ -name "*\.[ch]" -type f | xargs grep $$FIND
 
 links:
 	@echo "Linking platform/$(PLATFORM)..."
 	@cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
 	@cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h
+	@cd testing && ln -s ../platform/$(PLATFORM)/testing/printf_reference.txt
 	@cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
 	@cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
+	@cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
 
 unlink:
 	@echo "Unlinking platform files..."
 	@if [ -f internals/_PDCLIB_config.h ]; then rm internals/_PDCLIB_config.h; fi
 	@if [ -f includes/float.h ]; then rm includes/float.h; fi
+	@if [ -f testing/printf_reference.txt ]; then rm testing/printf_reference.txt; fi
 	@cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
 	@cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
+	@cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
 
 help:
 	@echo "Available make targets:"
@@ -112,7 +132,7 @@ help:
 
 %.o: %.c Makefile
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -MMD -MP -MT "$*.d $*.t" -I./includes -c $< -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -MT "$*.d $*.t $*.o" -I./includes -c $< -o $@
 
 %.t: %.c Makefile pdclib.a
 	@echo " CC	$(patsubst functions/%,%,$@)"