Skip to content

Commit 8d96a94

Browse files
nikomatsakisnikomatsakis
committed
---
yaml --- r: 59859 b: refs/heads/master c: 14bf5c4 h: refs/heads/master i: 59857: 8648168 59855: e7fee35 v: v3
1 parent 38ee447 commit 8d96a94

File tree

272 files changed

+8676
-7017
lines changed

Some content is hidden

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

272 files changed

+8676
-7017
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3afd708e2acd767f1af90de52c139c1b6b877311
2+
refs/heads/master: 14bf5c4fe7eb110fc124a710b40bc7c5a7801e25
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

‎trunk/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2393,7 +2393,7 @@ variables in the arm's block, and control enters the block.
23932393
An example of an `match` expression:
23942394

23952395

2396-
~~~~
2396+
~~~~ {.xfail-test}
23972397
# fn process_pair(a: int, b: int) { }
23982398
# fn process_ten() { }
23992399

‎trunk/mk/clean.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ clean-misc:
4848
$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
4949
$(Q)rm -Rf $(DOCS)
5050
$(Q)rm -Rf $(GENERATED)
51-
$(Q)rm -f tmp/*
51+
$(Q)rm -f tmp/*.log tmp/*.rc tmp/*.rs tmp/*.ok
5252
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
5353
$(Q)rm -Rf $(foreach ext, \
5454
html aux cp fn ky log pdf pg toc tp vr cps, \

‎trunk/mk/install.mk

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -154,66 +154,3 @@ uninstall:
154154
done
155155
$(Q)rm -Rf $(PHL)/rustc
156156
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
157-
158-
# target platform specific variables
159-
# for arm-linux-androidabi
160-
define DEF_ADB_STATUS
161-
CFG_ADB_DEVICE=$(1)
162-
endef
163-
164-
$(foreach target,$(CFG_TARGET_TRIPLES), \
165-
$(if $(findstring $(target),"arm-linux-androideabi"), \
166-
$(if $(findstring adb,$(shell which adb)), \
167-
$(if $(findstring device,$(shell adb devices 2>/dev/null | grep -E '^[A-Za-z0-9]+[[:blank:]]+device')), \
168-
$(info install: install-runtime-target for arm-linux-androideabi enabled \
169-
$(info install: android device attached) \
170-
$(eval $(call DEF_ADB_STATUS, true))), \
171-
$(info install: install-runtime-target for arm-linux-androideabi disabled \
172-
$(info install: android device not attached) \
173-
$(eval $(call DEF_ADB_STATUS, false))) \
174-
), \
175-
$(info install: install-runtime-target for arm-linux-androideabi disabled \
176-
$(info install: adb not found) \
177-
$(eval $(call DEF_ADB_STATUS, false))) \
178-
), \
179-
) \
180-
)
181-
182-
ifeq ($(CFG_ADB_DEVICE),true)
183-
184-
ifdef VERBOSE
185-
ADB = adb $(1)
186-
ADB_PUSH = adb push $(1) $(2)
187-
ADB_SHELL = adb shell $(1) $(2)
188-
else
189-
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null 2>/dev/null
190-
ADB_PUSH = $(Q)$(call E, adb push $(1)) && adb push $(1) $(2) 1>/dev/null 2>/dev/null
191-
ADB_SHELL = $(Q)$(call E, adb shell $(1) $(2)) && adb shell $(1) $(2) 1>/dev/null 2>/dev/null
192-
endif
193-
194-
define INSTALL_RUNTIME_TARGET_N
195-
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
196-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),/system/lib)
197-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CORELIB_GLOB_$(1)),/system/lib)
198-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),/system/lib)
199-
endef
200-
201-
define INSTALL_RUNTIME_TARGET_CLEANUP_N
202-
install-runtime-target-$(1)-cleanup:
203-
$(Q)$(call ADB,remount)
204-
$(Q)$(call ADB_SHELL,rm,/system/lib/$(CFG_RUNTIME_$(1)))
205-
$(Q)$(call ADB_SHELL,rm,/system/lib/$(CORELIB_GLOB_$(1)))
206-
$(Q)$(call ADB_SHELL,rm,/system/lib/$(STDLIB_GLOB_$(1)))
207-
endef
208-
209-
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD_TRIPLE)))
210-
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
211-
212-
install-runtime-target: \
213-
install-runtime-target-arm-linux-androideabi-cleanup \
214-
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
215-
216-
else
217-
install-runtime-target:
218-
@echo
219-
endif

‎trunk/mk/tests.mk

Lines changed: 5 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -92,48 +92,6 @@ endef
9292
$(foreach target,$(CFG_TARGET_TRIPLES), \
9393
$(eval $(call DEF_TARGET_COMMANDS,$(target))))
9494

95-
# Target specific variables
96-
# for arm-linux-androidabi
97-
define DEF_RUNNABLE_STATUS
98-
CFG_RUNNABLE_$(1)=$(2)
99-
endef
100-
101-
$(foreach target,$(CFG_TARGET_TRIPLES), \
102-
$(if $(findstring $(target),$(CFG_BUILD_TRIPLE)), \
103-
$(info check: $(target) test set is runnable \
104-
$(eval $(call DEF_RUNNABLE_STATUS,$(target),true))), \
105-
$(if $(findstring $(target),"arm-linux-androideabi"), \
106-
$(if $(findstring adb,$(shell which adb)), \
107-
$(if $(findstring device,$(shell adb devices 2>/dev/null | grep -E '^[A-Za-z0-9]+[[:blank:]]+device')), \
108-
$(info check: $(target) test set is runnable \
109-
$(info check: adb device attached) \
110-
$(eval $(call DEF_RUNNABLE_STATUS,$(target),true))), \
111-
$(info check: $(target) test set is not runnable \
112-
$(info check: adb device not attached) \
113-
$(eval $(call DEF_RUNNABLE_STATUS,$(target),false))) \
114-
), \
115-
$(info check: $(target) test set is not runnable \
116-
$(info check: adb not found) \
117-
$(eval $(call DEF_RUNNABLE_STATUS,$(target),false))) \
118-
), \
119-
$(info check: $(target) test set is not runnable \
120-
$(eval $(call DEF_RUNNABLE_STATUS,$(target),false)) \
121-
) \
122-
) \
123-
) \
124-
)
125-
126-
ifeq ($(CFG_RUNNABLE_arm-linux-androideabi),true)
127-
CFG_ADB_DEVICE=true
128-
CFG_ADB_PATH := $(shell which adb)
129-
CFG_ADB_TEST_DIR=/system/tmp
130-
131-
$(info check: device $(CFG_ADB_TEST_DIR) \
132-
$(shell $(CFG_ADB_PATH) shell mkdir $(CFG_ADB_TEST_DIR) 1>/dev/null) \
133-
$(shell $(CFG_ADB_PATH) shell rm $(CFG_ADB_TEST_DIR)/*-arm-linux-androideabi 1>/dev/null) \
134-
$(shell $(CFG_ADB_PATH) shell rm $(CFG_ADB_TEST_DIR)/*.so 1>/dev/null) \
135-
)
136-
endif
13795

13896
######################################################################
13997
# Main test targets
@@ -361,52 +319,11 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
361319
&& touch $$@
362320
endef
363321

364-
define DEF_TEST_CRATE_RULES_arm-linux-androideabi
365-
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
366-
367-
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
368-
$(3)/test/$(4)test.stage$(1)-$(2)$$(X_$(2))
369-
@$$(call E, run: $$< via adb)
370-
@$(CFG_ADB_PATH) push $$< $(CFG_ADB_TEST_DIR)
371-
@$(CFG_ADB_PATH) shell $(CFG_ADB_TEST_DIR)/`echo $$< | sed 's/.*\///'` \
372-
--logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log > \
373-
tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
374-
@cat tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
375-
@touch tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
376-
@$(CFG_ADB_PATH) pull $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log tmp/
377-
@$(CFG_ADB_PATH) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
378-
@if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
379-
then \
380-
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
381-
touch $$@; \
382-
else \
383-
rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
384-
exit 101; \
385-
fi
386-
endef
387-
388-
define DEF_TEST_CRATE_RULES_null
389-
check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
390-
391-
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
392-
$(3)/test/$(4)test.stage$(1)-$(2)$$(X_$(2))
393-
@$$(call E, run: skipped $$< )
394-
@touch $$@
395-
endef
396-
397322
$(foreach host,$(CFG_HOST_TRIPLES), \
398323
$(foreach target,$(CFG_TARGET_TRIPLES), \
399324
$(foreach stage,$(STAGES), \
400325
$(foreach crate, $(TEST_CRATES), \
401-
$(if $(findstring $(target),$(CFG_BUILD_TRIPLE)), \
402-
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))), \
403-
$(if $(findstring $(target),"arm-linux-androideabi"), \
404-
$(if $(findstring $(CFG_RUNNABLE_arm-linux-androideabi),"true"), \
405-
$(eval $(call DEF_TEST_CRATE_RULES_arm-linux-androideabi,$(stage),$(target),$(host),$(crate))), \
406-
$(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \
407-
), \
408-
$(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \
409-
))))))
326+
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate)))))))
410327

411328

412329
######################################################################
@@ -497,35 +414,15 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
497414

498415
# Rules for the cfail/rfail/rpass/bench/perf test runner
499416

500-
ifeq ($(CFG_ADB_DEVICE),true)
501-
502417
CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
503418
--compile-lib-path $$(HLIB$(1)_H_$(3)) \
504419
--run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \
505420
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
506421
--aux-base $$(S)src/test/auxiliary/ \
507422
--stage-id stage$(1)-$(2) \
508-
--host $(CFG_BUILD_TRIPLE) \
509-
--target $(2) \
510-
--adb-path=$(CFG_ADB_PATH) \
511423
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CFG_RUSTC_FLAGS) --target=$(2)" \
512424
$$(CTEST_TESTARGS)
513425

514-
else
515-
516-
CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
517-
--compile-lib-path $$(HLIB$(1)_H_$(3)) \
518-
--run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \
519-
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
520-
--aux-base $$(S)src/test/auxiliary/ \
521-
--stage-id stage$(1)-$(2) \
522-
--host $(CFG_BUILD_TRIPLE) \
523-
--target $(2) \
524-
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CFG_RUSTC_FLAGS) --target=$(2)" \
525-
$$(CTEST_TESTARGS)
526-
527-
endif
528-
529426
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
530427
CTEST_DEPS_rpass_full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
531428
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
@@ -557,7 +454,7 @@ ifeq ($$(CTEST_DISABLE_$(4)),)
557454
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
558455
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
559456
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
560-
@$$(call E, run $(4) [$(2)]: $$<)
457+
@$$(call E, run $(4): $$<)
561458
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
562459
$$(CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
563460
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
@@ -568,7 +465,7 @@ else
568465
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
569466
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
570467
$$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
571-
@$$(call E, run $(4) [$(2)]: $$<)
468+
@$$(call E, run $(4): $$<)
572469
@$$(call E, warning: tests disabled: $$(CTEST_DISABLE_$(4)))
573470
touch $$@
574471

@@ -609,7 +506,7 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
609506
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
610507
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
611508
$$(PRETTY_DEPS_$(4))
612-
@$$(call E, run pretty-rpass [$(2)]: $$<)
509+
@$$(call E, run pretty-rpass: $$<)
613510
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
614511
$$(PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
615512
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
@@ -636,7 +533,7 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3)
636533
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
637534
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
638535
doc-$(4)-extract$(3)
639-
@$$(call E, run doc-$(4) [$(2)]: $$<)
536+
@$$(call E, run doc-$(4): $$<)
640537
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
641538
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4)) \
642539
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),doc-$(4)) \

‎trunk/src/compiletest/common.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@ pub struct config {
6464
// Run tests using the new runtime
6565
newrt: bool,
6666

67-
// Host System to be built
68-
host: ~str,
69-
70-
// Target System to be executed
71-
target: ~str,
72-
73-
// Extra parameter to run arm-linux-androideabi
74-
adb_path: ~str,
75-
76-
// check if can be run or not
77-
flag_runnable: bool,
78-
7967
// Explain what's going on
8068
verbose: bool
8169

‎trunk/src/compiletest/compiletest.rc

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ pub fn parse_config(args: ~[~str]) -> config {
6060
getopts::optflag(~"verbose"),
6161
getopts::optopt(~"logfile"),
6262
getopts::optflag(~"jit"),
63-
getopts::optflag(~"newrt"),
64-
getopts::optopt(~"host"),
65-
getopts::optopt(~"target"),
66-
getopts::optopt(~"adb-path")
67-
];
63+
getopts::optflag(~"newrt")];
6864

6965
assert!(!args.is_empty());
7066
let args_ = vec::tail(args);
@@ -97,22 +93,6 @@ pub fn parse_config(args: ~[~str]) -> config {
9793
rustcflags: getopts::opt_maybe_str(matches, ~"rustcflags"),
9894
jit: getopts::opt_present(matches, ~"jit"),
9995
newrt: getopts::opt_present(matches, ~"newrt"),
100-
host: opt_str(getopts::opt_maybe_str(matches, ~"host")),
101-
target: opt_str(getopts::opt_maybe_str(matches, ~"target")),
102-
adb_path: opt_str(getopts::opt_maybe_str(matches, ~"adb-path")),
103-
flag_runnable:
104-
if (getopts::opt_maybe_str(matches, ~"host") ==
105-
getopts::opt_maybe_str(matches, ~"target")) { true }
106-
else {
107-
match getopts::opt_maybe_str(matches, ~"target") {
108-
Some(~"arm-linux-androideabi") => {
109-
if (getopts::opt_maybe_str(matches, ~"adb-path") !=
110-
option::None) { true }
111-
else { false }
112-
}
113-
_ => { false }
114-
}
115-
},
11696
verbose: getopts::opt_present(matches, ~"verbose")
11797
}
11898
}
@@ -133,10 +113,6 @@ pub fn log_config(config: config) {
133113
logv(c, fmt!("rustcflags: %s", opt_str(config.rustcflags)));
134114
logv(c, fmt!("jit: %b", config.jit));
135115
logv(c, fmt!("newrt: %b", config.newrt));
136-
logv(c, fmt!("host: %s", config.host));
137-
logv(c, fmt!("target: %s", config.target));
138-
logv(c, fmt!("adb_path: %s", config.adb_path));
139-
logv(c, fmt!("flag_runnable: %b", config.flag_runnable));
140116
logv(c, fmt!("verbose: %b", config.verbose));
141117
logv(c, fmt!("\n"));
142118
}

‎trunk/src/compiletest/header.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ pub fn load_props(testfile: &Path) -> TestProps {
8282
}
8383

8484
pub fn is_test_ignored(config: config, testfile: &Path) -> bool {
85-
let mut found = false;
8685
for iter_header(testfile) |ln| {
8786
if parse_name_directive(ln, ~"xfail-test") { return true; }
8887
if parse_name_directive(ln, xfail_target()) { return true; }
8988
if config.mode == common::mode_pretty &&
9089
parse_name_directive(ln, ~"xfail-pretty") { return true; }
9190
};
92-
return found;
91+
return false;
9392

9493
fn xfail_target() -> ~str {
9594
~"xfail-" + str::from_slice(os::SYSNAME)

0 commit comments

Comments
 (0)