diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-09-09 14:48:22 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-09-09 14:50:59 -0300 |
| commit | 3e8364b2675880d4688f65b3f2ed3bbd4244f7b2 (patch) | |
| tree | 46023f205bd7dd265f16f9669bf82f5266a3702c /testing | |
| parent | 233eb8d0f5f1ee0407f5cff1512234262a4aa556 (diff) | |
| download | aports-3e8364b2675880d4688f65b3f2ed3bbd4244f7b2.tar.bz2 aports-3e8364b2675880d4688f65b3f2ed3bbd4244f7b2.tar.xz | |
testing/folks: re-enable tests but disable py2 test
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/folks/APKBUILD | 9 | ||||
| -rw-r--r-- | testing/folks/disable-py2-test.patch | 41 |
2 files changed, 47 insertions, 3 deletions
diff --git a/testing/folks/APKBUILD b/testing/folks/APKBUILD index ffaa701ca0..0e9b760e9e 100644 --- a/testing/folks/APKBUILD +++ b/testing/folks/APKBUILD @@ -4,7 +4,7 @@ pkgname=folks pkgver=0.12.1 pkgrel=1 pkgdesc="GObject Library to aggregate people into metacontacts" -options="!check" # Tests require python2 +options="!check" # one test requires python2 url="https://wiki.gnome.org/Projects/Folks" arch="all" license="LGPL-2.1-or-later" @@ -21,7 +21,9 @@ makedepends=" readline-dev" options="!check" # Can only be run against installed instance subpackages="$pkgname-dev $pkgname-lang" -source="https://download.gnome.org/sources/folks/${pkgver%.*}/folks-$pkgver.tar.xz" +source="https://download.gnome.org/sources/folks/${pkgver%.*}/folks-$pkgver.tar.xz + disable-py2-test.patch + " build() { meson \ @@ -43,4 +45,5 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb folks-0.12.1.tar.xz" +sha512sums="f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb folks-0.12.1.tar.xz +6430e31023b2408970a9a0aa00d2adad339593a436bef3d58d076ce7cbc8032fc1f1e5444ee539edb037a92414c3f8cfed7bdf5c8332adf51ff3339c0e624e9a disable-py2-test.patch" diff --git a/testing/folks/disable-py2-test.patch b/testing/folks/disable-py2-test.patch new file mode 100644 index 0000000000..681a4f362f --- /dev/null +++ b/testing/folks/disable-py2-test.patch @@ -0,0 +1,41 @@ +diff --git a/tests/lib/telepathy/contactlist/meson.build b/tests/lib/telepathy/contactlist/meson.build +index 00e0266..61c0c3e 100644 +--- a/tests/lib/telepathy/contactlist/meson.build ++++ b/tests/lib/telepathy/contactlist/meson.build +@@ -30,15 +30,6 @@ telepathy_test_contactlist_sources = [ + 'util.h', + ] + +-telepathy_test_contactlist_manager = custom_target('tp_test_contact_list.manager', +- output: 'param-spec-struct.h', +- input: 'manager-file.py', +- command: [ test_tools_manager_file_script, +- '@INPUT@', +- meson.current_build_dir(), +- ], +-) +- + telepathy_test_contactlist_deps = [ + glib_dep, + gio_dep, +diff --git a/tests/tools/meson.build b/tests/tools/meson.build +index babbe5f..9ff3971 100644 +--- a/tests/tools/meson.build ++++ b/tests/tools/meson.build +@@ -1,2 +1 @@ + # Used for telepathy test lib (contactlist) +-test_tools_manager_file_script = find_program('manager-file.py') + +diff --git a/tests/lib/telepathy/contactlist/meson.build b/tests/lib/telepathy/contactlist/meson.build +index 61c0c3e..80c845a 100644 +--- a/tests/lib/telepathy/contactlist/meson.build ++++ b/tests/lib/telepathy/contactlist/meson.build +@@ -39,7 +39,7 @@ telepathy_test_contactlist_deps = [ + ] + + telepathy_test_contactlist_lib = static_library('tp-test-contactlist', +- [ telepathy_test_contactlist_sources, telepathy_test_contactlist_manager ], ++ [ telepathy_test_contactlist_sources ], + dependencies: telepathy_test_contactlist_deps, + include_directories: config_h_dir, + ) |