Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scripts unittests fix

This commit is contained in:
Andreas Streichardt 2017-03-03 21:15:06 +01:00
parent cb8e5aa331
commit 9420fb0e84
2 changed files with 4 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
UnitTests/CMakeLists.txt
View File

@ -1,72 +0,0 @@
# -*- mode: CMAKE; -*-
include_directories(.)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_TEST_DIRECTORY}")
################################################################################
## basics_suite
################################################################################
add_executable(${TEST_BASICS_SUITE}
Basics/Runner.cpp
Basics/conversions-test.cpp
Basics/csv-test.cpp
Basics/files-test.cpp
Basics/fpconv-test.cpp
Basics/json-test.cpp
Basics/hashes-test.cpp
Basics/associative-multi-pointer-test.cpp
Basics/associative-multi-pointer-nohashcache-test.cpp
Basics/skiplist-test.cpp
Basics/priorityqueue-test.cpp
Basics/string-buffer-test.cpp
Basics/string-utf8-normalize-test.cpp
Basics/string-utf8-test.cpp
Basics/string-test.cpp
Basics/structure-size-test.cpp
Basics/vector-test.cpp
Basics/EndpointTest.cpp
Basics/StringBufferTest.cpp
Basics/StringUtilsTest.cpp
Basics/icu-helper.cpp
../lib/ApplicationFeatures/LanguageFeature.cpp
../lib/Basics/WorkMonitorDummy.cpp
)
include_directories(
${TEST_BASICS_SUITE}
PUBLIC ${Boost_UNIT_TEST_INCLUDE_DIR}
)
target_link_libraries(${TEST_BASICS_SUITE}
${LIB_ARANGO}
boost_system
boost_boost
${MSVC_LIBS}
${SYSTEM_LIBRARIES}
)
if (NOT USE_PRECOMPILED_V8)
add_dependencies(basics_suite v8_build)
endif ()
################################################################################
## geo_suite
################################################################################
add_executable(${TEST_GEO_SUITE}
Geo/georeg.cpp
../lib/Basics/WorkMonitorDummy.cpp
../arangod/MMFiles/geo-index.cpp
)
target_link_libraries(${TEST_GEO_SUITE}
${LIB_ARANGO}
${MSVC_LIBS}
${SYSTEM_LIBRARIES}
)
if (NOT USE_PRECOMPILED_V8)
add_dependencies(geo_suite v8_build)
endif ()

8
js/client/modules/@arangodb/testing.js
View File

@ -2643,12 +2643,11 @@ function locateBoostTest (name) {
}
testFuncs.boost = function (options) {
const args = ['--show_progress'];
let args = [];
let results = {};
if (!options.skipBoost) {
const run = locateBoostTest('basics_suite');
const run = locateBoostTest('arangodbtests');
if (run !== '') {
results.basics = executeAndWait(run, args, options, 'basics');
@ -2661,7 +2660,8 @@ testFuncs.boost = function (options) {
}
if (!options.skipGeo) {
const run = locateBoostTest('geo_suite');
const run = locateBoostTest('arangodbtests');
args.push('[geo]');
if (run !== '') {
results.geo_suite = executeAndWait(run, args, options, 'geo_suite');