[SSSD] [PATCH] RFC: Support both cmocka 1.0 and pre-1.0 API at the same time

Lukas Slebodnik lslebodn at redhat.com
Wed Mar 11 09:17:27 UTC 2015


On (11/03/15 09:58), Jakub Hrozek wrote:
>New patches are attached.

>From 4fb6deab618d82efc9097fbc1d3f59f70612922d Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jhrozek at redhat.com>
>Date: Tue, 10 Mar 2015 18:10:37 +0100
>Subject: [PATCH 1/3] build: Only run cmocka tests if cmocka 1.0 or newer is
> available
>
>---
> src/external/libcmocka.m4 | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

ACK

>From 11eeff3202a04a61ae7b4d450bd705477f6e512c Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jhrozek at redhat.com>
>Date: Tue, 10 Mar 2015 11:02:30 +0100
>Subject: [PATCH 2/3] RPM: BuildRequire libcmocka >= 1.0
>
>---
> contrib/sssd.spec.in | 2 +-
ACK


>From e29026b4fe09cfbfa1c090e502464972c18ba623 Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jhrozek at redhat.com>
>Date: Mon, 9 Mar 2015 21:48:11 +0100
>Subject: [PATCH 3/3] tests: convert all unit tests to cmocka 1.0 or later
>
>All tests now use the cmocka-1.0-compatible API.
>---
> src/tests/cmocka/sbus_internal_tests.c      |  22 +--
> src/tests/cmocka/sss_nss_idmap-tests.c      |   8 +-
> src/tests/cmocka/test_ad_access_filter.c    |  86 ++++++------
> src/tests/cmocka/test_ad_common.c           |  22 +--
> src/tests/cmocka/test_ad_gpo.c              |  58 ++++----
> src/tests/cmocka/test_authtok.c             |  29 ++--
> src/tests/cmocka/test_be_ptask.c            |  12 +-
> src/tests/cmocka/test_child_common.c        |  46 ++++---
> src/tests/cmocka/test_copy_ccache.c         |  14 +-
> src/tests/cmocka/test_copy_keytab.c         |  22 +--
> src/tests/cmocka/test_dp_opts.c             |  40 +++---
> src/tests/cmocka/test_dyndns.c              |  45 ++++---
> src/tests/cmocka/test_find_uid.c            |  10 +-
> src/tests/cmocka/test_fo_srv.c              |  22 +--
> src/tests/cmocka/test_fqnames.c             |  80 +++++------
> src/tests/cmocka/test_ifp.c                 |  25 ++--
> src/tests/cmocka/test_ipa_idmap.c           |  16 ++-
> src/tests/cmocka/test_negcache.c            |  39 +++---
> src/tests/cmocka/test_nested_groups.c       |  16 ++-
> src/tests/cmocka/test_nss_srv.c             | 160 ++++++++++++----------
> src/tests/cmocka/test_resolv_fake.c         |  16 ++-
> src/tests/cmocka/test_responder_cache_req.c |  28 ++--
> src/tests/cmocka/test_responder_common.c    |  34 ++---
> src/tests/cmocka/test_sbus_opath.c          |  14 +-
> src/tests/cmocka/test_sdap.c                |  76 +++++------
> src/tests/cmocka/test_search_bases.c        |  14 +-
> src/tests/cmocka/test_sss_idmap.c           |  67 +++++-----
> src/tests/cmocka/test_sss_sifp.c            | 199 ++++++++++++++--------------
> src/tests/cmocka/test_sysdb_views.c         |  30 +++--
> src/tests/cmocka/test_utils.c               | 104 ++++++++-------
> src/tests/cwrap/test_become_user.c          |   8 +-
> src/tests/cwrap/test_responder_common.c     |  22 +--
> src/tests/cwrap/test_server.c               |  10 +-
> src/tests/cwrap/test_usertools.c            |  10 +-
> 34 files changed, 753 insertions(+), 651 deletions(-)

I can one unfixed test and thus warning:

src/tests/cmocka/test_io.c: In function ‘main’:
src/tests/cmocka/test_io.c:238:5: warning: ‘_run_tests’ is deprecated [-Wdeprecated-declarations]
     return run_tests(tests);
     ^
In file included from src/tests/cmocka/test_io.c:33:0:
/usr/include/cmocka.h:2001:34: note: declared here
 CMOCKA_DEPRECATED int _run_tests(const UnitTest * const tests,
                                  ^

LS



More information about the sssd-devel mailing list