Merge lp:~alan-griffiths/mir/revert-3477 into lp:mir

[Alan Griffiths]

Revert change that overwrites the "wrapper" executable (linked by various targets) with a script

Revert change that overwrites the "wrapper" executable (linked by various targets) with a script

[Daniel van Vugt (vanvugt)]

We found it's just the result of an unclean build tree (incremental builds).

Simple to fix.

review: Disapprove

[Daniel van Vugt (vanvugt)]

Try this:
https://code.launchpad.net/~vanvugt/mir/cp-dont-follow-symlinks/+merge/293064

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

PASSED: Continuous integration, rev:3481
https://mir-jenkins.ubuntu.com/job/mir-ci/905/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/949
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/988
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/979
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/979
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/959
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/959/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/959
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/959/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/959
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/959/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/959
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/959/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/959
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/959/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

3481. By Alan Griffiths on 2016-04-27

Revert -C 3477

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2016-04-22 03:37:10 +0000
+++ debian/mir-test-tools.install	2016-04-27 09:07:30 +0000
@@ -5,7 +5,6 @@
 usr/bin/mir_umock_acceptance_tests
 usr/bin/mir_integration_tests*
 usr/bin/mir_performance_tests
-usr/bin/mir_glmark2_performance_test
 usr/bin/mir_privileged_tests
 usr/bin/mir_test_reload_protobuf
 usr/bin/mir_test_client_*
 
=== modified file 'tests/performance-tests/CMakeLists.txt'
--- tests/performance-tests/CMakeLists.txt	2016-04-22 03:37:10 +0000
+++ tests/performance-tests/CMakeLists.txt	2016-04-27 09:07:30 +0000
@@ -1,18 +1,25 @@
-add_custom_target(mir_performance_tests ALL
-  cp ${CMAKE_CURRENT_SOURCE_DIR}/performance_tests.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_performance_tests
-)
-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_performance_tests
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+set(
+  PERFORMANCE_TESTS_SOURCES
 
-mir_add_wrapped_executable(mir_glmark2_performance_test
   test_glmark2-es2-mir.cpp
 )
-add_dependencies(mir_glmark2_performance_test GMock)
-target_link_libraries(mir_glmark2_performance_test
+
+mir_add_wrapped_executable(
+  mir_performance_tests
+
+  ${PERFORMANCE_TESTS_SOURCES}
+)
+
+add_dependencies(mir_performance_tests GMock)
+
+target_link_libraries(
+  mir_performance_tests
+
   mir-test-static
   mir-test-framework-static
   mir-test-doubles-static
   mirserver
+
   ${GTEST_BOTH_LIBRARIES}
 )
+
 
=== removed file 'tests/performance-tests/performance_tests.sh'
--- tests/performance-tests/performance_tests.sh	2016-04-22 05:09:40 +0000
+++ tests/performance-tests/performance_tests.sh	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2016 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Daniel van Vugt <[e-mail]>
-#
-
-### This is a wrapper script that runs all Mir's performance tests ###
-
-bin_dir=`dirname $0`
-
-title_banner()
-{
-    echo "======================================================================="
-    echo "|  $*"
-    echo "======================================================================="
-}
-
-tests_run=0
-failures=0
-for perf_test in mir_glmark2_performance_test
-do
-    title_banner "Mir Performance Tests now running: $perf_test"
-    tests_run=$(($tests_run + 1))
-    $bin_dir/$perf_test || failures=$(($failures + 1))
-done
-
-passes=$(($tests_run - $failures))
-title_banner "Mir Performance Tests ran $tests_run tests: $passes passed, $failures failed."
-return $failures