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

fix(build): make perf tests work again

This commit is contained in:
Tobias Bosch 2015-02-26 11:32:57 -08:00
parent ccb306cce7
commit 15afb80a2f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protractor-shared.js
View File

@ -155,7 +155,7 @@ var config = exports.config = {
jasmineNodeOpts: { jasmineNodeOpts: {
showColors: true, showColors: true,
defaultTimeoutInterval: argv.benchpress ? 80000 : 30000 defaultTimeoutInterval: argv['benchmark'] ? 1200000 : 30000
}, },
params: { params: {
benchmark: { benchmark: {

1
scripts/ci/env_dart.sh
View File

@ -70,6 +70,7 @@ if [[ -z $ENV_SET ]]; then
export DARTSDK export DARTSDK
export DART export DART
export PUB=${PUB:-"$DART_SDK/bin/pub"} export PUB=${PUB:-"$DART_SDK/bin/pub"}
export PUB_CACHE=$DART_SDK/pub-cache
export DARTANALYZER=${DARTANALYZER:-"$DART_SDK/bin/dartanalyzer"} export DARTANALYZER=${DARTANALYZER:-"$DART_SDK/bin/dartanalyzer"}
export DARTDOC=${DARTDOC:-"$DART_SDK/bin/dartdoc"} export DARTDOC=${DARTDOC:-"$DART_SDK/bin/dartdoc"}
export DART_DOCGEN=${DART_DOCGEN:-"$DART_SDK/bin/docgen"} export DART_DOCGEN=${DART_DOCGEN:-"$DART_SDK/bin/docgen"}

13
scripts/jenkins/jenkins_perf.sh
View File

@ -6,7 +6,7 @@ export ANDROID_SDK="/Users/Shared/jenkins/android-sdk"
export PATH+=":$ANDROID_SDK/tools:$ANDROID_SDK/platform-tools" export PATH+=":$ANDROID_SDK/tools:$ANDROID_SDK/platform-tools"
export PATH+=":/usr/local/git/bin" export PATH+=":/usr/local/git/bin"
export CHANNEL=stable export DART_CHANNEL=dev
export ARCH=macos-ia32 export ARCH=macos-ia32
export PERF_BROWSERS=ChromeAndroid export PERF_BROWSERS=ChromeAndroid
export CLOUD_SECRET_PATH="/Users/Shared/jenkins/keys/perf-cloud-secret" export CLOUD_SECRET_PATH="/Users/Shared/jenkins/keys/perf-cloud-secret"
@ -15,7 +15,12 @@ export GIT_SHA=$(git rev-parse HEAD)
nvm use 0.10 nvm use 0.10
./scripts/ci/init_android.sh ./scripts/ci/init_android.sh
./scripts/ci/install_dart.sh ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH}
npm cache clean
# use newest npm because of errors during npm install like
# npm ERR! EEXIST, open '/Users/Shared/Jenkins/.npm/e4d0eb16-adable-stream-1-1-13-package-tgz.lock'
npm install -g npm@2.6
npm install npm install
./scripts/ci/build.sh ./scripts/ci/build_js.sh
./scripts/ci/test_perf.sh ./scripts/ci/build_dart.sh
./scripts/ci/test_perf.sh