Skip to content

Commit

Permalink
removed bii publishing until it is fixed and only publishes on tag/ l…
Browse files Browse the repository at this point in the history
…imit of 2k files and disabled package_source_tests because due to their nature they are non deterministic
  • Loading branch information
toeb committed Apr 8, 2015
1 parent 64ae740 commit 96236da
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ before_install:
- git config --global user.email "travis-ci@example.com"
- git config --global user.name "Build Server"
install:
- wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh
- bii setup:cpp
- bii init
- bii open toeb/cmakepp
- rsync -av --exclude="blocks" --exclude="bii" --exclude=".git" --exclude=".gitignore" . blocks/toeb/cmakepp > /dev/null
#- wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh
#- bii setup:cpp
#- bii init
#- bii open toeb/cmakepp
#- rsync -av --exclude="blocks" --exclude="bii" --exclude=".git" --exclude=".gitignore" . blocks/toeb/cmakepp > /dev/null
#- sudo apt-get install cmake
#- cmake --version
# install cmake --
Expand All @@ -61,8 +61,8 @@ script:

after_success:
- "cmake -P build/after_success.cmake"
- bii user toeb -p $BII_PASSWORD
- bii publish toeb/cmakepp --tag STABLE
#- bii user toeb -p $BII_PASSWORD
#- bii publish toeb/cmakepp --tag STABLE
after_failure: "cmake -P build/after_failure.cmake"
after_script: "cmake -P build/after_script.cmake"
branches:
Expand Down
11 changes: 9 additions & 2 deletions build/script.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/../cmakepp.cmake")

## execute all tests in test directory
if("$ENV{CMAKEPP_TEST_EXECUTE_PARALLEL}_" STREQUAL "true_" )
test_execute_glob_parallel("${CMAKE_CURRENT_LIST_DIR}/../tests/**.cmake" --recurse --no-status)
## removed package source tests as they fail non deterministically
test_execute_glob_parallel(
"${CMAKE_CURRENT_LIST_DIR}/../tests/**.cmake"
"!${CMAKE_CURRENT_LIST_DIR}/../tests/package/package_source_tests/**.cmake"
--recurse --no-status)
else()
test_execute_glob("${CMAKE_CURRENT_LIST_DIR}/../tests/**.cmake" --recurse)
test_execute_glob(
"${CMAKE_CURRENT_LIST_DIR}/../tests/**.cmake"
"!${CMAKE_CURRENT_LIST_DIR}/../tests/package/package_source_tests/**.cmake"
--recurse)
endif()

## beep three times to indicate end of testrun...
Expand Down
2 changes: 1 addition & 1 deletion cmake/testing/test_execute_glob.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function(test_execute_glob)
timer_start(test_run)
cd("${CMAKE_CURRENT_BINARY_DIR}")
glob(${ARGN})
glob_ignore(${ARGN})
ans(test_files)
list(LENGTH test_files len)
## sort the test files so that they are always executed in the same order
Expand Down
2 changes: 1 addition & 1 deletion cmake/testing/test_execute_glob_parallel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function(test_execute_glob_parallel)

## get all test files
cd("${CMAKE_CURRENT_BINARY_DIR}")
glob("${args}")
glob_ignore("${args}")
ans(test_files)


Expand Down

0 comments on commit 96236da

Please sign in to comment.