Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
87de1ca9
There was an error fetching the commit references. Please try again later.
Commit
87de1ca9
authored
8 years ago
by
MerryMage
Browse files
Options
Downloads
Patches
Plain Diff
Tests: Run tests on CI
parent
a03f9b6f
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis-build.sh
+8
-1
8 additions, 1 deletion
.travis-build.sh
CMakeLists.txt
+2
-0
2 additions, 0 deletions
CMakeLists.txt
appveyor.yml
+4
-1
4 additions, 1 deletion
appveyor.yml
src/tests/CMakeLists.txt
+2
-0
2 additions, 0 deletions
src/tests/CMakeLists.txt
with
16 additions
and
2 deletions
.travis-build.sh
+
8
−
1
View file @
87de1ca9
...
@@ -18,9 +18,16 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
...
@@ -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
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
0
View file @
87de1ca9
...
@@ -255,6 +255,8 @@ endif()
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
4
−
1
View file @
87de1ca9
...
@@ -26,7 +26,10 @@ build:
...
@@ -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"))
...
...
This diff is collapsed.
Click to expand it.
src/tests/CMakeLists.txt
+
2
−
0
View file @
87de1ca9
...
@@ -12,3 +12,5 @@ include_directories(../../externals/catch/single_include/)
...
@@ -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>
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment