Skip to content

Commit 5714824

Browse files
committed
---
yaml --- r: 272763 b: refs/heads/beta c: 9601e6f h: refs/heads/master i: 272761: 3dff174 272759: 417b6d1
1 parent 5eb2719 commit 5714824

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: fff9c2b6db70e0bb895fc0d1e207566345f098c5
26+
refs/heads/beta: 9601e6f252f725f1aa90b15cab0e22732b0076ee
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/compiletest/runtest.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,11 @@ fn run_valgrind_test(config: &Config, props: &TestProps, testpaths: &TestPaths)
213213
}
214214

215215
fn run_pretty_test(config: &Config, props: &TestProps, testpaths: &TestPaths) {
216-
assert!(props.revisions.is_empty(), "revisions not relevant here");
216+
// Note: because we run the --pretty tests on the code in run-pass etc,
217+
// we may see a list of revisions -- but we can just ignore them.
218+
// We cannot assert that the list is empty as we do elsewhere.
219+
//
220+
// assert!(props.revisions.is_empty(), "revisions not relevant here");
217221

218222
if props.pp_exact.is_some() {
219223
logv(config, "testing for exact pretty-printing".to_owned());

0 commit comments

Comments
 (0)