diff options
author | Przemyslaw Skibinski <inikep@gmail.com> | 2016-11-03 14:28:50 (GMT) |
---|---|---|
committer | Przemyslaw Skibinski <inikep@gmail.com> | 2016-11-03 14:28:50 (GMT) |
commit | 74ba377d7220fce86df74bf83eca504c40b3212e (patch) | |
tree | 97436e56ce96fe20813fdff8722a5cdd153dc50f | |
parent | 9f15a4c6e6aa1d6aadfc87501576a4bf3d16c771 (diff) | |
download | lz4-74ba377d7220fce86df74bf83eca504c40b3212e.zip lz4-74ba377d7220fce86df74bf83eca504c40b3212e.tar.gz lz4-74ba377d7220fce86df74bf83eca504c40b3212e.tar.bz2 |
updated .travis.yml
-rw-r--r-- | .travis.yml | 34 | ||||
-rw-r--r-- | programs/Makefile | 4 | ||||
-rw-r--r-- | visual/VS2010/datagen/datagen.vcxproj | 8 |
3 files changed, 21 insertions, 25 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/programs/Makefile b/programs/Makefile index 8cb416c..59eb5e7 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -50,10 +50,6 @@ VOID = /dev/null endif -# Default test parameters -TEST_FILES := COPYING -FUZZER_TIME := -T9mn - default: lz4 diff --git a/visual/VS2010/datagen/datagen.vcxproj b/visual/VS2010/datagen/datagen.vcxproj index d64a3c2..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'"> |