Skip to content

Commit 6c1b80d

Browse files
borsbors
committed
---
yaml --- r: 274426 b: refs/heads/stable c: aaab14d h: refs/heads/master
1 parent ba188ea commit 6c1b80d

File tree

173 files changed

+6133
-89698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+6133
-89698
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: e1be504068d827e4a8e42bf63a355fea9484ef5d
32+
refs/heads/stable: aaab14dd3f5e66097e5ef3dba1a6bfe3fcab68fb
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and documentation.
99

1010
Read ["Installing Rust"] from [The Book].
1111

12-
["Installing Rust"]: https://doc.rust-lang.org/book/installing-rust.html
12+
["Installing Rust"]: https://doc.rust-lang.org/book/getting-started.html#installing-rust
1313
[The Book]: https://doc.rust-lang.org/book/index.html
1414

1515
## Building from Source

‎branches/stable/RELEASES.md

Lines changed: 352 additions & 0 deletions
Large diffs are not rendered by default.

‎branches/stable/configure

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,6 @@ enable_if_not_disabled() {
334334
fi
335335
}
336336

337-
to_llvm_triple() {
338-
case $1 in
339-
i686-w64-mingw32) echo i686-pc-windows-gnu ;;
340-
x86_64-w64-mingw32) echo x86_64-pc-windows-gnu ;;
341-
*) echo $1 ;;
342-
esac
343-
}
344-
345337
to_gnu_triple() {
346338
case $1 in
347339
i686-pc-windows-gnu) echo i686-w64-mingw32 ;;
@@ -646,12 +638,6 @@ valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
646638
valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
647639
valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
648640

649-
# Temporarily support old triples until buildbots get updated
650-
CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
651-
putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
652-
CFG_HOST=$(to_llvm_triple $CFG_HOST)
653-
CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
654-
655641
# On Windows this determines root of the subtree for target libraries.
656642
# Host runtime libs always go to 'bin'.
657643
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
@@ -1178,7 +1164,7 @@ do
11781164
;;
11791165

11801166

1181-
*-musl)
1167+
x86_64-*-musl)
11821168
if [ ! -f $CFG_MUSL_ROOT/lib/libc.a ]
11831169
then
11841170
err "musl libc $CFG_MUSL_ROOT/lib/libc.a not found"
@@ -1409,6 +1395,7 @@ do
14091395
make_dir $h/test/debuginfo-gdb
14101396
make_dir $h/test/debuginfo-lldb
14111397
make_dir $h/test/codegen
1398+
make_dir $h/test/codegen-units
14121399
make_dir $h/test/rustdoc
14131400
done
14141401

‎branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# armv7-unknown-linux-gnueabihf configuration
2+
CROSS_PREFIX_armv7-unknown-linux-gnueabihf=arm-linux-gnueabihf-
3+
CC_armv7-unknown-linux-gnueabihf=gcc
4+
CXX_armv7-unknown-linux-gnueabihf=g++
5+
CPP_armv7-unknown-linux-gnueabihf=gcc -E
6+
AR_armv7-unknown-linux-gnueabihf=ar
7+
CFG_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).so
8+
CFG_STATIC_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).a
9+
CFG_LIB_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.so
10+
CFG_LIB_DSYM_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
11+
CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7-a
12+
CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7-a
13+
CFG_GCCISH_CXXFLAGS_armv7-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
14+
CFG_GCCISH_LINK_FLAGS_armv7-unknown-linux-gnueabihf := -shared -fPIC -g
15+
CFG_GCCISH_DEF_FLAG_armv7-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=
16+
CFG_LLC_FLAGS_armv7-unknown-linux-gnueabihf :=
17+
CFG_INSTALL_NAME_ar,-unknown-linux-gnueabihf =
18+
CFG_EXE_SUFFIX_armv7-unknown-linux-gnueabihf :=
19+
CFG_WINDOWSY_armv7-unknown-linux-gnueabihf :=
20+
CFG_UNIXY_armv7-unknown-linux-gnueabihf := 1
21+
CFG_LDPATH_armv7-unknown-linux-gnueabihf :=
22+
CFG_RUN_armv7-unknown-linux-gnueabihf=$(2)
23+
CFG_RUN_TARG_armv7-unknown-linux-gnueabihf=$(call CFG_RUN_armv7-unknown-linux-gnueabihf,,$(2))
24+
RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp2,+neon
25+
RUSTC_CROSS_FLAGS_armv7-unknown-linux-gnueabihf :=
26+
CFG_GNU_TRIPLE_armv7-unknown-linux-gnueabihf := armv7-unknown-linux-gnueabihf

‎branches/stable/mk/cfg/armv7s-apple-ios.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a
1414
CFG_INSTALL_ONLY_RLIB_armv7s-apple-ios = 1
1515
CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a
1616
CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM
17-
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios)
18-
CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -mfpu=vfp4 -arch armv7s
17+
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios)
18+
CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -arch armv7s
1919
CFG_GCCISH_CXXFLAGS_armv7s-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -I$(CFG_IOS_SDK_armv7s-apple-ios)/usr/include/c++/4.2.1
2020
CFG_GCCISH_LINK_FLAGS_armv7s-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7s-apple-ios) -Wl,-no_compact_unwind
2121
CFG_GCCISH_DEF_FLAG_armv7s-apple-ios := -Wl,-exported_symbols_list,

‎branches/stable/mk/cfg/mips-unknown-linux-musl.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# mips-unknown-linux-musl configuration
2+
CC_mips-unknown-linux-musl=mips-linux-musl-gcc
3+
CXX_mips-unknown-linux-musl=mips-linux-musl-g++
4+
CPP_mips-unknown-linux-musl=mips-linux-musl-gcc -E
5+
AR_mips-unknown-linux-musl=mips-linux-musl-ar
6+
CFG_LIB_NAME_mips-unknown-linux-musl=lib$(1).so
7+
CFG_STATIC_LIB_NAME_mips-unknown-linux-musl=lib$(1).a
8+
CFG_LIB_GLOB_mips-unknown-linux-musl=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_mips-unknown-linux-musl=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_mips-unknown-linux-musl := -mips32r2 -msoft-float -mabi=32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_mips-unknown-linux-musl := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-musl := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-musl := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
14+
CFG_GCCISH_DEF_FLAG_mips-unknown-linux-musl := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_mips-unknown-linux-musl :=
16+
CFG_INSTALL_NAME_mips-unknown-linux-musl =
17+
CFG_EXE_SUFFIX_mips-unknown-linux-musl =
18+
CFG_WINDOWSY_mips-unknown-linux-musl :=
19+
CFG_UNIXY_mips-unknown-linux-musl := 1
20+
CFG_LDPATH_mips-unknown-linux-musl :=
21+
CFG_RUN_mips-unknown-linux-musl=
22+
CFG_RUN_TARG_mips-unknown-linux-musl=
23+
RUSTC_FLAGS_mips-unknown-linux-musl :=
24+
CFG_GNU_TRIPLE_mips-unknown-linux-musl := mips-unknown-linux-musl

‎branches/stable/mk/cfg/mipsel-unknown-linux-musl.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# mipsel-unknown-linux-musl configuration
2+
CC_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
3+
CXX_mipsel-unknown-linux-musl=mipsel-linux-musl-g++
4+
CPP_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
5+
AR_mipsel-unknown-linux-musl=mipsel-linux-musl-ar
6+
CFG_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).so
7+
CFG_STATIC_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).a
8+
CFG_LIB_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-musl := -mips32 -mabi=32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_mipsel-unknown-linux-musl := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-musl := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-musl := -shared -fPIC -g -mips32
14+
CFG_GCCISH_DEF_FLAG_mipsel-unknown-linux-musl := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_mipsel-unknown-linux-musl :=
16+
CFG_INSTALL_NAME_mipsel-unknown-linux-musl =
17+
CFG_EXE_SUFFIX_mipsel-unknown-linux-musl :=
18+
CFG_WINDOWSY_mipsel-unknown-linux-musl :=
19+
CFG_UNIXY_mipsel-unknown-linux-musl := 1
20+
CFG_LDPATH_mipsel-unknown-linux-musl :=
21+
CFG_RUN_mipsel-unknown-linux-musl=
22+
CFG_RUN_TARG_mipsel-unknown-linux-musl=
23+
RUSTC_FLAGS_mipsel-unknown-linux-musl :=
24+
CFG_GNU_TRIPLE_mipsel-unknown-linux-musl := mipsel-unknown-linux-musl

‎branches/stable/mk/cfg/powerpc64-unknown-linux-gnu.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# powerpc64-unknown-linux-gnu configuration
2-
CROSS_PREFIX_powerpc64-unknown-linux-gnu=powerpc64-linux-gnu-
2+
CROSS_PREFIX_powerpc64-unknown-linux-gnu=powerpc-linux-gnu-
33
CC_powerpc64-unknown-linux-gnu=$(CC)
44
CXX_powerpc64-unknown-linux-gnu=$(CXX)
55
CPP_powerpc64-unknown-linux-gnu=$(CPP)
@@ -8,6 +8,7 @@ CFG_LIB_NAME_powerpc64-unknown-linux-gnu=lib$(1).so
88
CFG_STATIC_LIB_NAME_powerpc64-unknown-linux-gnu=lib$(1).a
99
CFG_LIB_GLOB_powerpc64-unknown-linux-gnu=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_powerpc64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
11+
CFG_JEMALLOC_CFLAGS_powerpc64-unknown-linux-gnu := -m64
1112
CFG_CFLAGS_powerpc64-unknown-linux-gnu := -m64 $(CFLAGS)
1213
CFG_GCCISH_CFLAGS_powerpc64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64 $(CFLAGS)
1314
CFG_GCCISH_CXXFLAGS_powerpc64-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)

‎branches/stable/mk/tests.mk

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ifdef CHECK_IGNORED
4545
TESTARGS += --ignored
4646
endif
4747

48-
# Arguments to the cfail/rfail/rpass/bench tests
48+
# Arguments to the cfail/rfail/rpass tests
4949
ifdef CFG_VALGRIND
5050
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
5151
endif
@@ -306,10 +306,10 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
306306
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
307307
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
308308
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
309-
check-stage$(1)-T-$(2)-H-$(3)-bench-exec \
310309
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \
311310
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \
312311
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
312+
check-stage$(1)-T-$(2)-H-$(3)-codegen-units-exec \
313313
check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
314314
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
315315

@@ -343,7 +343,6 @@ check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
343343
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \
344344
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \
345345
check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-full-exec \
346-
check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \
347346
check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec
348347

349348
endef
@@ -467,12 +466,12 @@ CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
467466
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
468467
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
469468
PFAIL_RS := $(wildcard $(S)src/test/parse-fail/*.rs)
470-
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
471469
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
472470
DEBUGINFO_GDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
473471
DEBUGINFO_LLDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
474472
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
475473
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
474+
CODEGEN_UNITS_RS := $(wildcard $(S)src/test/codegen-units/*.rs)
476475
RUSTDOCCK_RS := $(wildcard $(S)src/test/rustdoc/*.rs)
477476

478477
RPASS_TESTS := $(RPASS_RS)
@@ -483,11 +482,11 @@ CFAIL_FULL_TESTS := $(CFAIL_FULL_RS)
483482
RFAIL_TESTS := $(RFAIL_RS)
484483
CFAIL_TESTS := $(CFAIL_RS)
485484
PFAIL_TESTS := $(PFAIL_RS)
486-
BENCH_TESTS := $(BENCH_RS)
487485
PRETTY_TESTS := $(PRETTY_RS)
488486
DEBUGINFO_GDB_TESTS := $(DEBUGINFO_GDB_RS)
489487
DEBUGINFO_LLDB_TESTS := $(DEBUGINFO_LLDB_RS)
490488
CODEGEN_TESTS := $(CODEGEN_RS) $(CODEGEN_CC)
489+
CODEGEN_UNITS_TESTS := $(CODEGEN_UNITS_RS)
491490
RUSTDOCCK_TESTS := $(RUSTDOCCK_RS)
492491

493492
CTEST_SRC_BASE_rpass = run-pass
@@ -530,11 +529,6 @@ CTEST_BUILD_BASE_pfail = parse-fail
530529
CTEST_MODE_pfail = parse-fail
531530
CTEST_RUNTOOL_pfail = $(CTEST_RUNTOOL)
532531

533-
CTEST_SRC_BASE_bench = bench
534-
CTEST_BUILD_BASE_bench = bench
535-
CTEST_MODE_bench = run-pass
536-
CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL)
537-
538532
CTEST_SRC_BASE_debuginfo-gdb = debuginfo
539533
CTEST_BUILD_BASE_debuginfo-gdb = debuginfo-gdb
540534
CTEST_MODE_debuginfo-gdb = debuginfo-gdb
@@ -550,6 +544,11 @@ CTEST_BUILD_BASE_codegen = codegen
550544
CTEST_MODE_codegen = codegen
551545
CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL)
552546

547+
CTEST_SRC_BASE_codegen-units = codegen-units
548+
CTEST_BUILD_BASE_codegen-units = codegen-units
549+
CTEST_MODE_codegen-units = codegen-units
550+
CTEST_RUNTOOL_codegen-units = $(CTEST_RUNTOOL)
551+
553552
CTEST_SRC_BASE_rustdocck = rustdoc
554553
CTEST_BUILD_BASE_rustdocck = rustdoc
555554
CTEST_MODE_rustdocck = rustdoc
@@ -604,7 +603,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
604603
$$(HBIN$(1)_H_$(3))/compiletest$$(X_$(3)) \
605604
$$(SREQ$(1)_T_$(2)_H_$(3))
606605

607-
# Rules for the cfail/rfail/rpass/bench test runner
606+
# Rules for the cfail/rfail/rpass test runner
608607

609608
# The tests select when to use debug configuration on their own;
610609
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
@@ -667,12 +666,12 @@ CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$
667666
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
668667
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
669668
CTEST_DEPS_pfail_$(1)-T-$(2)-H-$(3) = $$(PFAIL_TESTS)
670-
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
671669
CTEST_DEPS_debuginfo-gdb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_GDB_TESTS)
672670
CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS) \
673671
$(S)src/etc/lldb_batchmode.py \
674672
$(S)src/etc/lldb_rust_formatters.py
675673
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
674+
CTEST_DEPS_codegen-units_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_UNITS_TESTS)
676675
CTEST_DEPS_rustdocck_$(1)-T-$(2)-H-$(3) = $$(RUSTDOCCK_TESTS) \
677676
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
678677
$(S)src/etc/htmldocck.py
@@ -739,7 +738,7 @@ endif
739738
endef
740739

741740
CTEST_NAMES = rpass rpass-valgrind rpass-full rfail-full cfail-full rfail cfail pfail \
742-
bench debuginfo-gdb debuginfo-lldb codegen rustdocck
741+
debuginfo-gdb debuginfo-lldb codegen codegen-units rustdocck
743742

744743
$(foreach host,$(CFG_HOST), \
745744
$(eval $(foreach target,$(CFG_TARGET), \
@@ -748,20 +747,18 @@ $(foreach host,$(CFG_HOST), \
748747
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
749748

750749
PRETTY_NAMES = pretty-rpass pretty-rpass-valgrind pretty-rpass-full pretty-rfail-full pretty-rfail \
751-
pretty-bench pretty-pretty
750+
pretty-pretty
752751
PRETTY_DEPS_pretty-rpass = $(RPASS_TESTS)
753752
PRETTY_DEPS_pretty-rpass-valgrind = $(RPASS_VALGRIND_TESTS)
754753
PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS)
755754
PRETTY_DEPS_pretty-rfail-full = $(RFAIL_FULL_TESTS)
756755
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
757-
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
758756
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
759757
PRETTY_DIRNAME_pretty-rpass = run-pass
760758
PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
761759
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
762760
PRETTY_DIRNAME_pretty-rfail-full = run-fail-fulldeps
763761
PRETTY_DIRNAME_pretty-rfail = run-fail
764-
PRETTY_DIRNAME_pretty-bench = bench
765762
PRETTY_DIRNAME_pretty-pretty = pretty
766763

767764
define DEF_PRETTY_FULLDEPS
@@ -911,12 +908,12 @@ TEST_GROUPS = \
911908
rfail \
912909
cfail \
913910
pfail \
914-
bench \
915911
rmake \
916912
rustdocck \
917913
debuginfo-gdb \
918914
debuginfo-lldb \
919915
codegen \
916+
codegen-units \
920917
doc \
921918
$(foreach docname,$(DOC_NAMES),doc-$(docname)) \
922919
pretty \
@@ -925,7 +922,6 @@ TEST_GROUPS = \
925922
pretty-rpass-full \
926923
pretty-rfail-full \
927924
pretty-rfail \
928-
pretty-bench \
929925
pretty-pretty \
930926
$(NULL)
931927

@@ -1029,6 +1025,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10291025
export INCLUDE := $$(CFG_MSVC_INCLUDE_PATH_$$(HOST_$(3)))
10301026
$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10311027
export LIB := $$(CFG_MSVC_LIB_PATH_$$(HOST_$(3)))
1028+
$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
1029+
export MSVC_LIB := "$$(CFG_MSVC_LIB_$$(HOST_$(3)))"
10321030
$(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10331031
$(S)src/test/run-make/%/Makefile \
10341032
$$(CSREQ$(1)_T_$(2)_H_$(3))

‎branches/stable/src/compiletest/common.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pub enum Mode {
2525
DebugInfoLldb,
2626
Codegen,
2727
Rustdoc,
28+
CodegenUnits
2829
}
2930

3031
impl FromStr for Mode {
@@ -41,6 +42,7 @@ impl FromStr for Mode {
4142
"debuginfo-gdb" => Ok(DebugInfoGdb),
4243
"codegen" => Ok(Codegen),
4344
"rustdoc" => Ok(Rustdoc),
45+
"codegen-units" => Ok(CodegenUnits),
4446
_ => Err(()),
4547
}
4648
}
@@ -59,6 +61,7 @@ impl fmt::Display for Mode {
5961
DebugInfoLldb => "debuginfo-lldb",
6062
Codegen => "codegen",
6163
Rustdoc => "rustdoc",
64+
CodegenUnits => "codegen-units",
6265
}, f)
6366
}
6467
}

0 commit comments

Comments
 (0)