Fix integration nightly test (#1703)

dsmilkov · web-flow · commit 95a213956696 · 2019-04-25T10:09:48.000-04:00
INTERNAL
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
@@ -24,35 +24,37 @@ echo '######################'
 echo 'Nightly build or version.ts was modified.'
 echo 'Testing layers/converter/node/data against tfjs-core@master.'
 echo '######################'
-yarn build && yarn run yalc publish
+yarn build && yarn yalc publish
 
 echo 'Cloning layers'
 git clone https://github.com/tensorflow/tfjs-layers.git --depth 1
 cd tfjs-layers
-yarn && yarn link-local '@tensorflow/tfjs-core' && ./scripts/test-travis.sh
+yarn && yarn link-local '@tensorflow/tfjs-core'
+yarn test-ci
 LAYERS_EXIT_CODE=$?
 
 cd ..
 echo 'Cloning node'
 git clone https://github.com/tensorflow/tfjs-node.git --depth 1
 cd tfjs-node
-yarn && yarn link-local '@tensorflow/tfjs-core' && ./scripts/test-travis.sh
+yarn && yarn link-local '@tensorflow/tfjs-core'
+yarn test-ci
 NODE_EXIT_CODE=$?
 
 cd ..
 echo 'Cloning converter'
 git clone https://github.com/tensorflow/tfjs-converter.git --depth 1
 cd tfjs-converter
 yarn && yarn link-local '@tensorflow/tfjs-core'
-yarn build && yarn lint && yarn test-travis
+yarn test-ci
 CONVERTER_EXIT_CODE=$?
 
 cd ..
 echo 'Cloning data'
 git clone https://github.com/tensorflow/tfjs-data.git --depth 1
 cd tfjs-data
 yarn && yarn link-local '@tensorflow/tfjs-core'
-yarn build && yarn lint && yarn test-travis
+yarn test-ci
 DATA_EXIT_CODE=$?
 
 echo '==== INTEGRATION TEST RESULTS ===='
diff --git a/scripts/test-util.js b/scripts/test-util.js
@@ -19,7 +19,7 @@ function exec(command, opt, ignoreCode) {
   const res = shell.exec(command, opt);
   if (!ignoreCode && res.code !== 0) {
     shell.echo('command', command, 'returned code', res.code);
-    shell.exit(1);
+    process.exit(1);
   }
   return res;
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function exec(command, opt, ignoreCode) {`
`19`	`19`	`const res = shell.exec(command, opt);`
`20`	`20`	`if (!ignoreCode && res.code !== 0) {`
`21`	`21`	`shell.echo('command', command, 'returned code', res.code);`
`22`		`- shell.exit(1);`
	`22`	`+ process.exit(1);`
`23`	`23`	`}`
`24`	`24`	`return res;`
`25`	`25`	`}`