Skip to content

Commit

Permalink
Revert "fix(tooling): wait for emulator before running adb commands (#…
Browse files Browse the repository at this point in the history
…912)"

This reverts commit 07c8140.
  • Loading branch information
Plamen5kov committed Mar 7, 2018
1 parent e71b034 commit cc29ba0
Show file tree
Hide file tree
Showing 183 changed files with 1,126 additions and 2,184 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Expand Up @@ -4,3 +4,7 @@
[submodule "test-app/app/src/main/assets/app/shared"]
path = test-app/app/src/main/assets/app/shared
url = https://github.com/NativeScript/common-runtime-tests-app.git
[submodule "test-app/build-tools/android-dts-generator"]
path = test-app/build-tools/android-dts-generator
url = https://github.com/NativeScript/android-dts-generator.git
branch = master
20 changes: 1 addition & 19 deletions .travis.yml
Expand Up @@ -10,22 +10,6 @@ env:

matrix:
include:
- stage: "Static Binding Generator Parser Tests"
language: node_js
node_js: "6"
git:
submodules: false
script:
- cd android-static-binding-generator
- npm install && node run-tests
- cd ..
- stage: "Static Binding Generator Class Generator Tests"
language: android
jdk: oraclejdk8
git:
submodules: false
script:
- "android-static-binding-generator/project/staticbindinggenerator/gradlew test --project-dir android-static-binding-generator/project/staticbindinggenerator/"
- stage: "Build and Tests"
sudo: true
language: android
Expand All @@ -41,15 +25,13 @@ matrix:
submodules: false
script:
# (master branch) build the runtime twice - optimized, and regular packages, skip on PRs
# test-app/gradlew runtest will take care of building the runtime for its testing needs
# test-app/gradlew runtests will take care of building the runtime for its testing needs
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace; fi'
- echo no | android create avd --force -n $EMULATOR_NAME-$EMULATOR_API_LEVEL -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M
- emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
- android-wait-for-emulator
- cd test-app
- "./gradlew runtest --stacktrace"
- adb -e logcat -d 300
- cd ..
before_install:
- echo "y" | sdkmanager "cmake;3.6.4111459"
- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
Expand Down
131 changes: 0 additions & 131 deletions android-metadata-generator/build.gradle

This file was deleted.

Binary file not shown.

This file was deleted.

172 changes: 0 additions & 172 deletions android-metadata-generator/gradlew

This file was deleted.

0 comments on commit cc29ba0

Please sign in to comment.