Merge pull request apache#7507 from mbien/revert-missing-graal-branch

Revert "Disable failing java.mx.project tests"
junichi11 · Jun 23, 2024 · f7f9a54 · f7f9a54
2 parents 02c6612 + 46e4f53
commit f7f9a54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -891,9 +891,9 @@ jobs:
 #        run: ant $OPTS -f java/ant.grammar test
 
       # TODO next are JDK 21+ incompatibe steps
-#      - name: java/java.mx.project
-#        if: ${{ matrix.java == '17' }}
-#        run: .github/retry.sh ant $OPTS -f java/java.mx.project test
+      - name: java/java.mx.project
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/java.mx.project test
 
       - name: java/gradle.java
         if: ${{ matrix.java == '17' }}

diff --git a/java/java.mx.project/build.xml b/java/java.mx.project/build.xml
@@ -47,14 +47,11 @@
         </exec>
     </target>
 
-    <!--
-    TODO the branches of https://github.com/graalvm/mx disappered
     <target name="test-preinit" depends="-checkout-graalvm">
         <exec dir="${graal.dir}/truffle" executable="${mx.dir}/mx" failonerror="true">
             <arg value="build"/>
         </exec>
     </target>
-    -->
     <target name="test-unit-build-datajar"/>
 
     <import file="../../nbbuild/templates/projectized.xml"/>