Add combined test meta-task

rzblue · Oct 24, 2023 · c4b7990 · c4b7990
1 parent f4cbcbc
commit c4b7990
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/shared/cppJavaDesktopTestTask.gradle b/shared/cppJavaDesktopTestTask.gradle
@@ -0,0 +1,7 @@
+apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+
+tasks.register('testDesktop') {
+    dependsOn testDesktopJava
+    dependsOn testDesktopCpp
+}
diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle
@@ -182,8 +182,7 @@ model {
     }
 }
 
-apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
-apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/cppJavaDesktopTestTask.gradle"
 
 tasks.withType(RunTestExecutable) {
     args "--gtest_output=xml:test_detail.xml"

diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
@@ -327,8 +327,7 @@ model {
     }
 }
 
-apply from: "${rootDir}/shared/cppDesktopTestTask.gradle"
-apply from: "${rootDir}/shared/javaDesktopTestTask.gradle"
+apply from: "${rootDir}/shared/cppJavaDesktopTestTask.gradle"
 
 ext.getJniSpecClass = {
     return JniNativeLibrarySpec