Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

ECSS Services
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

474fc6ae

Commit 474fc6ae authored 6 years ago by Dimitrios Stoupis

Downloads
- Plain Diff

Merge branch 'master' into 'requestVerification' to resolve conflicts

# Conflicts:
#   CMakeLists.txt

parents 4ac79a31 0cf1b969

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 32 additions, 5 deletions

.gitlab-ci.yml
.gitmodules 3 additions, 0 deletions

.gitmodules
.idea/misc.xml 9 additions, 0 deletions

.idea/misc.xml
.idea/vcs.xml 1 addition, 0 deletions

.idea/vcs.xml
CMakeLists.txt 7 additions, 1 deletion

CMakeLists.txt
ci/clang-tidy.sh 1 addition, 1 deletion

ci/clang-tidy.sh
ci/cppcheck.sh 1 addition, 1 deletion

ci/cppcheck.sh
ci/vera.sh 1 addition, 1 deletion

ci/vera.sh
inc/Message.hpp 7 additions, 0 deletions

inc/Message.hpp
lib/Catch2 1 addition, 0 deletions

lib/Catch2
src/Message.cpp 5 additions, 0 deletions

src/Message.cpp
test/Message.cpp 173 additions, 0 deletions

test/Message.cpp
test/Services/ServiceTests.hpp 53 additions, 0 deletions

test/Services/ServiceTests.hpp
test/Services/TestService.cpp 32 additions, 0 deletions

test/Services/TestService.cpp
test/TestPlatform.cpp 22 additions, 0 deletions

test/TestPlatform.cpp
test/tests.cpp 3 additions, 0 deletions

test/tests.cpp

with 351 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment