Skip to content

Commit adc080d

Browse files
borsbors
committed
---
yaml --- r: 115567 b: refs/heads/try c: ab22d99 h: refs/heads/master i: 115565: 2cee36c 115563: 3683229 115559: b481e1c 115551: 9c80667 v: v3
1 parent 6088d22 commit adc080d

File tree

250 files changed

+17960
-16308
lines changed

Some content is hidden

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

250 files changed

+17960
-16308
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
5-
refs/heads/try: ec9ade938e9e4aa710f4351e48a8fda1037352aa
5+
refs/heads/try: ab22d99e73f81f35dd4edbdc9b27152dc653f5b6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/configure

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,26 @@ probe CFG_PDFLATEX pdflatex
466466
probe CFG_XELATEX xelatex
467467
probe CFG_LUALATEX lualatex
468468
probe CFG_GDB gdb
469+
probe CFG_LLDB lldb
470+
471+
if [ ! -z "$CFG_LLDB" ]
472+
then
473+
# If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
474+
# LLDB via the -P commandline options.
475+
if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
476+
then
477+
CFG_LLDB_PYTHON_DIR=$($CFG_LLDB -P)
478+
479+
# If CFG_LLDB_PYTHON_DIR is not a valid directory, set it to something more readable
480+
if [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
481+
then
482+
CFG_LLDB_PYTHON_DIR="LLDB_PYTHON_DIRECTORY_NOT_FOUND"
483+
fi
484+
485+
putvar CFG_LLDB_PYTHON_DIR
486+
fi
487+
fi
488+
469489
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
470490
then
471491
probe CFG_PAXCTL paxctl /sbin/paxctl
@@ -803,10 +823,12 @@ do
803823
make_dir $h/test/run-pass-fulldeps
804824
make_dir $h/test/run-fail
805825
make_dir $h/test/compile-fail
826+
make_dir $h/test/compile-fail-fulldeps
806827
make_dir $h/test/bench
807828
make_dir $h/test/perf
808829
make_dir $h/test/pretty
809-
make_dir $h/test/debug-info
830+
make_dir $h/test/debuginfo-gdb
831+
make_dir $h/test/debuginfo-lldb
810832
make_dir $h/test/codegen
811833
make_dir $h/test/doc-tutorial
812834
make_dir $h/test/doc-guide-ffi

‎branches/try/mk/crates.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url log regex graphviz
54+
workcache url log regex graphviz core
5555
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

59-
DEPS_std := libc native:rustrt native:compiler-rt native:backtrace
59+
DEPS_core :=
60+
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace
6061
DEPS_green := std rand native:context_switch
6162
DEPS_rustuv := std native:uv native:uv_support
6263
DEPS_native := std
@@ -95,6 +96,8 @@ TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
9596
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
9697
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9798

99+
ONLY_RLIB_core := 1
100+
98101
################################################################################
99102
# You should not need to edit below this line
100103
################################################################################

‎branches/try/mk/host.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# $(5) - the name of the crate being processed
1919
define CP_HOST_STAGE_N_CRATE
2020

21+
ifeq ($$(ONLY_RLIB_$(5)),)
2122
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
2223
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
2324
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
@@ -30,6 +31,10 @@ $$(HLIB$(2)_H_$(4))/stamp.$(5): \
3031
$$(HLIB$(2)_H_$(4))
3132
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3233
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
34+
else
35+
$$(HLIB$(2)_H_$(4))/stamp.$(5):
36+
$$(Q)touch $$@
37+
endif
3338

3439
endef
3540

@@ -54,9 +59,6 @@ endef
5459
# $(4) - the host triple (same as $(3))
5560
define CP_HOST_STAGE_N
5661

57-
$$(HBIN$(2)_H_$(4))/:
58-
@mkdir -p $$@
59-
6062
ifneq ($(CFG_LIBDIR_RELATIVE),bin)
6163
$$(HLIB$(2)_H_$(4))/:
6264
@mkdir -p $$@

‎branches/try/mk/tests.mk

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,13 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
288288
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
289289
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
290290
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
291+
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
291292
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
292293
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
293294
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
294295
check-stage$(1)-T-$(2)-H-$(3)-bench-exec \
295-
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-exec \
296+
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \
297+
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \
296298
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
297299
check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
298300
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
@@ -451,13 +453,16 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
451453
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
452454
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
453455
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
456+
CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
457+
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
454458
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
455459
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
456460
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
457461
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
458462
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
459463
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
460-
DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
464+
DEBUGINFO_GDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
465+
DEBUGINFO_LLDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
461466
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
462467
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
463468

@@ -467,12 +472,14 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
467472

468473
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
469474
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
475+
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
470476
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
471477
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
472478
BENCH_TESTS := $(BENCH_RS)
473479
PERF_TESTS := $(PERF_RS)
474480
PRETTY_TESTS := $(PRETTY_RS)
475-
DEBUGINFO_TESTS := $(DEBUGINFO_RS)
481+
DEBUGINFO_GDB_TESTS := $(DEBUGINFO_GDB_RS)
482+
DEBUGINFO_LLDB_TESTS := $(DEBUGINFO_LLDB_RS)
476483
CODEGEN_TESTS := $(CODEGEN_RS) $(CODEGEN_CC)
477484

478485
CTEST_SRC_BASE_rpass = run-pass
@@ -485,6 +492,11 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
485492
CTEST_MODE_rpass-full = run-pass
486493
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
487494

495+
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
496+
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
497+
CTEST_MODE_cfail-full = compile-fail
498+
CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)
499+
488500
CTEST_SRC_BASE_rfail = run-fail
489501
CTEST_BUILD_BASE_rfail = run-fail
490502
CTEST_MODE_rfail = run-fail
@@ -505,10 +517,15 @@ CTEST_BUILD_BASE_perf = perf
505517
CTEST_MODE_perf = run-pass
506518
CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL)
507519

508-
CTEST_SRC_BASE_debuginfo = debug-info
509-
CTEST_BUILD_BASE_debuginfo = debug-info
510-
CTEST_MODE_debuginfo = debug-info
511-
CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL)
520+
CTEST_SRC_BASE_debuginfo-gdb = debuginfo
521+
CTEST_BUILD_BASE_debuginfo-gdb = debuginfo-gdb
522+
CTEST_MODE_debuginfo-gdb = debuginfo-gdb
523+
CTEST_RUNTOOL_debuginfo-gdb = $(CTEST_RUNTOOL)
524+
525+
CTEST_SRC_BASE_debuginfo-lldb = debuginfo
526+
CTEST_BUILD_BASE_debuginfo-lldb = debuginfo-lldb
527+
CTEST_MODE_debuginfo-lldb = debuginfo-lldb
528+
CTEST_RUNTOOL_debuginfo-lldb = $(CTEST_RUNTOOL)
512529

513530
CTEST_SRC_BASE_codegen = codegen
514531
CTEST_BUILD_BASE_codegen = codegen
@@ -520,15 +537,22 @@ CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL)
520537
# during attempts to run those tests.
521538

522539
ifeq ($(CFG_GDB),)
523-
CTEST_DISABLE_debuginfo = "no gdb found"
540+
CTEST_DISABLE_debuginfo-gdb = "no gdb found"
524541
endif
525542

543+
ifeq ($(CFG_LLDB),)
544+
CTEST_DISABLE_debuginfo-lldb = "no lldb found"
545+
endif
546+
547+
# Completely disable LLDB tests for now
548+
CTEST_DISABLE_debuginfo-lldb = "LLDB tests are not enabled yet"
549+
526550
ifeq ($(CFG_CLANG),)
527551
CTEST_DISABLE_codegen = "no clang found"
528552
endif
529553

530554
ifeq ($(CFG_OSTYPE),apple-darwin)
531-
CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
555+
CTEST_DISABLE_debuginfo-gdb = "gdb on darwing needs root"
532556
endif
533557

534558
# CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP), if set, will cause that
@@ -578,16 +602,19 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
578602
--adb-path=$(CFG_ADB) \
579603
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
580604
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \
605+
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \
581606
--target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
582607
$$(CTEST_TESTARGS)
583608

584609
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
585610
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
611+
CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
586612
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
587613
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
588614
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
589615
CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
590-
CTEST_DEPS_debuginfo_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_TESTS)
616+
CTEST_DEPS_debuginfo-gdb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_GDB_TESTS)
617+
CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS)
591618
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
592619

593620
endef
@@ -651,7 +678,7 @@ endif
651678

652679
endef
653680

654-
CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
681+
CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo-gdb debuginfo-lldb codegen
655682

656683
$(foreach host,$(CFG_HOST), \
657684
$(eval $(foreach target,$(CFG_TARGET), \
@@ -794,12 +821,14 @@ TEST_GROUPS = \
794821
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
795822
rpass \
796823
rpass-full \
824+
cfail-full \
797825
rfail \
798826
cfail \
799827
bench \
800828
perf \
801829
rmake \
802-
debuginfo \
830+
debuginfo-gdb \
831+
debuginfo-lldb \
803832
codegen \
804833
doc \
805834
$(foreach docname,$(DOCS),doc-$(docname)) \

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ pub enum mode {
1414
mode_run_fail,
1515
mode_run_pass,
1616
mode_pretty,
17-
mode_debug_info,
17+
mode_debug_info_gdb,
18+
mode_debug_info_lldb,
1819
mode_codegen
1920
}
2021

@@ -101,6 +102,9 @@ pub struct config {
101102
// status whether android device available or not
102103
pub adb_device_status: bool,
103104

105+
// the path containing LLDB's Python module
106+
pub lldb_python_dir: Option<~str>,
107+
104108
// Explain what's going on
105109
pub verbose: bool
106110

‎branches/try/src/compiletest/compiletest.rs

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,8 @@ use std::os;
2828
use std::io;
2929
use std::io::fs;
3030
use getopts::{optopt, optflag, reqopt};
31-
use common::config;
32-
use common::mode_run_pass;
33-
use common::mode_run_fail;
34-
use common::mode_compile_fail;
35-
use common::mode_pretty;
36-
use common::mode_debug_info;
37-
use common::mode_codegen;
38-
use common::mode;
31+
use common::{config, mode_run_pass, mode_run_fail, mode_compile_fail, mode_pretty,
32+
mode_debug_info_gdb, mode_debug_info_lldb, mode_codegen, mode};
3933
use util::logv;
4034

4135
pub mod procsrv;
@@ -87,6 +81,7 @@ pub fn parse_config(args: Vec<~str> ) -> config {
8781
optopt("", "host", "the host to build for", "HOST"),
8882
optopt("", "adb-path", "path to the android debugger", "PATH"),
8983
optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
84+
optopt("", "lldb-python-dir", "directory containing LLDB's python module", "PATH"),
9085
optopt("", "test-shard", "run shard A, of B shards, worth of the testsuite", "A.B"),
9186
optflag("h", "help", "show this message"));
9287

@@ -154,6 +149,7 @@ pub fn parse_config(args: Vec<~str> ) -> config {
154149
"arm-linux-androideabi" == opt_str2(matches.opt_str("target")) &&
155150
"(none)" != opt_str2(matches.opt_str("adb-test-dir")) &&
156151
!opt_str2(matches.opt_str("adb-test-dir")).is_empty(),
152+
lldb_python_dir: matches.opt_str("lldb-python-dir"),
157153
test_shard: test::opt_shard(matches.opt_str("test-shard")),
158154
verbose: matches.opt_present("verbose")
159155
}
@@ -204,13 +200,14 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
204200

205201
pub fn str_mode(s: ~str) -> mode {
206202
match s.as_slice() {
207-
"compile-fail" => mode_compile_fail,
208-
"run-fail" => mode_run_fail,
209-
"run-pass" => mode_run_pass,
210-
"pretty" => mode_pretty,
211-
"debug-info" => mode_debug_info,
212-
"codegen" => mode_codegen,
213-
_ => fail!("invalid mode")
203+
"compile-fail" => mode_compile_fail,
204+
"run-fail" => mode_run_fail,
205+
"run-pass" => mode_run_pass,
206+
"pretty" => mode_pretty,
207+
"debuginfo-gdb" => mode_debug_info_gdb,
208+
"debuginfo-lldb" => mode_debug_info_lldb,
209+
"codegen" => mode_codegen,
210+
s => fail!("invalid mode: " + s)
214211
}
215212
}
216213

@@ -220,15 +217,16 @@ pub fn mode_str(mode: mode) -> ~str {
220217
mode_run_fail => "run-fail".to_owned(),
221218
mode_run_pass => "run-pass".to_owned(),
222219
mode_pretty => "pretty".to_owned(),
223-
mode_debug_info => "debug-info".to_owned(),
220+
mode_debug_info_gdb => "debuginfo-gdb".to_owned(),
221+
mode_debug_info_lldb => "debuginfo-lldb".to_owned(),
224222
mode_codegen => "codegen".to_owned(),
225223
}
226224
}
227225

228226
pub fn run_tests(config: &config) {
229227
if config.target == "arm-linux-androideabi".to_owned() {
230228
match config.mode{
231-
mode_debug_info => {
229+
mode_debug_info_gdb => {
232230
println!("arm-linux-androideabi debug-info \
233231
test uses tcp 5039 port. please reserve it");
234232
}

0 commit comments

Comments
 (0)