Fix preset filtering in test-runner.

touchlab · Apr 13, 2024 · 72cf41e · 72cf41e
1 parent 48526b0
commit 72cf41e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -155,7 +155,7 @@ jobs:
             :test
             -PtestLevel=smoke
             -PtestType=gradle
-            "-Pmatrix.targets=${{ inputs.target || 'macosArm64,iosArm64,iosSimulatorArm64' }}"
+            "-Pmatrix.targets=${{ inputs.target || 'macosArm64' }}"
             "-Pmatrix.configurations=${{ inputs.configuration || 'debug' }}"
-            "-Pmatrix.linkModes=${{ inputs.linkage || 'static,dynamic' }}"
+            "-Pmatrix.linkModes=${{ inputs.linkage || 'static' }}"
           build-root-directory: test-runner
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/runner/SkieTestRunnerConfiguration.kt
@@ -38,10 +38,12 @@ object SkieTestRunnerConfiguration {
         this += SkieTestMatrix.Axis("Target", filteredTargets.filterIsInstance<KotlinTarget.Native.MacOS>())
 
         // TODO: Add filtering
-        val filteredPresets = targets.presets
-        this += SkieTestMatrix.Axis("Preset", filteredPresets)
-        this += SkieTestMatrix.Axis("Preset", filteredPresets.filterIsInstance<KotlinTarget.Preset.Native>())
-        this += SkieTestMatrix.Axis("Preset", filteredPresets.filterIsInstance<KotlinTarget.Preset.Native.Darwin>())
+        val presets = targets.presets.takeIf { it.isNotEmpty() } ?: KotlinTarget.Preset.Root.children.presets.filter { preset ->
+            targets.targets.toSet().intersect(preset.targets.toSet()).isNotEmpty()
+        }
+        this += SkieTestMatrix.Axis("Preset", presets)
+        this += SkieTestMatrix.Axis("Preset", presets.filterIsInstance<KotlinTarget.Preset.Native>())
+        this += SkieTestMatrix.Axis("Preset", presets.filterIsInstance<KotlinTarget.Preset.Native.Darwin>())
     }.associateBy { it.type }
 
     private fun <T: Any> value(property: String, deserialize: (String) -> T?): T? {