Overview

Request 1101309 accepted

- update to 1.90.2:
* Note that this is the last release of UPower with lid
handling. OS components that rely on the lid status
should get it from logind instead.
* Fix wireless devices not disappearing from Settings when
disconnected
* Require a newer libgudev to avoid bugs related to newline
stripping when reading sysfs attributes
* Add installed-tests files for use with gnome-desktop-testing
* Fix integration test to work with system installed upower
binary and under jhbuild
- add skip-tests-install.patch to skip installation of test-only
assets

Loading...


Luciano Santos's avatar

It looks good to me, except the patch tag. # PATCH-FIX-SUSE should either be # PATCH-FIX-OPENSUSE, or # PATCH-FIX-SLE. But IMHO, it should be PATCH-FIX-UPSTREAM - probably not in the current form -, because they shouldn't force everybody to install those tests only because of gnome-desktop-testing.


Dirk Mueller's avatar
author source maintainer target maintainer

okay, I'll change it to OPENSUSE and submit to factory. please submit teh patch you proposed upstream, that makes sense and then we can remove this patch in the next update that ships it.


Luciano Santos's avatar

OK, I'm thinking in proposing this patch, to upstream:

@@ -0,0 +1,64 @@
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,3 +33,7 @@ option('idevice',
        type : 'feature',
        value : 'auto',
        description : 'Build with libimobiledevice')
+option('installed_tests',
+       type : 'boolean',
+       value : 'true',
+       description : 'Install integration tests')

--- a/src/meson.build
+++ b/src/meson.build
@@ -118,6 +118,8 @@ test(
    up_self_test,
 )

+installed_tests = get_option('installed_tests')
+
 # On Linux, we can run the additional integration test;
 # defined here as we would have a circular dependency otherwise.
 if os_backend == 'linux' and gobject_introspection.found()
@@ -142,21 +144,22 @@ if os_backend == 'linux' and gobject_int
              timeout: 80,
             )
     endforeach
+    if installed_tests
+        install_data( [
+            'linux/integration-test.py',
+            'linux/output_checker.py',
+          ],
+          install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+        )
+        install_subdir('linux/tests/',
+          install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+        )

-    install_data( [
-        'linux/integration-test.py',
-        'linux/output_checker.py',
-      ],
-      install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
-    )
-    install_subdir('linux/tests/',
-      install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
-    )
-
-    configure_file(
-      input: 'upower-integration.test.in',
-      output: 'upower-integration.test',
-      install_dir: get_option('datadir') / 'installed-tests' / 'upower',
-      configuration: cdata
-    )
+        configure_file(
+          input: 'upower-integration.test.in',
+          output: 'upower-integration.test',
+          install_dir: get_option('datadir') / 'installed-tests' / 'upower',
+          configuration: cdata
+        )
+    endif
 endif

 

So we can pass -Dinstalled_tests=false to meson, as seen in here.

Request History
Dirk Mueller's avatar

dirkmueller created request

- update to 1.90.2:
* Note that this is the last release of UPower with lid
handling. OS components that rely on the lid status
should get it from logind instead.
* Fix wireless devices not disappearing from Settings when
disconnected
* Require a newer libgudev to avoid bugs related to newline
stripping when reading sysfs attributes
* Add installed-tests files for use with gnome-desktop-testing
* Fix integration test to work with system installed upower
binary and under jhbuild
- add skip-tests-install.patch to skip installation of test-only
assets


GNOME Review Bot's avatar

gnome-review-bot accepted review

Check script succeeded


Luciano Santos's avatar

luc14n0 accepted review

For now, I'm inclined to say LGTM. I'm about to send a PR upstream adding installed_tests meson option.


Luciano Santos's avatar

luc14n0 approved review

For now, I'm inclined to say LGTM. I'm about to send a PR upstream adding installed_tests meson option.


Dirk Mueller's avatar

dirkmueller accepted request

openSUSE Build Service is sponsored by