Browse Source

back to no android e2e on CI

Daniel Zlotin 8 years ago
parent
commit
d9d89e2410
2 changed files with 17 additions and 16 deletions
  1. 9
    9
      scripts/env/installAndroidSDK.sh
  2. 8
    7
      scripts/test.e2e.android.js

+ 9
- 9
scripts/env/installAndroidSDK.sh View File

18
 mkdir -p "${ANDROID_HOME}"/licenses
18
 mkdir -p "${ANDROID_HOME}"/licenses
19
 cp "$scriptdir/android-sdk-licenses/"* "${ANDROID_HOME}"/licenses
19
 cp "$scriptdir/android-sdk-licenses/"* "${ANDROID_HOME}"/licenses
20
 
20
 
21
-package="system-images;android-24;default;armeabi_v7a"
22
-echo "Downloading emulator"
23
-sdkmanager "emulator"
24
-echo "Downloading $package"
25
-sdkmanager "${package}"
26
-echo "Creating avd"
27
-echo no | avdmanager create avd --force --name "pixel" --abi "default/armeabi_v7a" --package "${package}" --device "pixel"
28
-sleep 2
29
-avdmanager list avd
21
+# package="system-images;android-24;default;armeabi-v7a"
22
+# echo "Downloading emulator"
23
+# sdkmanager "emulator"
24
+# echo "Downloading $package"
25
+# sdkmanager "${package}"
26
+# echo "Creating avd"
27
+# echo no | avdmanager create avd --force --name "pixel" --abi "default/armeabi-v7a" --package "${package}" --device "pixel"
28
+# sleep 2
29
+# avdmanager list avd

+ 8
- 7
scripts/test.e2e.android.js View File

8
 
8
 
9
 function run() {
9
 function run() {
10
   if (process.env.CI) {
10
   if (process.env.CI) {
11
-    try {
12
-      launchEmulator();
13
-      runTests();
14
-    } finally {
15
-      killEmulators();
16
-    }
11
+    console.log(`android e2e is disabled on CI`);
12
+    // try {
13
+    //   launchEmulator();
14
+    //   runTests();
15
+    // } finally {
16
+    //   killEmulators();
17
+    // }
17
   } else {
18
   } else {
18
     runTests();
19
     runTests();
19
   }
20
   }
27
 
28
 
28
 function launchEmulator() {
29
 function launchEmulator() {
29
   console.log(`Launching Android Emulator`);
30
   console.log(`Launching Android Emulator`);
30
-  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -no-audio @pixel`);
31
+  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -gpu host -no-audio @pixel`);
31
   exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
32
   exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
32
 }
33
 }
33
 
34