Merge lp:~michihenning/storage-framework/stand-alone-provider-headers into lp:storage-framework/devel

[Michi Henning]

Added provider headers to unit tests.

Added provider headers to unit tests.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:54
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/83/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/439/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/445
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/351
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/351
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/351
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/281/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/281/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/281/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/281/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/281/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/281/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/281/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/281
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/281/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/281/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/83/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-autoland/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/449/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/455
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/360
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/360
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/360
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/290/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/290/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/290/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/290/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/290
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/290/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/290/console

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/stand-alone-provider-headers]

55. By Michi Henning on 2016-08-23

Merged devel.

56. By Michi Henning on 2016-08-23

Fixed stand-alone header test failure on yakkety.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:56
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/89/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/459
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/465
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/370
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/370
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/370
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/300/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/300
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/300/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/89/rebuild

review: Approve (continuous-integration)

=== modified file 'include/unity/storage/provider/internal/dbusmarshal.h'
--- include/unity/storage/provider/internal/dbusmarshal.h	2016-08-11 03:49:32 +0000
+++ include/unity/storage/provider/internal/dbusmarshal.h	2016-08-23 23:50:49 +0000
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <unity/storage/provider/ProviderBase.h>
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QDBusArgument>

=== modified file 'tests/headers/CMakeLists.txt'
--- tests/headers/CMakeLists.txt	2016-06-28 06:35:19 +0000
+++ tests/headers/CMakeLists.txt	2016-08-23 23:50:49 +0000
@@ -6,6 +6,7 @@
 
 set(subdirs
     unity/storage
+    unity/storage/provider
     unity/storage/qt/client
     unity/storage/qt/client/internal/local_client
     unity/storage/qt/client/internal/remote_client
@@ -17,6 +18,8 @@
 set(extra_inc_dirs "${extra_inc_dirs};${GIO_DEPS_INCLUDE_DIRS}")
 set(extra_inc_dirs "${extra_inc_dirs};${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}")
 
+set(extra_defines "-D BOOST_THREAD_VERSION=4")
+
 # Replace ; with -I as the include directories are separated by ";"
 string(REPLACE ";" " -I/" extra_inc_dirs "${extra_inc_dirs}")
 set(extra_inc_dirs " -I${extra_inc_dirs}")
@@ -36,12 +39,14 @@
     # Test that each public header compiles stand-alone.
     add_test(stand-alone-${location}-headers
         ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
+            ${extra_defines}
             ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -fsyntax-only -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
 
     # Test that each internal header compiles stand-alone.
     if (IS_DIRECTORY ${internal_inc_dir})
         add_test(stand-alone-${location}-internal-headers
             ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
+                ${extra_defines}
                 ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fPIC -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS} ${extra_inc_dirs}")
     endif()
 

=== modified file 'tests/headers/compile_headers.py'
--- tests/headers/compile_headers.py	2016-04-20 01:56:37 +0000
+++ tests/headers/compile_headers.py	2016-08-23 23:50:49 +0000
@@ -55,11 +55,6 @@
 import tempfile
 import concurrent.futures, multiprocessing
 
-# Additional #defines that should be set before including a header.
-# This is intended for things such as enabling additional features
-# that are conditionally compiled in the source.
-extra_defines =[]
-
 #
 # Write the supplied message to stderr, preceded by the program name.
 #
@@ -77,13 +72,13 @@
 # and check exit status from the compiler. Throw if the compile command itself fails,
 # return False if the compile command worked but reported errors, True if the compile succeeded.
 #
-def run_compiler(hdr, compiler, copts, verbose, hdr_dir):
+def run_compiler(hdr, compiler, copts, define, verbose, hdr_dir):
     try:
         src = tempfile.NamedTemporaryFile(suffix='.cpp', dir='.')
 
-        # Add any extra defines at the beginning of the temporary file.
-        for flag in extra_defines:
-            src.write(bytes("#define " + flag + "" + "\n", 'UTF-8'))
+        # Add any extra defines to the command line.
+        for flag in define:
+            copts = "-D" + flag + " " + copts
 
         src.write(bytes("#include <" + hdr + ">" + "\n", 'UTF-8'))
         src.flush()                                                 # Need this to make the file visible
@@ -119,10 +114,10 @@
 # and then try to compile the header. Returns normally if all files could be compiled successfully and
 # throws, otherwise.
 #
-def test_files(hdrs, compiler, copts, verbose, hdr_dir):
+def test_files(hdrs, compiler, copts, define, verbose, hdr_dir):
     num_errs = 0
     executor = concurrent.futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count())
-    futures = [executor.submit(run_compiler, h, compiler, copts, verbose, hdr_dir) for h in hdrs]
+    futures = [executor.submit(run_compiler, h, compiler, copts, define, verbose, hdr_dir) for h in hdrs]
     for f in futures:
         try:
             if not f.result():
@@ -144,10 +139,12 @@
     #
     parser = argparse.ArgumentParser(description = 'Test that all headers in the passed directory compile stand-alone.')
     parser.add_argument('-v', '--verbose', action='store_true', help = 'Trace invocations of the compiler')
+    parser.add_argument('-D', '--define', action='append', default=[],
+                        help = 'Additional -D directives to be added to the compiler command line')
     parser.add_argument('dir', nargs = 1, help = 'The directory to look for header files ending in ".h"')
     parser.add_argument('compiler', nargs = 1, help = 'The compiler executable, such as "gcc"')
     parser.add_argument('copts', nargs = '?', default="",
-                        help = 'The compiler options (excluding -c), such as "-g -Wall -I." as a single string.')
+                        help = 'The compiler options (excluding -c), such as "-g -Wall -I.", as a single string')
     args = parser.parse_args()
 
     #
@@ -163,7 +160,7 @@
     hdrs = [hdr for hdr in files if hdr.endswith('.h')]
 
     try:
-        test_files(hdrs, args.compiler[0], args.copts, args.verbose, hdr_dir)
+        test_files(hdrs, args.compiler[0], args.copts, args.define, args.verbose, hdr_dir)
     except OSError:
         sys.exit(1)    # Errors were written earlier