Copy tracing things back to maint-0.3.5, for consistency. (122b297a) · Commits · ZerXes / Tor

.gitlab-ci.yml

+12 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ variables:
		- if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
		# TODO: This next line should not be debian-only.
		- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
		- if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi

		# Minmal check on debian: just make, make check.
		#
		@@ -155,3 +156,14 @@ debian-integration:
		STEM: "yes"
		script:
		- ./scripts/ci/ci-driver.sh

		#####
		# Tracing build on Debian stable.
		debian-tracing:
		image: debian:stable
		<<: *debian-template
		variables:
		TRACING: "yes"
		CHECK: "no"
		script:
		- ./scripts/ci/ci-driver.sh

+5 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}"
		RUST="${RUST:-no}"
		DOXYGEN="${DOXYGEN:-no}"
		ASCIIDOC="${ASCIIDOC:-no}"
		TRACING="${TRACING:-no}"

		# Options for which tests to run. All should be yes/no.
		CHECK="${CHECK:-yes}"
		@@ -191,6 +192,7 @@ yes_or_no COVERAGE
		yes_or_no RUST
		yes_or_no DOXYGEN
		yes_or_no ASCIIDOC
		yes_or_no TRACING

		yes_or_no RUN_STAGE_CONFIGURE
		yes_or_no RUN_STAGE_BUILD
		@@ -241,6 +243,9 @@ fi
		if [[ "$ASCIIDOC" != "yes" ]]; then
		configure_options+=("--disable-asciidoc")
		fi
		if [[ "$TRACING" == "yes" ]]; then
		configure_options+=("--enable-tracing-instrumentation-lttng")
		fi

		#############################################################################
		# Tell the user about our versions of different tools and packages.