libretro/mgba
1
0
Fork 0
mirror of https://github.com/libretro/mgba.git synced 2024-11-24 08:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test: Refactor test framework

Browse Source
This commit is contained in:
Jeffrey Pfau 2016-10-21 18:28:18 -07:00
parent dec8a1223c
commit e54772fead
9 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -35,13 +35,20 @@ set(BUILD_GLES2 OFF CACHE STRING "Build with OpenGL|ES 2")
set(USE_EPOXY ON CACHE STRING "Build with libepoxy")
set(DISABLE_DEPS OFF CACHE BOOL "Build without dependencies")
file(GLOB ARM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/arm/*.c)
file(GLOB ARM_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/arm/test/*.c)
file(GLOB LR35902_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/lr35902/*.c)
file(GLOB LR35902_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/lr35902/test/*.c)
file(GLOB GBA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/*.c)
file(GLOB GBA_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/test/*.c)
file(GLOB GB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/*.c)
file(GLOB GB_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/test/*.c)
file(GLOB GBA_CHEATS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/cheats/*.c)
file(GLOB GBA_RR_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/rr/*.c)
file(GLOB GBA_EXTRA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/extra/*.c)
file(GLOB UTIL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.[cSs] ${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.c)
file(GLOB CORE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.c)
file(GLOB CORE_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/core/test/*.c)
file(GLOB UTIL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.[cSs])
file(GLOB UTIL_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/test/*.c)
file(GLOB GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/feature/gui/*.c)
file(GLOB GBA_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/renderers/*.c)
file(GLOB SIO_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/sio/lockstep.c)
@ -533,7 +540,7 @@ foreach(FEATURE IN LISTS FEATURES)
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
endforeach()
set(CORE_SRC)
set(TEST_SRC ${CORE_TEST_SRC})
if(M_CORE_GB)
add_definitions(-DM_CORE_GB)
list(APPEND CORE_SRC
@ -541,6 +548,9 @@ if(M_CORE_GB)
${CMAKE_CURRENT_SOURCE_DIR}/src/lr35902/debugger/debugger.c
${GB_SRC}
${GB_RENDERER_SRC})
list(APPEND TEST_SRC
${LR35902_TEST_SRC}
${GB_TEST_SRC})
endif()
if(M_CORE_GBA)
@ -552,6 +562,9 @@ if(M_CORE_GBA)
${GBA_SRC}
${GBA_CHEATS_SRC}
${GBA_RENDERER_SRC})
list(APPEND TEST_SRC
${ARM_TEST_SRC}
${GBA_TEST_SRC})
if(NOT M_CORE_GB)
list(APPEND CORE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/audio.c)
endif()
@ -581,6 +594,7 @@ list(APPEND CORE_SRC
${DEBUGGER_SRC}
${OS_SRC}
${THIRD_PARTY_SRC})
list(APPEND TEST_SRC ${UTIL_TEST_SRC})
set(SRC ${CORE_SRC} ${VFS_SRC})
if(NOT MINIMAL_CORE)
@ -708,11 +722,15 @@ endif()
if(NOT USE_CMOCKA)
set(BUILD_SUITE OFF)
endif()
if(USE_CMOCKA)
if(BUILD_SUITE)
enable_testing()
include_directories(AFTER ${CMOCKA_INCLUDE_DIRS})
link_directories(${CMOCKA_LIBRARY_DIRS})
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/platform/test/suite ${CMAKE_CURRENT_BINARY_DIR}/suite)
add_executable(${BINARY_NAME}-suite ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/test/suite-main.c ${TEST_SRC})
target_link_libraries(${BINARY_NAME}-suite ${BINARY_NAME} ${PLATFORM_LIBRARY} cmocka)
set_target_properties(${BINARY_NAME}-suite PROPERTIES COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}")
add_test(${BINARY_NAME}-suite ${BINARY_NAME}-suite)
endif()
if(BUILD_EXAMPLE)

10
src/platform/test/suite/common/core.c → src/core/test/core.c
View File

@ -3,7 +3,7 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "platform/test/suite/suite.h"
#include "util/test/suite.h"
#include "core/core.h"
#include "util/vfs.h"
@ -33,4 +33,10 @@ M_TEST_SUITE_DEFINE(mCore,
cmocka_unit_test(findNullPath),
#endif
cmocka_unit_test(findNullVF),
cmocka_unit_test(findEmpty))
cmocka_unit_test(findEmpty))
int TestRunCore(void) {
int failures = 0;
failures += M_TEST_SUITE_RUN(mCore);
return failures;
}

8
src/platform/test/suite/common/common.h → src/core/test/core.h
View File

@ -3,10 +3,10 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef SUITE_COMMON_H
#define SUITE_COMMON_H
#ifndef TEST_M_CORE_H
#define TEST_M_CORE_H
#include "util/common.h"
int mTestRunCommon(void);
int TestRunCore(void);
#endif
#endif

9
src/platform/test/suite-main.c
View File

@ -3,10 +3,13 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "platform/test/suite/suite.h"
#include "util/test/suite.h"
#include "platform/test/suite/common/common.h"
#include "util/test/util.h"
#include "core/test/core.h"
int main() {
return mTestRunCommon() != 0;
int failures = TestRunUtil();
failures += TestRunCore();
return failures != 0;
}

4
src/platform/test/suite/CMakeLists.txt
View File

@ -1,4 +0,0 @@
file(GLOB SUITE_COMMON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/*.c)
add_executable(${BINARY_NAME}-suite ${SUITE_COMMON_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/../suite-main.c)
target_link_libraries(${BINARY_NAME}-suite ${BINARY_NAME} ${PLATFORM_LIBRARY} cmocka)
add_test(${BINARY_NAME}-suite ${BINARY_NAME}-suite)

0
src/platform/test/suite/suite.h → src/util/test/suite.h
View File

6
src/platform/test/suite/common/common.c → src/util/test/util.c
View File

@ -3,14 +3,12 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "platform/test/suite/suite.h"
#include "util/test/suite.h"
M_TEST_SUITE_DECLARE(mCore);
M_TEST_SUITE_DECLARE(VFS);
int mTestRunCommon(void) {
int TestRunUtil(void) {
int failures = 0;
failures += M_TEST_SUITE_RUN(mCore);
failures += M_TEST_SUITE_RUN(VFS);
return failures;
}

12
src/util/test/util.h Normal file
View File

@ -0,0 +1,12 @@
/* Copyright (c) 2013-2016 Jeffrey Pfau
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef TEST_UTIL_H
#define TEST_UTIL_H
#include "util/common.h"
int TestRunUtil(void);
#endif

2
src/platform/test/suite/common/vfs.c → src/util/test/vfs.c
View File

@ -3,7 +3,7 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "platform/test/suite/suite.h"
#include "util/test/suite.h"
#include "util/vfs.h"