summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--Makefile10
-rw-r--r--NEWS3
-rw-r--r--programs/Makefile8
4 files changed, 19 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 4e975b5..8fabb1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,19 +3,21 @@ compiler: gcc
script: make test-travis
before_install:
- sudo apt-get update -qq
+ - sudo apt-get install -qq gcc-arm-linux-gnueabi
- sudo apt-get install -qq clang
- sudo apt-get install -qq g++-multilib
- sudo apt-get install -qq gcc-multilib
- sudo apt-get install -qq valgrind
env:
+ - LZ4_TRAVIS_CI_ENV=dist
- LZ4_TRAVIS_CI_ENV=travis-install
- LZ4_TRAVIS_CI_ENV=streaming-examples
- LZ4_TRAVIS_CI_ENV=cmake
- - LZ4_TRAVIS_CI_ENV=gpptest
- LZ4_TRAVIS_CI_ENV=clangtest
- LZ4_TRAVIS_CI_ENV=staticAnalyze
- - LZ4_TRAVIS_CI_ENV=dist
+ - LZ4_TRAVIS_CI_ENV=gpptest
+ - LZ4_TRAVIS_CI_ENV=armtest
- LZ4_TRAVIS_CI_ENV=test-lz4
- LZ4_TRAVIS_CI_ENV=test-lz4c
- LZ4_TRAVIS_CI_ENV=test-lz4c32
diff --git a/Makefile b/Makefile
index 5e6157f..451672b 100644
--- a/Makefile
+++ b/Makefile
@@ -127,15 +127,19 @@ test-travis: $(TRAVIS_TARGET)
cmake:
@cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
-gpptest: clean
- export CC=g++; export CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align"; $(MAKE) -e all
-
clangtest: clean
export CC=clang; $(MAKE) all
staticAnalyze: clean
export CFLAGS=-g; scan-build -v $(MAKE) all
+gpptest: clean
+ export CC=g++; export CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align"; $(MAKE) -e all
+
+armtest: clean
+ export CC=arm-linux-gnueabi-gcc; cd lib; $(MAKE) -e all
+ export CC=arm-linux-gnueabi-gcc; cd programs; $(MAKE) -e bins
+
streaming-examples:
cd examples; $(MAKE) -e test
diff --git a/NEWS b/NEWS
index aea9cd1..2eeb948 100644
--- a/NEWS
+++ b/NEWS
@@ -7,9 +7,10 @@ New : lz4frame & lz4cli frame content size support
New : lz4frame supports skippable frames
Changed:Default "make install" directory is /usr/local
New : lz4 cli supports "pass-through" mode
-New : g++ compatibility tests
New : datagen can generate sparse files
New : scan-build tests
+New : g++ compatibility tests
+New : arm cross-compilation test
Fixed : Fuzzer + frametest compatibility with NetBSD (issue #48)
Added : Visual project directory
Updated:Man page & Specification
diff --git a/programs/Makefile b/programs/Makefile
index a5ae8d3..a324148 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -61,9 +61,13 @@ endif
TRAVIS_TARGET=$(LZ4_TRAVIS_CI_ENV)
-default: lz4 lz4c
+default: lz4
-all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen
+m32: lz4c32 fullbench32 fuzzer32 frametest32
+
+bins: lz4 lz4c fullbench fuzzer frametest datagen
+
+all: bins m32
lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
$(CC) $(FLAGS) $^ -o $@$(EXT)