summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qmutexpool.cpp
blob: 527b7189d8c6dcfe95d940c1be17d9e12a4c8c56 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/

#include "qatomic.h"
#include "qmutexpool_p.h"

#ifndef QT_NO_THREAD

QT_BEGIN_NAMESPACE

Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive))

/*!
    \class QMutexPool
    \inmodule QtCore
    \brief The QMutexPool class provides a pool of QMutex objects.

    \internal

    \ingroup thread

    QMutexPool is a convenience class that provides access to a fixed
    number of QMutex objects.

    Typical use of a QMutexPool is in situations where it is not
    possible or feasible to use one QMutex for every protected object.
    The mutex pool will return a mutex based on the address of the
    object that needs protection.

    For example, consider this simple class:

    \snippet code/src_corelib_thread_qmutexpool.cpp 0

    Adding a QMutex member to the Number class does not make sense,
    because it is so small. However, in order to ensure that access to
    each Number is protected, you need to use a mutex. In this case, a
    QMutexPool would be ideal.

    Code to calculate the square of a number would then look something
    like this:

    \snippet code/src_corelib_thread_qmutexpool.cpp 1

    This function will safely calculate the square of a number, since
    it uses a mutex from a QMutexPool. The mutex is locked and
    unlocked automatically by the QMutexLocker class. See the
    QMutexLocker documentation for more details.
*/

/*!
    Constructs  a QMutexPool, reserving space for \a size QMutexes. All
    mutexes in the pool are created with \a recursionMode. By default,
    all mutexes are non-recursive.

    The QMutexes are created when needed, and deleted when the
    QMutexPool is destructed.
*/
QMutexPool::QMutexPool(QMutex::RecursionMode recursionMode, int size)
    : mutexes(size), recursionMode(recursionMode)
{
    for (int index = 0; index < mutexes.count(); ++index) {
        mutexes[index].store(0);
    }
}

/*!
    Destructs a QMutexPool. All QMutexes that were created by the pool
    are deleted.
*/
QMutexPool::~QMutexPool()
{
    for (int index = 0; index < mutexes.count(); ++index)
        delete mutexes[index].load();
}

/*!
    Returns the global QMutexPool instance.
*/
QMutexPool *QMutexPool::instance()
{
    return globalMutexPool();
}

/*!
    \fn QMutexPool::get(const void *address)
    Returns a QMutex from the pool. QMutexPool uses the value \a address
    to determine which mutex is returned from the pool.
*/

/*!
    \internal
  create the mutex for the given index
 */
QMutex *QMutexPool::createMutex(int index)
{
    // mutex not created, create one
    QMutex *newMutex = new QMutex(recursionMode);
    if (!mutexes[index].testAndSetRelease(0, newMutex))
        delete newMutex;
    return mutexes[index].load();
}

/*!
    Returns a QMutex from the global mutex pool.
*/
QMutex *QMutexPool::globalInstanceGet(const void *address)
{
    QMutexPool * const globalInstance = globalMutexPool();
    if (globalInstance == 0)
        return 0;
    return globalInstance->get(address);
}

QT_END_NAMESPACE

#endif // QT_NO_THREAD
est Mirror/fork of https://github.com/mapbox/mapbox-gl-native. This is a submodule of qtlocation - no point in cloning it separately.
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Alanen <juha.alanen@mapbox.com>2020-02-13 14:12:44 +0200
committerJuha Alanen <juha.alanen@mapbox.com>2020-02-14 12:01:52 +0200
commit6d815401b10aaf7facba5f0676931a9908c1ba5b (patch)
treed24f91be94c367bd29ecc613c24f1447732b8442
parentf44cfa2fbc1db9965bc830f5c1e74816869fafa2 (diff)
[test-runner] Share common code between iOS test runners
Diffstat
-rw-r--r--platform/ios/ios.cmake82
-rw-r--r--platform/ios/test/common/AppDelegate.h (renamed from render-test/ios/AppDelegate.h)0
-rw-r--r--platform/ios/test/common/AppDelegate.m (renamed from render-test/ios/AppDelegate.m)0
-rw-r--r--platform/ios/test/common/LaunchScreen.storyboard (renamed from render-test/ios/LaunchScreen.storyboard)0
-rw-r--r--platform/ios/test/common/Main.storyboard (renamed from render-test/ios/Main.storyboard)0
-rw-r--r--platform/ios/test/common/Tests.m (renamed from test/ios/tests/Tests.m)2
-rw-r--r--platform/ios/test/common/ViewController.h (renamed from render-test/ios/ViewController.h)0
-rw-r--r--platform/ios/test/common/ViewController.m (renamed from render-test/ios/ViewController.m)0
-rw-r--r--platform/ios/test/common/ios_test_runner.hpp (renamed from test/ios/ios_test_runner.hpp)2
-rw-r--r--platform/ios/test/common/main.m (renamed from test/ios/main.m)0
-rw-r--r--render-test/ios/Gemfile3
-rw-r--r--render-test/ios/Gemfile.lock159
-rw-r--r--render-test/ios/ios_test_runner.hpp14
-rw-r--r--test/ios/AppDelegate.h7
-rw-r--r--test/ios/AppDelegate.m38
-rw-r--r--test/ios/Gemfile3
-rw-r--r--test/ios/LaunchScreen.storyboard27
-rw-r--r--test/ios/Main.storyboard27
-rw-r--r--test/ios/ViewController.h6
-rw-r--r--test/ios/ViewController.m22
-rw-r--r--test/ios/iosTestRunner.mm2
-rw-r--r--test/ios/ios_test_runner.cpp2
22 files changed, 37 insertions, 359 deletions
diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake
index 85b22afcc..16d0ed41c 100644
--- a/platform/ios/ios.cmake
+++ b/platform/ios/ios.cmake
@@ -94,30 +94,26 @@ target_link_libraries(
)
if(MBGL_IOS_RENDER_TEST)
- set(CMAKE_OSX_ARCHITECTURES "armv7;i386;x86_64;arm64")
-
include(${PROJECT_SOURCE_DIR}/vendor/zip-archive.cmake)
initialize_ios_target(mbgl-vendor-zip-archive)
set(PREPARE_CMD "${PROJECT_SOURCE_DIR}/render-test/ios/setup_test_data.sh")
- message("COMMAND: ${PREPARE_CMD}")
execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
- message(STATUS "CMD_ERROR:" ${CMD_ERROR})
- set(RESOURCES ${PROJECT_SOURCE_DIR}/render-test/ios/Main.storyboard ${PROJECT_SOURCE_DIR}/render-test/ios/LaunchScreen.storyboard
- ${PROJECT_SOURCE_DIR}/test-data)
+ set(RESOURCES ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Main.storyboard
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/LaunchScreen.storyboard ${PROJECT_SOURCE_DIR}/test-data)
add_executable(
RenderTestApp
- ${PROJECT_SOURCE_DIR}/render-test/ios/ios_test_runner.hpp
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ios_test_runner.hpp
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.h
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.m
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.h
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.m
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/main.m
${PROJECT_SOURCE_DIR}/render-test/ios/ios_test_runner.cpp
- ${PROJECT_SOURCE_DIR}/render-test/ios/AppDelegate.h
- ${PROJECT_SOURCE_DIR}/render-test/ios/AppDelegate.m
- ${PROJECT_SOURCE_DIR}/render-test/ios/ViewController.h
- ${PROJECT_SOURCE_DIR}/render-test/ios/ViewController.m
${PROJECT_SOURCE_DIR}/render-test/ios/iosTestRunner.h
${PROJECT_SOURCE_DIR}/render-test/ios/iosTestRunner.mm
- ${PROJECT_SOURCE_DIR}/render-test/ios/main.m
${RESOURCES}
)
initialize_ios_target(RenderTestApp)
@@ -147,6 +143,7 @@ if(MBGL_IOS_RENDER_TEST)
${PROJECT_SOURCE_DIR}/platform/darwin/include
${PROJECT_SOURCE_DIR}/platform/darwin/include/mbgl/interface/
${PROJECT_SOURCE_DIR}/platform/default/include
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common
${PROJECT_SOURCE_DIR}/src
)
@@ -168,19 +165,13 @@ if(MBGL_IOS_RENDER_TEST)
mbgl-vendor-zip-archive
)
+ set_target_properties(RenderTestApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+ set_target_properties(RenderTestApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+
find_package(XCTest REQUIRED)
xctest_add_bundle(RenderTestAppTests RenderTestApp ${PROJECT_SOURCE_DIR}/render-test/ios/tests/Tests.m)
- set_target_properties(
- RenderTestAppTests
- PROPERTIES
- XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET
- "${IOS_DEPLOYMENT_TARGET}"
- XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH
- $<$<CONFIG:Debug>:YES>
- )
-
target_include_directories(
RenderTestAppTests
PUBLIC ${PROJECT_SOURCE_DIR}/render-test/ios
@@ -188,7 +179,11 @@ if(MBGL_IOS_RENDER_TEST)
xctest_add_test(XCTest.RenderTestApp RenderTestAppTests)
+ set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}")
+ set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>)
set_target_properties(RenderTestAppTests PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/render-test/ios/tests/Info.plist)
+ set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+ set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
endif()
if(MBGL_IOS_UNIT_TEST)
@@ -199,24 +194,20 @@ if(MBGL_IOS_UNIT_TEST)
${CMAKE_CURRENT_BINARY_DIR}/test-data/mapbox-gl-js/src/style-spec/reference
)
- set(
- RESOURCES
- ${PROJECT_SOURCE_DIR}/test/ios/Main.storyboard
- ${PROJECT_SOURCE_DIR}/test/ios/LaunchScreen.storyboard
- ${CMAKE_CURRENT_BINARY_DIR}/test-data
- )
+ set(RESOURCES ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Main.storyboard
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/LaunchScreen.storyboard ${CMAKE_CURRENT_BINARY_DIR}/test-data)
add_executable(
UnitTestsApp
- ${PROJECT_SOURCE_DIR}/test/ios/ios_test_runner.hpp
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ios_test_runner.hpp
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.h
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.m
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.h
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.m
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common/main.m
${PROJECT_SOURCE_DIR}/test/ios/ios_test_runner.cpp
- ${PROJECT_SOURCE_DIR}/test/ios/AppDelegate.h
- ${PROJECT_SOURCE_DIR}/test/ios/AppDelegate.m
- ${PROJECT_SOURCE_DIR}/test/ios/ViewController.h
- ${PROJECT_SOURCE_DIR}/test/ios/ViewController.m
${PROJECT_SOURCE_DIR}/test/ios/iosTestRunner.h
${PROJECT_SOURCE_DIR}/test/ios/iosTestRunner.mm
- ${PROJECT_SOURCE_DIR}/test/ios/main.m
${RESOURCES}
)
initialize_ios_target(UnitTestsApp)
@@ -236,12 +227,11 @@ if(MBGL_IOS_UNIT_TEST)
target_include_directories(
UnitTestsApp
- PUBLIC {MBGL_ROOT}/test/include ${PROJECT_SOURCE_DIR}/include
- )
-
- target_include_directories(
- UnitTestsApp
- PUBLIC ${PROJECT_SOURCE_DIR}/test/ios
+ PUBLIC
+ ${PROJECT_SOURCE_DIR}/include
+ ${PROJECT_SOURCE_DIR}/platform/ios/test/common
+ ${PROJECT_SOURCE_DIR}/test/include
+ ${PROJECT_SOURCE_DIR}/test/ios
)
target_link_libraries(
@@ -263,16 +253,7 @@ if(MBGL_IOS_UNIT_TEST)
find_package(XCTest REQUIRED)
- xctest_add_bundle(UnitTestsAppTests UnitTestsApp ${PROJECT_SOURCE_DIR}/test/ios/tests/Tests.m)
-
- set_target_properties(
- UnitTestsAppTests
- PROPERTIES
- XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET
- "${IOS_DEPLOYMENT_TARGET}"
- XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH
- $<$<CONFIG:Debug>:YES>
- )
+ xctest_add_bundle(UnitTestsAppTests UnitTestsApp ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Tests.m)
target_include_directories(
UnitTestsAppTests
@@ -281,8 +262,11 @@ if(MBGL_IOS_UNIT_TEST)
xctest_add_test(XCTest.UnitTestsApp UnitTestsAppTests)
+ set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}")
+ set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>)
set_target_properties(UnitTestsAppTests PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/test/ios/tests/Info.plist)
set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
endif()
+
unset(IOS_DEPLOYMENT_TARGET CACHE)
diff --git a/render-test/ios/AppDelegate.h b/platform/ios/test/common/AppDelegate.h
index 134c8063d..134c8063d 100644
--- a/render-test/ios/AppDelegate.h
+++ b/platform/ios/test/common/AppDelegate.h
diff --git a/render-test/ios/AppDelegate.m b/platform/ios/test/common/AppDelegate.m
index 874d18de2..874d18de2 100644
--- a/render-test/ios/AppDelegate.m
+++ b/platform/ios/test/common/AppDelegate.m
diff --git a/render-test/ios/LaunchScreen.storyboard b/platform/ios/test/common/LaunchScreen.storyboard
index c9b756433..c9b756433 100644
--- a/render-test/ios/LaunchScreen.storyboard
+++ b/platform/ios/test/common/LaunchScreen.storyboard
diff --git a/render-test/ios/Main.storyboard b/platform/ios/test/common/Main.storyboard
index 34d4c7e2e..34d4c7e2e 100644
--- a/render-test/ios/Main.storyboard
+++ b/platform/ios/test/common/Main.storyboard
diff --git a/test/ios/tests/Tests.m b/platform/ios/test/common/Tests.m
index 4c2131d61..8d0719705 100644
--- a/test/ios/tests/Tests.m
+++ b/platform/ios/test/common/Tests.m
@@ -14,7 +14,7 @@
[super tearDown];
}
-- (void)testStartUnitTestRunner {
+- (void)testStartTestRunner {
IosTestRunner* runner = [[IosTestRunner alloc] init];
XCTAssert(runner, @"IOSTestRunner is not initialized correctly");
diff --git a/render-test/ios/ViewController.h b/platform/ios/test/common/ViewController.h
index 9c7dfc57e..9c7dfc57e 100644
--- a/render-test/ios/ViewController.h
+++ b/platform/ios/test/common/ViewController.h
diff --git a/render-test/ios/ViewController.m b/platform/ios/test/common/ViewController.m
index e9c526122..e9c526122 100644
--- a/render-test/ios/ViewController.m
+++ b/platform/ios/test/common/ViewController.m
diff --git a/test/ios/ios_test_runner.hpp b/platform/ios/test/common/ios_test_runner.hpp
index 3edae2282..db263dc73 100644
--- a/test/ios/ios_test_runner.hpp
+++ b/platform/ios/test/common/ios_test_runner.hpp
@@ -8,7 +8,7 @@ public:
TestRunner() = default;
~TestRunner() = default;
- bool startTest(const std::string& basePath);
+ bool startTest(const std::string& path);
};
#endif /* ios_test_runner_hpp */
diff --git a/test/ios/main.m b/platform/ios/test/common/main.m
index f813c8fea..f813c8fea 100644
--- a/test/ios/main.m
+++ b/platform/ios/test/common/main.m
diff --git a/render-test/ios/Gemfile b/render-test/ios/Gemfile
deleted file mode 100644
index adc90d98c..000000000
--- a/render-test/ios/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane" \ No newline at end of file
diff --git a/render-test/ios/Gemfile.lock b/render-test/ios/Gemfile.lock
deleted file mode 100644
index 23018150b..000000000
--- a/render-test/ios/Gemfile.lock
+++ /dev/null
@@ -1,159 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- CFPropertyList (3.0.2)
- addressable (2.7.0)
- public_suffix (>= 2.0.2, < 5.0)
- atomos (0.1.3)
- babosa (1.0.3)
- claide (1.0.3)
- colored (1.2)
- colored2 (3.1.2)
- commander-fastlane (4.4.6)
- highline (~> 1.7.2)
- declarative (0.0.10)
- declarative-option (0.1.0)
- digest-crc (0.4.1)
- domain_name (0.5.20190701)
- unf (>= 0.0.5, < 1.0.0)
- dotenv (2.7.5)
- emoji_regex (1.0.1)
- excon (0.71.1)
- faraday (0.17.3)
- multipart-post (>= 1.2, < 3)
- faraday-cookie_jar (0.0.6)
- faraday (>= 0.7.4)
- http-cookie (~> 1.0.0)
- faraday_middleware (0.13.1)
- faraday (>= 0.7.4, < 1.0)
- fastimage (2.1.7)
- fastlane (2.139.0)
- CFPropertyList (>= 2.3, < 4.0.0)
- addressable (>= 2.3, < 3.0.0)
- babosa (>= 1.0.2, < 2.0.0)
- bundler (>= 1.12.0, < 3.0.0)
- colored
- commander-fastlane (>= 4.4.6, < 5.0.0)
- dotenv (>= 2.1.1, < 3.0.0)
- emoji_regex (>= 0.1, < 2.0)
- excon (>= 0.71.0, < 1.0.0)
- faraday (~> 0.17)
- faraday-cookie_jar (~> 0.0.6)
- faraday_middleware (~> 0.13.1)
- fastimage (>= 2.1.0, < 3.0.0)
- gh_inspector (>= 1.1.2, < 2.0.0)
- google-api-client (>= 0.29.2, < 0.37.0)
- google-cloud-storage (>= 1.15.0, < 2.0.0)
- highline (>= 1.7.2, < 2.0.0)
- json (< 3.0.0)
- jwt (~> 2.1.0)
- mini_magick (>= 4.9.4, < 5.0.0)
- multi_xml (~> 0.5)
- multipart-post (~> 2.0.0)
- plist (>= 3.1.0, < 4.0.0)
- public_suffix (~> 2.0.0)
- rubyzip (>= 1.3.0, < 2.0.0)
- security (= 0.1.3)
- simctl (~> 1.6.3)
- slack-notifier (>= 2.0.0, < 3.0.0)
- terminal-notifier (>= 2.0.0, < 3.0.0)
- terminal-table (>= 1.4.5, < 2.0.0)
- tty-screen (>= 0.6.3, < 1.0.0)
- tty-spinner (>= 0.8.0, < 1.0.0)
- word_wrap (~> 1.0.0)
- xcodeproj (>= 1.13.0, < 2.0.0)
- xcpretty (~> 0.3.0)
- xcpretty-travis-formatter (>= 0.0.3)
- gh_inspector (1.1.3)
- google-api-client (0.36.4)
- addressable (~> 2.5, >= 2.5.1)
- googleauth (~> 0.9)
- httpclient (>= 2.8.1, < 3.0)
- mini_mime (~> 1.0)
- representable (~> 3.0)
- retriable (>= 2.0, < 4.0)
- signet (~> 0.12)
- google-cloud-core (1.4.1)
- google-cloud-env (~> 1.0)
- google-cloud-env (1.3.0)
- faraday (~> 0.11)
- google-cloud-storage (1.25.0)
- addressable (~> 2.5)
- digest-crc (~> 0.4)
- google-api-client (~> 0.33)
- google-cloud-core (~> 1.2)
- googleauth (~> 0.9)
- mini_mime (~> 1.0)
- googleauth (0.10.0)
- faraday (~> 0.12)
- jwt (>= 1.4, < 3.0)
- memoist (~> 0.16)
- multi_json (~> 1.11)
- os (>= 0.9, < 2.0)
- signet (~> 0.12)
- highline (1.7.10)
- http-cookie (1.0.3)
- domain_name (~> 0.5)
- httpclient (2.8.3)
- json (2.3.0)
- jwt (2.1.0)
- memoist (0.16.2)
- mini_magick (4.10.1)
- mini_mime (1.0.2)
- multi_json (1.14.1)
- multi_xml (0.6.0)
- multipart-post (2.0.0)
- nanaimo (0.2.6)
- naturally (2.2.0)
- os (1.0.1)
- plist (3.5.0)
- public_suffix (2.0.5)
- representable (3.0.4)
- declarative (< 0.1.0)
- declarative-option (< 0.2.0)
- uber (< 0.2.0)
- retriable (3.1.2)
- rouge (2.0.7)
- rubyzip (1.3.0)
- security (0.1.3)
- signet (0.12.0)
- addressable (~> 2.3)
- faraday (~> 0.9)
- jwt (>= 1.5, < 3.0)
- multi_json (~> 1.10)
- simctl (1.6.7)
- CFPropertyList
- naturally
- slack-notifier (2.3.2)
- terminal-notifier (2.0.0)
- terminal-table (1.8.0)
- unicode-display_width (~> 1.1, >= 1.1.1)
- tty-cursor (0.7.0)
- tty-screen (0.7.0)
- tty-spinner (0.9.2)
- tty-cursor (~> 0.7)
- uber (0.1.0)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.7.6)
- unicode-display_width (1.6.0)
- word_wrap (1.0.0)
- xcodeproj (1.14.0)
- CFPropertyList (>= 2.3.3, < 4.0)
- atomos (~> 0.1.3)
- claide (>= 1.0.2, < 2.0)
- colored2 (~> 3.1)
- nanaimo (~> 0.2.6)
- xcpretty (0.3.0)
- rouge (~> 2.0.7)
- xcpretty-travis-formatter (1.0.0)
- xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- fastlane
-
-BUNDLED WITH
- 2.1.4
diff --git a/render-test/ios/ios_test_runner.hpp b/render-test/ios/ios_test_runner.hpp
deleted file mode 100644
index 4ec1da93b..000000000
--- a/render-test/ios/ios_test_runner.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ios_test_runner_hpp
-#define ios_test_runner_hpp
-
-#include <string>
-
-class TestRunner {
-public:
- TestRunner() = default;
- ~TestRunner() = default;
-
- bool startTest(const std::string& manifest);
-};
-
-#endif /* ios_test_runner_hpp */
diff --git a/test/ios/AppDelegate.h b/test/ios/AppDelegate.h
deleted file mode 100644
index 134c8063d..000000000
--- a/test/ios/AppDelegate.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <UIKit/UIApplication.h> // UIApplicationDelegate
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end \ No newline at end of file
diff --git a/test/ios/AppDelegate.m b/test/ios/AppDelegate.m
deleted file mode 100644
index 874d18de2..000000000
--- a/test/ios/AppDelegate.m
+++ /dev/null
@@ -1,38 +0,0 @@
-#import "AppDelegate.h"
-
-@interface AppDelegate()
-
-@end
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
- // Insert code here to initialize your application
- NSLog(@"didFinishLaunchingWithOptions");
- return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application {
- // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
- // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
- // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
- // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application {
- // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
- // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
- // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-
-@end
diff --git a/test/ios/Gemfile b/test/ios/Gemfile
deleted file mode 100644
index adc90d98c..000000000
--- a/test/ios/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane" \ No newline at end of file
diff --git a/test/ios/LaunchScreen.storyboard b/test/ios/LaunchScreen.storyboard
deleted file mode 100644
index c9b756433..000000000
--- a/test/ios/LaunchScreen.storyboard
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="EHf-IW-A2E">
- <objects>
- <viewController id="01J-lp-oVM" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
- <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="53" y="375"/>
- </scene>
- </scenes>
-</document>
diff --git a/test/ios/Main.storyboard b/test/ios/Main.storyboard
deleted file mode 100644
index 34d4c7e2e..000000000
--- a/test/ios/Main.storyboard
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="tne-QT-ifu">
- <objects>
- <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
- <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <animations/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
- </objects>
- </scene>
- </scenes>
-</document>
diff --git a/test/ios/ViewController.h b/test/ios/ViewController.h
deleted file mode 100644
index 9c7dfc57e..000000000
--- a/test/ios/ViewController.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface ViewController : UIViewController
-
-@end
-
diff --git a/test/ios/ViewController.m b/test/ios/ViewController.m
deleted file mode 100644
index e9c526122..000000000
--- a/test/ios/ViewController.m
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "ViewController.h"
-#import "iosTestRunner.h"
-
-@interface ViewController ()
-{
- IosTestRunner* i;
-}
-@end
-
-@implementation ViewController
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-// In order to run test runner with app itself instead of with unit test, comment out the following line.
-// i = [[IosTestRunner alloc]init];
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-}
-
-@end
diff --git a/test/ios/iosTestRunner.mm b/test/ios/iosTestRunner.mm
index 383b9036e..d3f6113a0 100644
--- a/test/ios/iosTestRunner.mm
+++ b/test/ios/iosTestRunner.mm
@@ -1,6 +1,6 @@
#import "iosTestRunner.h"
-#include "ios_test_runner.hpp"
+#include <ios_test_runner.hpp>
#include <string>
diff --git a/test/ios/ios_test_runner.cpp b/test/ios/ios_test_runner.cpp
index 293a2955b..c99d8c3f3 100644
--- a/test/ios/ios_test_runner.cpp
+++ b/test/ios/ios_test_runner.cpp
@@ -1,4 +1,4 @@
-#include "ios_test_runner.hpp"
+#include <ios_test_runner.hpp>
#include <mbgl/test.hpp>