Skip to content

Commit 298efd3

Browse files
awlnxawlnx
committed
---
yaml --- r: 189181 b: refs/heads/snap-stage3 c: 951ef9d h: refs/heads/master i: 189179: 5b8a9bd v: v3
1 parent 2d70301 commit 298efd3

File tree

874 files changed

+6265
-9722
lines changed

Some content is hidden

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

874 files changed

+6265
-9722
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4d716decb5d9944bc0d79cdc51b03e3af69bc59c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ce2d04a77acd1021d91d81d04f399df731daf0cf
4+
refs/heads/snap-stage3: 951ef9d1f105984383b9795c56f7ab8fdd681b63
55
refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/mk/debuggers.mk

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,29 @@ define DEF_INSTALL_DEBUGGER_SCRIPTS_HOST
5656
tmp/install-debugger-scripts$(1)_H_$(2)-gdb.done: \
5757
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
5858
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
59-
$(Q)touch $$@.start_time
6059
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
6160
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
6261
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(HBIN$(1)_H_$(2))
6362
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
64-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
63+
$(Q)touch $$@
6564

6665
tmp/install-debugger-scripts$(1)_H_$(2)-lldb.done: \
6766
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
6867
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
69-
$(Q)touch $$@.start_time
7068
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
7169
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
7270
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(HBIN$(1)_H_$(2))
7371
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
74-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
72+
$(Q)touch $$@
7573

7674
tmp/install-debugger-scripts$(1)_H_$(2)-all.done: \
7775
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
7876
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
79-
$(Q)touch $$@.start_time
8077
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
8178
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
8279
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(HBIN$(1)_H_$(2))
8380
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
84-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
81+
$(Q)touch $$@
8582

8683
tmp/install-debugger-scripts$(1)_H_$(2)-none.done:
8784
$(Q)touch $$@
@@ -101,32 +98,29 @@ define DEF_INSTALL_DEBUGGER_SCRIPTS_TARGET
10198
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-gdb.done: \
10299
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
103100
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
104-
$(Q)touch $$@.start_time
105101
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
106102
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
107103
$(Q)install $(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
108104
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
109-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
105+
$(Q)touch $$@
110106

111107
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-lldb.done: \
112108
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
113109
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
114-
$(Q)touch $$@.start_time
115110
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
116111
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
117112
$(Q)install $(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
118113
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
119-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
114+
$(Q)touch $$@
120115

121116
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-all.done: \
122117
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
123118
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
124-
$(Q)touch $$@.start_time
125119
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
126120
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
127121
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
128122
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
129-
$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
123+
$(Q)touch $$@
130124

131125
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-none.done:
132126
$(Q)touch $$@

‎branches/snap-stage3/mk/docs.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,11 @@ compiler-docs: $(COMPILER_DOC_TARGETS)
273273
trpl: doc/book/index.html
274274

275275
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
276-
@$(call E, rustbook: $@)
277276
$(Q)rm -rf doc/book
278277
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
279278

280279
style: doc/style/index.html
281280

282281
doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
283-
@$(call E, rustbook: $@)
284282
$(Q)rm -rf doc/style
285283
$(Q)$(RUSTBOOK) build $(S)src/doc/style doc/style

‎branches/snap-stage3/mk/llvm.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ endif
3838
# the stamp in the source dir.
3939
$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
4040
@$$(call E, make: cleaning llvm)
41-
$(Q)touch $$@.start_time
4241
$(Q)$(MAKE) clean-llvm$(1)
4342
@$$(call E, make: done cleaning llvm)
44-
touch -r $$@.start_time $$@ && rm $$@.start_time
43+
touch $$@
4544

4645
ifeq ($$(CFG_ENABLE_LLVM_STATIC_STDCPP),1)
4746
LLVM_STDCPP_LOCATION_$(1) = $$(shell $$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \

‎branches/snap-stage3/mk/target.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7575
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
7676
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7777
@$$(call E, rustc: $$(@D)/lib$(4))
78-
@touch $$@.start_time
7978
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
8079
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
8180
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
@@ -90,7 +89,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
9089
--out-dir $$(@D) \
9190
-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
9291
$$<
93-
@touch -r $$@.start_time $$@ && rm $$@.start_time
92+
@touch $$@
9493
$$(call LIST_ALL_OLD_GLOB_MATCHES, \
9594
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
9695
$$(call LIST_ALL_OLD_GLOB_MATCHES, \

‎branches/snap-stage3/mk/tests.mk

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,10 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
389389
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
390390
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
391391
@$$(call E, run: $$<)
392-
$$(Q)touch $$@.start_time
393392
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(1),$(2),$(3)) $$(TESTARGS) \
394393
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
395394
$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) \
396-
&& touch -r $$@.start_time $$@ && rm $$@.start_time
395+
&& touch $$@
397396
endef
398397

399398
define DEF_TEST_CRATE_RULES_android
@@ -402,7 +401,6 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
402401
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
403402
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
404403
@$$(call E, run: $$< via adb)
405-
$$(Q)touch $$@.start_time
406404
$$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
407405
$$(Q)$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=./$(2) \
408406
./$$(notdir $$<) \
@@ -416,7 +414,7 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
416414
@if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
417415
then \
418416
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
419-
touch -r $$@.start_time $$@ && rm $$@.start_time; \
417+
touch $$@; \
420418
else \
421419
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
422420
exit 101; \
@@ -590,7 +588,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
590588

591589
# The tests select when to use debug configuration on their own;
592590
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
593-
CTEST_RUSTC_FLAGS := $$(subst -C debug-assertions,,$$(CFG_RUSTC_FLAGS))
591+
CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS))
594592

595593
# The tests cannot be optimized while the rest of the compiler is optimized, so
596594
# filter out the optimization (if any) from rustc and then figure out if we need
@@ -692,11 +690,10 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
692690
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
693691
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
694692
@$$(call E, run $(4) [$(2)]: $$<)
695-
$$(Q)touch [email protected]_time
696693
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
697694
$$(CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
698695
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
699-
&& touch -r $$@.start_time $$@ && rm [email protected]_time
696+
&& touch $$@
700697

701698
else
702699

@@ -753,11 +750,10 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
753750
$$(PRETTY_DEPS_$(4)) \
754751
$$(PRETTY_DEPS$(1)_H_$(3)_$(4))
755752
@$$(call E, run pretty-rpass [$(2)]: $$<)
756-
$$(Q)touch $$@.start_time
757753
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
758754
$$(PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
759755
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
760-
&& touch -r $$@.start_time $$@ && rm $$@.start_time
756+
&& touch $$@
761757

762758
endef
763759

@@ -803,10 +799,8 @@ endif
803799
ifeq ($(2),$$(CFG_BUILD))
804800
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): $$(DOCTESTDEP_$(1)_$(2)_$(3)_$(4))
805801
@$$(call E, run doc-$(4) [$(2)])
806-
$$(Q)touch $$@.start_time
807802
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --cfg dox --test $$< \
808-
--test-args "$$(TESTARGS)" && \
809-
touch -r $$@.start_time $$@ && rm $$@.start_time
803+
--test-args "$$(TESTARGS)" && touch $$@
810804
else
811805
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
812806
touch $$@
@@ -841,11 +835,9 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$(4)-exec: \
841835
ifeq ($(2),$$(CFG_BUILD))
842836
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4))
843837
@$$(call E, run doc-crate-$(4) [$(2)])
844-
$$(Q)touch $$@.start_time
845838
$$(Q)CFG_LLVM_LINKAGE_FILE=$$(LLVM_LINKAGE_PATH_$(3)) \
846839
$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test --cfg dox \
847-
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && \
848-
touch -r $$@.start_time $$@ && rm $$@.start_time
840+
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
849841
else
850842
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)):
851843
touch $$@
@@ -992,7 +984,6 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
992984
$$(CSREQ$(1)_T_$(2)_H_$(3))
993985
@rm -rf $(3)/test/run-make/$$*
994986
@mkdir -p $(3)/test/run-make/$$*
995-
$$(Q)touch $$@.start_time
996987
$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
997988
$$(MAKE) \
998989
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
@@ -1005,7 +996,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
1005996
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1006997
$(1) \
1007998
$$(S)
1008-
@touch -r $$@.start_time $$@ && rm [email protected]_time
999+
@touch $$@
10091000
else
10101001
# FIXME #11094 - The above rule doesn't work right for multiple targets
10111002
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:

‎branches/snap-stage3/src/compiletest/common.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub use self::Mode::*;
1111

1212
use std::fmt;
1313
use std::str::FromStr;
14-
use std::path::PathBuf;
1514

1615
#[derive(Clone, Copy, PartialEq, Debug)]
1716
pub enum Mode {
@@ -69,13 +68,13 @@ pub struct Config {
6968
pub run_lib_path: String,
7069

7170
// The rustc executable
72-
pub rustc_path: PathBuf,
71+
pub rustc_path: Path,
7372

7473
// The clang executable
75-
pub clang_path: Option<PathBuf>,
74+
pub clang_path: Option<Path>,
7675

7776
// The llvm binaries path
78-
pub llvm_bin_path: Option<PathBuf>,
77+
pub llvm_bin_path: Option<Path>,
7978

8079
// The valgrind path
8180
pub valgrind_path: Option<String>,
@@ -85,13 +84,13 @@ pub struct Config {
8584
pub force_valgrind: bool,
8685

8786
// The directory containing the tests to run
88-
pub src_base: PathBuf,
87+
pub src_base: Path,
8988

9089
// The directory where programs should be built
91-
pub build_base: PathBuf,
90+
pub build_base: Path,
9291

9392
// Directory for auxiliary libraries
94-
pub aux_base: PathBuf,
93+
pub aux_base: Path,
9594

9695
// The name of the stage being built (stage1, etc)
9796
pub stage_id: String,
@@ -106,7 +105,7 @@ pub struct Config {
106105
pub filter: Option<String>,
107106

108107
// Write out a parseable log of tests that were run
109-
pub logfile: Option<PathBuf>,
108+
pub logfile: Option<Path>,
110109

111110
// A command line to prefix program execution with,
112111
// for running under valgrind
@@ -134,7 +133,7 @@ pub struct Config {
134133
pub lldb_version: Option<String>,
135134

136135
// Path to the android tools
137-
pub android_cross_path: PathBuf,
136+
pub android_cross_path: Path,
138137

139138
// Extra parameter to run adb on arm-linux-androideabi
140139
pub adb_path: String,

0 commit comments

Comments
 (0)