Skip to content

Commit 07dcf7c

Browse files
committed
Merge branch 'coverity_scan' into autobuild/alpha_v380, co-opting the auto-build branch for Coverity static code analysis.
2 parents b382441 + d359466 commit 07dcf7c

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

.travis.yml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
env:
22
global:
3-
# Required for clang.
4-
- CXXFLAGS="-fno-fast-math"
3+
# Required for Coverity Scan
4+
- secure: "BT2A2IDJx9nlEUnE8ZYtJQk2XAYTGu3+BT4qTTmxrS94htpUl1c82cM0RceUW/rzKrcJ7JAvQ1YuqJLlUW7J2cIWOdrF8Mk4DtlZSV9KnMc5+h7hf3bGGPw/LnYGnhrWYtSQfjZJHeCBfJufb4e7YqDfRz3UKDQ6FZCsFFMWnCAmBymF1Zj+ip7jkUn+P2gP8/vPjZupvfEZ0h8CkCXm7kSqHmTj0l9gOBQ6OMzP0uFN3KcRD5B+DSxoTmRGe+1abOr2nxUhIQsJxQZ5Y/V0ItwgNnoevi8d35QD9A2FT7gtuDkhYu0Fb8Jz6mReXk51hM6hE1qmfW+n2Dau679WkAtm4c/2osWwtxc1dbvQNvnr/XEnj51c4pbyPugjAKWoa/B73hXAflbrq0FWm14JVG2kCJYqid12HRvkMvzGJtjgJy5jIlPx+cb+BZ6tYsoa9m7CO1rTuYxUyKsHGtXSYOMPKyc7RIePOi37ZBF9QAm/urJdP6c6pfsrLEKvNOHArmUIixjrC9ImdQdJDBcgVUgP1h4oFfWaHgrys8B0EviIMoBewmTF8dUkD9j5rbpAonfjSpX0RX0Rcqtx2Mr68W97+BSGCy+WNIBe4ACivHDjYzfUw44ruYjZqUeXKzhJUHJxCf9OnqpppJ8ru6n6Tc7kMKcEEfZGDdVICrsBuMs="
5+
# In Coverity Scan builds, ./configure is automatically called without parameters, so we must pass them via
6+
# environment variables.
7+
- COMPILED_BY="Travis CI for Coverity Scan"
8+
# In Coverity Scan builds, the assembler gags on FMA3 instructions (e.g. VFMADD321SS) for some reason, so we must
9+
# forbid the compiler to emit them.
10+
# We also set a preprocessor macro to know we're building for Coverity.
11+
- CXXFLAGS="-mno-fma -DSTATIC_CODE_ANALYSIS"
12+
13+
before_install:
14+
# Required(?) for Coverity Scan
15+
- echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
516

617
branches:
718
except:
@@ -13,10 +24,8 @@ matrix:
1324
include:
1425
- os: linux
1526
compiler: gcc
16-
- os: osx
17-
compiler: clang
1827

19-
sudo: false
28+
sudo: required
2029
dist: trusty
2130

2231
addons:
@@ -30,19 +39,15 @@ addons:
3039
- libpng12-dev
3140
- libtiff4-dev
3241
- zlib1g-dev
33-
34-
install:
35-
- unix/prebuild.sh
36-
- ./configure COMPILED_BY="Travis CI" --prefix="$(pwd)/build"
37-
- make check
38-
- make install
42+
# Required for Coverity Scan
43+
coverity_scan:
44+
project:
45+
name: "POV-Ray/povray"
46+
description: "Linux build submitted via Travis CI"
47+
notification_email: [email protected]
48+
build_command_prepend: "unix/prebuild.sh ; ./configure"
49+
build_command: "make"
50+
branch_pattern: coverity_scan
3951

4052
script:
4153
- true
42-
43-
notifications:
44-
email:
45-
recipients:
46-
- ${NOTIFICATION_EMAIL}
47-
on_success: change
48-
on_failure: always

source/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
/// where `N` is a serial number starting at 1 in each phase, `TIME` is the number of minutes
101101
/// since 2000-01-01 00:00, and `FEATURE` is an arbitrary alphanumeric moniker for a particular
102102
/// experimental feature.
103-
#define POV_RAY_PRERELEASE "alpha.9844485"
103+
#define POV_RAY_PRERELEASE "alpha.9844500"
104104

105105
#if defined(DOXYGEN) && !defined(POV_RAY_PRERELEASE)
106106
// Work around doxygen being unable to document undefined macros.

0 commit comments

Comments
 (0)