iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(build): temporarily test dart with dart2js instead of pub serve 

Should be changed back when #4316 is resolved.
This commit is contained in:
Jeff Cross 2015-09-22 11:32:14 -07:00
parent f600d88209
commit eb7839e0ec
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/ci/test_e2e_dart.sh
View File

@ -15,14 +15,15 @@ function killServer () {
# Serving pre-compiled dart JS takes an extra 15m. # Serving pre-compiled dart JS takes an extra 15m.
# So we do this only for post-commit testing. # So we do this only for post-commit testing.
# Pull requests test with Dartium and pub serve # Pull requests test with Dartium and pub serve
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then # TODO(jeffbcross): restore conditional dart2js/pubserve #4316
#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
# WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh # WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh
./node_modules/.bin/gulp serve.js.dart2js& ./node_modules/.bin/gulp serve.js.dart2js&
serverPid=$! serverPid=$!
else #else
./node_modules/.bin/gulp serve.dart& # ./node_modules/.bin/gulp serve.dart&
serverPid=$! # serverPid=$!
fi #fi
./node_modules/.bin/gulp build.css.material& ./node_modules/.bin/gulp build.css.material&

11
scripts/ci/test_perf.sh
View File

@ -16,14 +16,15 @@ function killServer () {
# Serving pre-compiled dart JS takes an extra 15m. # Serving pre-compiled dart JS takes an extra 15m.
# So we do this only for post-commit testing. # So we do this only for post-commit testing.
# Pull requests test with Dartium and pub serve # Pull requests test with Dartium and pub serve
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then # TODO(jeffbcross): restore conditional dart2js/pubserve #4316
#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
./node_modules/.bin/gulp build/pubbuild.dart ./node_modules/.bin/gulp build/pubbuild.dart
./node_modules/.bin/gulp serve.js.prod serve.js.dart2js& ./node_modules/.bin/gulp serve.js.prod serve.js.dart2js&
serverPid=$! serverPid=$!
else #else
./node_modules/.bin/gulp serve.js.prod serve.dart& # ./node_modules/.bin/gulp serve.js.prod serve.dart&
serverPid=$! # serverPid=$!
fi #fi
trap killServer EXIT trap killServer EXIT

11
scripts/ci/test_server_dart.sh
View File

@ -14,14 +14,15 @@ ps -ef | grep webdriver-manager
# Serving pre-compiled dart JS takes an extra 15m. # Serving pre-compiled dart JS takes an extra 15m.
# So we do this only for post-commit testing. # So we do this only for post-commit testing.
# Pull requests test with Dartium and pub serve # Pull requests test with Dartium and pub serve
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then # TODO(jeffbcross): restore conditional dart2js/pubserve #4316
#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
./node_modules/.bin/gulp build/pubbuild.dart ./node_modules/.bin/gulp build/pubbuild.dart
./node_modules/.bin/gulp serve.js.dart2js& ./node_modules/.bin/gulp serve.js.dart2js&
serverPid=$! serverPid=$!
else #else
./node_modules/.bin/gulp serve.dart& # ./node_modules/.bin/gulp serve.dart&
serverPid=$! # serverPid=$!
fi #fi
function killAllServers () { function killAllServers () {
kill $serverPid kill $serverPid