mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
fix: avoid incompatible Turnip selection and explain Steam startup failures (#1380)
This commit is contained in:
16 files changed
+504
-7
No files matched your search
@@ -0,0 +1,20 @@
|
||||
package com.droiddeck.launcher.core
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class DeviceReportCpuTest {
|
||||
@Test fun onlyFeatureListsAreReportedAndDifferentCoreCapabilitiesAreKept() {
|
||||
val cpuInfo = """
|
||||
processor : 0
|
||||
Features : fp asimd aes
|
||||
Serial : private-device-id
|
||||
processor : 1
|
||||
Features : fp asimd aes atomics
|
||||
processor : 2
|
||||
Features : fp asimd aes
|
||||
""".trimIndent()
|
||||
assertEquals("fp asimd aes | fp asimd aes atomics", DeviceReport.cpuFeaturesSummary(cpuInfo))
|
||||
assertEquals("not reported", DeviceReport.cpuFeaturesSummary("processor : 0\n"))
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
package com.droiddeck.launcher.gpu
|
||||
|
||||
import android.os.Environment
|
||||
import android.os.Build
|
||||
import com.droiddeck.launcher.session.QuestExperimental
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
import java.io.File
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
@@ -9,6 +14,7 @@ import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.shadows.ShadowBuild
|
||||
import org.robolectric.util.ReflectionHelpers
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28], manifest = Config.NONE)
|
||||
@@ -16,10 +22,23 @@ class TurnipDriverAutoTest {
|
||||
@Before fun reset() {
|
||||
ShadowBuild.setModel("Phone")
|
||||
ShadowBuild.setDevice("phone")
|
||||
overrideFile().delete()
|
||||
}
|
||||
|
||||
@After fun cleanUp() {
|
||||
overrideFile().delete()
|
||||
SessionPrefs.setAndroidDriver(RuntimeEnvironment.getApplication(), TurnipDriver.AUTO)
|
||||
File(RuntimeEnvironment.getApplication().filesDir, "graphics_driver/test-pinned").deleteRecursively()
|
||||
}
|
||||
|
||||
private fun overrideFile() = File(Environment.getExternalStorageDirectory(), "Download/droiddeck-driver")
|
||||
|
||||
private fun gpu(model: Int, adreno: Boolean = true) = GpuInfo(
|
||||
"test GPU", model, GpuInfo.familyOf(adreno, model), "", false,
|
||||
)
|
||||
|
||||
@Test fun questModelsUseTheirPatchedDriverAsTheFallback() {
|
||||
val driver = TurnipDriver(RuntimeEnvironment.getApplication())
|
||||
val driver = TurnipDriver(RuntimeEnvironment.getApplication()) { error("Quest must not use generic GPU detection") }
|
||||
for (model in listOf("Quest 3", "Quest 3S", "Quest 2")) {
|
||||
ShadowBuild.setModel(model)
|
||||
assertEquals(if (model == "Quest 2") QuestExperimental.DRIVER_A6XX else QuestExperimental.DRIVER,
|
||||
@@ -27,8 +46,54 @@ class TurnipDriverAutoTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun otherDevicesRetainTheGenericFallback() {
|
||||
assertEquals("turnip25.1.0", TurnipDriver(RuntimeEnvironment.getApplication()).autoId())
|
||||
@Test fun aNonAdrenoDeviceDoesNotAutomaticallyLoadTurnip() {
|
||||
assertEquals(GpuInfo.Family.NOT_ADRENO, GpuInfo.detect().family)
|
||||
assertEquals("system", TurnipDriver(RuntimeEnvironment.getApplication()).autoId())
|
||||
}
|
||||
|
||||
@Test fun autoSelectionUsesTheDetectedFamilyAndModel() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
for ((detected, expected) in listOf(
|
||||
gpu(0, adreno = false) to "system",
|
||||
gpu(0) to "turnip25.1.0",
|
||||
gpu(650) to "turnip26.3.0-a6xx",
|
||||
gpu(730) to "turnip25.1.0",
|
||||
gpu(850) to "turnip-sdk36",
|
||||
)) {
|
||||
var calls = 0
|
||||
assertEquals(expected, TurnipDriver(context) { calls++; detected }.autoId())
|
||||
assertEquals(1, calls)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun nonAdrenoDoesNotUseTheAndroid16TurnipFallback() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
val sdk = Build.VERSION.SDK_INT
|
||||
try {
|
||||
ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SDK_INT", 36)
|
||||
assertEquals("system", TurnipDriver(context) { gpu(0, adreno = false) }.autoId())
|
||||
assertEquals("turnip-sdk36", TurnipDriver(context) { gpu(0) }.autoId())
|
||||
} finally {
|
||||
ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SDK_INT", sdk)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun externalOverrideStillTakesPriorityOverDetection() {
|
||||
val driver = TurnipDriver(RuntimeEnvironment.getApplication()) { error("override must precede detection") }
|
||||
overrideFile().parentFile!!.mkdirs()
|
||||
overrideFile().writeText("system")
|
||||
assertEquals("system", driver.autoId())
|
||||
overrideFile().writeText("a8")
|
||||
assertEquals("turnip-sdk36", driver.autoId())
|
||||
}
|
||||
|
||||
@Test fun aManuallySelectedImportedDriverStillTakesPriorityOverDetection() {
|
||||
val context = RuntimeEnvironment.getApplication()
|
||||
val dir = File(context.filesDir, "graphics_driver/test-pinned").apply { mkdirs() }
|
||||
File(dir, "meta.json").writeText("""{"libraryName":"test.so"}""")
|
||||
File(dir, "test.so").writeText("")
|
||||
SessionPrefs.setAndroidDriver(context, "test-pinned")
|
||||
assertEquals("test-pinned", TurnipDriver(context) { error("manual choice must precede detection") }.install())
|
||||
}
|
||||
|
||||
@Test fun normalizedGpuModelsSelectExistingGenerationDrivers() {
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
package com.droiddeck.launcher.session
|
||||
|
||||
import android.app.Application
|
||||
import com.droiddeck.launcher.R
|
||||
import com.droiddeck.launcher.SessionActivity
|
||||
import com.droiddeck.launcher.gpu.GpuInfo
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNotNull
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Before
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.rules.TemporaryFolder
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.Robolectric
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.annotation.Implementation
|
||||
import org.robolectric.annotation.Implements
|
||||
import org.robolectric.util.ReflectionHelpers
|
||||
import java.io.File
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(
|
||||
sdk = [33], application = Application::class, qualifiers = "en-rUS",
|
||||
instrumentedPackages = ["com.droiddeck.launcher.gpu.GpuInfo"],
|
||||
shadows = [SessionEndHintTest.DetectedGpu::class],
|
||||
)
|
||||
class SessionEndHintTest {
|
||||
@get:Rule val temporary = TemporaryFolder()
|
||||
private lateinit var activity: SessionActivity
|
||||
private var previousArchitecture: String? = null
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
previousArchitecture = SessionState.steamClientArch
|
||||
DetectedGpu.family = GpuInfo.Family.NOT_ADRENO
|
||||
activity = Robolectric.buildActivity(SessionActivity::class.java).get()
|
||||
SessionState.steamClientArch = "arm64"
|
||||
}
|
||||
|
||||
@After
|
||||
fun tearDown() {
|
||||
SessionState.steamClientArch = previousArchitecture
|
||||
DetectedGpu.family = GpuInfo.Family.NOT_ADRENO
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sigillOnArm64IncludesTheExperimentalX64Fallback() {
|
||||
SessionState.steamClientArch = "arm64"
|
||||
|
||||
assertEquals(
|
||||
activity.getString(R.string.session_end_steam_sigill) + "\n" + activity.getString(R.string.session_end_steam_try_x64),
|
||||
hintText(sigillLog()),
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sigillOnX86_64DoesNotSuggestSwitchingToItself() {
|
||||
SessionState.steamClientArch = "x86_64"
|
||||
|
||||
assertEquals(activity.getString(R.string.session_end_steam_sigill), hintText(sigillLog()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sigillWithUnknownArchitectureDoesNotAssumeArm64() {
|
||||
SessionState.steamClientArch = null
|
||||
|
||||
assertEquals(activity.getString(R.string.session_end_steam_sigill), hintText(sigillLog()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun vulkanFailureOnAdrenoSelectsTheDriverHint() {
|
||||
for (family in listOf(GpuInfo.Family.A6XX, GpuInfo.Family.ADRENO_UNKNOWN)) {
|
||||
DetectedGpu.family = family
|
||||
|
||||
assertEquals(family.name, activity.getString(R.string.session_end_vulkan_device), hintText(vulkanLog()))
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun vulkanFailureOnNonAdrenoExplainsTheMissingLinuxDriver() {
|
||||
DetectedGpu.family = GpuInfo.Family.NOT_ADRENO
|
||||
|
||||
assertEquals(activity.getString(R.string.session_end_gpu_unsupported), hintText(vulkanLog()))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun missingEmptyAndUnrelatedLogsHaveNoHint() {
|
||||
assertNull(hint(null))
|
||||
assertNull(hint(File(temporary.root, "missing.log")))
|
||||
assertNull(hint(log("")))
|
||||
assertNull(hint(log("game: Illegal instruction\n== steam exited rc=132")))
|
||||
}
|
||||
|
||||
private fun sigillLog() = log("== STEP 12:00:00 starting the Steam client\n== steam exited rc=132\n")
|
||||
|
||||
private fun vulkanLog() = log("[gamescope] [Error] vulkan: failed to find physical device\n")
|
||||
|
||||
private fun log(text: String): File = temporary.newFile().apply { writeText(text) }
|
||||
|
||||
private fun hint(log: File?): Any? = SessionActivity::class.java
|
||||
.getDeclaredMethod("sessionEndHint", File::class.java).apply { isAccessible = true }.invoke(activity, log)
|
||||
|
||||
private fun hintText(log: File): String {
|
||||
val result = hint(log)
|
||||
assertNotNull(result)
|
||||
return ReflectionHelpers.getField(result, "text")
|
||||
}
|
||||
|
||||
@Implements(value = GpuInfo.Companion::class, isInAndroidSdk = false)
|
||||
class DetectedGpu {
|
||||
@Implementation
|
||||
fun detect(): GpuInfo = GpuInfo("test GPU", if (family == GpuInfo.Family.A6XX) 610 else 0, family, "", false)
|
||||
|
||||
companion object {
|
||||
var family = GpuInfo.Family.NOT_ADRENO
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.droiddeck.launcher.session
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Test
|
||||
|
||||
class SessionLaunchFailureTest {
|
||||
private fun find(vararg lines: String) = SessionLaunchFailure.find(lines.asSequence())
|
||||
|
||||
@Test fun installedSteamThatExitsWithSigillHasACpuFailureHint() {
|
||||
assertEquals(SessionLaunchFailure.STEAM_ILLEGAL_INSTRUCTION, find(
|
||||
"== STEP 06:35:36.987 Steam client ready",
|
||||
"== STEP 06:35:41.058 starting the Steam client",
|
||||
"/usr/local/bin/droiddeck-session: line 309: 1192 Illegal instruction steam",
|
||||
"== steam exited rc=132",
|
||||
"(EE) failed to read Wayland events: Broken pipe",
|
||||
))
|
||||
}
|
||||
|
||||
@Test fun gamescopeWithoutAPhysicalDeviceHasAGraphicsFailureHint() {
|
||||
assertEquals(SessionLaunchFailure.VULKAN_DEVICE_MISSING, find(
|
||||
"[gamescope] [\u001b[0;31mError\u001b[0m] \u001b[0;37mvulkan:\u001b[0m failed to find physical device",
|
||||
"SDL_Vulkan_CreateSurface failed: VK_KHR_wayland_surface extension is not enabled in the Vulkan instance.Failed to create backend.",
|
||||
))
|
||||
}
|
||||
|
||||
@Test fun unrelatedIllegalInstructionsAndExitCodesAreNotBlamedOnSteam() {
|
||||
assertNull(find("game: Illegal instruction", "== steam exited rc=132"))
|
||||
assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=139"))
|
||||
assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=1320"))
|
||||
assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=0"))
|
||||
}
|
||||
|
||||
@Test fun onlyTheLatestClientAttemptCounts() {
|
||||
assertNull(find(
|
||||
"== STEP 12:00:00 starting the Steam client", "== steam exited rc=132",
|
||||
"== STEP 12:01:00 starting the Steam client", "== steam exited rc=0",
|
||||
))
|
||||
}
|
||||
|
||||
@Test fun aLaterSuccessfulDeviceSelectionClearsTheGraphicsFailure() {
|
||||
assertNull(find(
|
||||
"[gamescope] [Error] vulkan: failed to find physical device",
|
||||
"[gamescope] [Info] vulkan: selecting physical device 'Turnip Adreno (TM) 610': queue family 0",
|
||||
))
|
||||
}
|
||||
|
||||
@Test fun aNewSessionDoesNotReuseAnOldFailure() {
|
||||
assertNull(find(
|
||||
"== STEP 12:00:00 starting the Steam client", "== steam exited rc=132",
|
||||
"== droiddeck-session Fri Oct 23 12:01:00 mode=steam",
|
||||
))
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.droiddeck.launcher.stores
|
||||
|
||||
import android.app.Application
|
||||
import org.json.JSONObject
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
@@ -18,7 +19,7 @@ import javax.crypto.SecretKey
|
||||
import javax.crypto.spec.SecretKeySpec
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [33])
|
||||
@Config(sdk = [33], application = Application::class)
|
||||
class StoreAccountsCipherTest {
|
||||
private val app get() = RuntimeEnvironment.getApplication()
|
||||
private fun newKey(): SecretKey = SecretKeySpec(ByteArray(32).also { SecureRandom().nextBytes(it) }, "AES")
|
||||
|
||||
Reference in new issue
Block a user