summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/run-travis.sh1
-rwxr-xr-xci/run.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/ci/run-travis.sh b/ci/run-travis.sh
index 3b4ee138..5be6372e 100644
--- a/ci/run-travis.sh
+++ b/ci/run-travis.sh
@@ -33,7 +33,6 @@ fi
if [ "$DOCKER_IMAGE" = "" ]; then
export RUST_TEST_THREADS=1
curl -sSL "https://raw.githubusercontent.com/carllerche/travis-rust-matrix/master/test" | bash
- cargo doc --no-deps
else
export RUST_VERSION=${TRAVIS_RUST_VERSION}
export RUST_TARGET=${TARGET}
diff --git a/ci/run.sh b/ci/run.sh
index 2a94980f..770f5aa7 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -6,7 +6,7 @@
set -e
# This should only be run in a docker container, so verify that
-if [ ! -f /.dockerinit ]; then
+if [ ! $(pidof $0) = "1" ]; then
echo "run.sh should only be executed in a docker container"
echo "and that does not appear to be the case. Maybe you meant"
echo "to execute the tests via run-all.sh or run-docker.sh."