Add e2e android intl test (#1644)

Summary: Pull Request resolved: #1644

Differential Revision: D70862275

Author: lavenzg

.github/workflows/build.yml

@@ -121,3 +121,35 @@ jobs:
         # toLocaleLowerCase and toLocaleUpperCase are the two main ones.
         # cmake --build ./build --target check-hermes
         python3 hermes/utils/test_runner.py --test-intl test262/test -b build/bin ${{ matrix.test_runner_flags }}
+
+  test-android-e2e-intl:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04]
+        abis: ["x86"]
+    runs-on: ${{ matrix.os }}
+    env:
+      HERMES_WS_DIR: /home/runner/work/hermes
+      ANDROID_NDK: /usr/local/lib/android/sdk/ndk/27.1.12297006
+    steps:
+    - name: Checkout Hermes
+      uses: actions/[email protected]
+    - name: Checkout Test262
+      run: |-
+        cd "$HERMES_WS_DIR"
+        git clone https://github.com/tc39/test262
+        cd test262
+        git checkout 62626e083bd506124aac6c799464d76c2c42851b
+    - name: Build Hermes Compiler
+      run: |-
+        cd "$HERMES_WS_DIR"
+        cmake -S hermes -B ./build -DCMAKE_BUILD_TYPE=Release
+        cmake --build ./build -j 4 --target hermesc
+    - name: Run android tests
+      uses: ReactiveCircus/android-emulator-runner@v2
+      with:
+        api-level: 29
+        cmake: 3.22.1
+        emulator-options: -timezone Europe/Paris -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+        script: cd android && ./gradlew :intltest:prepareTests && ./gradlew -Pabis=${{ matrix.abis }} :intltest:connectedAndroidTest --stacktrace --debug

CMakeLists.txt

@@ -314,6 +314,9 @@ endif()
 if (HERMES_IS_MOBILE_BUILD)
   add_definitions(-DHERMES_IS_MOBILE_BUILD)
 endif()
+if (HERMES_PARSE_FLOW)
+  add_definitions(-DHERMES_PARSE_FLOW=1)
+endif()
 
 if (HERMESVM_INTERNAL_JAVASCRIPT_NATIVE)
   add_definitions(-DHERMESVM_INTERNAL_JAVASCRIPT_NATIVE)

android/build.gradle

@@ -28,8 +28,8 @@ buildscript {
     // This is used as part of the Hermes build process
     hermesC = ""
     for (f in [
-        "${hermesHostBuild}/build/ImportHermesc.cmake",
-        "${hermesHostBuild}/build_release/ImportHermesc.cmake"]) {
+        "${hermesHostBuild}/build/ImportHostCompilers.cmake",
+        "${hermesHostBuild}/build_release/ImportHostCompilers.cmake"]) {
       if(file(f).exists()) hermesC = f;
     }
     assert hermesC != "" : "Hermes host build not found"

android/hermes/build.gradle

@@ -21,13 +21,14 @@ android {
       cmake {
         arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
         arguments "-DHERMES_IS_ANDROID=True"
+        arguments "-DHERMES_PARSE_FLOW=1"
         arguments "-DHERMES_FACEBOOK_BUILD=${rootProject.ext.facebookBuild}"
         arguments "-DANDROID_STL=c++_shared"
         arguments "-DANDROID_PIE=True"
-        arguments "-DIMPORT_HERMESC=${rootProject.ext.hermesC}"
+        arguments "-DIMPORT_HOST_COMPILERS=${rootProject.ext.hermesC}"
         arguments "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True"
         arguments "-DHERMES_BUILD_SHARED_JSI=True"
-        targets "libhermes"
+        targets "hermesvm_a"
       }
     }
     ndk {

android/intltest/build.gradle

@@ -20,6 +20,13 @@ buildDir.mkdirs()
 
 def testDestination = "java/com/facebook/hermes/test/assets"
 
+// Don't redirect logs.
+tasks.withType(Test) {
+    testLogging {
+      showStandardStreams = true
+    }
+}
+
 task prepareTests() {
   doLast {
     def test262Dir = file(rootProject.ext.fbsource).exists() ?
@@ -68,13 +75,14 @@ android {
     externalNativeBuild {
       cmake {
         arguments "-DHERMES_IS_ANDROID=True"
+        arguments "-DHERMES_PARSE_FLOW=1"
         arguments "-DHERMES_FACEBOOK_BUILD=${rootProject.ext.facebookBuild}"
         arguments "-DANDROID_STL=c++_shared"
         arguments "-DANDROID_PIE=True"
-        arguments "-DIMPORT_HERMESC=${rootProject.ext.hermesC}"
+        arguments "-DIMPORT_HOST_COMPILERS=${rootProject.ext.hermesC}"
         arguments "-DHERMES_SLOW_DEBUG=False"
         arguments "-DHERMES_ENABLE_INTL=True"
-        targets "jsijni", "jsijniepi", "libhermes"
+        targets "jsijni", "jsijniepi", "hermesvm_a"
       }
     }
     ndk {

android/intltest/java/com/facebook/hermes/test/CMakeLists.txt

@@ -24,7 +24,7 @@ if(HERMES_IS_ANDROID)
   add_hermes_library(jsijni SHARED
       ${jni_source_files}
       LINK_OBJLIBS
-      hermesvm
+      hermesvm_a
       hermesapi
       compileJS
       fbjni::fbjni
@@ -35,7 +35,7 @@ if(HERMES_IS_ANDROID)
   add_hermes_library(jsijniepi SHARED
       ${epi_source_files}
       LINK_OBJLIBS
-      hermesvm
+      hermesvm_a
       hermesapi
       compileJS
       fbjni::fbjni

android/intltest/java/com/facebook/hermes/test/HermesIntlTest262.java

@@ -63,6 +63,7 @@ protected void evaluateCommonScriptsFromAsset(JSRuntime rt) throws IOException {
 
   @Test
   public void test262Intl() throws IOException {
+    Log.v(LOG_TAG, "Enter test262Intl");
     Set<String> skipList = getSkipList();
     Stack<String> testFiles = new Stack<>();
     testFiles.push("test262/test");
@@ -71,6 +72,7 @@ public void test262Intl() throws IOException {
     ArrayList<String> ranTests = new ArrayList<>();
     HashMap<String, String> failedTests = new HashMap<>();
 
+    Log.v(LOG_TAG, "Start run test loop");
     while (!testFiles.isEmpty()) {
       String path = testFiles.pop();
       String[] contents = assets.list(path);