From ab6884f44ae256d7210578dea2bb990d4cdc93cc Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Tue, 13 Jun 2017 14:17:12 -0500 Subject: [PATCH] enable tests in Travis CI for fedora --- contrib/ci/build_and_install_rpms.sh | 9 +++++---- contrib/fwupd.spec.in | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/ci/build_and_install_rpms.sh b/contrib/ci/build_and_install_rpms.sh index 9c47bffb7..c9ad9e1f5 100755 --- a/contrib/ci/build_and_install_rpms.sh +++ b/contrib/ci/build_and_install_rpms.sh @@ -21,10 +21,11 @@ mv fwupd-$VERSION.tar.xz $HOME/rpmbuild/SOURCES/ #generate a spec file rm -rf fwupd.spec -sed "s/#VERSION#/$VERSION/; - s/#BUILD#/1/; - s/#LONGDATE#/`date '+%a %b %d %Y'`/ - s/#ALPHATAG#/alpha/; +sed "s,#VERSION#,$VERSION,; + s,enable_tests 0,enable_tests 1,; + s,#BUILD#,1,; + s,#LONGDATE#,`date '+%a %b %d %Y'`,; + s,#ALPHATAG#,alpha,; s,Source0.*,Source0:\tfwupd-$VERSION.tar.xz," \ contrib/fwupd.spec.in > fwupd.spec diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in index b100fdc20..4dcd6eddc 100644 --- a/contrib/fwupd.spec.in +++ b/contrib/fwupd.spec.in @@ -6,6 +6,8 @@ %define alphatag #ALPHATAG# +%global enable_tests 0 + %ifarch x86_64 %{ix86} %global have_smbios 1 %endif @@ -112,7 +114,11 @@ Rendered labels for display during system firmware updates. %meson \ -Denable-doc=true \ -Denable-man=true \ +%if 0%{?enable_tests} + -Denable-tests=true \ +%else -Denable-tests=false \ +%endif -Denable-thunderbolt=false \ %if 0%{?have_uefi} -Denable-uefi=true \ @@ -129,6 +135,9 @@ Rendered labels for display during system firmware updates. -Denable-colorhug=true %meson_build +%if 0%{?enable_tests} +%meson_test +%endif %install %meson_install