summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml34
-rw-r--r--Makefile8
-rw-r--r--README.md4
-rw-r--r--doc/lz4_Block_format.md (renamed from lz4_Block_format.md)0
-rw-r--r--doc/lz4_Frame_format.md (renamed from lz4_Frame_format.md)0
-rw-r--r--lib/README.md2
-rw-r--r--lib/lz4.c2
-rw-r--r--lib/lz4.h4
-rw-r--r--lib/lz4frame.c2
-rw-r--r--lib/lz4frame.h2
-rw-r--r--lib/lz4frame_static.h2
-rw-r--r--lib/lz4hc.c2
-rw-r--r--lib/lz4hc.h2
-rw-r--r--programs/Makefile202
-rw-r--r--programs/README.md67
-rw-r--r--programs/bench.c2
-rw-r--r--programs/bench.h2
-rw-r--r--programs/datagen.c2
-rw-r--r--programs/datagen.h2
-rw-r--r--programs/lz4cli.c2
-rw-r--r--programs/lz4io.c2
-rw-r--r--programs/lz4io.h2
-rw-r--r--tests/COPYING339
-rw-r--r--tests/Makefile285
-rw-r--r--tests/README.md23
-rw-r--r--tests/datagencli.c (renamed from programs/datagencli.c)2
-rw-r--r--tests/frametest.c (renamed from programs/frametest.c)2
-rw-r--r--tests/fullbench.c (renamed from programs/fullbench.c)2
-rw-r--r--tests/fuzzer.c (renamed from programs/fuzzer.c)2
-rw-r--r--tests/test-lz4-versions.py (renamed from versionsTest/test-lz4-versions.py)15
-rw-r--r--versionsTest/Makefile40
-rw-r--r--visual/VS2010/datagen/datagen.vcxproj10
-rw-r--r--visual/VS2010/frametest/frametest.vcxproj2
-rw-r--r--visual/VS2010/fullbench/fullbench.vcxproj2
-rw-r--r--visual/VS2010/fuzzer/fuzzer.vcxproj2
35 files changed, 776 insertions, 297 deletions
diff --git a/.travis.yml b/.travis.yml
index 4966e11..2a0eaab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ matrix:
include:
# OS X Mavericks
- os: osx
- env: Ubu="OS X Mavericks" PARAMS='-C programs test-lz4 CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"' COMPILER=clang
+ env: Ubu="OS X Mavericks" PARAMS='-C tests test-lz4 CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"' COMPILER=clang
# Container-based 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
- os: linux
sudo: false
@@ -23,22 +23,22 @@ matrix:
env: Ubu="12.04cont" PARAMS=gpptest COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-lz4' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-lz4' COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-lz4 MOREFLAGS="-std=c99"' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-lz4 MOREFLAGS="-std=c99"' COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-lz4c' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-lz4c' COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-fullbench' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-fullbench' COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-fuzzer' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-fuzzer' COMPILER=cc
- os: linux
sudo: false
- env: Ubu="12.04cont" PARAMS='-C programs test-frametest' COMPILER=cc
+ env: Ubu="12.04cont" PARAMS='-C tests test-frametest' COMPILER=cc
# 14.04 LTS Server Edition 64 bit
- env: Ubu="14.04" PARAMS=sanitize COMPILER=clang
dist: trusty
@@ -72,10 +72,10 @@ matrix:
- python3
- libc6-dev-i386
- gcc-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-lz4' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4' COMPILER=cc
dist: trusty
sudo: required
- - env: Ubu="14.04" PARAMS='-C programs test-lz4c32' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4c32' COMPILER=cc
dist: trusty
sudo: required
addons:
@@ -83,7 +83,7 @@ matrix:
packages:
- libc6-dev-i386
- gcc-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-lz4 CC=gcc-5' COMPILER=gcc-5
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=gcc-5' COMPILER=gcc-5
dist: trusty
sudo: required
addons:
@@ -92,7 +92,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-5
- - env: Ubu="14.04" PARAMS='-C programs test-lz4c32 CC=gcc-5' COMPILER=gcc-5
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4c32 CC=gcc-5' COMPILER=gcc-5
dist: trusty
sudo: required
addons:
@@ -102,7 +102,7 @@ matrix:
packages:
- gcc-5
- gcc-5-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-lz4 CC=gcc-6' COMPILER=gcc-6
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=gcc-6' COMPILER=gcc-6
dist: trusty
sudo: required
addons:
@@ -111,7 +111,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-6
- - env: Ubu="14.04" PARAMS='-C programs test-lz4 CC=clang-3.8' COMPILER=clang-3.8
+ - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=clang-3.8' COMPILER=clang-3.8
dist: trusty
sudo: required
addons:
@@ -121,7 +121,7 @@ matrix:
- llvm-toolchain-precise-3.8
packages:
- clang-3.8
- - env: Ubu="14.04" PARAMS='-C programs test-fullbench32' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-fullbench32' COMPILER=cc
dist: trusty
sudo: required
addons:
@@ -129,7 +129,7 @@ matrix:
packages:
- libc6-dev-i386
- gcc-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-fuzzer32' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-fuzzer32' COMPILER=cc
dist: trusty
sudo: required
addons:
@@ -137,7 +137,7 @@ matrix:
packages:
- libc6-dev-i386
- gcc-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-frametest32' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-frametest32' COMPILER=cc
dist: trusty
sudo: required
addons:
@@ -145,7 +145,7 @@ matrix:
packages:
- libc6-dev-i386
- gcc-multilib
- - env: Ubu="14.04" PARAMS='-C programs test-mem' COMPILER=cc
+ - env: Ubu="14.04" PARAMS='-C tests test-mem' COMPILER=cc
dist: trusty
sudo: required
addons:
diff --git a/Makefile b/Makefile
index 518ffbd..6997b19 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR=$(PREFIX)/include
PRGDIR = programs
LZ4DIR = lib
+TESTDIR = tests
# Define nul output
@@ -64,9 +65,9 @@ lz4:
clean:
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
+ @$(MAKE) -C $(TESTDIR) $@ > $(VOID)
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
@$(MAKE) -C examples $@ > $(VOID)
- @$(MAKE) -C versionsTest $@ > $(VOID)
@$(RM) lz4$(EXT)
@echo Cleaning completed
@@ -88,7 +89,7 @@ travis-install:
sudo $(MAKE) install
test:
- $(MAKE) -C $(PRGDIR) test
+ $(MAKE) -C $(TESTDIR) test
cmake:
@cd contrib/cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
@@ -108,9 +109,10 @@ staticAnalyze: clean
armtest: clean
CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
+ CFLAGS="-O3 -Werror" $(MAKE) -C $(TESTDIR) bins CC=arm-linux-gnueabi-gcc
versionsTest: clean
- $(MAKE) -C versionsTest
+ $(MAKE) -C $(TESTDIR) $@
examples:
$(MAKE) -C $(LZ4DIR)
diff --git a/README.md b/README.md
index 753f11d..3f9cba6 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,6 @@ A list of known source ports is maintained on the [LZ4 Homepage].
[Open-Source Benchmark program by m^2 (v0.14.3)]: http://encode.ru/threads/1371-Filesystem-benchmark?p=34029&viewfull=1#post34029
[Silesia Corpus]: http://sun.aei.polsl.pl/~sdeor/index.php?page=silesia
-[lz4_Block_format]: lz4_Block_format.md
-[lz4_Frame_format]: lz4_Frame_format.md
+[lz4_Block_format]: doc/lz4_Block_format.md
+[lz4_Frame_format]: doc/lz4_Frame_format.md
[LZ4 Homepage]: http://www.lz4.org
diff --git a/lz4_Block_format.md b/doc/lz4_Block_format.md
index 0f6a5ba..0f6a5ba 100644
--- a/lz4_Block_format.md
+++ b/doc/lz4_Block_format.md
diff --git a/lz4_Frame_format.md b/doc/lz4_Frame_format.md
index 2ea1a86..2ea1a86 100644
--- a/lz4_Frame_format.md
+++ b/doc/lz4_Frame_format.md
diff --git a/lib/README.md b/lib/README.md
index f932d42..209cac1 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -37,4 +37,4 @@ Other files present in the directory are not source code. There are :
- liblz4.pc.in : for pkg-config (make install)
- README.md : this file
-[official interoperable frame format]: ../lz4_Frame_format.md
+[official interoperable frame format]: ../doc/lz4_Frame_format.md
diff --git a/lib/lz4.c b/lib/lz4.c
index 08128bb..5b7d71f 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -29,7 +29,7 @@
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
*/
diff --git a/lib/lz4.h b/lib/lz4.h
index 3ece4dd..fc27c95 100644
--- a/lib/lz4.h
+++ b/lib/lz4.h
@@ -30,7 +30,7 @@
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
*/
#ifndef LZ4_H_2983827168210
#define LZ4_H_2983827168210
@@ -44,7 +44,7 @@ extern "C" {
* Block compression functions are not-enough to send information,
* since it's still necessary to provide metadata (such as compressed size),
* and each application can do it in whichever way it wants.
- * For interoperability, there is LZ4 frame specification (lz4_Frame_format.md).
+ * For interoperability, there is LZ4 frame specification (doc/lz4_Frame_format.md).
* A library is provided to take care of it, see lz4frame.h.
*/
diff --git a/lib/lz4frame.c b/lib/lz4frame.c
index 9df2493..6bb76a1 100644
--- a/lib/lz4frame.c
+++ b/lib/lz4frame.c
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
-- LZ4 source repository : https://github.com/Cyan4973/lz4
+- LZ4 source repository : https://github.com/lz4/lz4
*/
/* LZ4F is a stand-alone API to create LZ4-compressed Frames
diff --git a/lib/lz4frame.h b/lib/lz4frame.h
index a70d0e0..79164b8 100644
--- a/lib/lz4frame.h
+++ b/lib/lz4frame.h
@@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/lib/lz4frame_static.h b/lib/lz4frame_static.h
index 0d90975..79e481c 100644
--- a/lib/lz4frame_static.h
+++ b/lib/lz4frame_static.h
@@ -29,7 +29,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/lib/lz4hc.c b/lib/lz4hc.c
index 68afa98..a1d1a55 100644
--- a/lib/lz4hc.c
+++ b/lib/lz4hc.c
@@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/lib/lz4hc.h b/lib/lz4hc.h
index 3995ada..4f676aa 100644
--- a/lib/lz4hc.h
+++ b/lib/lz4hc.h
@@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
#ifndef LZ4_HC_H_19834876238432
diff --git a/programs/Makefile b/programs/Makefile
index 26857c8..ba01b40 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -25,13 +25,6 @@
# lz4 : Command Line Utility, supporting gzip-like arguments
# lz4c : CLU, supporting also legacy lz4demo arguments
# lz4c32: Same as lz4c, but forced to compile in 32-bits mode
-# fuzzer : Test tool, to check lz4 integrity on target platform
-# fuzzer32: Same as fuzzer, but forced to compile in 32-bits mode
-# frametest : Test tool, to check lz4frame integrity on target platform
-# frametest32: Same as frametest, but forced to compile in 32-bits mode
-# fullbench : Precisely measure speed for each LZ4 function variant
-# fullbench32: Same as fullbench, but forced to compile in 32-bits mode
-# datagen : generates synthetic data samples for tests & benchmarks
# ##########################################################################
DESTDIR ?=
@@ -57,16 +50,12 @@ VOID = /dev/null
endif
-# Default test parameters
-TEST_FILES := COPYING
-FUZZER_TIME := -T9mn
-
default: lz4
-m32: lz4c32 fullbench32 fuzzer32 frametest32
+m32: lz4c32
-bins: lz4 lz4c fullbench fuzzer frametest datagen
+bins: lz4 lz4c
all: bins m32
@@ -79,35 +68,10 @@ lz4c : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.
lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
$(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
-fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
-
-fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
-
-fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
-
-fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
-
-frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
-
-frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
-
-datagen : datagen.o datagencli.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
-
clean:
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
@$(RM) core *.o *.test tmp* \
lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) \
- fullbench$(EXT) fullbench32$(EXT) \
- fuzzer$(EXT) fuzzer32$(EXT) \
- frametest$(EXT) frametest32$(EXT) \
- datagen$(EXT)
@echo Cleaning completed
@@ -141,166 +105,4 @@ uninstall:
@$(RM) $(DESTDIR)$(MANDIR)/unlz4.1
@echo lz4 programs successfully uninstalled
-test: test-lz4 test-lz4c test-frametest test-fullbench test-fuzzer test-mem
-
-test32: test-lz4c32 test-frametest32 test-fullbench32 test-fuzzer32 test-mem32
-
-test-all: test test32
-
-test-lz4-sparse: lz4 datagen
- @echo "\n ---- test sparse file support ----"
- ./datagen -g5M -P100 > tmpSrc
- ./lz4 -B4D tmpSrc | ./lz4 -dv --sparse > tmpB4
- diff -s tmpSrc tmpB4
- ./lz4 -B5D tmpSrc | ./lz4 -dv --sparse > tmpB5
- diff -s tmpSrc tmpB5
- ./lz4 -B6D tmpSrc | ./lz4 -dv --sparse > tmpB6
- diff -s tmpSrc tmpB6
- ./lz4 -B7D tmpSrc | ./lz4 -dv --sparse > tmpB7
- diff -s tmpSrc tmpB7
- ./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 generate non-full last block)
- ./datagen -s1 -g1200007 -P100 | diff -s - tmpOdd
- ls -ls tmpOdd
- @$(RM) tmp*
- @echo "\n Compatibility with Console :"
- echo "Hello World 1 !" | ./lz4 | ./lz4 -d -c
- echo "Hello World 2 !" | ./lz4 | ./lz4 -d | cat
- echo "Hello World 3 !" | ./lz4 --no-frame-crc | ./lz4 -d -c
- @echo "\n Compatibility with Append :"
- ./datagen -P100 -g1M > tmp1M
- cat tmp1M tmp1M > tmp2M
- ./lz4 -B5 -v tmp1M tmpC
- ./lz4 -d -v tmpC tmpR
- ./lz4 -d -v tmpC >> tmpR
- ls -ls tmp*
- diff tmp2M tmpR
- @$(RM) tmp*
-
-test-lz4-contentSize: lz4 datagen
- @echo "\n ---- test original size support ----"
- ./datagen -g15M > tmp
- ./lz4 -v tmp | ./lz4 -t
- ./lz4 -v --content-size tmp | ./lz4 -d > tmp2
- diff -s tmp tmp2
- # test large size [2-4] GB
- @./datagen -g3G -P100 | ./lz4 | ./lz4 --decompress --force --sparse - tmp
- @ls -ls tmp
- ./lz4 --quiet --content-size tmp | ./lz4 --verbose --decompress --force --sparse - tmp2
- @ls -ls tmp2
- @$(RM) tmp*
-
-test-lz4-frame-concatenation: lz4 datagen
- @echo "\n ---- test frame concatenation ----"
- @echo -n > empty.test
- @echo hi > nonempty.test
- cat nonempty.test empty.test nonempty.test > orig.test
- @./lz4 -zq empty.test > empty.lz4.test
- @./lz4 -zq nonempty.test > nonempty.lz4.test
- cat nonempty.lz4.test empty.lz4.test nonempty.lz4.test > concat.lz4.test
- ./lz4 -d concat.lz4.test > result.test
- sdiff orig.test result.test
- @$(RM) *.test
- @echo frame concatenation test completed
-
-test-lz4-multiple: lz4 datagen
- @echo "\n ---- test multiple files ----"
- @./datagen -s1 > tmp1 2> $(VOID)
- @./datagen -s2 -g100K > tmp2 2> $(VOID)
- @./datagen -s3 -g1M > tmp3 2> $(VOID)
- ./lz4 -f -m tmp*
- ls -ls tmp*
- @$(RM) tmp1 tmp2 tmp3
- ./lz4 -df -m *.lz4
- ls -ls tmp*
- ./lz4 -f -m tmp1 notHere tmp2; echo $$?
- @$(RM) tmp*
-
-test-lz4-basic: lz4 datagen
- @echo "\n ---- test lz4 basic compression/decompression ----"
- ./datagen -g0 | ./lz4 -v | ./lz4 -t
- ./datagen -g16KB | ./lz4 -9 | ./lz4 -t
- ./datagen -g20KB > tmpSrc
- ./lz4 < tmpSrc | ./lz4 -d > tmpRes
- diff -q tmpSrc tmpRes
- ./lz4 --no-frame-crc < tmpSrc | ./lz4 -d > tmpRes
- diff -q tmpSrc tmpRes
- ./datagen | ./lz4 | ./lz4 -t
- ./datagen -g6M -P99 | ./lz4 -9BD | ./lz4 -t
- ./datagen -g17M | ./lz4 -9v | ./lz4 -qt
- ./datagen -g33M | ./lz4 --no-frame-crc | ./lz4 -t
- ./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -t
- ./datagen -g6GB | ./lz4 -vqB5D | ./lz4 -qt
- ./datagen -g6GB | ./lz4 -vq9BD | ./lz4 -qt
- @$(RM) tmp*
-
-test-lz4: lz4 datagen test-lz4-basic test-lz4-multiple test-lz4-sparse test-lz4-contentSize test-lz4-frame-concatenation
- @echo "\n ---- test pass-through ----"
- ./datagen | ./lz4 -tf
-
-test-lz4c: lz4c datagen
- @echo "\n ---- test lz4c version ----"
- ./datagen -g256MB | ./lz4c -l -v | ./lz4c -t
-
-test-interop-32-64: lz4 lz4c32 datagen
- @echo "\n ---- test interoperability 32-bits -vs- 64 bits ----"
- ./datagen -g16KB | ./lz4c32 -9 | ./lz4 -t
- ./datagen -P10 | ./lz4 -9B4 | ./lz4c32 -t
- ./datagen | ./lz4c32 | ./lz4 -t
- ./datagen -g1M | ./lz4 -3B5 | ./lz4c32 -t
- ./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4 -qt
- ./datagen -g1G -P90 | ./lz4 | ./lz4c32 -t
- ./datagen -g6GB | ./lz4c32 -vq9BD | ./lz4 -qt
-
-test-lz4c32-basic: lz4c32 datagen
- @echo "\n ---- test lz4c32 32-bits version ----"
- ./datagen -g16KB | ./lz4c32 -9 | ./lz4c32 -t
- ./datagen | ./lz4c32 | ./lz4c32 -t
- ./datagen -g256MB | ./lz4c32 -vqB4D | ./lz4c32 -qt
- ./datagen -g6GB | ./lz4c32 -vqB5D | ./lz4c32 -qt
-
-test-lz4c32: test-lz4c32-basic test-interop-32-64
-
-test-fullbench: fullbench
- ./fullbench --no-prompt $(NB_LOOPS) $(TEST_FILES)
-
-test-fullbench32: fullbench32
- ./fullbench32 --no-prompt $(NB_LOOPS) $(TEST_FILES)
-
-test-fuzzer: fuzzer
- ./fuzzer $(FUZZER_TIME)
-
-test-fuzzer32: fuzzer32
- ./fuzzer32 $(FUZZER_TIME)
-
-test-frametest: frametest
- ./frametest $(FUZZER_TIME)
-
-test-frametest32: frametest32
- ./frametest32 $(FUZZER_TIME)
-
-test-mem: lz4 datagen fuzzer frametest fullbench
- @echo "\n ---- valgrind tests : memory analyzer ----"
- valgrind --leak-check=yes --error-exitcode=1 ./datagen -g50M > $(VOID)
- ./datagen -g16KB > tmp
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 -9 -BD -f tmp $(VOID)
- ./datagen -g16KB -s2 > tmp2
- ./datagen -g16KB -s3 > tmp3
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 --force --multiple tmp tmp2 tmp3
- ./datagen -g16MB > tmp
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 -9 -B5D -f tmp tmp2
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 -t tmp2
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 -bi1 tmp
- valgrind --leak-check=yes --error-exitcode=1 ./fullbench -i1 tmp tmp2
- ./datagen -g256MB > tmp
- valgrind --leak-check=yes --error-exitcode=1 ./lz4 -B4D -f -vq tmp $(VOID)
- $(RM) tmp*
- valgrind --leak-check=yes --error-exitcode=1 ./fuzzer -i64 -t1
- valgrind --leak-check=yes --error-exitcode=1 ./frametest -i256
-
-test-mem32: lz4c32 datagen
-# unfortunately, valgrind doesn't seem to work with non-native binary...
-
endif
diff --git a/programs/README.md b/programs/README.md
index a952c2f..7a5d2e2 100644
--- a/programs/README.md
+++ b/programs/README.md
@@ -1,6 +1,67 @@
-This directory `programs` contains source files
-to generate `lz4` command line utility,
-and many test tools, such as `fuzzer`, `fullbench` and such.
+Command Line Interface for LZ4 library
+============================================
+
+Command Line Interface (CLI) can be created using the `make` command without any additional parameters.
+There are however other Makefile targets that create different variations of CLI:
+- `lz4` : default CLI supporting gzip-like arguments
+- `lz4c` : Same as `lz4` with additional support for decompression of legacy lz4 versions
+- `lz4c32` : Same as `lz4c`, but forced to compile in 32-bits mode
+
+
+#### Aggregation of parameters
+CLI supports aggregation of parameters i.e. `-b1`, `-e18`, and `-i1` can be joined into `-b1e18i1`.
+
+
+
+#### Benchmark in Command Line Interface
+CLI includes in-memory compression benchmark module for lz4.
+The benchmark is conducted using a given filename.
+The file is read into memory.
+It makes benchmark more precise as it eliminates I/O overhead.
+
+The benchmark measures ratio, compressed size, compression and decompression speed.
+One can select compression levels starting from `-b` and ending with `-e`.
+The `-i` parameter selects a number of iterations used for each of tested levels.
+
+
+
+#### Usage of Command Line Interface
+The full list of options can be obtained with `-h` or `-H` parameter:
+```
+Usage :
+ lz4 [arg] [input] [output]
+
+input : a filename
+ with no FILE, or when FILE is - or stdin, read standard input
+Arguments :
+ -1 : Fast compression (default)
+ -9 : High compression
+ -d : decompression (default for .lz4 extension)
+ -z : force compression
+ -f : overwrite output without prompting
+ -h/-H : display help/long help and exit
+
+Advanced arguments :
+ -V : display Version number and exit
+ -v : verbose mode
+ -q : suppress warnings; specify twice to suppress errors too
+ -c : force write to standard output, even if it is the console
+ -t : test compressed file integrity
+ -m : multiple input files (implies automatic output filenames)
+ -l : compress using Legacy format (Linux kernel compression)
+ -B# : Block size [4-7](default : 7)
+ -BD : Block dependency (improve compression ratio)
+--no-frame-crc : disable stream checksum (default:enabled)
+--content-size : compressed frame includes original size (default:not present)
+--[no-]sparse : sparse mode (default:enabled on file, disabled on stdout)
+Benchmark arguments :
+Benchmark arguments :
+ -b# : benchmark file(s), using # compression level (default : 1)
+ -e# : test all compression levels from -bX to # (default: 1)
+ -i# : iteration loops [1-9](default : 3), benchmark mode only
+ ```
+
+#### License
All files in this directory are licensed under GPL-v2.
See [COPYING](COPYING) for details.
diff --git a/programs/bench.c b/programs/bench.c
index 5952f47..bec93f9 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -20,7 +20,7 @@
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
*/
/*-************************************
diff --git a/programs/bench.h b/programs/bench.h
index 1e3df78..e84aaee 100644
--- a/programs/bench.h
+++ b/programs/bench.h
@@ -17,7 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
#pragma once
diff --git a/programs/datagen.c b/programs/datagen.c
index 5e4cdd2..d851418 100644
--- a/programs/datagen.c
+++ b/programs/datagen.c
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- Public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/programs/datagen.h b/programs/datagen.h
index 2bf3d7f..680afa2 100644
--- a/programs/datagen.h
+++ b/programs/datagen.h
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- Public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/programs/lz4cli.c b/programs/lz4cli.c
index 961bea1..7cf035e 100644
--- a/programs/lz4cli.c
+++ b/programs/lz4cli.c
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
/*
diff --git a/programs/lz4io.c b/programs/lz4io.c
index 98002a4..f2d7b51 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
/*
diff --git a/programs/lz4io.h b/programs/lz4io.h
index 11c8fdb..4f0e02a 100644
--- a/programs/lz4io.h
+++ b/programs/lz4io.h
@@ -18,7 +18,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
/*
diff --git a/tests/COPYING b/tests/COPYING
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/tests/COPYING
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..d7a195a
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,285 @@
+# ##########################################################################
+# LZ4 programs - Makefile
+# Copyright (C) Yann Collet 2011-2016
+#
+# GPL v2 License
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# You can contact the author at :
+# - LZ4 homepage : http://www.lz4.org
+# - LZ4 source repository : https://github.com/lz4/lz4
+# ##########################################################################
+# fuzzer : Test tool, to check lz4 integrity on target platform
+# fuzzer32: Same as fuzzer, but forced to compile in 32-bits mode
+# frametest : Test tool, to check lz4frame integrity on target platform
+# frametest32: Same as frametest, but forced to compile in 32-bits mode
+# fullbench : Precisely measure speed for each LZ4 function variant
+# fullbench32: Same as fullbench, but forced to compile in 32-bits mode
+# datagen : generates synthetic data samples for tests & benchmarks
+# ##########################################################################
+
+DESTDIR ?=
+PREFIX ?= /usr/local
+BINDIR := $(PREFIX)/bin
+MANDIR := $(PREFIX)/share/man/man1
+LZ4DIR := ../lib
+PRGDIR := ../programs
+TESTDIR := versionsTest
+PYTHON?= python3
+
+CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make
+CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes
+CFLAGS += $(MOREFLAGS)
+CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ -DLZ4_DLL_EXPORT=1
+FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+
+# Define *.exe as extension for Windows systems
+ifneq (,$(filter Windows%,$(OS)))
+EXT =.exe
+VOID = nul
+else
+EXT =
+VOID = /dev/null
+endif
+
+
+# Default test parameters
+TEST_FILES := COPYING
+FUZZER_TIME := -T9mn
+
+
+default: bins
+
+m32: fullbench32 fuzzer32 frametest32
+
+bins: fullbench fuzzer frametest datagen
+
+all: bins m32
+
+
+lz4:
+ $(MAKE) -C $(PRGDIR) $@
+
+lz4c:
+ $(MAKE) -C $(PRGDIR) $@
+
+lz4c32:
+ $(MAKE) -C $(PRGDIR) $@
+
+fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c
+ $(CC) $(FLAGS) $^ -o $@$(EXT)
+
+fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+
+fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c
+ $(CC) $(FLAGS) $^ -o $@$(EXT)
+
+fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+
+frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c
+ $(CC) $(FLAGS) $^ -o $@$(EXT)
+
+frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+
+datagen : $(PRGDIR)/datagen.c datagencli.c
+ $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT)
+
+clean:
+ @$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
+ @$(RM) core *.o *.test tmp* \
+ fullbench$(EXT) fullbench32$(EXT) \
+ fuzzer$(EXT) fuzzer32$(EXT) \
+ frametest$(EXT) frametest32$(EXT) \
+ datagen$(EXT)
+ @rm -fR $(TESTDIR)
+ @echo Cleaning completed
+
+versionsTest:
+ $(PYTHON) test-lz4-versions.py
+
+
+#------------------------------------------------------------------------
+#make install is validated only for Linux, OSX, kFreeBSD, Hurd and
+#FreeBSD targets
+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))
+
+test: test-lz4 test-lz4c test-frametest test-fullbench test-fuzzer test-mem
+
+test32: test-lz4c32 test-frametest32 test-fullbench32 test-fuzzer32 test-mem32
+
+test-all: test test32
+
+test-lz4-sparse: lz4 datagen
+ @echo "\n ---- test sparse file support ----"
+ ./datagen -g5M -P100 > tmpSrc
+ $(PRGDIR)/lz4 -B4D tmpSrc | $(PRGDIR)/lz4 -dv --sparse > tmpB4
+ diff -s tmpSrc tmpB4
+ $(PRGDIR)/lz4 -B5D tmpSrc | $(PRGDIR)/lz4 -dv --sparse > tmpB5
+ diff -s tmpSrc tmpB5
+ $(PRGDIR)/lz4 -B6D tmpSrc | $(PRGDIR)/lz4 -dv --sparse > tmpB6
+ diff -s tmpSrc tmpB6
+ $(PRGDIR)/lz4 -B7D tmpSrc | $(PRGDIR)/lz4 -dv --sparse > tmpB7
+ diff -s tmpSrc tmpB7
+ $(PRGDIR)/lz4 tmpSrc | $(PRGDIR)/lz4 -dv --no-sparse > tmpNoSparse
+ diff -s tmpSrc tmpNoSparse
+ ls -ls tmp*
+ ./datagen -s1 -g1200007 -P100 | $(PRGDIR)/lz4 | $(PRGDIR)/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*
+ @echo "\n Compatibility with Console :"
+ echo "Hello World 1 !" | $(PRGDIR)/lz4 | $(PRGDIR)/lz4 -d -c
+ echo "Hello World 2 !" | $(PRGDIR)/lz4 | $(PRGDIR)/lz4 -d | cat
+ echo "Hello World 3 !" | $(PRGDIR)/lz4 --no-frame-crc | $(PRGDIR)/lz4 -d -c
+ @echo "\n Compatibility with Append :"
+ ./datagen -P100 -g1M > tmp1M
+ cat tmp1M tmp1M > tmp2M
+ $(PRGDIR)/lz4 -B5 -v tmp1M tmpC
+ $(PRGDIR)/lz4 -d -v tmpC tmpR
+ $(PRGDIR)/lz4 -d -v tmpC >> tmpR
+ ls -ls tmp*
+ diff tmp2M tmpR
+ @$(RM) tmp*
+
+test-lz4-contentSize: lz4 datagen
+ @echo "\n ---- test original size support ----"
+ ./datagen -g15M > tmp
+ $(PRGDIR)/lz4 -v tmp | $(PRGDIR)/lz4 -t
+ $(PRGDIR)/lz4 -v --content-size tmp | $(PRGDIR)/lz4 -d > tmp2
+ diff -s tmp tmp2
+ # test large size [2-4] GB
+ @./datagen -g3G -P100 | $(PRGDIR)/lz4 | $(PRGDIR)/lz4 --decompress --force --sparse - tmp
+ @ls -ls tmp
+ $(PRGDIR)/lz4 --quiet --content-size tmp | $(PRGDIR)/lz4 --verbose --decompress --force --sparse - tmp2
+ @ls -ls tmp2
+ @$(RM) tmp*
+
+test-lz4-frame-concatenation: lz4 datagen
+ @echo "\n ---- test frame concatenation ----"
+ @echo -n > empty.test
+ @echo hi > nonempty.test
+ cat nonempty.test empty.test nonempty.test > orig.test
+ @$(PRGDIR)/lz4 -zq empty.test > empty.lz4.test
+ @$(PRGDIR)/lz4 -zq nonempty.test > nonempty.lz4.test
+ cat nonempty.lz4.test empty.lz4.test nonempty.lz4.test > concat.lz4.test
+ $(PRGDIR)/lz4 -d concat.lz4.test > result.test
+ sdiff orig.test result.test
+ @$(RM) *.test
+ @echo frame concatenation test completed
+
+test-lz4-multiple: lz4 datagen
+ @echo "\n ---- test multiple files ----"
+ @./datagen -s1 > tmp1 2> $(VOID)
+ @./datagen -s2 -g100K > tmp2 2> $(VOID)
+ @./datagen -s3 -g1M > tmp3 2> $(VOID)
+ $(PRGDIR)/lz4 -f -m tmp*
+ ls -ls tmp*
+ @$(RM) tmp1 tmp2 tmp3
+ $(PRGDIR)/lz4 -df -m *.lz4
+ ls -ls tmp*
+ $(PRGDIR)/lz4 -f -m tmp1 notHere tmp2; echo $$?
+ @$(RM) tmp*
+
+test-lz4-basic: lz4 datagen
+ @echo "\n ---- test lz4 basic compression/decompression ----"
+ ./datagen -g0 | $(PRGDIR)/lz4 -v | $(PRGDIR)/lz4 -t
+ ./datagen -g16KB | $(PRGDIR)/lz4 -9 | $(PRGDIR)/lz4 -t
+ ./datagen -g20KB > tmpSrc
+ $(PRGDIR)/lz4 < tmpSrc | $(PRGDIR)/lz4 -d > tmpRes
+ diff -q tmpSrc tmpRes
+ $(PRGDIR)/lz4 --no-frame-crc < tmpSrc | $(PRGDIR)/lz4 -d > tmpRes
+ diff -q tmpSrc tmpRes
+ ./datagen | $(PRGDIR)/lz4 | $(PRGDIR)/lz4 -t
+ ./datagen -g6M -P99 | $(PRGDIR)/lz4 -9BD | $(PRGDIR)/lz4 -t
+ ./datagen -g17M | $(PRGDIR)/lz4 -9v | $(PRGDIR)/lz4 -qt
+ ./datagen -g33M | $(PRGDIR)/lz4 --no-frame-crc | $(PRGDIR)/lz4 -t
+ ./datagen -g256MB | $(PRGDIR)/lz4 -vqB4D | $(PRGDIR)/lz4 -t
+ ./datagen -g6GB | $(PRGDIR)/lz4 -vqB5D | $(PRGDIR)/lz4 -qt
+ ./datagen -g6GB | $(PRGDIR)/lz4 -vq9BD | $(PRGDIR)/lz4 -qt
+ @$(RM) tmp*
+
+test-lz4: lz4 datagen test-lz4-basic test-lz4-multiple test-lz4-sparse test-lz4-contentSize test-lz4-frame-concatenation
+ @echo "\n ---- test pass-through ----"
+ ./datagen | $(PRGDIR)/lz4 -tf
+
+test-lz4c: lz4c datagen
+ @echo "\n ---- test lz4c version ----"
+ ./datagen -g256MB | $(PRGDIR)/lz4c -l -v | $(PRGDIR)/lz4c -t
+
+test-interop-32-64: lz4 lz4c32 datagen
+ @echo "\n ---- test interoperability 32-bits -vs- 64 bits ----"
+ ./datagen -g16KB | $(PRGDIR)/lz4c32 -9 | $(PRGDIR)/lz4 -t
+ ./datagen -P10 | $(PRGDIR)/lz4 -9B4 | $(PRGDIR)/lz4c32 -t
+ ./datagen | $(PRGDIR)/lz4c32 | $(PRGDIR)/lz4 -t
+ ./datagen -g1M | $(PRGDIR)/lz4 -3B5 | $(PRGDIR)/lz4c32 -t
+ ./datagen -g256MB | $(PRGDIR)/lz4c32 -vqB4D | $(PRGDIR)/lz4 -qt
+ ./datagen -g1G -P90 | $(PRGDIR)/lz4 | $(PRGDIR)/lz4c32 -t
+ ./datagen -g6GB | $(PRGDIR)/lz4c32 -vq9BD | $(PRGDIR)/lz4 -qt
+
+test-lz4c32-basic: lz4c32 datagen
+ @echo "\n ---- test lz4c32 32-bits version ----"
+ ./datagen -g16KB | $(PRGDIR)/lz4c32 -9 | $(PRGDIR)/lz4c32 -t
+ ./datagen | $(PRGDIR)/lz4c32 | $(PRGDIR)/lz4c32 -t
+ ./datagen -g256MB | $(PRGDIR)/lz4c32 -vqB4D | $(PRGDIR)/lz4c32 -qt
+ ./datagen -g6GB | $(PRGDIR)/lz4c32 -vqB5D | $(PRGDIR)/lz4c32 -qt
+
+test-lz4c32: test-lz4c32-basic test-interop-32-64
+
+test-fullbench: fullbench
+ ./fullbench --no-prompt $(NB_LOOPS) $(TEST_FILES)
+
+test-fullbench32: fullbench32
+ ./fullbench32 --no-prompt $(NB_LOOPS) $(TEST_FILES)
+
+test-fuzzer: fuzzer
+ ./fuzzer $(FUZZER_TIME)
+
+test-fuzzer32: fuzzer32
+ ./fuzzer32 $(FUZZER_TIME)
+
+test-frametest: frametest
+ ./frametest $(FUZZER_TIME)
+
+test-frametest32: frametest32
+ ./frametest32 $(FUZZER_TIME)
+
+test-mem: lz4 datagen fuzzer frametest fullbench
+ @echo "\n ---- valgrind tests : memory analyzer ----"
+ valgrind --leak-check=yes --error-exitcode=1 ./datagen -g50M > $(VOID)
+ ./datagen -g16KB > tmp
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 -9 -BD -f tmp $(VOID)
+ ./datagen -g16KB -s2 > tmp2
+ ./datagen -g16KB -s3 > tmp3
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 --force --multiple tmp tmp2 tmp3
+ ./datagen -g16MB > tmp
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 -9 -B5D -f tmp tmp2
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 -t tmp2
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 -bi1 tmp
+ valgrind --leak-check=yes --error-exitcode=1 ./fullbench -i1 tmp tmp2
+ ./datagen -g256MB > tmp
+ valgrind --leak-check=yes --error-exitcode=1 $(PRGDIR)/lz4 -B4D -f -vq tmp $(VOID)
+ $(RM) tmp*
+ valgrind --leak-check=yes --error-exitcode=1 ./fuzzer -i64 -t1
+ valgrind --leak-check=yes --error-exitcode=1 ./frametest -i256
+
+test-mem32: lz4c32 datagen
+# unfortunately, valgrind doesn't seem to work with non-native binary...
+
+endif
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000..9070317
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,23 @@
+Programs and scripts for automated testing of LZ4
+=======================================================
+
+This directory contains the following programs and scripts:
+- `datagen` : Synthetic and parametrable data generator, for tests
+- `frametest` : Test tool that checks lz4frame integrity on target platform
+- `fullbench` : Precisely measure speed for each lz4 inner functions
+- `fuzzer` : Test tool, to check lz4 integrity on target platform
+- `test-lz4-versions.py` : compatibility test between lz4 versions stored on Github
+
+
+#### `test-lz4-versions.py` - script for testing lz4 interoperability between versions
+
+This script creates `versionsTest` directory to which lz4 repository is cloned.
+Then all taged (released) versions of lz4 are compiled.
+In the following step interoperability between lz4 versions is checked.
+
+
+#### License
+
+All files in this directory are licensed under GPL-v2.
+See [COPYING](COPYING) for details.
+The text of the license is also included at the top of each source file.
diff --git a/programs/datagencli.c b/tests/datagencli.c
index 2fbcc50..d74d5dd 100644
--- a/programs/datagencli.c
+++ b/tests/datagencli.c
@@ -20,7 +20,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- Public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/programs/frametest.c b/tests/frametest.c
index 4322ab8..ccf4278 100644
--- a/programs/frametest.c
+++ b/tests/frametest.c
@@ -20,7 +20,7 @@
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
*/
/*-************************************
diff --git a/programs/fullbench.c b/tests/fullbench.c
index ab6bba1..67442b2 100644
--- a/programs/fullbench.c
+++ b/tests/fullbench.c
@@ -19,7 +19,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You can contact the author at :
- - LZ4 source repository : https://github.com/Cyan4973/lz4
+ - LZ4 source repository : https://github.com/lz4/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
diff --git a/programs/fuzzer.c b/tests/fuzzer.c
index db7ad07..bbf4e14 100644
--- a/programs/fuzzer.c
+++ b/tests/fuzzer.c
@@ -20,7 +20,7 @@
You can contact the author at :
- LZ4 homepage : http://www.lz4.org
- - LZ4 source repo : https://github.com/Cyan4973/lz4
+ - LZ4 source repo : https://github.com/lz4/lz4
*/
/*-************************************
diff --git a/versionsTest/test-lz4-versions.py b/tests/test-lz4-versions.py
index ec2b7b2..54b7e13 100644
--- a/versionsTest/test-lz4-versions.py
+++ b/tests/test-lz4-versions.py
@@ -1,4 +1,11 @@
#!/usr/bin/env python3
+"""Test LZ4 interoperability between versions"""
+
+#
+# Copyright (C) 2011-present, Takayuki Matsuoka
+# All rights reserved.
+# GPL v2 License
+#
import glob
import subprocess
@@ -8,8 +15,8 @@ import shutil
import sys
import hashlib
-repo_url = 'https://github.com/Cyan4973/lz4.git'
-tmp_dir_name = 'versionsTest/lz4test'
+repo_url = 'https://github.com/lz4/lz4.git'
+tmp_dir_name = 'tests/versionsTest'
make_cmd = 'make'
git_cmd = 'git'
test_dat_src = 'README.md'
@@ -46,8 +53,8 @@ def sha1_of_file(filepath):
if __name__ == '__main__':
error_code = 0
base_dir = os.getcwd() + '/..' # /path/to/lz4
- tmp_dir = base_dir + '/' + tmp_dir_name # /path/to/lz4/versionsTest/lz4test
- clone_dir = tmp_dir + '/' + 'lz4' # /path/to/lz4/versionsTest/lz4test/lz4
+ tmp_dir = base_dir + '/' + tmp_dir_name # /path/to/lz4/tests/versionsTest
+ clone_dir = tmp_dir + '/' + 'lz4' # /path/to/lz4/tests/versionsTest/lz4
programs_dir = base_dir + '/programs' # /path/to/lz4/programs
os.makedirs(tmp_dir, exist_ok=True)
diff --git a/versionsTest/Makefile b/versionsTest/Makefile
deleted file mode 100644
index 2ce719a..0000000
--- a/versionsTest/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# ##########################################################################
-# LZ4 tests - Makefile
-# Copyright (C) Takayuki Matsuoka - Yann Collet 2011-2015
-#
-# GPL v2 License
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# You can contact the author at :
-# - LZ4 source repository : https://github.com/Cyan4973/lz4
-# - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-# ##########################################################################
-# versionstest : Compatibility test between LZ4 versions stored on Github (r116+)
-# ##########################################################################
-
-PYTHON?= python3
-TESTDIR := lz4test
-
-default: all
-
-all: versionsTest
-
-versionsTest:
- $(PYTHON) test-lz4-versions.py
-
-clean:
- @rm -fR $(TESTDIR)
- @echo Cleaning completed
diff --git a/visual/VS2010/datagen/datagen.vcxproj b/visual/VS2010/datagen/datagen.vcxproj
index 74aabba..4d7516e 100644
--- a/visual/VS2010/datagen/datagen.vcxproj
+++ b/visual/VS2010/datagen/datagen.vcxproj
@@ -65,20 +65,20 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
+ <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
+ <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
+ <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
- <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
+ <IncludePath>$(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -153,7 +153,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\programs\datagen.c" />
- <ClCompile Include="..\..\..\programs\datagencli.c" />
+ <ClCompile Include="..\..\..\tests\datagencli.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\programs\datagen.h" />
diff --git a/visual/VS2010/frametest/frametest.vcxproj b/visual/VS2010/frametest/frametest.vcxproj
index b44a3e6..5def90e 100644
--- a/visual/VS2010/frametest/frametest.vcxproj
+++ b/visual/VS2010/frametest/frametest.vcxproj
@@ -156,7 +156,7 @@
<ClCompile Include="..\..\..\lib\lz4frame.c" />
<ClCompile Include="..\..\..\lib\lz4hc.c" />
<ClCompile Include="..\..\..\lib\xxhash.c" />
- <ClCompile Include="..\..\..\programs\frametest.c" />
+ <ClCompile Include="..\..\..\tests\frametest.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\lib\lz4.h" />
diff --git a/visual/VS2010/fullbench/fullbench.vcxproj b/visual/VS2010/fullbench/fullbench.vcxproj
index 84b22c6..3d858a3 100644
--- a/visual/VS2010/fullbench/fullbench.vcxproj
+++ b/visual/VS2010/fullbench/fullbench.vcxproj
@@ -156,7 +156,7 @@
<ClCompile Include="..\..\..\lib\lz4frame.c" />
<ClCompile Include="..\..\..\lib\lz4hc.c" />
<ClCompile Include="..\..\..\lib\xxhash.c" />
- <ClCompile Include="..\..\..\programs\fullbench.c" />
+ <ClCompile Include="..\..\..\tests\fullbench.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\lib\lz4.h" />
diff --git a/visual/VS2010/fuzzer/fuzzer.vcxproj b/visual/VS2010/fuzzer/fuzzer.vcxproj
index 9b36c8a..2b2d58d 100644
--- a/visual/VS2010/fuzzer/fuzzer.vcxproj
+++ b/visual/VS2010/fuzzer/fuzzer.vcxproj
@@ -155,7 +155,7 @@
<ClCompile Include="..\..\..\lib\lz4.c" />
<ClCompile Include="..\..\..\lib\lz4hc.c" />
<ClCompile Include="..\..\..\lib\xxhash.c" />
- <ClCompile Include="..\..\..\programs\fuzzer.c" />
+ <ClCompile Include="..\..\..\tests\fuzzer.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\lib\lz4.h" />
generated by cgit v0.12 at 2024-08-21 08:22:17 (GMT)