Merge branch 'master' into fix-cpp-tests

Author: aminya

binding.gyp

@@ -69,7 +69,7 @@
     "variables": {
         "tests": 0,
         "STANDARD": 17,
-        "MACOSX_DEPLOYMENT_TARGET": "10.8"
+        "MACOSX_DEPLOYMENT_TARGET": "10.15"
     },
 
     "conditions": [
@@ -119,7 +119,7 @@
             ['OS=="mac"', {
                 "xcode_settings": {
                     'CLANG_CXX_LIBRARY': 'libc++',
-                    'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
+                    'CLANG_CXX_LANGUAGE_STANDARD':'c++(STANDARD)',
                 }
             }],
             ['OS=="win"', {
@@ -136,8 +136,8 @@
           # Release Settings
           'Release': {
             'defines': [ 'NDEBUG' ],
-            "cflags": [ "-fno-exceptions", "-Ofast" ],
-            "cflags_cc": [ "-fno-exceptions", "-Ofast", "-std=c++<(STANDARD)" ],
+            "cflags": [ "-fno-exceptions", "-O3" ],
+            "cflags_cc": [ "-fno-exceptions", "-O3", "-std=c++<(STANDARD)" ],
             "xcode_settings": {
               'GCC_OPTIMIZATION_LEVEL': '3', # stop gyp from defaulting to -Os
               "CLANG_CXX_LIBRARY": "libc++",

package.json

@@ -6,12 +6,12 @@
   "browser": "./browser",
   "scripts": {
     "build:node": "node-gyp rebuild",
-    "build:browser": "script/build-browser-version.sh",
+    "build:browser": "bash -c script/build-browser-version.sh || echo 'the browser build is unsupported'",
     "build": "npm run build:node && npm run build:browser",
     "test:native": "node-gyp build --debug --tests && node script/test-native.js",
     "test:node": "mocha test/js/*.js",
-    "test:browser": "SUPERSTRING_USE_BROWSER_VERSION=1 mocha test/js/*.js",
-    "test": "npm run test:node && npm run test:browser",
+    "test:browser": "cross-env SUPERSTRING_USE_BROWSER_VERSION=1 mocha test/js/*.js || echo 'the browser tests are unsupported'",
+    "test": "npm run test:node && npm run test:native && npm run test:browser",
     "benchmark": "node benchmark/marker-index.benchmark.js",
     "prepublishOnly": "git submodule update --init --recursive && npm run build:browser",
     "standard": "standard --recursive src test"
@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "chai": "^2.0.0",
+    "cross-env": "^7.0.3",
     "mocha": "^2.3.4",
     "random-seed": "^0.2.0",
     "standard": "^4.5.4",