Commit Graph

78 Commits

Author SHA1 Message Date
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
704b3719f5 use standard DEBUG macro rather than NDEBUG 2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
4a985e09f2 asset:// URLs are local to the executable path now 2015-02-04 10:49:06 +01:00
Konstantin Käfer
92a7f73bbe fixes for linux 2015-02-04 10:49:06 +01:00
Konstantin Käfer
aa09aa321b rearrange tests and make more robust 2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1 remove circular shared_ptr and a few other memory leaks 2015-02-04 10:49:05 +01:00
John Firebaugh
c6ca57045f Merge pull request #744 from mapbox/merge-roads
merge adjacent roads with the same text for labeling
2015-01-14 10:12:45 -08:00
Ansis Brammanis
4fbb7d614c port tests for mergeLines
js: 867b7f4be01126663df609756049515a41e700d1
2015-01-13 22:29:28 -05:00
Mike Morris
f1609ef329 include sqlite3_static_libs in linker flags 2015-01-13 14:31:50 -05:00
Konstantin Käfer
8fd04ebc44 add missing gyp file 2014-12-08 22:35:03 +01:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
artemp
759a5e65cf simplify image_readers creation implementation
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
2014-11-19 13:06:47 +01:00
artemp
782a0be4bf Merge branch 'master' into image-readers 2014-11-13 15:46:11 +00:00
Mike Morris
b5198374e7 add boost headers to cflags_cc for text_conversions test 2014-11-07 12:20:40 -05:00
artemp
5d29742e1c fix tests for linux (todo - find a better way to run 'linux' tests on 'osx') 2014-11-07 15:52:30 +00:00
Konstantin Käfer
c575191409 Merge pull request #540 from mapbox/test-http
Run tests using HTTP requests
2014-11-04 16:33:39 +01:00
artemp
76066c6afd format 2014-11-04 14:56:12 +00:00
artemp
e5f7e3e96c add basic toupper/tolower text conversions tests #309 2014-11-04 14:53:45 +00:00
Konstantin Käfer
4efb441008 Run tests using http requests
We now start a local HTTP server on port 2900 that serves the test fixtures. This is the same port we also use in the JS test suite

fixes #532
2014-11-04 12:45:01 +01:00
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -04:00
Konstantin Käfer
930d063259 Merge branch 'master' into platform-image
Conflicts:
	gyp/install.gypi
2014-10-30 15:44:09 -04:00
Konstantin Käfer
592ed57d09 use more modern libpng version instead of the system-provided one and fix compile errors 2014-10-30 12:40:16 -07:00
Dane Springmeyer
c40a85587b attemp to fix #525 2014-10-30 13:37:10 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
Dane Springmeyer
152545d33a fix xtest target - closes #520 - longer term fix at #519 2014-10-30 11:24:28 -04:00
Dane Springmeyer
d8a93dbb95 use stable cross-generator direction for referencing standalone lib + other minor fixups 2014-10-29 18:13:25 -04:00
Dane Springmeyer
cefa3462f8 linux test build fixes 2014-10-29 16:34:53 -04:00
Dane Springmeyer
1069e3b4e9 fix tests 2014-10-29 16:29:48 -04:00
Konstantin Käfer
293b291b80 rename mbgl to mbgl-core 2014-10-29 11:59:24 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Konstantin Käfer
84700fce90 allow installing the library 2014-10-27 10:12:30 -04:00
Konstantin Käfer
0e928b5204 make tests work 2014-10-24 17:44:51 +02:00
Konstantin Käfer
d299e58088 Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
Conflicts:
	Makefile
	ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a restructure gyp files 2014-10-24 16:40:08 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
2f3952b305 fix compile warnings 2014-10-22 11:00:34 +02:00
Konstantin Käfer
b9d422ebc3 use glfw3 libs instead of manually linking OpenGL frameworks on OS X
[skip ci]
2014-10-22 10:45:50 +02:00
Mike Morris
0f1d33f5ee break out HeadlessDisplay from HeadlessView, ref #478 2014-10-03 18:31:38 -04:00
Konstantin Käfer
b68a2a4f76 add uppercase/lowercase symbols to headless test 2014-08-22 14:54:09 +02:00
Konstantin Käfer
9b9ad20a90 Merge branch 'master' into style-parser-test
Conflicts:
	mapboxgl.gyp
2014-08-12 13:16:20 +02:00
Konstantin Käfer
367b35998d fix gyp builds 2014-08-12 12:26:00 +02:00
Mike Morris
fae1c157f6 build fixes 2014-08-11 13:24:25 -04:00
Mike Morris
a79afb78d8 Merge branch 'master' into style-parser-test
Conflicts:
	bin/build-style.js
	bin/default.style.json
	mapboxgl.gyp
	src/style/style_parser.cpp
	test/test.gyp
2014-08-11 12:42:49 -04:00
Konstantin Käfer
eef51a8679 fix test gyp file 2014-08-11 13:00:15 +02:00
Mike Morris
54a81d0f9b migrate style_parser tests to use info and style json fixtures 2014-07-18 14:09:33 -04:00
Mike Morris
7fab02d6bd split stylesheet fixtures into separate gyp action 2014-07-17 16:49:30 -04:00
Mike Morris
4cb9972278 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
	src/style/style_parser.cpp
	test/fixtures/fixture_log.cpp
	test/test.gyp
2014-07-17 12:44:45 -04:00