diff options
| author | Akash Agrawal <akagrawal@google.com> | 2019-09-16 15:24:24 -0700 |
|---|---|---|
| committer | Akash Agrawal <akagrawal@google.com> | 2019-09-16 15:24:24 -0700 |
| commit | a7dc3e952fbb2a15f7746cab4639ac064d40ef06 (patch) | |
| tree | 8e04cee99e79a03604add1a147cf3a0276030c74 /emu_test | |
| parent | 147b0331f5762e2568a4e48f1897b083018851d4 (diff) | |
| download | platform_testing-a7dc3e952fbb2a15f7746cab4639ac064d40ef06.tar.gz | |
Extract tests from general-tests
Extract general-tests to get adb/device specific test suite.
general-tests is downloaded as a dependency for the test target on
go/ab.
Test: Local
Change-Id: I32205a5777369791a5eb1028b85324afd5d52bd2
Diffstat (limited to 'emu_test')
| -rwxr-xr-x | emu_test/run_android_bridge_test.cmd | 8 | ||||
| -rwxr-xr-x | emu_test/run_android_bridge_test.sh | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/emu_test/run_android_bridge_test.cmd b/emu_test/run_android_bridge_test.cmd index c0e98808b..e229bba2b 100755 --- a/emu_test/run_android_bridge_test.cmd +++ b/emu_test/run_android_bridge_test.cmd @@ -30,6 +30,14 @@ echo "Setup new ADB" mv %ANDROID_SDK_ROOT%\platform-tools %DIST_DIR%\ 7z x -aoa %BUILD_DIR%\sdk-repo* -o%ANDROID_SDK_ROOT%\ +echo "Extract tests from general-tests.zip" +7z l %BUILD_DIR%\general-tests.zip | findstr "adb_integration_test" +if errorlevel 1 goto StartTest + +mkdir %DIST_DIR%\general-tests +7z x -aoa %BUILD_DIR%\general-tests.zip -o%DIST_DIR%\general-tests\ host\testcases\adb_integration_test_* + +:StartTest echo "Run ADB tests from $ADT_INFRA" set count=0 start %ADT_INFRA%\emu_test\utils\run_test_android_bridge.cmd %DIST_DIR% diff --git a/emu_test/run_android_bridge_test.sh b/emu_test/run_android_bridge_test.sh index 2d4db3678..3b5560329 100755 --- a/emu_test/run_android_bridge_test.sh +++ b/emu_test/run_android_bridge_test.sh @@ -41,6 +41,14 @@ echo "Setup new ADB" mv $ANDROID_SDK_ROOT/platform-tools $DIST_DIR/ unzip -o $BUILD_DIR/sdk-repo* -d $ANDROID_SDK_ROOT +echo "Extract tests from general-tests.zip" +unzip -l $BUILD_DIR/general-tests.zip | grep -q adb_integration_test +if [[ "$?" == "0" ]] +then + mkdir -p $DIST_DIR/general-tests + unzip $BUILD_DIR/general-tests.zip host/testcases/adb_integration_test_*/* -d $DIST_DIR/general-tests +fi + echo "Run ADB tests from $ADT_INFRA" cmd="$ADT_INFRA/emu_test/utils/run_test_android_bridge.sh" run_with_timeout $cmd $DIST_DIR 5400 |