summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-06-29 12:44:40 -0700
committerKonstantin Käfer <mail@kkaefer.com>2018-06-29 12:44:40 -0700
commitee5cd165c57fcce8e067c0a7c267ad4307c67433 (patch)
tree087805a7ae903fc3d7b4e99f307402131d999d3d
parent821b6bdb9ab87ad120e7cdcbd9391e78768dfee2 (diff)
downloadqtlocation-mapboxgl-upstream/filesource.tar.gz
-rw-r--r--circle.yml102
-rw-r--r--test/storage/offline_database.test.cpp1
2 files changed, 52 insertions, 51 deletions
diff --git a/circle.yml b/circle.yml
index a3b81ed0c8..92c8026398 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,58 +4,58 @@ workflows:
version: 2
default:
jobs:
- - nitpick
- - clang-tidy:
- filters:
- branches:
- ignore: master
- - android-debug-arm-v7
- - android-build-release:
- filters:
- branches:
- ignore: /(master|release-boba|release-chai)/
- - android-release-snapshot:
- filters:
- branches:
- only: /(master|release-boba|release-chai)/
- - android-release-tag:
- filters:
- tags:
- only: /android-v.*/
- branches:
- ignore: /.*/
- - node-clang39-release:
- filters:
- tags:
- only: /node-.*/
- - node-gcc6-debug:
- filters:
- tags:
- only: /node-.*/
- - linux-clang-3.8-libcxx-debug
- - linux-clang4-sanitize-address
- - linux-clang4-sanitize-undefined
- - linux-clang4-sanitize-thread
+ # - nitpick
+ # - clang-tidy:
+ # filters:
+ # branches:
+ # ignore: master
+ # - android-debug-arm-v7
+ # - android-build-release:
+ # filters:
+ # branches:
+ # ignore: /(master|release-boba|release-chai)/
+ # - android-release-snapshot:
+ # filters:
+ # branches:
+ # only: /(master|release-boba|release-chai)/
+ # - android-release-tag:
+ # filters:
+ # tags:
+ # only: /android-v.*/
+ # branches:
+ # ignore: /.*/
+ # - node-clang39-release:
+ # filters:
+ # tags:
+ # only: /node-.*/
+ # - node-gcc6-debug:
+ # filters:
+ # tags:
+ # only: /node-.*/
+ # - linux-clang-3.8-libcxx-debug
+ # - linux-clang4-sanitize-address
+ # - linux-clang4-sanitize-undefined
+ # - linux-clang4-sanitize-thread
- linux-gcc4.9-debug
- - linux-gcc5-debug-coverage
- - linux-gcc5-release-qt4
- - linux-gcc5-release-qt5
- - ios-debug
- - ios-sanitize
- - ios-sanitize-address
- - ios-static-analyzer
- - ios-release:
- filters:
- tags:
- only: /ios-.*/
- branches:
- ignore: /.*/
- - macos-debug
- - macos-debug-qt5
- - macos-release-node:
- filters:
- tags:
- only: /node-.*/
+ # - linux-gcc5-debug-coverage
+ # - linux-gcc5-release-qt4
+ # - linux-gcc5-release-qt5
+ # - ios-debug
+ # - ios-sanitize
+ # - ios-sanitize-address
+ # - ios-static-analyzer
+ # - ios-release:
+ # filters:
+ # tags:
+ # only: /ios-.*/
+ # branches:
+ # ignore: /.*/
+ # - macos-debug
+ # - macos-debug-qt5
+ # - macos-release-node:
+ # filters:
+ # tags:
+ # only: /node-.*/
step-library:
- &generate-cache-key
diff --git a/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp
index 5ca9d31a30..4aea602952 100644
--- a/test/storage/offline_database.test.cpp
+++ b/test/storage/offline_database.test.cpp
@@ -199,6 +199,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
{
mapbox::sqlite::Database db = mapbox::sqlite::Database::open(filename, mapbox::sqlite::ReadWriteCreate);
+ db.setBusyTimeout(Milliseconds::max());
db.exec("PRAGMA user_version = 1");
}