Merge branch 'devel' of github.com:arangodb/arangodb into devel

CMakeLists.txt

@@ -290,8 +290,12 @@ else ()
 
   include(VcMacros)
 
-  include(OptimizeForArchitecture)
-  OptimizeForArchitecture()
+  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
+
+  if (USE_OPTIMIZE_FOR_ARCHITECTURE)
+    include(OptimizeForArchitecture)
+    OptimizeForArchitecture()
+  endif ()
 
   set(BASE_FLAGS "${Vc_ARCHITECTURE_FLAGS} ${BASE_FLAGS}")
 endif ()

UnitTests/Basics/string-utf8-normalize-test.cpp

@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (tst_2) {
     };    
   
   int32_t len = 0;
-  char* result = TRI_tolower_utf8(TRI_CORE_MEM_ZONE, (const char*) gruessgott1, strlen((const char*) gruessgott1), &len);
+  char* result = TRI_tolower_utf8(TRI_CORE_MEM_ZONE, (const char*) gruessgott1, (int32_t) strlen((const char*) gruessgott1), &len);
 
 
   //printf("\nOriginal: %s\nLower: %s (%d)\n", gruessgott1, result, len);
@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE (tst_2) {
   BOOST_CHECK_EQUAL(expectString, resultString);
   
   len = 0;
-  result = TRI_tolower_utf8(TRI_CORE_MEM_ZONE, (const char*) gruessgott2, strlen((const char*) gruessgott2), &len);
+  result = TRI_tolower_utf8(TRI_CORE_MEM_ZONE, (const char*) gruessgott2, (int32_t) strlen((const char*) gruessgott2), &len);
   //printf("\nOriginal: %s\nLower: %s (%d)\n", gruessgott2, result, len);
   l2 = strlen(result);
   BOOST_CHECK_EQUAL(l1, l2);

js/client/modules/@arangodb/testing.js

@@ -2354,25 +2354,47 @@ testFuncs.authentication_parameters = function(options) {
 /// @brief TEST: boost
 ////////////////////////////////////////////////////////////////////////////////
 
+function locateBoostTest(name) {
+  var file = fs.join(UNITTESTS_DIR,name);
+  if (platform.substr(0, 3) === 'win') {
+    file += ".exe";
+  }
+  
+  if (!fs.exists(file)) {
+    return "";
+  }
+  return file;
+}
+
 testFuncs.boost = function(options) {
   const args = ["--show_progress"];
 
   let results = {};
 
   if (!options.skipBoost) {
-    const run = fs.join(UNITTESTS_DIR, "basics_suite");
+    const run = locateBoostTest("basics_suite");
 
-    if (fs.exists(run)) {
+    if (run !== "") {
       results.basics = executeAndWait(run, args, options, "basics");
     }
+    else {
+      results.basics = {
+        status: false,
+        message: "binary 'basics_suite' not found"};
+    }
   }
 
   if (!options.skipGeo) {
-    const run = fs.join(UNITTESTS_DIR, "geo_suite");
+    const run = locateBoostTest("geo_suite");
 
-    if (fs.exists(run)) {
+    if (run !== "") {
       results.geo_suite = executeAndWait(run, args, options, "geo_suite");
     }
+    else {
+      results.geo_suite = {
+        status: false,
+        message: "binary 'geo_suite' not found"};
+    }
   }
 
   return results;

js/server/modules/@arangodb/foxx/manager.js

@@ -70,21 +70,11 @@ const legacyManifestFields = [
 ];
 
 const manifestSchema = {
+  // FoxxStore metadata
   name: joi.string().regex(/^[-_a-z][-_a-z0-9]*$/i).optional(),
   version: joi.string().optional(),
-  engines: (
-    joi.object().optional()
-    .pattern(RE_EMPTY, joi.forbidden())
-    .pattern(RE_NOT_EMPTY, joi.string().required())
-  ),
-
-  license: joi.string().optional(),
-  description: joi.string().allow('').default(''),
   keywords: joi.array().optional(),
-  thumbnail: joi.string().optional(),
-  author: joi.string().allow('').default(''),
-  contributors: joi.array().optional(),
-  defaultDocument: joi.string().allow('').optional(),
+  license: joi.string().optional(),
   repository: (
     joi.object().optional()
     .keys({
@@ -93,9 +83,29 @@ const manifestSchema = {
     })
   ),
 
+  // Additional web interface metadata
+  author: joi.string().allow('').default(''),
+  contributors: joi.array().optional(),
+  description: joi.string().allow('').default(''),
+  thumbnail: joi.string().optional(),
+
+  // Compatibility
+  engines: (
+    joi.object().optional()
+    .pattern(RE_EMPTY, joi.forbidden())
+    .pattern(RE_NOT_EMPTY, joi.string().required())
+  ),
+
+  // Index redirect
+  defaultDocument: joi.string().allow('').optional(),
+
+  // JS path
   lib: joi.string().default('.'),
+
+  // Entrypoint
   main: joi.string().optional(),
 
+  // Config
   configuration: (
     joi.object().optional()
     .pattern(RE_EMPTY, joi.forbidden())
@@ -113,6 +123,7 @@ const manifestSchema = {
     ))
   ),
 
+  // Dependencies supported
   dependencies: (
     joi.object().optional()
     .pattern(RE_EMPTY, joi.forbidden())
@@ -127,6 +138,7 @@ const manifestSchema = {
     ))
   ),
 
+  // Dependencies provided
   provides: (
     joi.alternatives().try(
       joi.string().optional(),
@@ -138,6 +150,7 @@ const manifestSchema = {
     )
   ),
 
+  // Bundled assets
   files: (
     joi.object().optional()
     .pattern(RE_EMPTY, joi.forbidden())
@@ -152,12 +165,15 @@ const manifestSchema = {
     ))
   ),
 
+  // Scripts/queue jobs
   scripts: (
     joi.object().optional()
     .pattern(RE_EMPTY, joi.forbidden())
     .pattern(RE_NOT_EMPTY, joi.string().required())
     .default(Object, 'empty scripts object')
   ),
+
+  // Foxx tests path
   tests: (
     joi.alternatives()
     .try(