Merge lp:~alan-griffiths/mir/rework-throwback-and-staging into lp:mir

[Alan Griffiths]

Reorganize the acceptance tests to eliminate the "throwback" and "staging" subdirectories

Reorganize the acceptance tests to eliminate the "throwback" and "staging" subdirectories

This is really just an RFC to see if folks prefer this version.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3919
https://mir-jenkins.ubuntu.com/job/mir-ci/2586/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3367/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3434
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3426
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3426
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3426
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3396
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3396/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3396
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3396/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3396/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3396
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3396/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3396
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3396/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3396
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3396/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2586/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

(Somewhat surprisingly ☺) I have no strong feelings on this.

review: Abstain

[Kevin DuBois (kdub)]

sure, although typo here?
tests/acceptance-tests/test_buffer_stream_arrangement1.cpp

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> sure, although typo here?
> tests/acceptance-tests/test_buffer_stream_arrangement1.cpp

The '1' avoids a collision with the existing tests/acceptance-tests/test_buffer_stream_arrangement.cpp

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3920
https://mir-jenkins.ubuntu.com/job/mir-ci/2642/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3432
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3499
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3491
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3491
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3491
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3461/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3461/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3461/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3461/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3461/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3461
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3461/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2642/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

ah, didn't see the other file.

review: Approve

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2017-01-11 10:08:41 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2017-01-11 10:08:42 +0000
@@ -57,21 +57,57 @@
   test_new_display_configuration.cpp
   test_persistent_surface_store.cpp
   test_client_extensions.cpp
+  test_client_cursor_api.cpp
+  test_client_library_errors.cpp
+  test_shell_control_of_surface_configuration.cpp
+  test_client_library.cpp
+  test_presentation_chain.cpp
+  test_render_surface.cpp
+  test_buffer_stream_arrangement1.cpp
 )
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11")
   list(APPEND SOURCES test_symbols_required_by_mesa.cpp)
 endif()
 
-add_subdirectory(throwback)
-add_subdirectory(staging)
+# BEGIN "throwbacks"
+# The following tests use still files we have chosen not to support in the public API
+# TODO update these "throwback" tests to rely only on the public APIs
+
+  # uses BasicWindowManager<>
+  set_source_files_properties(test_client_cursor_api.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
+
+  # uses UsingClientPlatform
+  set_source_files_properties(test_client_library_errors.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR} -I ${PROJECT_SOURCE_DIR}/src/include/client -I ${PROJECT_SOURCE_DIR}/tests/include")
+
+  # uses CanonicalWindowManager
+  set_source_files_properties(test_shell_control_of_surface_configuration.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
+
+  # uses src/include/common/mir/protobuf/protocol_version.h
+  set_source_files_properties(test_client_library.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR}")
+# END "throwbacks"
+
+# BEGIN "staging"
+# The following tests use files we do not yet to support in the public API
+# TODO update the public APIs
+  set_source_files_properties(test_presentation_chain.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/client")
+
+  set_source_files_properties(test_render_surface.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/client")
+
+  set_source_files_properties(test_buffer_stream_arrangement1.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/client")
+# END "staging"
 
 mir_add_wrapped_executable(
   mir_acceptance_tests
 
   ${SOURCES}
-  $<TARGET_OBJECTS:acceptance-test-throwback>
-  $<TARGET_OBJECTS:acceptance-test-staging>
 )
 
 mir_precompiled_header(mir_acceptance_tests ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.hpp)

=== removed directory 'tests/acceptance-tests/staging'
=== removed file 'tests/acceptance-tests/staging/CMakeLists.txt'
--- tests/acceptance-tests/staging/CMakeLists.txt	2016-11-07 02:53:07 +0000
+++ tests/acceptance-tests/staging/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/src/include/client
-)
-
-add_library(acceptance-test-staging OBJECT
-  test_presentation_chain.cpp
-  test_render_surface.cpp
-  test_buffer_stream_arrangement.cpp
-)

=== renamed file 'tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp' => 'tests/acceptance-tests/test_buffer_stream_arrangement1.cpp'
--- tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp	2017-01-09 06:48:47 +0000
+++ tests/acceptance-tests/test_buffer_stream_arrangement1.cpp	2017-01-11 10:08:42 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "../buffer_stream_arrangement.h"
+#include "buffer_stream_arrangement.h"
 #include "mir_toolkit/mir_presentation_chain.h"
 #include <gmock/gmock.h>
 

=== renamed file 'tests/acceptance-tests/throwback/test_client_cursor_api.cpp' => 'tests/acceptance-tests/test_client_cursor_api.cpp'
=== renamed file 'tests/acceptance-tests/throwback/test_client_library.cpp' => 'tests/acceptance-tests/test_client_library.cpp'
=== renamed file 'tests/acceptance-tests/throwback/test_client_library_errors.cpp' => 'tests/acceptance-tests/test_client_library_errors.cpp'
=== renamed file 'tests/acceptance-tests/staging/test_presentation_chain.cpp' => 'tests/acceptance-tests/test_presentation_chain.cpp'
=== renamed file 'tests/acceptance-tests/staging/test_render_surface.cpp' => 'tests/acceptance-tests/test_render_surface.cpp'
=== renamed file 'tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp' => 'tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp'
=== removed directory 'tests/acceptance-tests/throwback'
=== removed file 'tests/acceptance-tests/throwback/CMakeLists.txt'
--- tests/acceptance-tests/throwback/CMakeLists.txt	2017-01-11 10:08:41 +0000
+++ tests/acceptance-tests/throwback/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-add_library(acceptance-test-throwback OBJECT
-
-  test_client_cursor_api.cpp
-  test_client_library_errors.cpp
-  test_shell_control_of_surface_configuration.cpp
-  test_client_library.cpp
-)
-
-# uses BasicWindowManager<>
-set_source_files_properties(test_client_cursor_api.cpp PROPERTIES COMPILE_FLAGS
-        "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
-
-# uses UsingClientPlatform
-set_source_files_properties(test_client_library_errors.cpp PROPERTIES COMPILE_FLAGS
-        "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR} -I ${PROJECT_SOURCE_DIR}/src/include/client -I ${PROJECT_SOURCE_DIR}/tests/include")
-
-# uses CanonicalWindowManager
-set_source_files_properties(test_shell_control_of_surface_configuration.cpp PROPERTIES COMPILE_FLAGS
-        "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/server")
-
-# uses src/include/common/mir/protobuf/protocol_version.h
-set_source_files_properties(test_client_library.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR}")