Compiz

Merge lp:~muktupavels/compiz/build-tests into lp:compiz/0.9.13

  1. build-tests
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4179
Merged at revision: 4172
Proposed branch: lp:~muktupavels/compiz/build-tests
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/gtest
Diff against target: 27 lines (+7/-2)
1 file modified
debian/rules (+7/-2)
To merge this branch: bzr merge lp:~muktupavels/compiz/build-tests
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Dmitry Shachnev Pending
Review via email: mp+350444@code.launchpad.net

Commit message

Build tests.

To post a comment you must log in.
lp:~muktupavels/compiz/build-tests updated
4179. By Alberts Muktupāvels

Don't build tests with DEB_BUILD_OPTIONS=nocheck.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2018-02-20 18:26:33 +0000
3+++ debian/rules 2018-07-23 11:51:40 +0000
4@@ -7,6 +7,11 @@
5
6 python2_version := $(shell pyversions --requested --version debian/control)
7 gles2_architectures := armel armhf
8+build_testing := OFF
9+
10+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
11+ build_testing := ON
12+endif
13
14 # currently, segfault if CMAKE_BUILD_TYPE=Release
15 export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
16@@ -20,9 +25,9 @@
17 override_dh_auto_configure:
18 # right now, xorg-gtest won't compile on arm.
19 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
20- dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF
21+ dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=$(build_testing) -DUSE_KDE4=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF
22 else
23- dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF
24+ dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=$(build_testing) -DUSE_KDE4=OFF
25 endif
26
27 override_dh_install:

Subscribers

People subscribed via source and target branches