← Back to branch summary

~compiz-team/compiz/compiz.fix_1130160

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-config.patch

  • Committer: Tarmac
  • Author(s): Sam Spilsbury
  • Date: 2013-02-19 14:44:27 UTC
  • mfrom: (3554.6.19 compiz.fix_1120009)
  • Revision ID: tarmac-20130219144427-2xzi2f9b4ap9b2r0
Enable xorg-gtest tests by default and build in CI.

This change also refactors a number of parts of the code to find and build the tests. It puts the logic to find Google Test and Xorg GTest in their own cmake files, and also splits the find logic with the build logic. Finally, it makes the xorg-gtest variables available to all subdirectories and not just the ones under tests/.

This change also refreshes some distro patches. A new option was added to not auto-load the ccp plugin, and also modifies one of the tests depending on a modified setting value.

(LP: #1120009). Fixes: https://bugs.launchpad.net/bugs/1120009.

Approved by Sam Spilsbury, Andrea Azzarone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-config.patch
204
204
            <min>0</min>
205
205
            <max>1</max>
206
206
            <precision>0.01</precision>
 
207
 
207
208
--- a/plugins/decor/decor.xml.in
208
209
+++ b/plugins/decor/decor.xml.in
209
210
@@ -31,7 +31,7 @@
242
243
            </option>
243
244
            <option name="mipmap" type="bool">
244
245
                <_short>Mipmap</_short>
 
246
 
245
247
--- a/plugins/expo/expo.xml.in
246
248
+++ b/plugins/expo/expo.xml.in
247
249
@@ -17,6 +17,7 @@
355
357
                        <min>0.0</min>
356
358
                        <max>2.0</max>
357
359
                        <precision>0.01</precision>
 
360
 
358
361
--- a/plugins/ezoom/ezoom.xml.in
359
362
+++ b/plugins/ezoom/ezoom.xml.in
360
363
@@ -29,7 +29,6 @@
390
393
                    </option>
391
394
                </subgroup>
392
395
            </group>
 
396
 
393
397
--- a/plugins/fade/fade.xml.in
394
398
+++ b/plugins/fade/fade.xml.in
395
399
@@ -10,6 +10,7 @@
409
413
            </option>
410
414
            <option name="visual_bell" type="bell">
411
415
                <_short>Visual Bell</_short>
 
416
 
412
417
--- a/plugins/gnomecompat/gnomecompat.xml.in
413
418
+++ b/plugins/gnomecompat/gnomecompat.xml.in
414
419
@@ -53,6 +53,7 @@
419
424
                </option>
420
425
            </group>
421
426
        </options>
 
427
 
422
428
--- a/plugins/grid/grid.xml.in
423
429
+++ b/plugins/grid/grid.xml.in
424
430
@@ -23,17 +23,16 @@
449
455
                </option>
450
456
                <option name="put_restore_key" type="key">
451
457
                    <_short>Restore</_short>
 
458
 
452
459
--- a/plugins/place/place.xml.in
453
460
+++ b/plugins/place/place.xml.in
454
461
@@ -20,8 +20,8 @@
462
469
                <max>5</max>
463
470
                <desc>
464
471
                    <value>0</value>
 
472
 
465
473
--- a/plugins/resize/resize.xml.in
466
474
+++ b/plugins/resize/resize.xml.in
467
475
@@ -28,7 +28,7 @@
508
516
                </default>
509
517
            </option>
510
518
            <subgroup>
 
519
 
511
520
--- a/plugins/scale/scale.xml.in
512
521
+++ b/plugins/scale/scale.xml.in
513
522
@@ -19,14 +19,14 @@
598
607
                        </option>
599
608
            </group>
600
609
        </options>
 
610
 
601
611
--- a/plugins/staticswitcher/staticswitcher.xml.in
602
612
+++ b/plugins/staticswitcher/staticswitcher.xml.in
603
613
@@ -11,7 +11,6 @@
676
686
                        <desc>
677
687
                            <value>0</value>
678
688
                            <_name>None</_name>
 
689
 
679
690
--- a/plugins/vpswitch/vpswitch.xml.in
680
691
+++ b/plugins/vpswitch/vpswitch.xml.in
681
692
@@ -95,13 +95,11 @@
692
703
                                        <internal/>
693
704
                                </option>
694
705
                                <option name="initiate_button" type="button">
 
706
 
695
707
--- a/plugins/wall/wall.xml.in
696
708
+++ b/plugins/wall/wall.xml.in
697
709
@@ -31,12 +31,12 @@
841
853
                                </option>
842
854
                                <option name="edgeflip_dnd" type="bool">
843
855
                                        <_short>Edge Flip DnD</_short>
 
856
 
 
857
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
 
858
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
 
859
@@ -46,7 +46,7 @@
 
860
 
 
861
 namespace
 
862
 {
 
863
-unsigned int DEFAULT_VIEWPORT_WIDTH = 4;
 
864
+unsigned int DEFAULT_VIEWPORT_WIDTH = 1;
 
865
 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
 
866
 
 
867
 bool Advance (Display *d, bool r)