Nux

Merge lp:~sil2100/nux/unity_support_test into lp:nux

  1. unity_support_test
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 809
Merged at revision: 810
Proposed branch: lp:~sil2100/nux/unity_support_test
Merge into: lp:nux
Diff against target: 25 lines (+8/-1)
3 files modified
debian/50_check_unity_support (+7/-0)
debian/nux-tools.install (+1/-0)
debian/nux-tools.maintscript (+0/-1)
To merge this branch: bzr merge lp:~sil2100/nux/unity_support_test
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Didier Roche-Tolomelli Approve
Review via email: mp+179666@code.launchpad.net

Commit message

Add 50_check_unity_support to Xsession.d that will run the unity support test app to determine if we should use the fallback mode or not, since we'll be dropping the test from compiz

Description of the change

Add 50_check_unity_support to Xsession.d that will run the unity support test app to determine if we should use the fallback mode or not, since we'll be dropping the test from compiz

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looking good, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:809
http://jenkins.qa.ubuntu.com/job/nux-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/64/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-autolanding/32/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-autolanding/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-autolanding/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-autolanding/13/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:809
http://jenkins.qa.ubuntu.com/job/nux-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/65/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Lets try again

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/50_check_unity_support'
2--- debian/50_check_unity_support 1970-01-01 00:00:00 +0000
3+++ debian/50_check_unity_support 2013-08-12 11:21:31 +0000
4@@ -0,0 +1,7 @@
5+# This file is sourced by Xsession(5), not executed.
6+# If the hardware does not pass unity_support_test, fall back to LLVMpipe
7+# which does.
8+
9+if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
10+ /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
11+fi
12
13=== modified file 'debian/nux-tools.install'
14--- debian/nux-tools.install 2012-11-14 16:05:24 +0000
15+++ debian/nux-tools.install 2013-08-12 11:21:31 +0000
16@@ -1,2 +1,3 @@
17 usr/lib/*/nux/unity_support_test usr/lib/nux
18+debian/50_check_unity_support etc/X11/Xsession.d
19 debian/source_nux.py usr/share/apport/package-hooks
20
21=== removed file 'debian/nux-tools.maintscript'
22--- debian/nux-tools.maintscript 2012-08-15 12:42:57 +0000
23+++ debian/nux-tools.maintscript 1970-01-01 00:00:00 +0000
24@@ -1,1 +0,0 @@
25-rm_conffile /etc/X11/Xsession.d/50_check_unity_support 3.2.0-0ubuntu3~

Subscribers

People subscribed via source and target branches