Attachment 705201 Details for Bug 910938 – [PATCH 3/4] Do not compile main() in DP if UNIT_TESTING is defined

[patch] [PATCH 3/4] Do not compile main() in DP if UNIT_TESTING is defined

0003-Do-not-compile-main-in-DP-if-UNIT_TESTING-is-defined.patch (text/plain), 1.31 KB, created by Jakub Hrozek on 2013-03-04 22:24:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Hrozek

Created: 2013-03-04 22:24:02 UTC

Size: 1.31 KB

patch

obsolete

>From 5afa5bb817f182e1ab35d4819d1d7831bcab3556 Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jhrozek@redhat.com>
>Date: Mon, 4 Mar 2013 16:37:04 +0100
>Subject: [PATCH 3/4] Do not compile main() in DP if UNIT_TESTING is defined
>
>The simple access provider unit tests now need to link against the Data
>Provider when they start using the be_file_account_request() function.
>But then we would start having conflicts as at least the main()
>functions would clash.
>
>If UNIT_TESTING is defined, then the data_provider_be.c module does not
>contain the main() function and can be linked against directly from
>another module that contains its own main() function
>---
> src/providers/data_provider_be.c | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
>index 32548b6bef62d855ce3a52994b1bb5cedb9cd5f6..df077b249df6cf79d0a50c6fe2c28955b63c7316 100644
>--- a/src/providers/data_provider_be.c
>+++ b/src/providers/data_provider_be.c
>@@ -2686,6 +2686,7 @@ fail:
>     return ret;
> }
> 
>+#ifndef UNIT_TESTING
> int main(int argc, const char *argv[])
> {
>     int opt;
>@@ -2766,6 +2767,7 @@ int main(int argc, const char *argv[])
> 
>     return 0;
> }
>+#endif
> 
> static int data_provider_res_init(DBusMessage *message,
>                                   struct sbus_connection *conn)
>-- 
>1.8.1.4
>

Flags:

jhrozek: review?

Actions: View | Diff

Attachments on bug 910938: 704993 | 704995 | 704996 | 704997 | 704998 | 705198 | 705200 | 705201 | 705202