Skip to content

Commit 0919f33

Browse files
authored
Merge pull request #303 from azarzadavila/gtest-travis-master
Enable Tests on Travis
2 parents e9cdf6b + fc987a1 commit 0919f33

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ script:
4141
- cmake -DCMAKE_BUILD_TYPE=Release -DMOZART_BOOST_USE_STATIC_LIBS=False -DCMAKE_PROGRAM_PATH=$BIN -DCMAKE_PREFIX_PATH=$PREFIX $SOURCES
4242
- make dist VERBOSE=1
4343
- make VERBOSE=1
44+
- make check
4445
deploy:
4546
provider: releases
4647
skip_cleanup: true

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
1010
project(MOZART CXX)
1111

1212
ENABLE_TESTING()
13-
# Custom CMake modules
13+
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
1414

15+
# Custom CMake modules
1516
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_local ${CMAKE_MODULE_PATH})
1617
include(MozartProperties)
1718

platform-test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,5 @@ if(BUILD_TESTING)
208208
set(TEST_FUNCTORS_OZF ${TEST_FUNCTORS_OZF} "${FUNCTOR_OZF}")
209209
add_test(${FUNCTOR} ${OZEMULATOR} --home "${MOZART_BUILD_DIR}" "${RUNNER_OZF}" "${FUNCTOR_OZF}")
210210
endforeach()
211+
add_dependencies(check platform-test)
211212
endif(BUILD_TESTING)

vm/vm/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ add_executable(vmtest testutils.cc sanitytest.cc smallinttest.cc floattest.cc
1515
virtualstringtest.cc bytestringtest.cc)
1616
target_link_libraries(vmtest mozartvm gtest gtest_main)
1717
add_test(vmtest vmtest)
18+
add_dependencies(check vmtest)
1819

1920
if(NOT MINGW)
2021
target_link_libraries(vmtest pthread)

0 commit comments

Comments
 (0)