arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build timeout due to tracking vars under UBsan 

Also see https://stackoverflow.com/q/2954473/608639 and https://stackoverflow.com/q/708807/608639
pull/424/merge
Jeffrey Walton 2017-05-28 17:00:09 -04:00
parent 81c751314b
commit 0df38c3506
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -29,6 +29,7 @@ env:
- BUILD_MODE="codecov" - BUILD_MODE="codecov"
matrix: matrix:
exclude: exclude:
# Skip GCC on OS X entirely # Skip GCC on OS X entirely
- os: osx - os: osx
@ -43,7 +44,7 @@ matrix:
- env: BUILD_MODE="asan" - env: BUILD_MODE="asan"
script: script:
- travis_wait make "$BUILD_MODE" && ./cryptest.exe v && ./cryptest.exe tv all - make "$BUILD_MODE" && ./cryptest.exe v && ./cryptest.exe tv all
after_success: after_success:
- if [[ ( ("$BUILD_MODE" = "coverage") && ("$CC" = "gcc") ) ]]; then CODECOV_TOKEN="5c7bc59c-e95f-4594-82c3-33e7a1942592" bash <(curl -s https://codecov.io/bash); fi; - if [[ ( ("$BUILD_MODE" = "coverage") && ("$CC" = "gcc") ) ]]; then CODECOV_TOKEN="5c7bc59c-e95f-4594-82c3-33e7a1942592" bash <(curl -s https://codecov.io/bash); fi;

7
GNUmakefile
View File

@ -817,6 +817,13 @@ rdrand-%.o:
./rdrand-nasm.sh ./rdrand-nasm.sh
endif endif
# Don't build Threefish with UBsan on Travis CI. Timeouts cause the build to fail.
# Also see https://stackoverflow.com/q/12983137/608639.
ifeq ($(findstring true,$(CI)),true)
threefish.o : threefish.cpp
$(CXX) $(strip $(subst -fsanitize=undefined,,$(CXXFLAGS))) -c $<
endif
# Don't build Rijndael with UBsan. Too much noise due to unaligned data accesses. # Don't build Rijndael with UBsan. Too much noise due to unaligned data accesses.
ifneq ($(findstring -fsanitize=undefined,$(CXXFLAGS)),) ifneq ($(findstring -fsanitize=undefined,$(CXXFLAGS)),)
rijndael.o : rijndael.cpp rijndael.o : rijndael.cpp