Tests: Run tests on CI
This commit is contained in:
parent
a03f9b6fb6
commit
87de1ca968
4 changed files with 16 additions and 2 deletions
|
@ -18,9 +18,16 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -DCITRA_FORCE_QT4=ON ..
|
cmake -DCITRA_FORCE_QT4=ON ..
|
||||||
make -j4
|
make -j4
|
||||||
|
|
||||||
|
ctest -VV -C Release
|
||||||
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
export Qt5_DIR=$(brew --prefix)/opt/qt5
|
export Qt5_DIR=$(brew --prefix)/opt/qt5
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -GXcode
|
cmake .. -GXcode
|
||||||
xcodebuild -configuration Release | xcpretty -c && exit ${PIPESTATUS[0]}
|
xcodebuild -configuration Release | xcpretty -c
|
||||||
|
|
||||||
|
ctest -VV -C Release
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -255,6 +255,8 @@ endif()
|
||||||
|
|
||||||
add_subdirectory(externals/soundtouch)
|
add_subdirectory(externals/soundtouch)
|
||||||
|
|
||||||
|
enable_testing()
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
||||||
# Install freedesktop.org metadata files, following those specifications:
|
# Install freedesktop.org metadata files, following those specifications:
|
||||||
|
|
|
@ -26,7 +26,10 @@ build:
|
||||||
project: build/citra.sln
|
project: build/citra.sln
|
||||||
parallel: true
|
parallel: true
|
||||||
|
|
||||||
after_build:
|
test_script:
|
||||||
|
- cd build && ctest -VV -C Release
|
||||||
|
|
||||||
|
on_success:
|
||||||
# copying the needed QT Dlls is now done post build. See the CMakeLists.txt file in the citra-qt folder
|
# copying the needed QT Dlls is now done post build. See the CMakeLists.txt file in the citra-qt folder
|
||||||
- ps: >
|
- ps: >
|
||||||
if (!"$env:APPVEYOR_PULL_REQUEST_TITLE" -and ("$env:APPVEYOR_REPO_BRANCH" -eq "master"))
|
if (!"$env:APPVEYOR_PULL_REQUEST_TITLE" -and ("$env:APPVEYOR_REPO_BRANCH" -eq "master"))
|
||||||
|
|
|
@ -12,3 +12,5 @@ include_directories(../../externals/catch/single_include/)
|
||||||
add_executable(tests ${SRCS} ${HEADERS})
|
add_executable(tests ${SRCS} ${HEADERS})
|
||||||
target_link_libraries(tests core video_core audio_core common)
|
target_link_libraries(tests core video_core audio_core common)
|
||||||
target_link_libraries(tests ${PLATFORM_LIBRARIES})
|
target_link_libraries(tests ${PLATFORM_LIBRARIES})
|
||||||
|
|
||||||
|
add_test(NAME tests COMMAND $<TARGET_FILE:tests>)
|
||||||
|
|
Loading…
Reference in a new issue