From ce39a627f8c3f95b83fdda3669d72ad1d2218dbd Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 13 Apr 2017 18:24:09 +0000 Subject: [PATCH] travis: use mainline kernel uapi headers for coverage * .travis.yml (matrix) : Add KHEADERS=torvalds/linux. * travis-build.sh: Handle $KHEADERS. * travis-install.sh: Likewise. --- .travis.yml | 1 + travis-build.sh | 7 +++++++ travis-install.sh | 19 +++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94bf0916..f20f87ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,3 +52,4 @@ matrix: env: - TARGET=x86_64 - CHECK=coverage + - KHEADERS=torvalds/linux diff --git a/travis-build.sh b/travis-build.sh index 0f096e6c..ef609504 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -21,6 +21,13 @@ case "${TARGET-}" in ;; esac +case "$KHEADERS" in + */*) + CPPFLAGS='-isystem /opt/kernel/include' + export CPPFLAGS + ;; +esac + case "${CHECK-}" in coverage) DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-code-coverage" diff --git a/travis-install.sh b/travis-install.sh index ff21f16b..6334f7c6 100755 --- a/travis-install.sh +++ b/travis-install.sh @@ -11,6 +11,18 @@ apt_get_install() install -y "$@" } +case "$KHEADERS" in + */*) + git clone --depth=1 https://github.com/"$KHEADERS" kernel + sudo make -C kernel headers_install INSTALL_HDR_PATH=/opt/kernel + sudo rm -rf kernel + KHEADERS_INC=/opt/kernel/include + ;; + *) + KHEADERS_INC=/usr/include + ;; +esac + case "$CC" in gcc) apt_get_install gcc-multilib @@ -43,10 +55,9 @@ case "$CC" in cd - rm -rf musl sudo ln -s \ - /usr/include/linux \ - /usr/include/asm \ - /usr/include/asm-generic \ - /usr/include/mtd \ + $KHEADERS_INC/asm* \ + $KHEADERS_INC/linux \ + $KHEADERS_INC/mtd \ /opt/musl/include/ ;; esac -- 2.40.0