summaryrefslogtreecommitdiffstats
path: root/programs
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-09-01 14:59:24 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-09-01 14:59:24 (GMT)
commitfb6fece7704c7747d008c0afbc79d61671dcb1d6 (patch)
tree4d28c845226443ca5a63db4b0c188fe27023e44d /programs
parent13f12aa0276748e24a7fc8b01e227c68b4d4f56e (diff)
downloadlz4-fb6fece7704c7747d008c0afbc79d61671dcb1d6.zip
lz4-fb6fece7704c7747d008c0afbc79d61671dcb1d6.tar.gz
lz4-fb6fece7704c7747d008c0afbc79d61671dcb1d6.tar.bz2
Updated Makefile and .travis
Diffstat (limited to 'programs')
-rw-r--r--programs/Makefile12
-rw-r--r--programs/lz4.14
2 files changed, 5 insertions, 11 deletions
diff --git a/programs/Makefile b/programs/Makefile
index 0a6f91a..332fd01 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -38,7 +38,7 @@ RELEASE ?= r132
DESTDIR ?=
PREFIX ?= /usr/local
-CFLAGS ?= -O3 # can select your own settings, for example : CFLAGS="-O2 -g" make
+CFLAGS ?= -O3 # can select customized flags instead, for example : CFLAGS="-O2 -g" make
CFLAGS += -I../lib -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic
CPPFLAGS:= -DXXH_NAMESPACE=LZ4_ -DLZ4_VERSION=\"$(RELEASE)\"
FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
@@ -59,9 +59,7 @@ endif
# Select test target for Travis CI's Build Matrix
-TRAVIS_TARGET:= $(LZ4_TRAVIS_CI_ENV)
TEST_FILES := COPYING
-TEST_TARGETS := test-native
FUZZER_TIME := -T9mn
@@ -148,8 +146,6 @@ test32: test-lz4c32 test-frametest32 test-fullbench32 test-fuzzer32 test-mem32
test-all: test test32
-test-travis: $(TRAVIS_TARGET)
-
test-lz4-sparse: lz4 datagen
@echo "\n ---- test sparse file support ----"
./datagen -g5M -P100 > tmpSrc
@@ -164,7 +160,7 @@ test-lz4-sparse: lz4 datagen
./lz4 tmpSrc | ./lz4 -dv --no-sparse > tmpNoSparse
diff -s tmpSrc tmpNoSparse
ls -ls tmp*
- ./datagen -s1 -g1200007 -P100 | ./lz4 | ./lz4 -dv --sparse > tmpOdd # Odd size file (to not finish on an exact nb of blocks)
+ ./datagen -s1 -g1200007 -P100 | ./lz4 | ./lz4 -dv --sparse > tmpOdd # Odd size file (to generate non-full last block)
./datagen -s1 -g1200007 -P100 | diff -s - tmpOdd
ls -ls tmpOdd
@rm tmp*
@@ -182,8 +178,6 @@ test-lz4-sparse: lz4 datagen
diff tmp2M tmpR
@rm tmp*
-
-
test-lz4-contentSize: lz4 datagen
@echo "\n ---- test original size support ----"
./datagen -g15M > tmp
@@ -306,6 +300,6 @@ test-mem: lz4 datagen fuzzer frametest fullbench
valgrind --leak-check=yes --error-exitcode=1 ./frametest -i256
test-mem32: lz4c32 datagen
-# unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
+# unfortunately, valgrind doesn't seem to work with non-native binary...
endif
diff --git a/programs/lz4.1 b/programs/lz4.1
index 414da48..5c6eb32 100644
--- a/programs/lz4.1
+++ b/programs/lz4.1
@@ -1,6 +1,6 @@
\"
\" lz4.1: This is a manual page for 'lz4' program. This file is part of the
-\" lz4 <https://code.google.com/p/lz4/> project.
+\" lz4 <http://www.lz4.org/> project.
\" Author: Yann Collet
\"
@@ -215,7 +215,7 @@ This is default behavior anyway, so this option is just for compatibility with g
iteration loops [1-9](default : 3), benchmark mode only
.SH BUGS
-Report bugs at: https://github.com/Cyan4973/lz4
+Report bugs at: https://github.com/Cyan4973/lz4/issues
.SH AUTHOR
Yann Collet