From 8e396fda058a2638e22750a731cbf76a2c8e697c Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Mon, 24 Jul 2017 14:01:13 +0200 Subject: [PATCH] Set RUST_BACKTRACE=1 everywhere --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 60c449bbce..bd8072a792 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ DEB_CONFIGURE_FLAGS = --enable-llvm-link-shared --disable-dist-src --prefix=/usr LLVM_VERSION = 4.0 OLD_LLVM_VERSION = 3.9 DEB_CONFIGURE_FLAGS += --llvm-root=/usr/lib/llvm-$(LLVM_VERSION) -RUSTBUILD = ./x.py +RUSTBUILD = RUST_BACKTRACE=1 ./x.py RUSTBUILD_FLAGS = --config debian/config.toml -v --on-fail env # To run a specific test, run something like: # $ debian/rules override_dh_auto_test-arch \ @@ -191,7 +191,7 @@ override_dh_auto_test-arch: test "$$(stat -c %s "$$x")" -lt 6000000; \ done ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(call RUN_TESTS,RUST_BACKTRACE=1 $(RUSTBUILD) test --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS)) + $(call RUN_TESTS,$(RUSTBUILD) test --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS)) # don't continue if RUSTBUILD_TEST_FLAGS is non-empty test -z "$(RUSTBUILD_TEST_FLAGS)" endif @@ -200,7 +200,7 @@ override_dh_auto_test-indep: ifneq (,$(BUILD_DOCS)) ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) # Run all rules that test the docs, i.e. in step.rs that depend on default:doc - $(call RUN_TESTS,RUST_BACKTRACE=1 $(RUSTBUILD) test --no-fail-fast src/tools/linkchecker $(RUSTBUILD_FLAGS)) + $(call RUN_TESTS,$(RUSTBUILD) test --no-fail-fast src/tools/linkchecker $(RUSTBUILD_FLAGS)) endif endif