Merge pull request #14061 from unknownbrackets/ui-tests

UI: Correct developer tools test run
hrydgard · Feb 4, 2021 · 1115037 · 1115037
2 parents b7e1e9a + 17d2a31
commit 1115037
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp
@@ -84,6 +84,10 @@ bool RunTests() {
 	}
 #endif
 
+	GraphicsContext *tempCtx = PSP_CoreParameter().graphicsContext;
+	// Clear the context during tests.  We set it back later.
+	PSP_CoreParameter().graphicsContext = nullptr;
+
 	CoreParameter coreParam;
 	coreParam.cpuCore = (CPUCore)g_Config.iCpuCore;
 	coreParam.gpuCore = GPUCORE_SOFTWARE;
@@ -175,6 +179,8 @@ bool RunTests() {
 	PSP_CoreParameter().pixelWidth = pixel_xres;
 	PSP_CoreParameter().pixelHeight = pixel_yres;
 	PSP_CoreParameter().headLess = false;
+	PSP_CoreParameter().graphicsContext = tempCtx;
+
 	g_Config.sReportHost = savedReportHost;
 	return true;  // Managed to execute the tests. Says nothing about the result.
 }