GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit fe0e62dd authored by Nick Mathewson's avatar Nick Mathewson 🐭

CI: Try to enable integration tests, hardening, and clang.

parent 8182f135
...@@ -66,6 +66,7 @@ variables: ...@@ -66,6 +66,7 @@ variables:
- apt-get install - apt-get install
automake automake
build-essential build-essential
ca-certificates
git git
libevent-dev libevent-dev
liblzma-dev liblzma-dev
...@@ -77,6 +78,10 @@ variables: ...@@ -77,6 +78,10 @@ variables:
zlib1g-dev zlib1g-dev
- if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
- if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
- if [ "$CC" = clang ]; then apt-get install clang; fi
- if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
debian-minimal: debian-minimal:
image: debian:stable image: debian:stable
...@@ -84,17 +89,18 @@ debian-minimal: ...@@ -84,17 +89,18 @@ debian-minimal:
script: script:
- ./scripts/ci/ci-driver.sh - ./scripts/ci/ci-driver.sh
###############################################
# Temporarily diabled. This one just takes too long to finish right now! # TODO: This one just takes too long to finish right now!
# Maybe we need to divide the call to ./src/test/test into a few segments, # Maybe we need to divide the call to ./src/test/test into a few segments,
# that all end in similar amount of time? # that all end in similar amount of time?
#debian-hardened: debian-hardened:
# image: debian:testing image: debian:testing
# <<: *debian-template <<: *debian-template
# variables: variables:
# HARDENING: "yes" HARDENING: "yes"
# script: CC: "clang"
# - ./scripts/ci/ci-driver.sh script:
- ./scripts/ci/ci-driver.sh
debian-distcheck: debian-distcheck:
image: debian:stable image: debian:stable
...@@ -115,3 +121,13 @@ debian-docs: ...@@ -115,3 +121,13 @@ debian-docs:
CHECK: "no" CHECK: "no"
script: script:
- ./scripts/ci/ci-driver.sh - ./scripts/ci/ci-driver.sh
debian-integration:
image: debian:stable
<<: *debian-template
variables:
CHECK: "no"
CHUTNEY: "yes"
# STEM: "yes" -- currently failing on <044.
script:
- ./scripts/ci/ci-driver.sh
...@@ -411,10 +411,13 @@ fi ...@@ -411,10 +411,13 @@ fi
if [[ "${CHUTNEY}" = "yes" ]]; then if [[ "${CHUTNEY}" = "yes" ]]; then
start_section "Chutney" start_section "Chutney"
export CHUTNEY_TOR_SANDBOX=0
export CHUTNEY_ALLOW_FAILURES=2
if runcmd make "${CHUTNEY_MAKE_TARGET}"; then if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
hooray "Chutney tests have succeeded" hooray "Chutney tests have succeeded"
else else
error "Chutney says:" error "Chutney says:"
export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
# XXXX These next two should be part of a make target. # XXXX These next two should be part of a make target.
runcmd ls test_network_log || true runcmd ls test_network_log || true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment