Fix tests

defold · Feb 21, 2025 · e9b562d · e9b562d
1 parent 6fd53e2
commit e9b562d
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 36 deletions.
diff --git a/server/src/test/java/com/defold/extender/ExtenderTest.java b/server/src/test/java/com/defold/extender/ExtenderTest.java
@@ -255,10 +255,10 @@ public void testCollectLibraries() {
 
     @Test
     public void testCollectJars() {
-        String[] endings = {"test-data/ext/lib/armv7-android/Dummy.jar", "test-data/ext/lib/armv7-android/JarDep.jar",
-                            "test-data/ext/lib/armv7-android/VeryLarge1.jar", "test-data/ext/lib/armv7-android/VeryLarge2.jar",
-                            "test-data/ext/lib/armv7-android/meta-inf.jar"};
-        List<String> paths = ExtenderUtil.collectFilesByPath(new File("test-data/ext/lib/armv7-android"), Extender.JAR_RE);
+        String[] endings = {"test-data/ext/lib/android/Dummy.jar", "test-data/ext/lib/android/JarDep.jar",
+                            "test-data/ext/lib/android/VeryLarge1.jar", "test-data/ext/lib/android/VeryLarge2.jar",
+                            "test-data/ext/lib/android/meta-inf.jar"};
+        List<String> paths = ExtenderUtil.collectFilesByPath(new File("test-data/ext/lib/android"), Extender.JAR_RE);
         assertEquals(endings.length, paths.size());
 
 

diff --git a/server/src/test/java/com/defold/extender/IntegrationTest.java b/server/src/test/java/com/defold/extender/IntegrationTest.java
@@ -351,8 +351,8 @@ public void buildAndroidCheckClassesDex(TestConfiguration configuration) throws
                 new FileExtenderResource("test-data/AndroidManifest.xml", "AndroidManifest.xml"),
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/Dummy.jar"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)),
+                new FileExtenderResource("test-data/ext/lib/android/Dummy.jar"));
 
         File destination = doBuild(sourceFiles, configuration);
 
@@ -369,10 +369,10 @@ public void buildAndroidCheckClassesMultiDex(TestConfiguration configuration) th
                 new FileExtenderResource("test-data/AndroidManifest.xml", "AndroidManifest.xml"),
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/Dummy.jar"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/VeryLarge1.jar"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/VeryLarge2.jar"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)),
+                new FileExtenderResource("test-data/ext/lib/android/Dummy.jar"),
+                new FileExtenderResource("test-data/ext/lib/android/VeryLarge1.jar"),
+                new FileExtenderResource("test-data/ext/lib/android/VeryLarge2.jar"));
 
         File destination = doBuild(sourceFiles, configuration);
 
@@ -390,8 +390,8 @@ public void buildAndroidCheckCompiledJava(TestConfiguration configuration) throw
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
                 new FileExtenderResource("test-data/ext/src/Test.java"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/Dummy.jar"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)),
+                new FileExtenderResource("test-data/ext/lib/android/Dummy.jar"));
 
         File destination = doBuild(sourceFiles, configuration);
 
@@ -412,8 +412,8 @@ public void buildAndroidJavaJarDependency(TestConfiguration configuration) throw
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
                 new FileExtenderResource("test-data/ext/src/TestJar.java"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/JarDep.jar"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)),
+                new FileExtenderResource("test-data/ext/lib/android/JarDep.jar"));
 
         File destination = doBuild(sourceFiles, configuration);
 
@@ -431,9 +431,9 @@ public void buildAndroidJarWithMetaInf(TestConfiguration configuration) throws I
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
                 new FileExtenderResource("test-data/ext/src/TestJar.java"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/JarDep.jar"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/meta-inf.jar"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)),
+                new FileExtenderResource("test-data/ext/lib/android/JarDep.jar"),
+                new FileExtenderResource("test-data/ext/lib/android/meta-inf.jar"));
 
         File destination = doBuild(sourceFiles, configuration);
         List<String> metaInfFiles = new ArrayList<>();
@@ -462,7 +462,7 @@ public void buildAndroidRJar(TestConfiguration configuration) throws IOException
                 new FileExtenderResource("test-data/AndroidManifest.xml", "AndroidManifest.xml"),
                 new FileExtenderResource("test-data/ext/ext.manifest"),
                 new FileExtenderResource("test-data/ext/src/test_ext.cpp"),
-                new FileExtenderResource("test-data/ext/lib/armv7-android/libalib.a"));
+                new FileExtenderResource(String.format("test-data/ext/lib/%s/libalib.a", configuration.platform)));
 
         File destination = doBuild(sourceFiles, configuration);
 
@@ -490,8 +490,8 @@ public void buildEngineAppManifest(TestConfiguration configuration) throws IOExc
         );
 
         if (isAndroid) {
-            sourceFiles.add(new FileExtenderResource("test-data/testproject_appmanifest/ext2/lib/armv7-android/Dummy1.jar"));
-            sourceFiles.add(new FileExtenderResource("test-data/testproject_appmanifest/ext2/lib/armv7-android/Dummy2.jar"));
+            sourceFiles.add(new FileExtenderResource("test-data/testproject_appmanifest/ext2/lib/android/Dummy1.jar"));
+            sourceFiles.add(new FileExtenderResource("test-data/testproject_appmanifest/ext2/lib/android/Dummy2.jar"));
         }
 
         doBuild(sourceFiles, configuration);

diff --git a/server/src/test/resources/junit-platform.properties b/server/src/test/resources/junit-platform.properties
@@ -1,2 +1,2 @@
-junit.jupiter.execution.parallel.enabled = false
+junit.jupiter.execution.parallel.enabled = true
 junit.jupiter.execution.parallel.mode.default = concurrent
diff --git a/server/test-data/build-libs.sh b/server/test-data/build-libs.sh
@@ -42,11 +42,8 @@ cp -v -r engineext/lib sdk/a/defoldsdk/
 rm -rf ./engineext
 
 # The sdk's has different naming
-mv sdk/a/defoldsdk/lib/x86-osx sdk/a/defoldsdk/lib/darwin
 mv sdk/a/defoldsdk/lib/x86_64-osx sdk/a/defoldsdk/lib/x86_64-macos
 
-mv sdk/a/defoldsdk/lib/x86-linux sdk/a/defoldsdk/lib/linux
-
 # Need these folders as well (empty is fine)
 mkdir -p sdk/a/defoldsdk/ext/lib/darwin
 mkdir -p sdk/a/defoldsdk/ext/lib/x86_64-macos

diff --git a/server/test-data/ext/ext.manifest b/server/test-data/ext/ext.manifest
@@ -3,7 +3,7 @@ name: Test
 
 
 platforms:
-  x86-osx:
+  arm64-osx:
     context:
         frameworks: ["AVFoundation"]
 
diff --git a/...test-data/ext/lib/armv7-android/Dummy.jar → server/test-data/ext/lib/android/Dummy.jar b/...test-data/ext/lib/armv7-android/Dummy.jar → server/test-data/ext/lib/android/Dummy.jar
diff --git a/...est-data/ext/lib/armv7-android/JarDep.jar → server/test-data/ext/lib/android/JarDep.jar b/...est-data/ext/lib/armv7-android/JarDep.jar → server/test-data/ext/lib/android/JarDep.jar
diff --git a/...data/ext/lib/armv7-android/VeryLarge1.jar → .../test-data/ext/lib/android/VeryLarge1.jar b/...data/ext/lib/armv7-android/VeryLarge1.jar → .../test-data/ext/lib/android/VeryLarge1.jar
diff --git a/...data/ext/lib/armv7-android/VeryLarge2.jar → .../test-data/ext/lib/android/VeryLarge2.jar b/...data/ext/lib/armv7-android/VeryLarge2.jar → .../test-data/ext/lib/android/VeryLarge2.jar
diff --git a/...t-data/ext/lib/armv7-android/meta-inf.jar → ...er/test-data/ext/lib/android/meta-inf.jar b/...t-data/ext/lib/armv7-android/meta-inf.jar → ...er/test-data/ext/lib/android/meta-inf.jar
diff --git a/server/test-data/ext/lib/x86-linux/libalib.a b/server/test-data/ext/lib/x86-linux/libalib.a
diff --git a/server/test-data/ext/lib/x86-osx/README.txt b/server/test-data/ext/lib/x86-osx/README.txt
diff --git a/server/test-data/ext/lib/x86-osx/blib.framework/README.txt b/server/test-data/ext/lib/x86-osx/blib.framework/README.txt
diff --git a/server/test-data/ext/lib/x86-osx/libalib.a b/server/test-data/ext/lib/x86-osx/libalib.a
diff --git a/server/test-data/ext2/ext.manifest b/server/test-data/ext2/ext.manifest
@@ -1,7 +1,7 @@
 name: Test
 
 platforms:
-  x86-osx:
+  arm64-osx:
     context:
         frameworks: ["AVFoundation"]
 
diff --git a/server/test-data/ext2/lib/x86-linux/libalib.a b/server/test-data/ext2/lib/x86-linux/libalib.a
diff --git a/server/test-data/ext2/lib/x86-linux/libblib.a b/server/test-data/ext2/lib/x86-linux/libblib.a
diff --git a/server/test-data/ext2/lib/x86-osx/libalib.a b/server/test-data/ext2/lib/x86-osx/libalib.a
diff --git a/server/test-data/ext2/lib/x86-osx/libblib.a b/server/test-data/ext2/lib/x86-osx/libblib.a
diff --git a/server/test-data/ext_std/lib/x86-linux/libstd.a b/server/test-data/ext_std/lib/x86-linux/libstd.a
diff --git a/server/test-data/ext_std/lib/x86-osx/libstd.a b/server/test-data/ext_std/lib/x86-osx/libstd.a
diff --git a/server/test-data/jars/build.sh b/server/test-data/jars/build.sh
@@ -19,7 +19,7 @@ mkdir -p $BUILD
 
 # Dummy.jar
 javac  -source 1.8 -target 1.8  -cp .  com/defold/dummy/Dummy.java
-jar -cvf ../ext/lib/armv7-android/Dummy.jar com
+jar -cvf ../ext/lib/android/Dummy.jar com
 
 # VeryLarge.jar
 
@@ -48,12 +48,12 @@ do
 
     javac  -source 1.8 -target 1.8  -cp . $VERYLARGE_JAVA
     rm $VERYLARGE_JAVA
-    jar -cvf ../../ext/lib/armv7-android/$NAME.jar com
+    jar -cvf ../../ext/lib/android/$NAME.jar com
 
     popd
     rm -rf ./tmp
 done
 
 # meta-inf.jar
 javac -cp .  io/foo/dummy/FooDummy.java
-jar -cvf ../ext/lib/armv7-android/meta-inf.jar io META-INF
+jar -cvf ../ext/lib/android/meta-inf.jar io META-INF
diff --git a/server/test-data/sdk/a/defoldsdk/extender/build.yml b/server/test-data/sdk/a/defoldsdk/extender/build.yml
@@ -191,9 +191,6 @@ platforms:
         zig-target:     'x86_64-macos'
         swiftFlags:     ["-target", "x86_64-apple-darwin19"]
 
-  x86-osx:
-    # Intentionally left empty to allow users to have old versions in their manifests
-
   ios:
     env:
         PATH:                   "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_16_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"

diff --git a/server/test-data/sdk/a/defoldsdk/lib/x86-linux/libengine_foo.a b/server/test-data/sdk/a/defoldsdk/lib/x86-linux/libengine_foo.a
diff --git a/server/test-data/sdk/a/defoldsdk/lib/x86-linux/libengine_main.a b/server/test-data/sdk/a/defoldsdk/lib/x86-linux/libengine_main.a
diff --git a/server/test-data/sdk/a/defoldsdk/lib/x86-osx/libengine_foo.a b/server/test-data/sdk/a/defoldsdk/lib/x86-osx/libengine_foo.a
diff --git a/server/test-data/sdk/a/defoldsdk/lib/x86-osx/libengine_main.a b/server/test-data/sdk/a/defoldsdk/lib/x86-osx/libengine_main.a
diff --git a/...-data/testproject/b/lib/x86-osx/x86-osx.a → ...ata/testproject/b/lib/arm64-osx/x86-osx.a b/...-data/testproject/b/lib/x86-osx/x86-osx.a → ...ata/testproject/b/lib/arm64-osx/x86-osx.a
diff --git a/server/test-data/testproject_appmanifest/_app/app.manifest b/server/test-data/testproject_appmanifest/_app/app.manifest
@@ -4,10 +4,10 @@ platforms:
             excludeSymbols: ["FooSymbol"]
             excludeLibs: ["alib", "engine_foo"]
 
-    x86-osx:
+    arm64-osx:
         context:
             excludeLibs: ["alib"]
 
-    armv7-android:
+    android:
         context:
             excludeJars: ["(.*)/Dummy1.jar"]
diff --git a/server/test-data/testproject_appmanifest/ext/lib/x86-osx/libalib.a b/server/test-data/testproject_appmanifest/ext/lib/x86-osx/libalib.a
diff --git a/...anifest/ext2/lib/armv7-android/Dummy1.jar → ...t_appmanifest/ext2/lib/android/Dummy1.jar b/...anifest/ext2/lib/armv7-android/Dummy1.jar → ...t_appmanifest/ext2/lib/android/Dummy1.jar
diff --git a/...anifest/ext2/lib/armv7-android/Dummy2.jar → ...t_appmanifest/ext2/lib/android/Dummy2.jar b/...anifest/ext2/lib/armv7-android/Dummy2.jar → ...t_appmanifest/ext2/lib/android/Dummy2.jar
diff --git a/server/test-data/testproject_appmanifest/ext2/lib/x86-osx/libblib.a b/server/test-data/testproject_appmanifest/ext2/lib/x86-osx/libblib.a