Skip to content

Commit

Permalink
Two fixes to get make check-stage1 working.
Browse files Browse the repository at this point in the history 
1. Fix a long-standing typo in the makefile: the relevant
   CTEST_NAME here is `rpass-full` (with a dash), not
   `rpass_full`.

2. The rpass-full tests depend on the complete set of target
   libraries.  Therefore, the rpass-full tests need to use
   the dependencies held in the CSREQ-prefixed variable, not
   the TLIBRUSTC_DEFAULT-prefixed variable.
  • Loading branch information
@pnkfelix
pnkfelix committed Apr 2, 2014
1 parent 2cddd68 commit 3cbd98e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/tests.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
$$(CTEST_TESTARGS)

CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
CTEST_DEPS_rpass_full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(2)_H_$(3))
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
Expand Down

4 comments on commit 3cbd98e

@bors
Copy link
Contributor

@bors bors commented on 3cbd98e Apr 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw
at pnkfelix@3cbd98e

@bors
Copy link
Contributor

@bors bors commented on 3cbd98e Apr 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging pnkfelix/rust/fsk-fix-13247 = 3cbd98e into auto

@bors
Copy link
Contributor

@bors bors commented on 3cbd98e Apr 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pnkfelix/rust/fsk-fix-13247 = 3cbd98e merged ok, testing candidate = c3a7e6fa

@bors
Copy link
Contributor

@bors bors commented on 3cbd98e Apr 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1989
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/5001
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5002
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4093
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4107
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5101
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4188
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4196
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5103
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4188
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4193
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5100
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4197
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4208
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4864

Please sign in to comment.