From 082a58287a387b4cce664d99dae64dc1f88e2280 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Wed, 17 Feb 2021 22:31:48 -0500 Subject: [PATCH 1/3] CMake: add TestShaderGenerators source back to unitTest --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaf3920e6a..6154cd8487 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2118,6 +2118,7 @@ endif() if(UNITTEST) add_executable(unitTest unittest/UnitTest.cpp + unittest/TestShaderGenerators.cpp unittest/TestArmEmitter.cpp unittest/TestArm64Emitter.cpp unittest/TestX64Emitter.cpp From 6bc6b0c5472daf37d4be661519283c89b08da3da Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Wed, 17 Feb 2021 00:42:31 -0500 Subject: [PATCH 2/3] CMake: enable testing --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6154cd8487..99ce879c74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ # vim:noexpandtab: cmake_minimum_required(VERSION 3.6) project(PPSSPP) +enable_testing() #This is supposed to work but doesn't! if(NOT ANDROID) @@ -2129,6 +2130,21 @@ if(UNITTEST) ) target_link_libraries(unitTest ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${LinkCommon} Common) setup_target_project(unitTest unittest) + add_test(arm64_emitter unitTest Arm64Emitter) + add_test(arm_emitter unitTest ArmEmitter) + add_test(x64_emitter unitTest X64Emitter) + add_test(vertex_jit unitTest VertexJit) + add_test(asin unitTest Asin) + add_test(sincos unitTest SinCos) + add_test(vfpu_sincos unitTest VFPUSinCos) + add_test(math_util unitTest MathUtil) + add_test(parsers unitTest Parsers) + add_test(jit unitTest Jit) + add_test(matrix_transpose unitTest MatrixTranspose) + add_test(parse_lbn unitTest ParseLBN) + add_test(quick_texhash unitTest QuickTexHash) + add_test(clz unitTest CLZ) + add_test(shadergen unitTest ShaderGenerators) endif() if(LIBRETRO) From 9a318673a7a3bb83755a650a7a21bb446e0bb7c8 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Thu, 18 Feb 2021 00:27:45 -0500 Subject: [PATCH 3/3] UnitTest: call InitVFPUSinCos() to set vfpu_* function pointers --- unittest/UnitTest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index c56ea4a189..677e831717 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -298,6 +298,7 @@ bool TestParsers() { bool TestVFPUSinCos() { float sine, cosine; + InitVFPUSinCos(false); EXPECT_FALSE(vfpu_sincos == nullptr); vfpu_sincos(0.0f, sine, cosine); EXPECT_EQ_FLOAT(sine, 0.0f);