Skip to content

Commit cc29ba0

Browse files
committed
Revert "fix(tooling): wait for emulator before running adb commands (#912)"
This reverts commit 07c8140.
1 parent e71b034 commit cc29ba0

File tree

181 files changed

+1124
-2182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+1124
-2182
lines changed

Diff for: .gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
[submodule "test-app/app/src/main/assets/app/shared"]
55
path = test-app/app/src/main/assets/app/shared
66
url = https://github.com/NativeScript/common-runtime-tests-app.git
7+
[submodule "test-app/build-tools/android-dts-generator"]
8+
path = test-app/build-tools/android-dts-generator
9+
url = https://github.com/NativeScript/android-dts-generator.git
10+
branch = master

Diff for: .travis.yml

+1-19
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@ env:
1010

1111
matrix:
1212
include:
13-
- stage: "Static Binding Generator Parser Tests"
14-
language: node_js
15-
node_js: "6"
16-
git:
17-
submodules: false
18-
script:
19-
- cd android-static-binding-generator
20-
- npm install && node run-tests
21-
- cd ..
22-
- stage: "Static Binding Generator Class Generator Tests"
23-
language: android
24-
jdk: oraclejdk8
25-
git:
26-
submodules: false
27-
script:
28-
- "android-static-binding-generator/project/staticbindinggenerator/gradlew test --project-dir android-static-binding-generator/project/staticbindinggenerator/"
2913
- stage: "Build and Tests"
3014
sudo: true
3115
language: android
@@ -41,15 +25,13 @@ matrix:
4125
submodules: false
4226
script:
4327
# (master branch) build the runtime twice - optimized, and regular packages, skip on PRs
44-
# test-app/gradlew runtest will take care of building the runtime for its testing needs
28+
# test-app/gradlew runtests will take care of building the runtime for its testing needs
4529
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace; fi'
4630
- echo no | android create avd --force -n $EMULATOR_NAME-$EMULATOR_API_LEVEL -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M
4731
- emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
4832
- android-wait-for-emulator
49-
- cd test-app
5033
- "./gradlew runtest --stacktrace"
5134
- adb -e logcat -d 300
52-
- cd ..
5335
before_install:
5436
- echo "y" | sdkmanager "cmake;3.6.4111459"
5537
- sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules

Diff for: android-metadata-generator/build.gradle

-131
This file was deleted.
-53.4 KB
Binary file not shown.

Diff for: android-metadata-generator/gradle/wrapper/gradle-wrapper.properties

-5
This file was deleted.

Diff for: android-metadata-generator/gradlew

-172
This file was deleted.

0 commit comments

Comments
 (0)