diff options
| author | James McCoy <jamessan@jamessan.com> | 2022-02-05 09:16:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-05 09:16:41 -0500 |
| commit | ef6cedf820f851020816ed02fe9f05993878b780 (patch) | |
| tree | 6d142553ed3abaa5ceacd6aedca57d3a622ad21f /ci/common | |
| parent | 7c8ef809e66d437e76aef84b54b5de5d33dd6930 (diff) | |
| parent | fa192e97d508acedeee2d2287ee28f4923a3b388 (diff) | |
| download | rneovim-ef6cedf820f851020816ed02fe9f05993878b780.tar.gz rneovim-ef6cedf820f851020816ed02fe9f05993878b780.tar.bz2 rneovim-ef6cedf820f851020816ed02fe9f05993878b780.zip | |
Merge pull request #17290 from dundargoc/ci/simplify-ci-process
ci: simplify CI process
Diffstat (limited to 'ci/common')
| -rw-r--r-- | ci/common/build.sh | 2 | ||||
| -rw-r--r-- | ci/common/suite.sh | 19 | ||||
| -rw-r--r-- | ci/common/test.sh | 5 |
3 files changed, 12 insertions, 14 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index 0ee4b7493f..c44c234274 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -8,8 +8,6 @@ _stat() { top_make() { printf '%78s\n' | tr ' ' '=' - # Travis has 1.5 virtual cores according to: - # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM ninja "$@" } diff --git a/ci/common/suite.sh b/ci/common/suite.sh index 561849ce2d..f6a8c22d21 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -73,13 +73,8 @@ fail() { run_test() { local cmd="$1" - test $# -gt 0 && shift - local test_name="$1" - : ${test_name:=$cmd} - test $# -gt 0 && shift - if ! eval "$cmd" ; then - fail "${test_name}" "$@" - fi + local test_name="$2" + eval "$cmd" || fail "$test_name" } ended_successfully() { @@ -99,3 +94,13 @@ end_tests() { touch "${END_MARKER}" ended_successfully } + +run_suite() { + local command="$1" + local suite_name="$2" + + enter_suite "$suite_name" + run_test "$command" "$suite_name" + exit_suite --continue +} + diff --git a/ci/common/test.sh b/ci/common/test.sh index 92c15c8ba1..798f2926c6 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -182,8 +182,3 @@ install_nvim() {( exit_suite )} - -csi_clean() { - find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete - find "${BUILD_DIR}" -name '*test-include*.o' -delete -} |