jsteemann
617e23e25a
cppcheck
2017-04-06 11:48:07 +02:00
Wilfried Goesgens
bf3f68ee26
BUGFIX: when we don't start the server we mustn't try to attempt to clean up its db directories
2017-04-06 11:43:11 +02:00
jsteemann
e3596d9d5d
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-06 11:21:50 +02:00
jsteemann
6308615825
renamed test file
2017-04-06 11:21:17 +02:00
Jan Christoph Uhde
5e63ba1e6f
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
fix objectId handling
Fixing windows build
Fixing windows build
Bugfix: we want the common _and_ the server tests.
Conversion warnings
Conversion errors
Renaming test files
fix windows build
fix if clause
exclude longrunning tests
add slash here too.
...
2017-04-06 11:20:32 +02:00
jsteemann
8b57f1996e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-06 11:19:41 +02:00
jsteemann
82fe6cf098
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-06 11:19:36 +02:00
Jan Christoph Uhde
cc39030042
move key options ot logical collection
2017-04-06 11:19:30 +02:00
jsteemann
0e98a32455
fix objectId handling
2017-04-06 11:19:27 +02:00
Simon Grätzer
d95205d76f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-06 11:18:34 +02:00
Simon Grätzer
e58bdb6258
Fixing windows build
2017-04-06 11:17:42 +02:00
Simon Grätzer
6435e3b2bc
Fixing windows build
2017-04-06 11:15:49 +02:00
Wilfried Goesgens
050d931446
Bugfix: we want the common _and_ the server tests.
2017-04-06 11:14:01 +02:00
Simon Grätzer
08167c2614
Conversion warnings
2017-04-06 10:56:50 +02:00
Simon Grätzer
a90e62bc02
Conversion errors
2017-04-06 10:50:40 +02:00
Simon Grätzer
5603e1a6da
Renaming test files
2017-04-06 10:29:40 +02:00
Jan Christoph Uhde
60956dc09c
fix windows build
2017-04-06 10:17:17 +02:00
Jan Christoph Uhde
b33bd8f5d5
fix windows build
2017-04-06 10:15:29 +02:00
Jan Christoph Uhde
e83aad21ac
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
Slightly improved any iterator.
Moved/split more tests.
Cache workaround to pass upgrade test.
2017-04-06 10:11:05 +02:00
Wilfried Goesgens
a0d331937c
fix if clause
2017-04-06 09:38:52 +02:00
jsteemann
6ae5cec318
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-06 09:06:28 +02:00
Dan Larkin
3c3d6ae52f
Slightly improved any iterator.
2017-04-05 18:03:10 -04:00
Dan Larkin
1d9366b1f1
Moved/split more tests.
2017-04-05 16:09:46 -04:00
Dan Larkin
ae84e8ac84
Cache workaround to pass upgrade test.
2017-04-05 12:55:16 -04:00
Andreas Streichardt
884b646614
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-05 18:49:15 +02:00
Andreas Streichardt
61f9f92c46
exclude longrunning tests
2017-04-05 18:47:44 +02:00
Jan Christoph Uhde
ed5b70a558
merge stash
2017-04-05 18:45:53 +02:00
Dan Larkin
4ca2cf52d3
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-04-05 12:17:27 -04:00
Dan Larkin
ff0efe8de8
Split/moved more test files.
2017-04-05 12:16:54 -04:00
Michael Hackstein
e3325e7e87
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-04-05 17:47:32 +02:00
Michael Hackstein
daa8b2b855
Detemplateified the ShortestPath class structure.
2017-04-05 17:47:14 +02:00
Simon Grätzer
b3743292e3
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-05 17:43:49 +02:00
Simon Grätzer
19f220726e
Fixed dump setup
2017-04-05 17:43:38 +02:00
Wilfried Goesgens
bbed39b172
add slash here too.
2017-04-05 17:40:35 +02:00
Dan Larkin
e1f448137e
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-04-05 11:39:37 -04:00
Dan Larkin
84be9365af
Split a JS test.
2017-04-05 11:39:28 -04:00
Andreas Streichardt
2bdc86d9f2
...
2017-04-05 17:35:06 +02:00
jsteemann
77ff2f360e
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel
2017-04-05 17:09:49 +02:00
jsteemann
5bca16bbf3
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-05 17:08:57 +02:00
jsteemann
a7cf037aaa
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-05 17:08:07 +02:00
Wilfried Goesgens
8ad9a67a7e
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-05 17:01:56 +02:00
Wilfried Goesgens
e77f9ed3e7
fix bracket type
2017-04-05 17:01:30 +02:00
jsteemann
d5bbcf7b1e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-05 17:01:20 +02:00
Michael Hackstein
fbd3e4e237
Removed VertexID from ShortestPath templates.
2017-04-05 17:01:05 +02:00
jsteemann
6fa5556ff7
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel
2017-04-05 16:58:17 +02:00
Andreas Streichardt
7514a1a1eb
fix js
2017-04-05 16:58:10 +02:00
Wilfried Goesgens
8d01619589
add option to specify the test output directory
2017-04-05 16:46:33 +02:00
Michael Hackstein
ee57f9abef
Renamed ConstDistanceFinder => ConstantWeightShortestPathFinder
2017-04-05 16:29:40 +02:00
Michael Hackstein
30095556e9
Renamed DynamicDistanceFinder => AttributeWeightShortestPathFinder
2017-04-05 16:21:38 +02:00
Michael Hackstein
829fb4be54
Renamed PathFinder => ShortestPathFinder.
2017-04-05 16:17:37 +02:00