Skip to content

Commit 3e836d2

Browse files
committed
---
yaml --- r: 63639 b: refs/heads/snap-stage3 c: 30f8621 h: refs/heads/master i: 63637: 269ca91 63635: 3c36f4a 63631: bc5b088 v: v3
1 parent 022f1c1 commit 3e836d2

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
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: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ac9481a438d2fa5000058b0f59b9cd6113f886ce
4+
refs/heads/snap-stage3: 30f8621386776bfa658041c971932840d769f394
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/compiletest.rc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,17 @@ pub fn make_test(config: &config, testfile: &Path) -> test::TestDescAndFn {
254254
}
255255

256256
pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
257+
258+
// Try to elide redundant long paths
259+
fn shorten(path: &Path) -> ~str {
260+
let filename = path.filename();
261+
let dir = path.pop().filename();
262+
fmt!("%s/%s", dir.get_or_default(~""), filename.get_or_default(~""))
263+
}
264+
257265
test::DynTestName(fmt!("[%s] %s",
258266
mode_str(config.mode),
259-
testfile.to_str()))
267+
shorten(testfile)))
260268
}
261269

262270
pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {

0 commit comments

Comments
 (0)