Mir

Merge lp:~alan-griffiths/mir/fix-bug-1153006 into lp:~mir-team/mir/trunk

Proposed by Alan Griffiths
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 486
Proposed branch: lp:~alan-griffiths/mir/fix-bug-1153006
Merge into: lp:~mir-team/mir/trunk
Diff against target: 76 lines (+0/-61)
2 files modified
tests/unit-tests/compositor/CMakeLists.txt (+0/-1)
tests/unit-tests/compositor/test_basic_buffer.cpp (+0/-60)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-bug-1153006
Reviewer Review Type Date Requested Status
Robert Carr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+152739@code.launchpad.net

Commit message

tests: delete "test" file with no tests in it

Description of the change

tests: delete "test" file with no tests in it

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/mir-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/43//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/42//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit-tests/compositor/CMakeLists.txt'
2--- tests/unit-tests/compositor/CMakeLists.txt 2013-03-04 15:54:45 +0000
3+++ tests/unit-tests/compositor/CMakeLists.txt 2013-03-11 18:14:22 +0000
4@@ -5,7 +5,6 @@
5 ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_swapper.cpp
6 ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_swapper_double.cpp
7 ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_swapper_triple.cpp
8- ${CMAKE_CURRENT_SOURCE_DIR}/test_basic_buffer.cpp
9 ${CMAKE_CURRENT_SOURCE_DIR}/test_temporary_buffers.cpp
10 ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_id.cpp
11 ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_properties.cpp
12
13=== removed file 'tests/unit-tests/compositor/test_basic_buffer.cpp'
14--- tests/unit-tests/compositor/test_basic_buffer.cpp 2012-12-19 16:01:00 +0000
15+++ tests/unit-tests/compositor/test_basic_buffer.cpp 1970-01-01 00:00:00 +0000
16@@ -1,60 +0,0 @@
17-/*
18- * Copyright © 2012 Canonical Ltd.
19- *
20- * This program is free software: you can redistribute it and/or modify
21- * it under the terms of the GNU General Public License version 3 as
22- * published by the Free Software Foundation.
23- *
24- * This program is distributed in the hope that it will be useful,
25- * but WITHOUT ANY WARRANTY; without even the implied warranty of
26- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27- * GNU General Public License for more details.
28- *
29- * You should have received a copy of the GNU General Public License
30- * along with this program. If not, see <http://www.gnu.org/licenses/>.
31- *
32- * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
33- */
34-
35-/* since we're testing functions that belong to a class that shouldn't have
36- a constructor, we test via a test class */
37-
38-#include "mir/compositor/buffer_basic.h"
39-#include "mir/compositor/buffer_ipc_package.h"
40-
41-#include <gtest/gtest.h>
42-
43-namespace mc=mir::compositor;
44-namespace geom=mir::geometry;
45-
46-class TestClassBuffer : public mc::BufferBasic
47-{
48-public:
49- TestClassBuffer()
50- {
51- }
52-
53- geom::Size size() const
54- {
55- return geom::Size{geom::Width{0}, geom::Height{0}};
56- }
57-
58- geom::Stride stride() const
59- {
60- return geom::Stride{0};
61- }
62-
63- geom::PixelFormat pixel_format() const
64- {
65- return geom::PixelFormat::abgr_8888;
66- }
67-
68- void bind_to_texture()
69- {
70- }
71-
72- std::shared_ptr<mc::BufferIPCPackage> get_ipc_package() const
73- {
74- return std::shared_ptr<mc::BufferIPCPackage>();
75- }
76-};

Subscribers

People subscribed via source and target branches