diff options
| author | Jonas Witschel <diabonas@gmx.de> | 2019-05-07 16:40:41 +0200 |
|---|---|---|
| committer | Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> | 2019-05-09 10:46:31 +0200 |
| commit | 56056303ffd56256b8d3fde747578a9de3a54bcf (patch) | |
| tree | 334c3fe087f9b6b4707316f00b3202c003416a7b /.travis.yml | |
| parent | 5b84fb31de3684bb6b247c249f357fb69a684e0a (diff) | |
| download | tpm2-tss-56056303ffd56256b8d3fde747578a9de3a54bcf.tar.gz | |
ci: replace check with distcheck for Clang, remove separate distcheck
Since the distcheck target already includes running the check target, we
don't need to run make check separately. This also has the advantage of
actually testing whether the distribution correctly works depending on
the values of WITH_TCTI_ASYNC and WITH_TCTI_PARTIAL, previously only the
value of WITH_CRYPTO was taken into account for make distcheck.
Note that distcheck doesn't work in combination with
--enable-code-coverage (ax_code_coverage.m4 automatically disables code
coverage when make distcheck is run), so we only do this for Clang,
leaving GCC untouched.
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2bcbc966..baae00cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,7 +111,7 @@ script: fi - | if [ "$CC" == "clang" ]; then - scan-build --status-bugs make -j$(nproc) check + scan-build --status-bugs make -j$(nproc) distcheck else make -j$(nproc) check fi @@ -123,12 +123,6 @@ script: fi - | - popd -# make distcheck - - mkdir ./distcheck_build - - pushd ./distcheck_build - - ../configure --enable-unit --enable-integration --with-crypto=$WITH_CRYPTO CFLAGS=-I${PWD}/../osslinstall/usr/local/include LDFLAGS=-L${PWD}/../osslinstall/usr/local/lib - - make -j$(nproc) distcheck - - popd after_success: - | |