diff options
| author | bors <bors@rust-lang.org> | 2017-01-02 18:10:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-02 18:10:37 +0000 |
| commit | 9953e76ca41bb42d27a52d6657304af5fe41f0c0 (patch) | |
| tree | ebf834c3d9ccb7e3dae6f5fc43b198908487e72e | |
| parent | df61658c8afc8b24800f5437e0000a99d04ea2b0 (diff) | |
| parent | 2dc228480869372eb8b1359696f70850f7541938 (diff) | |
Auto merge of #38760 - est31:ignorecfg, r=sanxiyn
Fix pre-cfg_attr notation in comment Commit aa3b1261b164eeac3e68573bfc698d1ca943fb05 has changed notation in the test from `#[ignore(cfg(ignorecfg))]` to `#[cfg_attr(ignorecfg, ignore)]`, but missed to change the comment in the accompanying Makefile.
| -rw-r--r-- | src/test/run-make/test-harness/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-make/test-harness/Makefile b/src/test/run-make/test-harness/Makefile index fc9b65c47a9..aad8b1b3fbb 100644 --- a/src/test/run-make/test-harness/Makefile +++ b/src/test/run-make/test-harness/Makefile @@ -1,7 +1,7 @@ -include ../tools.mk all: - # check that #[ignore(cfg(...))] does the right thing. + # check that #[cfg_attr(..., ignore)] does the right thing. $(RUSTC) --test test-ignore-cfg.rs --cfg ignorecfg $(call RUN,test-ignore-cfg) | grep 'shouldnotignore ... ok' $(call RUN,test-ignore-cfg) | grep 'shouldignore ... ignored' |