File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -11,8 +11,8 @@ permissions:
1111 contents : read
1212
1313env :
14- ANDROID_NDK_VERSION : r27c
15- ANDROID_NDK_DIR_NAME : " 27.2.12479018 "
14+ ANDROID_NDK_VERSION : r28
15+ ANDROID_NDK_DIR_NAME : " 28.0.13004108 "
1616
1717jobs :
1818 test :
Original file line number Diff line number Diff line change 11/discussion
22
33# Compiled E2E test binary
4- e2e /e2e_test
4+ tests / e2e /e2e_test
55
66* .apk
77_build /
Original file line number Diff line number Diff line change @@ -83,7 +83,7 @@ fixtures: specs-fixtures idiomatic
8383regen : clean specs capi idiomatic
8484
8585test :
86- go test $$(go list ./... | grep -v -E '/(capi|e2e |examples ) /| /ndk/[a-z][a-z0-9]* $$ ' ) -count=1
86+ go test $$(go list ./... | grep -v -E '/(capi|tests |examples ) /| /ndk/[a-z][a-z0-9]* $$ ' ) -count=1
8787
8888lint :
8989 golangci-lint run ./tools/...
@@ -98,15 +98,15 @@ check-examples:
9898e2e-build :
9999 CGO_ENABLED=1 GOOS=android GOARCH=amd64 \
100100 CC=$(NDK_PATH ) /toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android35-clang \
101- go build -o e2e/e2e_test ./e2e
101+ go build -o tests/ e2e/e2e_test ./tests /e2e
102102
103103# Run full E2E test on Android emulator (requires SDK + NDK + KVM)
104104e2e : e2e-build
105- ANDROID_HOME=$(dir $(NDK_PATH ) ) ./e2e/run.sh
105+ ANDROID_HOME=$(dir $(NDK_PATH ) ) ./tests/ e2e/run.sh
106106
107107# Run all examples on Android emulator (requires running emulator + NDK)
108108e2e-examples :
109- ./e2e/run-examples.sh
109+ ./tests/ e2e/run-examples.sh
110110
111111clean :
112112 @for m in $(MODULES ) ; do rm -rf " capi/$$ m/" ; done
File renamed without changes.
Original file line number Diff line number Diff line change 1414set -euo pipefail
1515
1616SCRIPT_DIR=" $( cd " $( dirname " $0 " ) " && pwd) "
17- PROJECT_DIR=" $( cd " $SCRIPT_DIR /.." && pwd) "
17+ PROJECT_DIR=" $( cd " $SCRIPT_DIR /../.. " && pwd) "
1818
1919# Detect NDK.
2020ANDROID_HOME=" ${ANDROID_HOME:- $HOME / Android/ Sdk} "
Original file line number Diff line number Diff line change 1212set -euo pipefail
1313
1414SCRIPT_DIR=" $( cd " $( dirname " $0 " ) " && pwd) "
15- PROJECT_DIR=" $( cd " $SCRIPT_DIR /.." && pwd) "
15+ PROJECT_DIR=" $( cd " $SCRIPT_DIR /../.. " && pwd) "
1616
1717: " ${ANDROID_HOME:? ANDROID_HOME must be set} "
1818NDK_VERSION=" ${NDK_VERSION:- 27.2.12479018} "
3535echo " === Step 1: Cross-compile ==="
3636cd " $PROJECT_DIR "
3737CGO_ENABLED=1 GOOS=android GOARCH=amd64 CC=" $CC " \
38- go build -o e2e/e2e_test ./e2e
39- file e2e/e2e_test
38+ go build -o tests/ e2e/e2e_test ./tests /e2e
39+ file tests/ e2e/e2e_test
4040
4141echo " === Step 2: Create AVD (if needed) ==="
4242if [ ! -d " $HOME /.android/avd/${AVD_NAME} .avd" ]; then
@@ -67,7 +67,7 @@ for i in $(seq 1 60); do
6767done
6868
6969echo " === Step 4: Run E2E test ==="
70- " $ADB " push e2e/e2e_test /data/local/tmp/
70+ " $ADB " push tests/ e2e/e2e_test /data/local/tmp/
7171" $ADB " shell chmod 755 /data/local/tmp/e2e_test
7272" $ADB " shell /data/local/tmp/e2e_test
7373EXIT_CODE=$?
You can’t perform that action at this time.
0 commit comments