ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed cmaketest

Browse Source
This commit is contained in:
Yann Collet
2016-05-30 18:50:28 +02:00
parent b880631aed
commit 118bfc4ccb
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+13 -11
View File
@@ -2,19 +2,19 @@
# zstd - Makefile # zstd - Makefile
# Copyright (C) Yann Collet 2014-2016 # Copyright (C) Yann Collet 2014-2016
# All rights reserved. # All rights reserved.
# #
# BSD license # BSD license
# #
# Redistribution and use in source and binary forms, with or without modification, # Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met: # are permitted provided that the following conditions are met:
# #
# * Redistributions of source code must retain the above copyright notice, this # * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer. # list of conditions and the following disclaimer.
# #
# * Redistributions in binary form must reproduce the above copyright notice, this # * Redistributions in binary form must reproduce the above copyright notice, this
# list of conditions and the following disclaimer in the documentation and/or # list of conditions and the following disclaimer in the documentation and/or
# other materials provided with the distribution. # other materials provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,7 +25,7 @@
# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
# You can contact the author at : # You can contact the author at :
# - zstd homepage : http://www.zstd.net/ # - zstd homepage : http://www.zstd.net/
# ################################################################ # ################################################################
@@ -44,7 +44,7 @@ endif
default: zstdprogram default: zstdprogram
all: all:
$(MAKE) -C $(ZSTDDIR) $@ $(MAKE) -C $(ZSTDDIR) $@
$(MAKE) -C $(PRGDIR) $@ $(MAKE) -C $(PRGDIR) $@
@@ -76,6 +76,8 @@ travis-install:
$(MAKE) install PREFIX=~/install_test_dir $(MAKE) install PREFIX=~/install_test_dir
cmaketest: cmaketest:
rm -rf projects/cmake/build
mkdir projects/cmake/build
cd projects/cmake/build ; cmake .. ; $(MAKE) cd projects/cmake/build ; cmake .. ; $(MAKE)
clangtest: clean clangtest: clean
@@ -114,8 +116,8 @@ armtest: clean
$(MAKE) -C $(PRGDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static" $(MAKE) -C $(PRGDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static"
# for Travis CI # for Travis CI
arminstall: clean arminstall: clean
sudo apt-get install -q qemu sudo apt-get install -q qemu
sudo apt-get install -q binfmt-support sudo apt-get install -q binfmt-support
sudo apt-get install -q qemu-user-static sudo apt-get install -q qemu-user-static
sudo apt-get install -q gcc-arm-linux-gnueabi sudo apt-get install -q gcc-arm-linux-gnueabi
@@ -125,11 +127,11 @@ armtest-w-install: clean arminstall armtest
ppctest: clean ppctest: clean
$(MAKE) -C $(PRGDIR) datagen # use native, faster $(MAKE) -C $(PRGDIR) datagen # use native, faster
$(MAKE) -C $(PRGDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static" $(MAKE) -C $(PRGDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static"
# for Travis CI # for Travis CI
ppcinstall: clean ppcinstall: clean
sudo apt-get install -q qemu sudo apt-get install -q qemu
sudo apt-get install -q binfmt-support sudo apt-get install -q binfmt-support
sudo apt-get install -q qemu-user-static sudo apt-get install -q qemu-user-static
sudo apt-get update -q sudo apt-get update -q
projects/.gitignore
+1
View File
@@ -0,0 +1 @@
build