Mir

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

Proposed by Alan Griffiths
Status: Rejected
Rejected by: Alan Griffiths
Proposed branch: lp:~alan-griffiths/mir/revert-3477
Merge into: lp:mir
Diff against target: 97 lines (+16/-52)
3 files modified
debian/mir-test-tools.install (+0/-1)
tests/performance-tests/CMakeLists.txt (+16/-9)
tests/performance-tests/performance_tests.sh (+0/-42)
To merge this branch: bzr merge lp:~alan-griffiths/mir/revert-3477
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Daniel van Vugt Disapprove
Review via email: mp+293063@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

Simple to fix.

review: Disapprove
Revision history for this message
Daniel van Vugt (vanvugt) wrote :
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

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

Revert -C 3477

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/mir-test-tools.install'
2--- debian/mir-test-tools.install 2016-04-22 03:37:10 +0000
3+++ debian/mir-test-tools.install 2016-04-27 09:07:30 +0000
4@@ -5,7 +5,6 @@
5 usr/bin/mir_umock_acceptance_tests
6 usr/bin/mir_integration_tests*
7 usr/bin/mir_performance_tests
8-usr/bin/mir_glmark2_performance_test
9 usr/bin/mir_privileged_tests
10 usr/bin/mir_test_reload_protobuf
11 usr/bin/mir_test_client_*
12
13=== modified file 'tests/performance-tests/CMakeLists.txt'
14--- tests/performance-tests/CMakeLists.txt 2016-04-22 03:37:10 +0000
15+++ tests/performance-tests/CMakeLists.txt 2016-04-27 09:07:30 +0000
16@@ -1,18 +1,25 @@
17-add_custom_target(mir_performance_tests ALL
18- cp ${CMAKE_CURRENT_SOURCE_DIR}/performance_tests.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_performance_tests
19-)
20-install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_performance_tests
21- DESTINATION ${CMAKE_INSTALL_BINDIR}
22-)
23+set(
24+ PERFORMANCE_TESTS_SOURCES
25
26-mir_add_wrapped_executable(mir_glmark2_performance_test
27 test_glmark2-es2-mir.cpp
28 )
29-add_dependencies(mir_glmark2_performance_test GMock)
30-target_link_libraries(mir_glmark2_performance_test
31+
32+mir_add_wrapped_executable(
33+ mir_performance_tests
34+
35+ ${PERFORMANCE_TESTS_SOURCES}
36+)
37+
38+add_dependencies(mir_performance_tests GMock)
39+
40+target_link_libraries(
41+ mir_performance_tests
42+
43 mir-test-static
44 mir-test-framework-static
45 mir-test-doubles-static
46 mirserver
47+
48 ${GTEST_BOTH_LIBRARIES}
49 )
50+
51
52=== removed file 'tests/performance-tests/performance_tests.sh'
53--- tests/performance-tests/performance_tests.sh 2016-04-22 05:09:40 +0000
54+++ tests/performance-tests/performance_tests.sh 1970-01-01 00:00:00 +0000
55@@ -1,42 +0,0 @@
56-#!/bin/sh
57-#
58-# Copyright © 2016 Canonical Ltd.
59-#
60-# This program is free software: you can redistribute it and/or modify
61-# it under the terms of the GNU General Public License version 3 as
62-# published by the Free Software Foundation.
63-#
64-# This program is distributed in the hope that it will be useful,
65-# but WITHOUT ANY WARRANTY; without even the implied warranty of
66-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
67-# GNU General Public License for more details.
68-#
69-# You should have received a copy of the GNU General Public License
70-# along with this program. If not, see <http://www.gnu.org/licenses/>.
71-#
72-# Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
73-#
74-
75-### This is a wrapper script that runs all Mir's performance tests ###
76-
77-bin_dir=`dirname $0`
78-
79-title_banner()
80-{
81- echo "======================================================================="
82- echo "| $*"
83- echo "======================================================================="
84-}
85-
86-tests_run=0
87-failures=0
88-for perf_test in mir_glmark2_performance_test
89-do
90- title_banner "Mir Performance Tests now running: $perf_test"
91- tests_run=$(($tests_run + 1))
92- $bin_dir/$perf_test || failures=$(($failures + 1))
93-done
94-
95-passes=$(($tests_run - $failures))
96-title_banner "Mir Performance Tests ran $tests_run tests: $passes passed, $failures failed."
97-return $failures

Subscribers

People subscribed via source and target branches