fixed c_standards tests

and added entry "make list"
This commit is contained in:
Yann Collet 2017-05-10 14:51:09 -07:00
parent a902127613
commit 2012e4de9e
2 changed files with 16 additions and 11 deletions

View File

@ -56,7 +56,10 @@ endif
default: lib lz4-release
.PHONY: all
all: default examples manuals
all: allmost manuals
.PHONY: allmost
allmost: lib lz4 examples
.PHONY: lib
lib:
@ -68,7 +71,7 @@ lz4 lz4-release: lib
@cp $(PRGDIR)/lz4$(EXT) .
.PHONY: examples
examples: lib lz4-release
examples: lib lz4
$(MAKE) -C $(EXDIR) test
.PHONY: manuals
@ -116,6 +119,10 @@ endif
#------------------------------------------------------------------------
ifneq (,$(filter $(HOST_OS),MSYS POSIX))
.PHONY: list
list:
@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | xargs
.PHONY: test
test:
$(MAKE) -C $(TESTDIR) $@
@ -166,13 +173,10 @@ gpptest32: clean
CC=g++ $(MAKE) -C $(TESTDIR) native CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
c_standards: clean
$(MAKE) all MOREFLAGS="-std=gnu90 -Werror"
$(MAKE) clean
$(MAKE) all MOREFLAGS="-std=c99 -Werror"
$(MAKE) clean
$(MAKE) all MOREFLAGS="-std=gnu99 -Werror"
$(MAKE) clean
$(MAKE) all MOREFLAGS="-std=c11 -Werror"
$(MAKE) clean
# note : lz4 is not C90 compatible, because it requires long long support
CFLAGS="-std=gnu90 -Werror" $(MAKE) clean allmost
CFLAGS="-std=c99 -Werror" $(MAKE) clean allmost
CFLAGS="-std=gnu99 -Werror" $(MAKE) clean allmost
CFLAGS="-std=c11 -Werror" $(MAKE) clean allmost
endif

View File

@ -290,7 +290,8 @@ int basicTests(U32 seed, double compressibility)
{ size_t nullSize = 0;
size_t const fiError = LZ4F_getFrameInfo(dCtx, &fi, ip, &nullSize);
if (LZ4F_getErrorCode(fiError) != LZ4F_ERROR_frameHeader_incomplete) {
DISPLAYLEVEL(3, "incorrect error : %s != ERROR_frameHeader_incomplete \n", LZ4F_getErrorName(fiError));
DISPLAYLEVEL(3, "incorrect error : %s != ERROR_frameHeader_incomplete \n",
LZ4F_getErrorName(fiError));
goto _output_error;
}
DISPLAYLEVEL(3, " correctly failed : %s \n", LZ4F_getErrorName(fiError));