diff --git a/packages/grpc-native-core/index.js b/packages/grpc-native-core/index.js index 30a6ff3c..b7deb73b 100644 --- a/packages/grpc-native-core/index.js +++ b/packages/grpc-native-core/index.js @@ -143,6 +143,11 @@ exports.load = function load(filename, format, options) { } finally { ProtoBuf.convertFieldsToCamelCase = convertFieldsToCamelCaseOriginal; } + + if (!builder) { + throw new Error('Could not load file "' + filename + '"'); + } + return loadObject(builder.ns, options); }; diff --git a/run-tests.bat b/run-tests.bat index 15914532..81de8d25 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -39,6 +39,8 @@ for %%v in (4 6 7 8) do ( mkdir reports\node%%v SET JUNIT_REPORT_PATH=reports/node%%v + node -e "process.exit(process.version.startsWith('v%%v') ? 0 : -1)" || goto :error + call .\node_modules\.bin\gulp clean.all || SET FAILED=1 call .\node_modules\.bin\gulp setup.windows || SET FAILED=1 call .\node_modules\.bin\gulp native.test || SET FAILED=1 diff --git a/run-tests.sh b/run-tests.sh index 5df88186..1444158b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -53,6 +53,8 @@ do mkdir -p "reports/node$version" + node -e 'process.exit(process.version.startsWith("v'$version'") ? 0 : -1)' + # Install dependencies and link packages together. ./node_modules/.bin/gulp clean.all ./node_modules/.bin/gulp setup