diff options
| author | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 12:51:44 +0100 |
|---|---|---|
| committer | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 12:51:44 +0100 |
| commit | d439d1e72cf4a90b26c58dd26fd274a71563c3b8 (patch) | |
| tree | bfbc5e5484969acdb8724bec70c99967bc3def7f | |
| parent | 147bb6c411d64afbce18c00d3b6107cf2d8638fb (diff) | |
Android wrapper fixes, disable Android instrumented tests on GitHub
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | wrappers/java-android/Makefile | 6 | ||||
| -rw-r--r-- | wrappers/java-android/README.md | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 426370a..8283702 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,4 +34,4 @@ jobs: - uses: slashmo/install-swift@v0.1.0 with: version: 5.5 - - run: make test-wrappers + - run: make test-wrappers NO_DAEMON=1 NO_EMULATOR=1 diff --git a/wrappers/java-android/Makefile b/wrappers/java-android/Makefile index d249a50..1082aed 100644 --- a/wrappers/java-android/Makefile +++ b/wrappers/java-android/Makefile @@ -1,4 +1,4 @@ -.PHONY: build test android-test clean +.PHONY: build android-test connected-android-test test clean EXPORTS_PATH ?= ../../exports include $(EXPORTS_PATH)/common.mk @@ -22,7 +22,11 @@ connected-android-test: ./gradlew $(GRADLE_FLAGS) connectedAndroidTest test: .try-build-lib +ifeq ($(NO_EMULATOR),1) + ./gradlew $(GRADLE_FLAGS) test +else ./gradlew $(GRADLE_FLAGS) test pixel2DebugAndroidTest +endif clean: rm -rf lib/build lib/.cxx lib/CMakeFiles lib/src/test/resources/* diff --git a/wrappers/java-android/README.md b/wrappers/java-android/README.md index 50e56fb..fe2660e 100644 --- a/wrappers/java-android/README.md +++ b/wrappers/java-android/README.md @@ -72,8 +72,8 @@ Run both unit tests and Android instrumented tests on a new emulator: make test ``` -For all commands you can specify options to pass to Gradle via `GRADLE_FLAGS=`. Specify `NO_DAEMON=1` to -add `--no-daemon`. +For all commands you can specify options to pass to Gradle via `GRADLE_FLAGS=`, e.g. `GRADLE_FLAGS=--info`. +Specify `NO_DAEMON=1` to add `--no-daemon`. ## Notes |