2012-12-10 19:32:48 -06:00
|
|
|
# Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
|
# file at the top-level directory of this distribution and at
|
|
|
|
|
# http://rust-lang.org/COPYRIGHT.
|
|
|
|
|
#
|
|
|
|
|
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
|
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
|
# option. This file may not be copied, modified, or distributed
|
|
|
|
|
# except according to those terms.
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
|
2011-05-01 15:18:52 -05:00
|
|
|
######################################################################
|
2013-02-05 16:14:58 -06:00
|
|
|
# Test variables
|
2011-05-01 15:18:52 -05:00
|
|
|
######################################################################
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
# The names of crates that must be tested
|
2013-12-12 20:07:23 -06:00
|
|
|
TEST_TARGET_CRATES = std extra rustuv green native
|
2013-12-22 15:46:06 -06:00
|
|
|
TEST_DOC_CRATES = std extra
|
2013-10-16 21:23:12 -05:00
|
|
|
TEST_HOST_CRATES = rustpkg rustc rustdoc syntax
|
2013-02-21 18:15:01 -06:00
|
|
|
TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
|
2011-05-01 15:18:52 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
# Markdown files under doc/ that should have their code extracted and run
|
2013-09-27 19:03:34 -05:00
|
|
|
DOC_TEST_NAMES = tutorial guide-ffi guide-macros guide-lifetimes \
|
|
|
|
|
guide-tasks guide-conditions guide-container guide-pointers \
|
2014-01-10 18:34:55 -06:00
|
|
|
complement-cheatsheet guide-runtime \
|
2013-09-27 19:03:34 -05:00
|
|
|
rust
|
2011-09-13 17:06:21 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
######################################################################
|
|
|
|
|
# Environment configuration
|
|
|
|
|
######################################################################
|
2011-06-29 17:12:02 -05:00
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
# The arguments to all test runners
|
|
|
|
|
ifdef TESTNAME
|
|
|
|
|
TESTARGS += $(TESTNAME)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef CHECK_XFAILS
|
|
|
|
|
TESTARGS += --ignored
|
|
|
|
|
endif
|
|
|
|
|
|
2013-07-29 14:38:12 -05:00
|
|
|
TEST_BENCH = --bench
|
2013-07-17 13:52:21 -05:00
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
# Arguments to the cfail/rfail/rpass/bench tests
|
|
|
|
|
ifdef CFG_VALGRIND
|
|
|
|
|
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
|
2013-07-29 14:38:12 -05:00
|
|
|
TEST_BENCH =
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
endif
|
2011-06-29 17:12:02 -05:00
|
|
|
|
2013-07-29 14:43:45 -05:00
|
|
|
ifdef NO_BENCH
|
|
|
|
|
TEST_BENCH =
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
endif
|
2011-06-29 17:12:02 -05:00
|
|
|
|
2011-09-13 17:06:21 -05:00
|
|
|
# Arguments to the perf tests
|
|
|
|
|
ifdef CFG_PERF_TOOL
|
|
|
|
|
CTEST_PERF_RUNTOOL = --runtool "$(CFG_PERF_TOOL)"
|
|
|
|
|
endif
|
|
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
CTEST_TESTARGS := $(TESTARGS)
|
2011-05-01 15:18:52 -05:00
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
ifdef VERBOSE
|
|
|
|
|
CTEST_TESTARGS += --verbose
|
|
|
|
|
endif
|
2011-05-04 19:32:05 -05:00
|
|
|
|
2012-05-24 00:53:50 -05:00
|
|
|
# If we're running perf then set this environment variable
|
|
|
|
|
# to put the benchmarks into 'hard mode'
|
|
|
|
|
ifeq ($(MAKECMDGOALS),perf)
|
|
|
|
|
RUST_BENCH=1
|
|
|
|
|
export RUST_BENCH
|
|
|
|
|
endif
|
|
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
TEST_LOG_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
|
|
|
|
|
TEST_OK_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).ok
|
2012-05-24 00:53:50 -05:00
|
|
|
|
2013-07-15 20:52:08 -05:00
|
|
|
TEST_RATCHET_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4)-metrics.json
|
|
|
|
|
TEST_RATCHET_NOISE_PERCENT=10.0
|
|
|
|
|
|
|
|
|
|
# Whether to ratchet or merely save benchmarks
|
|
|
|
|
ifdef CFG_RATCHET_BENCH
|
2013-08-23 17:30:23 -05:00
|
|
|
CRATE_TEST_EXTRA_ARGS=\
|
2013-07-29 14:38:12 -05:00
|
|
|
--test $(TEST_BENCH) \
|
2013-07-15 20:52:08 -05:00
|
|
|
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
|
|
|
|
|
--ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
|
|
|
|
|
else
|
2013-08-23 17:30:23 -05:00
|
|
|
CRATE_TEST_EXTRA_ARGS=\
|
2013-07-29 14:38:12 -05:00
|
|
|
--test $(TEST_BENCH) \
|
2013-07-15 20:52:08 -05:00
|
|
|
--save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
endif
|
|
|
|
|
|
2013-08-23 17:30:23 -05:00
|
|
|
# If we're sharding the testsuite between parallel testers,
|
|
|
|
|
# pass this argument along to the compiletest and crate test
|
|
|
|
|
# invocations.
|
|
|
|
|
ifdef TEST_SHARD
|
|
|
|
|
CTEST_TESTARGS += --test-shard=$(TEST_SHARD)
|
|
|
|
|
CRATE_TEST_EXTRA_ARGS += --test-shard=$(TEST_SHARD)
|
|
|
|
|
endif
|
|
|
|
|
|
2013-03-02 06:25:12 -06:00
|
|
|
define DEF_TARGET_COMMANDS
|
|
|
|
|
|
|
|
|
|
ifdef CFG_UNIXY_$(1)
|
|
|
|
|
CFG_RUN_TEST_$(1)=$$(call CFG_RUN_$(1),,$$(CFG_VALGRIND) $$(1))
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef CFG_WINDOWSY_$(1)
|
2013-11-29 19:09:10 -06:00
|
|
|
CFG_TESTLIB_$(1)=$$(CFG_BUILD_DIR)$$(2)/$$(strip \
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(if $$(findstring stage0,$$(1)), \
|
2014-01-13 18:45:33 -06:00
|
|
|
stage0/$$(CFG_LIBDIR_RELATIVE), \
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(if $$(findstring stage1,$$(1)), \
|
2014-01-13 18:45:33 -06:00
|
|
|
stage1/$$(CFG_LIBDIR_RELATIVE), \
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(if $$(findstring stage2,$$(1)), \
|
2014-01-13 18:45:33 -06:00
|
|
|
stage2/$$(CFG_LIBDIR_RELATIVE), \
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(if $$(findstring stage3,$$(1)), \
|
2014-01-13 18:45:33 -06:00
|
|
|
stage3/$$(CFG_LIBDIR_RELATIVE), \
|
2014-01-07 10:51:15 -06:00
|
|
|
)))))/$$(CFG_RUSTLIBDIR)/$$(CFG_BUILD)/lib
|
2013-03-02 06:25:12 -06:00
|
|
|
CFG_RUN_TEST_$(1)=$$(call CFG_RUN_$(1),$$(call CFG_TESTLIB_$(1),$$(1),$$(3)),$$(1))
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Run the compiletest runner itself under valgrind
|
|
|
|
|
ifdef CTEST_VALGRIND
|
2013-10-21 04:18:21 -05:00
|
|
|
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3))
|
2013-03-02 06:25:12 -06:00
|
|
|
else
|
2013-10-21 04:18:21 -05:00
|
|
|
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2))
|
2013-03-02 06:25:12 -06:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-03-02 06:25:12 -06:00
|
|
|
$(eval $(call DEF_TARGET_COMMANDS,$(target))))
|
|
|
|
|
|
2013-05-06 20:09:34 -05:00
|
|
|
# Target platform specific variables
|
2013-05-01 04:50:23 -05:00
|
|
|
# for arm-linux-androidabi
|
2013-05-03 10:49:18 -05:00
|
|
|
define DEF_ADB_DEVICE_STATUS
|
|
|
|
|
CFG_ADB_DEVICE_STATUS=$(1)
|
2013-05-01 04:50:23 -05:00
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-05-03 10:49:18 -05:00
|
|
|
$(if $(findstring $(target),"arm-linux-androideabi"), \
|
|
|
|
|
$(if $(findstring adb,$(CFG_ADB)), \
|
2014-01-04 02:36:02 -06:00
|
|
|
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[:_A-Za-z0-9-]+[[:blank:]]+device')), \
|
2013-12-15 00:42:01 -06:00
|
|
|
$(info check: android device attached) \
|
|
|
|
|
$(eval $(call DEF_ADB_DEVICE_STATUS, true)), \
|
|
|
|
|
$(info check: android device not attached) \
|
|
|
|
|
$(eval $(call DEF_ADB_DEVICE_STATUS, false)) \
|
2013-05-01 04:50:23 -05:00
|
|
|
), \
|
2013-12-15 00:42:01 -06:00
|
|
|
$(info check: adb not found) \
|
|
|
|
|
$(eval $(call DEF_ADB_DEVICE_STATUS, false)) \
|
2013-05-03 10:49:18 -05:00
|
|
|
), \
|
2013-05-01 04:50:23 -05:00
|
|
|
) \
|
|
|
|
|
)
|
|
|
|
|
|
2013-05-03 10:49:18 -05:00
|
|
|
ifeq ($(CFG_ADB_DEVICE_STATUS),true)
|
|
|
|
|
CFG_ADB_TEST_DIR=/data/tmp
|
2013-05-01 04:50:23 -05:00
|
|
|
|
2013-05-03 10:49:18 -05:00
|
|
|
$(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
|
2014-01-04 02:36:02 -06:00
|
|
|
$(shell $(CFG_ADB) remount 1>/dev/null) \
|
|
|
|
|
$(shell $(CFG_ADB) shell rm -r $(CFG_ADB_TEST_DIR) >/dev/null) \
|
|
|
|
|
$(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)) \
|
|
|
|
|
$(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \
|
|
|
|
|
$(CFG_ADB_TEST_DIR)) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \
|
|
|
|
|
$(CFG_ADB_TEST_DIR)) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
|
|
|
|
|
$(CFG_ADB_TEST_DIR)) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \
|
|
|
|
|
$(CFG_ADB_TEST_DIR)) \
|
|
|
|
|
$(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBGREEN_GLOB_arm-linux-androideabi) \
|
|
|
|
|
$(CFG_ADB_TEST_DIR)) \
|
2013-05-01 04:50:23 -05:00
|
|
|
)
|
2013-05-03 10:49:18 -05:00
|
|
|
else
|
|
|
|
|
CFG_ADB_TEST_DIR=
|
2013-05-01 04:50:23 -05:00
|
|
|
endif
|
2013-03-02 06:25:12 -06:00
|
|
|
|
|
|
|
|
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
######################################################################
|
|
|
|
|
# Main test targets
|
|
|
|
|
######################################################################
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
check: cleantestlibs cleantmptestlogs tidy all check-stage2
|
|
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
|
|
|
|
|
|
|
|
|
check-notidy: cleantestlibs cleantmptestlogs all check-stage2
|
|
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
|
|
|
|
|
|
|
|
|
check-full: cleantestlibs cleantmptestlogs tidy \
|
|
|
|
|
all check-stage1 check-stage2 check-stage3
|
|
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
|
|
|
|
|
|
|
|
|
check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
|
|
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
|
|
|
|
|
|
|
|
|
check-lite: cleantestlibs cleantmptestlogs \
|
2013-05-17 12:45:09 -05:00
|
|
|
check-stage2-std check-stage2-extra check-stage2-rpass \
|
2013-12-12 20:07:23 -06:00
|
|
|
check-stage2-rustuv check-stage2-native check-stage2-green \
|
2013-10-16 21:23:12 -05:00
|
|
|
check-stage2-rustpkg \
|
2013-11-16 19:07:32 -06:00
|
|
|
check-stage2-rfail check-stage2-cfail check-stage2-rmake
|
2013-02-05 16:14:58 -06:00
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
|
|
|
|
|
2012-04-04 19:57:36 -05:00
|
|
|
.PHONY: cleantmptestlogs cleantestlibs
|
|
|
|
|
|
2012-04-04 15:40:50 -05:00
|
|
|
cleantmptestlogs:
|
|
|
|
|
$(Q)rm -f tmp/*.log
|
2011-05-04 19:32:05 -05:00
|
|
|
|
2012-04-04 19:57:36 -05:00
|
|
|
cleantestlibs:
|
2013-10-21 04:18:21 -05:00
|
|
|
$(Q)find $(CFG_BUILD)/test \
|
2012-04-04 19:57:36 -05:00
|
|
|
-name '*.[odasS]' -o \
|
|
|
|
|
-name '*.so' -o \
|
|
|
|
|
-name '*.dylib' -o \
|
|
|
|
|
-name '*.dll' -o \
|
|
|
|
|
-name '*.def' -o \
|
|
|
|
|
-name '*.bc' -o \
|
|
|
|
|
-name '*.dSYM' -o \
|
2012-04-10 00:41:27 -05:00
|
|
|
-name '*.libaux' -o \
|
2012-04-04 19:57:36 -05:00
|
|
|
-name '*.out' -o \
|
2013-02-09 12:09:19 -06:00
|
|
|
-name '*.err' -o \
|
|
|
|
|
-name '*.debugger.script' \
|
2012-04-04 21:21:09 -05:00
|
|
|
| xargs rm -rf
|
2012-04-04 19:57:36 -05:00
|
|
|
|
2011-05-11 11:37:23 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
######################################################################
|
|
|
|
|
# Tidy
|
|
|
|
|
######################################################################
|
2012-06-01 14:28:01 -05:00
|
|
|
|
2011-11-18 16:03:11 -06:00
|
|
|
ifdef CFG_NOTIDY
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
tidy:
|
2011-11-18 16:03:11 -06:00
|
|
|
else
|
2012-04-01 00:49:11 -05:00
|
|
|
|
|
|
|
|
ALL_CS := $(wildcard $(S)src/rt/*.cpp \
|
|
|
|
|
$(S)src/rt/*/*.cpp \
|
|
|
|
|
$(S)src/rt/*/*/*.cpp \
|
2013-07-30 07:40:52 -05:00
|
|
|
$(S)src/rustllvm/*.cpp)
|
2013-07-30 07:44:34 -05:00
|
|
|
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
|
2013-09-23 17:35:09 -05:00
|
|
|
$(wildcard $(S)src/rt/sundown/src/*.c) \
|
|
|
|
|
$(wildcard $(S)src/rt/sundown/html/*.c) \
|
2012-04-01 00:49:11 -05:00
|
|
|
,$(ALL_CS))
|
|
|
|
|
ALL_HS := $(wildcard $(S)src/rt/*.h \
|
|
|
|
|
$(S)src/rt/*/*.h \
|
|
|
|
|
$(S)src/rt/*/*/*.h \
|
2013-07-30 07:40:52 -05:00
|
|
|
$(S)src/rustllvm/*.h)
|
2012-04-01 00:49:11 -05:00
|
|
|
ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
|
|
|
|
|
$(S)src/rt/vg/memcheck.h \
|
|
|
|
|
$(S)src/rt/msvc/typeof.h \
|
|
|
|
|
$(S)src/rt/msvc/stdint.h \
|
|
|
|
|
$(S)src/rt/msvc/inttypes.h \
|
2013-09-23 17:35:09 -05:00
|
|
|
$(wildcard $(S)src/rt/sundown/src/*.h) \
|
|
|
|
|
$(wildcard $(S)src/rt/sundown/html/*.h) \
|
2012-04-01 00:49:11 -05:00
|
|
|
,$(ALL_HS))
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
# Run the tidy script in multiple parts to avoid huge 'echo' commands
|
2011-11-18 16:03:11 -06:00
|
|
|
tidy:
|
|
|
|
|
@$(call E, check: formatting)
|
2012-04-13 13:59:17 -05:00
|
|
|
$(Q)find $(S)src -name '*.r[sc]' \
|
2012-04-30 18:32:47 -05:00
|
|
|
| grep '^$(S)src/test' -v \
|
2013-08-22 16:58:06 -05:00
|
|
|
| grep '^$(S)src/libuv' -v \
|
|
|
|
|
| grep '^$(S)src/llvm' -v \
|
2013-09-05 21:20:30 -05:00
|
|
|
| grep '^$(S)src/gyp' -v \
|
2012-10-29 15:10:54 -05:00
|
|
|
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
|
2012-04-13 13:59:17 -05:00
|
|
|
$(Q)find $(S)src/etc -name '*.py' \
|
2012-10-29 15:10:54 -05:00
|
|
|
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
|
2012-04-13 13:59:17 -05:00
|
|
|
$(Q)echo $(ALL_CS) \
|
2013-05-03 18:25:04 -05:00
|
|
|
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
|
2012-04-13 13:59:17 -05:00
|
|
|
$(Q)echo $(ALL_HS) \
|
2013-05-03 18:25:04 -05:00
|
|
|
| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
|
2013-09-30 12:14:40 -05:00
|
|
|
$(Q)find $(S)src -type f -perm +111 \
|
|
|
|
|
-not -name '*.rs' -and -not -name '*.py' \
|
|
|
|
|
-and -not -name '*.sh' \
|
|
|
|
|
| grep '^$(S)src/llvm' -v \
|
|
|
|
|
| grep '^$(S)src/libuv' -v \
|
|
|
|
|
| grep '^$(S)src/gyp' -v \
|
|
|
|
|
| grep '^$(S)src/etc' -v \
|
|
|
|
|
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
|
2012-04-09 20:04:37 -05:00
|
|
|
|
2011-11-18 16:03:11 -06:00
|
|
|
endif
|
2011-06-29 17:12:02 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
|
2012-01-20 20:05:07 -06:00
|
|
|
######################################################################
|
2013-02-05 16:14:58 -06:00
|
|
|
# Sets of tests
|
2012-01-20 20:05:07 -06:00
|
|
|
######################################################################
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_TEST_SETS
|
|
|
|
|
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-exec: \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rpass-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
|
2013-11-16 19:07:32 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
|
2013-12-22 15:46:06 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-bench-exec \
|
2013-02-10 16:17:28 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-exec \
|
2013-07-06 03:03:03 -05:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
|
|
|
|
|
|
2013-02-21 18:15:01 -06:00
|
|
|
# Only test the compiler-dependent crates when the target is
|
|
|
|
|
# able to build a compiler (when the target triple is in the set of host triples)
|
2013-10-21 04:18:21 -05:00
|
|
|
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
|
2013-02-21 18:15:01 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-crates-exec: \
|
|
|
|
|
$$(foreach crate,$$(TEST_CRATES), \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$$(crate)-exec)
|
|
|
|
|
|
2013-02-21 18:15:01 -06:00
|
|
|
else
|
|
|
|
|
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-crates-exec: \
|
|
|
|
|
$$(foreach crate,$$(TEST_TARGET_CRATES), \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$$(crate)-exec)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2013-12-22 15:46:06 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \
|
|
|
|
|
$$(foreach crate,$$(TEST_DOC_CRATES), \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-$$(crate)-exec)
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
|
|
|
|
|
$$(foreach docname,$$(DOC_TEST_NAMES), \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-$$(docname)-exec)
|
|
|
|
|
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec
|
2012-03-20 18:49:12 -05:00
|
|
|
|
2012-01-20 20:05:07 -06:00
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(call DEF_TEST_SETS,$(stage),$(target),$(host))))))
|
|
|
|
|
|
2012-01-20 20:05:07 -06:00
|
|
|
|
2011-06-29 17:12:02 -05:00
|
|
|
######################################################################
|
2013-02-05 16:14:58 -06:00
|
|
|
# Crate testing
|
2011-06-29 17:12:02 -05:00
|
|
|
######################################################################
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define TEST_RUNNER
|
2012-01-17 18:45:22 -06:00
|
|
|
|
2013-05-17 12:45:09 -05:00
|
|
|
# If NO_REBUILD is set then break the dependencies on extra so we can
|
|
|
|
|
# test crates without rebuilding std and extra first
|
2013-03-14 17:37:38 -05:00
|
|
|
ifeq ($(NO_REBUILD),)
|
2013-07-29 13:20:48 -05:00
|
|
|
STDTESTDEP_$(1)_$(2)_$(3) = $$(SREQ$(1)_T_$(2)_H_$(3)) \
|
2013-10-22 17:13:18 -05:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2)) \
|
2013-12-12 20:07:23 -06:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTUV_$(2)) \
|
|
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBGREEN_$(2))
|
2013-03-14 17:37:38 -05:00
|
|
|
else
|
|
|
|
|
STDTESTDEP_$(1)_$(2)_$(3) =
|
|
|
|
|
endif
|
|
|
|
|
|
2013-05-17 12:45:09 -05:00
|
|
|
$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \
|
2013-12-12 23:38:57 -06:00
|
|
|
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
|
2013-03-14 17:37:38 -05:00
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
2012-01-17 18:45:22 -06:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
2012-01-26 22:30:41 -06:00
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
2012-01-17 18:45:22 -06:00
|
|
|
|
2013-05-17 12:45:09 -05:00
|
|
|
$(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \
|
2013-12-12 23:38:57 -06:00
|
|
|
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
|
2013-03-14 17:37:38 -05:00
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
2011-10-02 19:37:50 -05:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
2011-11-22 00:45:14 -06:00
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
2011-07-12 15:04:29 -05:00
|
|
|
|
2013-10-22 17:13:18 -05:00
|
|
|
$(3)/stage$(1)/test/rustuvtest-$(2)$$(X_$(2)): \
|
|
|
|
|
$$(LIBRUSTUV_CRATE) $$(LIBRUSTUV_INPUTS) \
|
|
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
|
|
|
|
@$$(call E, compile_and_link: $$@)
|
2013-10-31 01:57:27 -05:00
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
|
|
|
|
|
-L $$(UV_SUPPORT_DIR_$(2)) \
|
|
|
|
|
-L $$(dir $$(LIBUV_LIB_$(2)))
|
2013-10-22 17:13:18 -05:00
|
|
|
|
2013-12-12 20:07:23 -06:00
|
|
|
$(3)/stage$(1)/test/nativetest-$(2)$$(X_$(2)): \
|
|
|
|
|
$$(LIBNATIVE_CRATE) $$(LIBNATIVE_INPUTS) \
|
|
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
|
|
|
|
@$$(call E, compile_and_link: $$@)
|
|
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
|
|
|
|
|
|
|
|
|
$(3)/stage$(1)/test/greentest-$(2)$$(X_$(2)): \
|
|
|
|
|
$$(LIBGREEN_CRATE) $$(LIBGREEN_INPUTS) \
|
|
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
|
|
|
|
@$$(call E, compile_and_link: $$@)
|
|
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
|
|
|
|
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
|
2013-01-25 16:48:57 -06:00
|
|
|
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
|
2013-03-14 17:37:38 -05:00
|
|
|
$$(STDTESTDEP_$(1)_$(2)_$(3))
|
2013-01-25 16:48:57 -06:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
|
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): CFG_COMPILER = $(2)
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
|
Add dependence arc from running rustc to its libraries.
This commit fixes some oversights in the Makefile where rustc could be
invoked without some of its dependencies yet in place. (I encountered
the problem in practice; its not just theoretical.)
As written in Makefile.in, $(STAGE$(1)_T_$(2)_H_$(3)) is the way one
writes an invocation of rustc where $(1) is the stage number $(2) is
the target triple $(3) is the host triple. (Other uses of the macro
may plug in actual values or different parameters in for those three
formal parameters.)
When you have invocations of $(STAGE...), you need to make sure that
its dependences are satisfied; otherwise, if someone is using `make
-jN` for certain (large-ish) `N`, one can encounter situations where
GNU make attempts to invoke `rustc` before it has actually copied some
of its libraries into place, such as libmorestack.a, which causes a
link failure when the rustc invocation attempts to link in those
libraries.
In this case, the main prerequisite to add is TSREQ$(1)_T_$(2)_H_$(3),
which is described in Makefile.in as "Prerequisites for using the
stageN compiler to build target artifacts"
----
In addition to adding the extra dependences on TSREQ..., I also
replaced occurrences of the pattern:
TSREQ$(1)_T_$(2)_H_$(3)
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
with:
SREQ$(1)_T_$(2)_H_$(3)
which is equivalent to the above, as defined in Makefile.in
----
Finally, for the cases where TSREQ was missing in tests.mk, I went
ahead and put in a dependence on SREQ rather than just TSREQ, since it
was not clear to me how one could expect to compile those cases
without stdlib and extralib.
(It could well be that I should have gone ahead and done the same in
other cases where I saw TSREQ was missing, and put SREQ in those
cases as well. But this seemed like a good measure for now, without
needing to tax my understanding of the overall makefile
infrastructure much further.)
2013-07-16 01:05:18 -05:00
|
|
|
$$(SREQ$(1)_T_$(2)_H_$(3)) \
|
2013-03-01 17:48:11 -06:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
|
2013-12-12 20:07:23 -06:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
|
2011-10-02 19:37:50 -05:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
2013-11-30 22:52:21 -06:00
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
|
2013-12-07 12:38:32 -06:00
|
|
|
-L "$$(LLVM_LIBDIR_$(2))"
|
2011-08-01 13:57:05 -05:00
|
|
|
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
|
2013-01-14 04:55:47 -06:00
|
|
|
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
|
Add dependence arc from running rustc to its libraries.
This commit fixes some oversights in the Makefile where rustc could be
invoked without some of its dependencies yet in place. (I encountered
the problem in practice; its not just theoretical.)
As written in Makefile.in, $(STAGE$(1)_T_$(2)_H_$(3)) is the way one
writes an invocation of rustc where $(1) is the stage number $(2) is
the target triple $(3) is the host triple. (Other uses of the macro
may plug in actual values or different parameters in for those three
formal parameters.)
When you have invocations of $(STAGE...), you need to make sure that
its dependences are satisfied; otherwise, if someone is using `make
-jN` for certain (large-ish) `N`, one can encounter situations where
GNU make attempts to invoke `rustc` before it has actually copied some
of its libraries into place, such as libmorestack.a, which causes a
link failure when the rustc invocation attempts to link in those
libraries.
In this case, the main prerequisite to add is TSREQ$(1)_T_$(2)_H_$(3),
which is described in Makefile.in as "Prerequisites for using the
stageN compiler to build target artifacts"
----
In addition to adding the extra dependences on TSREQ..., I also
replaced occurrences of the pattern:
TSREQ$(1)_T_$(2)_H_$(3)
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
with:
SREQ$(1)_T_$(2)_H_$(3)
which is equivalent to the above, as defined in Makefile.in
----
Finally, for the cases where TSREQ was missing in tests.mk, I went
ahead and put in a dependence on SREQ rather than just TSREQ, since it
was not clear to me how one could expect to compile those cases
without stdlib and extralib.
(It could well be that I should have gone ahead and done the same in
other cases where I saw TSREQ was missing, and put SREQ in those
cases as well. But this seemed like a good measure for now, without
needing to tax my understanding of the overall makefile
infrastructure much further.)
2013-07-16 01:05:18 -05:00
|
|
|
$$(SREQ$(1)_T_$(2)_H_$(3)) \
|
2013-08-01 18:11:24 -05:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
|
2013-07-31 15:47:32 -05:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2)) \
|
2013-10-01 00:39:50 -05:00
|
|
|
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(2)) \
|
2013-08-02 18:59:58 -05:00
|
|
|
$$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$$(X_$(2)) \
|
|
|
|
|
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(2))
|
2013-02-05 16:14:58 -06:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
|
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
|
2011-08-01 16:10:59 -05:00
|
|
|
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
|
2012-10-22 16:50:16 -05:00
|
|
|
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
|
Add dependence arc from running rustc to its libraries.
This commit fixes some oversights in the Makefile where rustc could be
invoked without some of its dependencies yet in place. (I encountered
the problem in practice; its not just theoretical.)
As written in Makefile.in, $(STAGE$(1)_T_$(2)_H_$(3)) is the way one
writes an invocation of rustc where $(1) is the stage number $(2) is
the target triple $(3) is the host triple. (Other uses of the macro
may plug in actual values or different parameters in for those three
formal parameters.)
When you have invocations of $(STAGE...), you need to make sure that
its dependences are satisfied; otherwise, if someone is using `make
-jN` for certain (large-ish) `N`, one can encounter situations where
GNU make attempts to invoke `rustc` before it has actually copied some
of its libraries into place, such as libmorestack.a, which causes a
link failure when the rustc invocation attempts to link in those
libraries.
In this case, the main prerequisite to add is TSREQ$(1)_T_$(2)_H_$(3),
which is described in Makefile.in as "Prerequisites for using the
stageN compiler to build target artifacts"
----
In addition to adding the extra dependences on TSREQ..., I also
replaced occurrences of the pattern:
TSREQ$(1)_T_$(2)_H_$(3)
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
with:
SREQ$(1)_T_$(2)_H_$(3)
which is equivalent to the above, as defined in Makefile.in
----
Finally, for the cases where TSREQ was missing in tests.mk, I went
ahead and put in a dependence on SREQ rather than just TSREQ, since it
was not clear to me how one could expect to compile those cases
without stdlib and extralib.
(It could well be that I should have gone ahead and done the same in
other cases where I saw TSREQ was missing, and put SREQ in those
cases as well. But this seemed like a good measure for now, without
needing to tax my understanding of the overall makefile
infrastructure much further.)
2013-07-16 01:05:18 -05:00
|
|
|
$$(SREQ$(1)_T_$(2)_H_$(3)) \
|
2013-08-01 18:11:24 -05:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
|
2013-12-10 18:04:17 -06:00
|
|
|
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2)) \
|
|
|
|
|
$$(SUNDOWN_LIB_$(2))
|
2012-01-15 19:34:18 -06:00
|
|
|
@$$(call E, compile_and_link: $$@)
|
2013-10-31 01:57:27 -05:00
|
|
|
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
|
|
|
|
|
-L $$(SUNDOWN_DIR_$(2))
|
2012-01-15 19:34:18 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(eval $(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(eval $(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(call TEST_RUNNER,$(stage),$(target),$(host))))))))
|
|
|
|
|
|
|
|
|
|
define DEF_TEST_CRATE_RULES
|
2013-02-05 22:05:00 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
2013-07-15 20:52:08 -05:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
|
2012-01-15 19:34:18 -06:00
|
|
|
@$$(call E, run: $$<)
|
2013-12-12 20:07:23 -06:00
|
|
|
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) $$(TESTARGS) \
|
|
|
|
|
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
|
|
|
|
|
$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) \
|
|
|
|
|
&& touch $$@
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2012-01-15 19:34:18 -06:00
|
|
|
|
2013-05-01 04:50:23 -05:00
|
|
|
define DEF_TEST_CRATE_RULES_arm-linux-androideabi
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
|
2013-05-01 04:50:23 -05:00
|
|
|
@$$(call E, run: $$< via adb)
|
2014-01-13 21:44:18 -06:00
|
|
|
$$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
|
|
|
|
|
$$(Q)$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=. \
|
2013-08-20 02:50:45 -05:00
|
|
|
./$$(notdir $$<) \
|
2013-08-20 05:07:36 -05:00
|
|
|
--logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log \
|
2014-01-13 21:44:18 -06:00
|
|
|
$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) $(TESTARGS))' \
|
2013-08-20 02:50:45 -05:00
|
|
|
> tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
|
2014-01-13 21:44:18 -06:00
|
|
|
$$(Q)cat tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
|
|
|
|
|
$$(Q)touch tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
|
|
|
|
|
$$(Q)$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log tmp/
|
|
|
|
|
$$(Q)$(CFG_ADB) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
|
|
|
|
|
$$(Q)$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/$$(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) tmp/
|
2013-05-01 04:50:23 -05:00
|
|
|
@if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
|
|
|
|
|
then \
|
|
|
|
|
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
|
|
|
|
|
touch $$@; \
|
|
|
|
|
else \
|
|
|
|
|
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
|
|
|
|
|
exit 101; \
|
|
|
|
|
fi
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define DEF_TEST_CRATE_RULES_null
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
2013-05-13 17:19:48 -05:00
|
|
|
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
|
2013-12-15 00:42:01 -06:00
|
|
|
@$$(call E, failing: no device for $$< )
|
|
|
|
|
false
|
2013-05-01 04:50:23 -05:00
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach crate, $(TEST_CRATES), \
|
2013-10-21 04:18:21 -05:00
|
|
|
$(if $(findstring $(target),$(CFG_BUILD)), \
|
2013-05-01 04:50:23 -05:00
|
|
|
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))), \
|
|
|
|
|
$(if $(findstring $(target),"arm-linux-androideabi"), \
|
2013-05-03 10:49:18 -05:00
|
|
|
$(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \
|
2013-05-01 04:50:23 -05:00
|
|
|
$(eval $(call DEF_TEST_CRATE_RULES_arm-linux-androideabi,$(stage),$(target),$(host),$(crate))), \
|
|
|
|
|
$(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \
|
|
|
|
|
), \
|
2013-05-03 10:49:18 -05:00
|
|
|
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))) \
|
2013-05-06 20:09:34 -05:00
|
|
|
))))))
|
2012-10-02 20:15:02 -05:00
|
|
|
|
2013-10-29 11:07:30 -05:00
|
|
|
# FIXME (#10104): Raise the stack size to work around rustpkg bypassing
|
|
|
|
|
# the code in rustc that would take care of it.
|
|
|
|
|
define DEF_RUSTPKG_STACK_FIX
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),rustpkg): export RUST_MIN_STACK=8000000
|
|
|
|
|
endef
|
|
|
|
|
|
2013-11-01 02:09:04 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-10-29 11:07:30 -05:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(call DEF_RUSTPKG_STACK_FIX,$(stage),$(target),$(host))))))
|
|
|
|
|
|
2012-10-02 20:15:02 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
######################################################################
|
|
|
|
|
# Rules for the compiletest tests (rpass, rfail, etc.)
|
|
|
|
|
######################################################################
|
|
|
|
|
|
|
|
|
|
RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
|
|
|
|
|
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
|
|
|
|
|
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
|
|
|
|
|
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
|
|
|
|
|
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
|
|
|
|
|
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
|
|
|
|
|
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
|
|
|
|
|
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
|
2013-08-30 15:17:53 -05:00
|
|
|
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
|
2013-02-05 16:14:58 -06:00
|
|
|
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
|
2013-02-10 15:35:20 -06:00
|
|
|
DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
|
2013-07-06 03:03:03 -05:00
|
|
|
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
|
|
|
|
|
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
|
2012-10-02 20:15:02 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
# perf tests are the same as bench tests only they run under
|
|
|
|
|
# a performance monitor.
|
2013-08-30 15:17:53 -05:00
|
|
|
PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
|
2012-10-29 20:08:36 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
|
|
|
|
|
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
|
|
|
|
|
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
|
|
|
|
|
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
|
|
|
|
|
BENCH_TESTS := $(BENCH_RS)
|
|
|
|
|
PERF_TESTS := $(PERF_RS)
|
|
|
|
|
PRETTY_TESTS := $(PRETTY_RS)
|
2013-02-09 12:09:19 -06:00
|
|
|
DEBUGINFO_TESTS := $(DEBUGINFO_RS)
|
2013-07-06 03:03:03 -05:00
|
|
|
CODEGEN_TESTS := $(CODEGEN_RS) $(CODEGEN_CC)
|
2012-06-02 23:30:26 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
CTEST_SRC_BASE_rpass = run-pass
|
|
|
|
|
CTEST_BUILD_BASE_rpass = run-pass
|
|
|
|
|
CTEST_MODE_rpass = run-pass
|
|
|
|
|
CTEST_RUNTOOL_rpass = $(CTEST_RUNTOOL)
|
2012-06-02 23:30:26 -05:00
|
|
|
|
2013-10-25 19:04:37 -05:00
|
|
|
CTEST_SRC_BASE_rpass-full = run-pass-fulldeps
|
|
|
|
|
CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
|
2013-02-05 16:14:58 -06:00
|
|
|
CTEST_MODE_rpass-full = run-pass
|
|
|
|
|
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
|
|
|
|
|
|
|
|
|
|
CTEST_SRC_BASE_rfail = run-fail
|
|
|
|
|
CTEST_BUILD_BASE_rfail = run-fail
|
|
|
|
|
CTEST_MODE_rfail = run-fail
|
|
|
|
|
CTEST_RUNTOOL_rfail = $(CTEST_RUNTOOL)
|
|
|
|
|
|
|
|
|
|
CTEST_SRC_BASE_cfail = compile-fail
|
|
|
|
|
CTEST_BUILD_BASE_cfail = compile-fail
|
|
|
|
|
CTEST_MODE_cfail = compile-fail
|
|
|
|
|
CTEST_RUNTOOL_cfail = $(CTEST_RUNTOOL)
|
|
|
|
|
|
2013-08-30 15:17:29 -05:00
|
|
|
CTEST_SRC_BASE_bench = bench
|
2013-02-05 16:14:58 -06:00
|
|
|
CTEST_BUILD_BASE_bench = bench
|
|
|
|
|
CTEST_MODE_bench = run-pass
|
|
|
|
|
CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL)
|
|
|
|
|
|
|
|
|
|
CTEST_SRC_BASE_perf = bench
|
|
|
|
|
CTEST_BUILD_BASE_perf = perf
|
|
|
|
|
CTEST_MODE_perf = run-pass
|
|
|
|
|
CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL)
|
|
|
|
|
|
2013-02-09 12:09:19 -06:00
|
|
|
CTEST_SRC_BASE_debuginfo = debug-info
|
|
|
|
|
CTEST_BUILD_BASE_debuginfo = debug-info
|
|
|
|
|
CTEST_MODE_debuginfo = debug-info
|
|
|
|
|
CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL)
|
|
|
|
|
|
2013-07-06 03:03:03 -05:00
|
|
|
CTEST_SRC_BASE_codegen = codegen
|
|
|
|
|
CTEST_BUILD_BASE_codegen = codegen
|
|
|
|
|
CTEST_MODE_codegen = codegen
|
|
|
|
|
CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL)
|
|
|
|
|
|
2013-02-10 16:17:28 -06:00
|
|
|
ifeq ($(CFG_GDB),)
|
|
|
|
|
CTEST_DISABLE_debuginfo = "no gdb found"
|
|
|
|
|
endif
|
|
|
|
|
|
2013-07-06 03:03:03 -05:00
|
|
|
ifeq ($(CFG_CLANG),)
|
|
|
|
|
CTEST_DISABLE_codegen = "no clang found"
|
|
|
|
|
endif
|
|
|
|
|
|
2013-03-12 13:58:50 -05:00
|
|
|
ifeq ($(CFG_OSTYPE),apple-darwin)
|
|
|
|
|
CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
|
|
|
|
|
endif
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_CTEST_VARS
|
|
|
|
|
|
|
|
|
|
# All the per-stage build rules you might want to call from the
|
|
|
|
|
# command line.
|
|
|
|
|
#
|
|
|
|
|
# $(1) is the stage number
|
|
|
|
|
# $(2) is the target triple to test
|
|
|
|
|
# $(3) is the host triple to test
|
|
|
|
|
|
|
|
|
|
# Prerequisites for compiletest tests
|
|
|
|
|
TEST_SREQ$(1)_T_$(2)_H_$(3) = \
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(HBIN$(1)_H_$(3))/compiletest$$(X_$(3)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(SREQ$(1)_T_$(2)_H_$(3))
|
2012-06-02 23:30:26 -05:00
|
|
|
|
2011-10-02 19:37:50 -05:00
|
|
|
# Rules for the cfail/rfail/rpass/bench/perf test runner
|
2011-08-01 16:10:59 -05:00
|
|
|
|
2013-07-24 04:26:52 -05:00
|
|
|
# The tests select when to use debug configuration on their own;
|
|
|
|
|
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
|
2013-09-17 23:02:11 -05:00
|
|
|
CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS))
|
2013-08-11 02:29:45 -05:00
|
|
|
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
# There's no need our entire test suite to take up gigabytes of space on disk
|
|
|
|
|
# including copies of libstd/libextra all over the place
|
|
|
|
|
CTEST_RUSTC_FLAGS := $$(CTEST_RUSTC_FLAGS) -Z prefer-dynamic
|
|
|
|
|
|
2013-08-11 02:29:45 -05:00
|
|
|
# The tests can not be optimized while the rest of the compiler is optimized, so
|
|
|
|
|
# filter out the optimization (if any) from rustc and then figure out if we need
|
|
|
|
|
# to be optimized
|
|
|
|
|
CTEST_RUSTC_FLAGS := $$(subst -O,,$$(CTEST_RUSTC_FLAGS))
|
|
|
|
|
ifndef CFG_DISABLE_OPTIMIZE_TESTS
|
|
|
|
|
CTEST_RUSTC_FLAGS += -O
|
|
|
|
|
endif
|
2013-07-24 04:26:52 -05:00
|
|
|
|
2011-11-22 00:45:14 -06:00
|
|
|
CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
|
2011-11-21 15:11:40 -06:00
|
|
|
--compile-lib-path $$(HLIB$(1)_H_$(3)) \
|
|
|
|
|
--run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \
|
2013-03-02 06:25:12 -06:00
|
|
|
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
|
2013-07-06 03:03:03 -05:00
|
|
|
--clang-path $(if $(CFG_CLANG),$(CFG_CLANG),clang) \
|
2013-10-21 04:18:21 -05:00
|
|
|
--llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD))/bin \
|
2012-02-28 08:45:33 -06:00
|
|
|
--aux-base $$(S)src/test/auxiliary/ \
|
2011-11-21 15:11:40 -06:00
|
|
|
--stage-id stage$(1)-$(2) \
|
2013-05-01 04:50:23 -05:00
|
|
|
--target $(2) \
|
2013-05-03 10:49:18 -05:00
|
|
|
--adb-path=$(CFG_ADB) \
|
2013-05-01 23:16:01 -05:00
|
|
|
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
|
2013-07-24 04:26:52 -05:00
|
|
|
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) --target=$(2)" \
|
2011-11-21 15:11:40 -06:00
|
|
|
$$(CTEST_TESTARGS)
|
|
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
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_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)
|
|
|
|
|
CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
|
2013-02-09 12:09:19 -06:00
|
|
|
CTEST_DEPS_debuginfo_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_TESTS)
|
2013-07-06 03:03:03 -05:00
|
|
|
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
|
2011-11-21 15:11:40 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2011-11-21 15:11:40 -06:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(eval $(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(eval $(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(call DEF_CTEST_VARS,$(stage),$(target),$(host))))))))
|
2011-11-21 15:11:40 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_RUN_COMPILETEST
|
2012-06-01 18:01:53 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
|
|
|
|
|
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
|
2013-08-30 15:17:29 -05:00
|
|
|
--src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \
|
2013-02-05 16:14:58 -06:00
|
|
|
--build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \
|
2013-07-15 20:52:08 -05:00
|
|
|
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
--mode $$(CTEST_MODE_$(4)) \
|
|
|
|
|
$$(CTEST_RUNTOOL_$(4))
|
2011-11-21 15:11:40 -06:00
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
2013-02-10 16:17:28 -06:00
|
|
|
ifeq ($$(CTEST_DISABLE_$(4)),)
|
|
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
|
|
|
|
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
|
2013-05-01 04:50:23 -05:00
|
|
|
@$$(call E, run $(4) [$(2)]: $$<)
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
|
2013-02-05 22:05:00 -06:00
|
|
|
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
|
|
|
|
|
&& touch $$@
|
2011-11-21 15:11:40 -06:00
|
|
|
|
2013-02-10 16:17:28 -06:00
|
|
|
else
|
|
|
|
|
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
|
|
|
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
|
|
|
|
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
|
2013-05-01 04:50:23 -05:00
|
|
|
@$$(call E, run $(4) [$(2)]: $$<)
|
2013-02-10 16:17:28 -06:00
|
|
|
@$$(call E, warning: tests disabled: $$(CTEST_DISABLE_$(4)))
|
|
|
|
|
touch $$@
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2011-11-22 00:45:14 -06:00
|
|
|
|
2013-07-06 03:03:03 -05:00
|
|
|
CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
|
2012-06-01 18:01:53 -05:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(eval $(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(eval $(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(foreach name,$(CTEST_NAMES), \
|
|
|
|
|
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
|
|
|
|
|
|
|
|
|
|
PRETTY_NAMES = pretty-rpass pretty-rpass-full pretty-rfail pretty-bench pretty-pretty
|
|
|
|
|
PRETTY_DEPS_pretty-rpass = $(RPASS_TESTS)
|
|
|
|
|
PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS)
|
|
|
|
|
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
|
|
|
|
|
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
|
|
|
|
|
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
|
|
|
|
|
PRETTY_DIRNAME_pretty-rpass = run-pass
|
2013-10-25 19:04:37 -05:00
|
|
|
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
|
2013-02-05 16:14:58 -06:00
|
|
|
PRETTY_DIRNAME_pretty-rfail = run-fail
|
|
|
|
|
PRETTY_DIRNAME_pretty-bench = bench
|
|
|
|
|
PRETTY_DIRNAME_pretty-pretty = pretty
|
|
|
|
|
|
|
|
|
|
define DEF_RUN_PRETTY_TEST
|
|
|
|
|
|
|
|
|
|
PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
|
2011-11-22 00:45:14 -06:00
|
|
|
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
--src-base $$(S)src/test/$$(PRETTY_DIRNAME_$(4))/ \
|
|
|
|
|
--build-base $(3)/test/$$(PRETTY_DIRNAME_$(4))/ \
|
2011-11-22 00:45:14 -06:00
|
|
|
--mode pretty
|
|
|
|
|
|
2013-02-05 22:05:00 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
|
|
|
|
|
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
|
|
|
|
$$(PRETTY_DEPS_$(4))
|
2013-05-01 04:50:23 -05:00
|
|
|
@$$(call E, run pretty-rpass [$(2)]: $$<)
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
|
2013-02-05 22:05:00 -06:00
|
|
|
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
|
|
|
|
|
&& touch $$@
|
2011-11-22 00:45:14 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2011-11-22 00:45:14 -06:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach pretty-name,$(PRETTY_NAMES), \
|
|
|
|
|
$(eval $(call DEF_RUN_PRETTY_TEST,$(stage),$(target),$(host),$(pretty-name)))))))
|
2012-01-20 20:05:07 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_RUN_DOC_TEST
|
2012-09-15 20:06:20 -05:00
|
|
|
|
2013-02-18 19:08:03 -06:00
|
|
|
DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4) := \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
|
|
|
|
|
--src-base $(3)/test/doc-$(4)/ \
|
|
|
|
|
--build-base $(3)/test/doc-$(4)/ \
|
2012-09-15 20:06:20 -05:00
|
|
|
--mode run-pass
|
|
|
|
|
|
2013-02-18 19:08:03 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
|
2013-02-05 22:05:00 -06:00
|
|
|
|
2013-02-18 19:08:03 -06:00
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
|
2013-02-05 16:14:58 -06:00
|
|
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
|
|
|
|
doc-$(4)-extract$(3)
|
2013-05-01 04:50:23 -05:00
|
|
|
@$$(call E, run doc-$(4) [$(2)]: $$<)
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
|
2013-02-18 19:08:03 -06:00
|
|
|
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4)) \
|
2013-02-05 22:05:00 -06:00
|
|
|
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),doc-$(4)) \
|
|
|
|
|
&& touch $$@
|
2012-09-15 20:06:20 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2012-09-22 17:33:50 -05:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach docname,$(DOC_TEST_NAMES), \
|
|
|
|
|
$(eval $(call DEF_RUN_DOC_TEST,$(stage),$(target),$(host),$(docname)))))))
|
2012-03-20 18:49:12 -05:00
|
|
|
|
2013-12-22 15:46:06 -06:00
|
|
|
CRATE_DOC_LIB-std = $(STDLIB_CRATE)
|
|
|
|
|
CRATE_DOC_LIB-extra = $(EXTRALIB_CRATE)
|
|
|
|
|
|
|
|
|
|
define DEF_CRATE_DOC_TEST
|
|
|
|
|
|
2013-12-25 00:59:38 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
|
2013-12-22 15:46:06 -06:00
|
|
|
|
2013-12-25 00:59:38 -06:00
|
|
|
ifeq ($(2),$$(CFG_BUILD))
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
|
|
|
|
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
|
|
|
|
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
|
|
|
|
|
@$$(call E, run doc-$(4) [$(2)])
|
|
|
|
|
$$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
|
2014-01-03 13:16:52 -06:00
|
|
|
$$(CRATE_DOC_LIB-$(4)) --test-args "$$(TESTARGS)" && touch $$@
|
2013-12-25 00:59:38 -06:00
|
|
|
else
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
|
|
|
|
|
touch $$@
|
|
|
|
|
endif
|
2013-12-22 15:46:06 -06:00
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-12-25 00:59:38 -06:00
|
|
|
$(foreach target,$(CFG_TARGET), \
|
|
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach crate,$(TEST_DOC_CRATES), \
|
|
|
|
|
$(eval $(call DEF_CRATE_DOC_TEST,$(stage),$(target),$(host),$(crate)))))))
|
2011-07-12 17:27:00 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
######################################################################
|
|
|
|
|
# Extracting tests for docs
|
|
|
|
|
######################################################################
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
EXTRACT_TESTS := "$(CFG_PYTHON)" $(S)src/etc/extract-tests.py
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_DOC_TEST_HOST
|
2012-06-01 18:01:53 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
doc-$(2)-extract$(1):
|
|
|
|
|
@$$(call E, extract: $(2) tests)
|
|
|
|
|
$$(Q)rm -f $(1)/test/doc-$(2)/*.rs
|
|
|
|
|
$$(Q)$$(EXTRACT_TESTS) $$(S)doc/$(2).md $(1)/test/doc-$(2)
|
2011-07-12 17:27:00 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
endef
|
2011-09-13 17:06:21 -05:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach docname,$(DOC_TEST_NAMES), \
|
|
|
|
|
$(eval $(call DEF_DOC_TEST_HOST,$(host),$(docname)))))
|
2011-08-01 13:57:05 -05:00
|
|
|
|
2012-06-01 18:01:53 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
######################################################################
|
|
|
|
|
# Shortcut rules
|
|
|
|
|
######################################################################
|
2011-08-01 13:57:05 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
TEST_GROUPS = \
|
|
|
|
|
crates \
|
|
|
|
|
$(foreach crate,$(TEST_CRATES),$(crate)) \
|
2013-12-22 15:46:06 -06:00
|
|
|
$(foreach crate,$(TEST_DOC_CRATES),doc-$(crate)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
rpass \
|
|
|
|
|
rpass-full \
|
|
|
|
|
rfail \
|
|
|
|
|
cfail \
|
|
|
|
|
bench \
|
|
|
|
|
perf \
|
2013-11-16 19:07:32 -06:00
|
|
|
rmake \
|
2013-02-09 12:09:19 -06:00
|
|
|
debuginfo \
|
2013-07-06 03:03:03 -05:00
|
|
|
codegen \
|
2013-02-05 16:14:58 -06:00
|
|
|
doc \
|
2013-05-22 18:17:37 -05:00
|
|
|
$(foreach docname,$(DOC_TEST_NAMES),doc-$(docname)) \
|
2013-02-05 16:14:58 -06:00
|
|
|
pretty \
|
|
|
|
|
pretty-rpass \
|
|
|
|
|
pretty-rpass-full \
|
|
|
|
|
pretty-rfail \
|
|
|
|
|
pretty-bench \
|
|
|
|
|
pretty-pretty \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
define DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3): check-stage$(1)-T-$(2)-H-$(3)-exec
|
|
|
|
|
endef
|
2011-08-02 16:37:03 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach target,$(CFG_TARGET), \
|
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST,$(stage),$(target),$(host))))))
|
2011-07-30 23:44:30 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST_AND_GROUP
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-$(4): check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec
|
|
|
|
|
endef
|
2012-01-20 20:05:07 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach target,$(CFG_TARGET), \
|
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach group,$(TEST_GROUPS), \
|
|
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE_AND_TARGET_AND_HOST_AND_GROUP,$(stage),$(target),$(host),$(group)))))))
|
2012-09-15 20:06:20 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_CHECK_FOR_STAGE
|
2013-10-21 04:18:21 -05:00
|
|
|
check-stage$(1): check-stage$(1)-H-$$(CFG_BUILD)
|
|
|
|
|
check-stage$(1)-H-all: $$(foreach target,$$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-H-$$(target))
|
|
|
|
|
endef
|
2012-09-15 20:06:20 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE,$(stage))))
|
2012-09-15 20:06:20 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
define DEF_CHECK_FOR_STAGE_AND_GROUP
|
2013-10-21 04:18:21 -05:00
|
|
|
check-stage$(1)-$(2): check-stage$(1)-H-$$(CFG_BUILD)-$(2)
|
|
|
|
|
check-stage$(1)-H-all-$(2): $$(foreach target,$$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-H-$$(target)-$(2))
|
|
|
|
|
endef
|
2012-09-22 17:33:50 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach group,$(TEST_GROUPS), \
|
|
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE_AND_GROUP,$(stage),$(group)))))
|
2012-03-20 18:49:12 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
|
|
|
|
|
define DEF_CHECK_FOR_STAGE_AND_HOSTS
|
2013-10-21 04:18:21 -05:00
|
|
|
check-stage$(1)-H-$(2): $$(foreach target,$$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$$(target)-H-$(2))
|
The Big Test Suite Overhaul
This replaces the make-based test runner with a set of Rust-based test
runners. I believe that all existing functionality has been
preserved. The primary objective is to dogfood the Rust test
framework.
A few main things happen here:
1) The run-pass/lib-* tests are all moved into src/test/stdtest. This
is a standalone test crate intended for all standard library tests. It
compiles to build/test/stdtest.stageN.
2) rustc now compiles into yet another build artifact, this one a test
runner that runs any tests contained directly in the rustc crate. This
allows much more fine-grained unit testing of the compiler. It
compiles to build/test/rustctest.stageN.
3) There is a new custom test runner crate at src/test/compiletest
that reproduces all the functionality for running the compile-fail,
run-fail, run-pass and bench tests while integrating with Rust's test
framework. It compiles to build/test/compiletest.stageN.
4) The build rules have been completely changed to use the new test
runners, while also being less redundant, following the example of the
recent stageN.mk rewrite.
It adds two new features to the cfail/rfail/rpass/bench tests:
1) Tests can specify multiple 'error-pattern' directives which must be
satisfied in order.
2) Tests can specify a 'compile-flags' directive which will make the
test runner provide additional command line arguments to rustc.
There are some downsides, the primary being that Rust has to be
functioning pretty well just to run _any_ tests, which I imagine will
be the source of some frustration when the entire test suite
breaks. Will also cause some headaches during porting.
Not having individual make rules, each rpass, etc test no longer
remembers between runs whether it completed successfully. As a result,
it's not possible to incrementally fix multiple tests by just running
'make check', fixing a test, and repeating without re-running all the
tests contained in the test runner. Instead you can filter just the
tests you want to run by using the TESTNAME environment variable.
This also dispenses with the ability to run stage0 tests, but they
tended to be broken more often than not anyway.
2011-07-12 21:01:09 -05:00
|
|
|
endef
|
2011-07-12 17:27:00 -05:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach stage,$(STAGES), \
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS,$(stage),$(host)))))
|
|
|
|
|
|
|
|
|
|
define DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP
|
2013-10-21 04:18:21 -05:00
|
|
|
check-stage$(1)-H-$(2)-$(3): $$(foreach target,$$(CFG_TARGET), \
|
2013-02-05 16:14:58 -06:00
|
|
|
check-stage$(1)-T-$$(target)-H-$(2)-$(3))
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(foreach stage,$(STAGES), \
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-05 16:14:58 -06:00
|
|
|
$(foreach group,$(TEST_GROUPS), \
|
|
|
|
|
$(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP,$(stage),$(host),$(group))))))
|
2011-07-12 17:27:00 -05:00
|
|
|
|
2011-11-29 09:07:25 -06:00
|
|
|
######################################################################
|
2013-02-05 16:14:58 -06:00
|
|
|
# check-fast rules
|
2011-11-29 09:07:25 -06:00
|
|
|
######################################################################
|
2011-11-17 14:04:37 -06:00
|
|
|
|
2013-02-05 16:14:58 -06:00
|
|
|
FT := run_pass_stage2
|
2013-10-21 04:18:21 -05:00
|
|
|
FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
|
2013-02-05 16:14:58 -06:00
|
|
|
FT_DRIVER := $(FT)_driver
|
|
|
|
|
|
2012-02-17 15:38:19 -06:00
|
|
|
GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
|
2011-11-29 09:07:25 -06:00
|
|
|
|
2011-11-29 10:03:22 -06:00
|
|
|
tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
|
2012-02-17 15:38:19 -06:00
|
|
|
$(RPASS_TESTS) \
|
2011-11-29 10:03:22 -06:00
|
|
|
$(S)src/etc/combine-tests.py
|
|
|
|
|
@$(call E, check: building combined stage2 test runner)
|
2013-01-03 01:53:05 -06:00
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
|
2011-11-29 09:07:25 -06:00
|
|
|
|
|
|
|
|
define DEF_CHECK_FAST_FOR_T_H
|
|
|
|
|
# $(1) unused
|
|
|
|
|
# $(2) target triple
|
|
|
|
|
# $(3) host triple
|
|
|
|
|
|
|
|
|
|
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
|
|
|
|
|
tmp/$$(FT).rc \
|
|
|
|
|
$$(SREQ2_T_$(2)_H_$(3))
|
|
|
|
|
@$$(call E, compile_and_link: $$@)
|
2011-11-29 10:03:22 -06:00
|
|
|
$$(STAGE2_T_$(2)_H_$(3)) --lib -o $$@ $$<
|
2011-11-29 09:07:25 -06:00
|
|
|
|
2013-03-02 06:25:12 -06:00
|
|
|
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
|
2011-11-29 10:03:22 -06:00
|
|
|
tmp/$$(FT_DRIVER).rs \
|
|
|
|
|
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
|
|
|
|
|
$$(SREQ2_T_$(2)_H_$(3))
|
|
|
|
|
@$$(call E, compile_and_link: $$@ $$<)
|
2012-04-06 00:24:46 -05:00
|
|
|
$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$<
|
2011-11-29 09:07:25 -06:00
|
|
|
|
2011-11-29 10:03:22 -06:00
|
|
|
$(3)/test/$$(FT_DRIVER)-$(2).out: \
|
2013-03-02 06:25:12 -06:00
|
|
|
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)) \
|
2011-11-29 10:03:22 -06:00
|
|
|
$$(SREQ2_T_$(2)_H_$(3))
|
2013-03-02 06:25:12 -06:00
|
|
|
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) \
|
2012-04-03 10:27:51 -05:00
|
|
|
--logfile tmp/$$(FT_DRIVER)-$(2).log
|
2011-11-29 09:07:25 -06:00
|
|
|
|
2012-08-29 16:32:54 -05:00
|
|
|
check-fast-T-$(2)-H-$(3): \
|
2011-11-29 10:03:22 -06:00
|
|
|
$(3)/test/$$(FT_DRIVER)-$(2).out
|
2011-11-29 09:07:25 -06:00
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(eval $(foreach target,$(CFG_TARGET), \
|
2011-11-29 09:07:25 -06:00
|
|
|
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
|
|
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
check-fast: tidy check-fast-H-$(CFG_BUILD) check-stage2-std check-stage2-extra
|
2013-08-28 03:39:29 -05:00
|
|
|
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
2011-11-29 09:07:25 -06:00
|
|
|
|
|
|
|
|
define DEF_CHECK_FAST_FOR_H
|
|
|
|
|
|
|
|
|
|
check-fast-H-$(1): check-fast-T-$(1)-H-$(1)
|
|
|
|
|
|
|
|
|
|
endef
|
2011-11-22 00:45:14 -06:00
|
|
|
|
2013-10-21 04:18:21 -05:00
|
|
|
$(foreach host,$(CFG_HOST), \
|
2013-02-21 18:15:01 -06:00
|
|
|
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
|
2013-11-16 19:07:32 -06:00
|
|
|
|
|
|
|
|
RMAKE_TESTS := $(shell ls -d $(S)src/test/run-make/*/)
|
|
|
|
|
RMAKE_TESTS := $(RMAKE_TESTS:$(S)src/test/run-make/%/=%)
|
|
|
|
|
|
|
|
|
|
define DEF_RMAKE_FOR_T_H
|
|
|
|
|
# $(1) the stage
|
|
|
|
|
# $(2) target triple
|
|
|
|
|
# $(3) host triple
|
|
|
|
|
|
2013-12-20 20:06:12 -06:00
|
|
|
|
|
|
|
|
ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD))
|
2013-11-16 19:07:32 -06:00
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake)
|
|
|
|
|
|
|
|
|
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake): \
|
|
|
|
|
$$(RMAKE_TESTS:%=$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok)
|
|
|
|
|
@touch $$@
|
|
|
|
|
|
|
|
|
|
$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
|
|
|
|
|
$(S)src/test/run-make/%/Makefile \
|
2013-12-17 11:05:36 -06:00
|
|
|
$$(CSREQ$(1)_T_$(2)_H_$(3))
|
2013-11-16 19:07:32 -06:00
|
|
|
@rm -rf $(3)/test/run-make/$$*
|
|
|
|
|
@mkdir -p $(3)/test/run-make/$$*
|
2013-12-02 16:51:47 -06:00
|
|
|
$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
|
2013-11-16 19:07:32 -06:00
|
|
|
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
|
2013-11-28 20:03:38 -06:00
|
|
|
$(3)/test/run-make/$$* \
|
2013-12-17 11:05:36 -06:00
|
|
|
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
|
2014-01-03 13:16:52 -06:00
|
|
|
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
|
|
|
|
|
"$$(TESTNAME)"
|
2013-11-16 19:07:32 -06:00
|
|
|
@touch $$@
|
2013-12-20 20:06:12 -06:00
|
|
|
else
|
|
|
|
|
# FIXME #11094 - The above rule doesn't work right for multiple targets
|
|
|
|
|
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:
|
|
|
|
|
@true
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2013-11-16 19:07:32 -06:00
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(foreach stage,$(STAGES), \
|
|
|
|
|
$(foreach target,$(CFG_TARGET), \
|
|
|
|
|
$(foreach host,$(CFG_HOST), \
|
|
|
|
|
$(eval $(call DEF_RMAKE_FOR_T_H,$(stage),$(target),$(host))))))
|
