Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

disable cpp lib test for mac, win and beta #9686

Merged
merged 1 commit into from
Oct 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ cache:
test-linux:
stage: test
variables:
RUN_TESTS: "true"
RUN_TESTS: all
script:
- scripts/gitlab/test-all.sh stable
tags:
Expand Down Expand Up @@ -143,7 +143,7 @@ test-darwin:
CARGO_TARGET: x86_64-apple-darwin
CC: gcc
CXX: g++
RUN_TESTS: "true"
RUN_TESTS: cargo
script:
- scripts/gitlab/test-all.sh stable
tags:
Expand All @@ -153,7 +153,7 @@ test-windows:
stage: optional
variables:
CARGO_TARGET: x86_64-pc-windows-msvc
RUN_TESTS: "true"
RUN_TESTS: cargo
script:
- sh scripts/gitlab/test-all.sh stable
tags:
Expand All @@ -162,7 +162,7 @@ test-windows:
test-beta:
stage: optional
variables:
RUN_TESTS: "true"
RUN_TESTS: cargo
script:
- scripts/gitlab/test-all.sh beta
tags:
Expand All @@ -171,7 +171,7 @@ test-beta:
test-nightly:
stage: optional
variables:
RUN_TESTS: "true"
RUN_TESTS: all
script:
- scripts/gitlab/test-all.sh nightly
tags:
Expand Down
16 changes: 9 additions & 7 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,19 @@ else
validate
fi

test "${RUN_TESTS}" = "true" && cpp_test
test "${RUN_TESTS}" = "all" && cpp_test

if [ "$CARGO_TARGET" ]
then

if [ "${RUN_TESTS}" = "true" ]
then
cargo_test --target $CARGO_TARGET $@
else
cargo_test --no-run --target $CARGO_TARGET $@
fi
case "${RUN_TESTS}" in
(cargo|all)
cargo_test --target $CARGO_TARGET $@
;;
('')
cargo_test --no-run --target $CARGO_TARGET $@
;;
esac
else
cargo_test $@
fi
Expand Down