diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 14:33:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 16:10:25 -0700 |
| commit | d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e (patch) | |
| tree | 3dbfd8c87647f67e1d17c726e72b153609d7eea8 /src/test/run-make | |
| parent | 1c0e1a80e54a4d231e01f2bf81c8c9529afd4ba5 (diff) | |
| parent | e77db16afbe9a7180242112456c7fded48f21b6d (diff) | |
| download | rust-d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e.tar.gz rust-d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e.zip | |
rollup merge of #23786: alexcrichton/less-quotes
Conflicts: src/test/auxiliary/static-function-pointer-aux.rs src/test/auxiliary/trait_default_method_xc_aux.rs src/test/run-pass/issue-4545.rs
Diffstat (limited to 'src/test/run-make')
| -rw-r--r-- | src/test/run-make/output-with-hyphens/Makefile | 6 | ||||
| -rw-r--r-- | src/test/run-make/output-with-hyphens/foo-bar.rs | 14 | ||||
| -rw-r--r-- | src/test/run-make/save-analysis/foo.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/weird-output-filenames/Makefile | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/src/test/run-make/output-with-hyphens/Makefile b/src/test/run-make/output-with-hyphens/Makefile new file mode 100644 index 00000000000..783d826a53d --- /dev/null +++ b/src/test/run-make/output-with-hyphens/Makefile @@ -0,0 +1,6 @@ +-include ../tools.mk + +all: + $(RUSTC) foo-bar.rs + [ -f $(TMPDIR)/$(call BIN,foo-bar) ] + [ -f $(TMPDIR)/libfoo_bar.rlib ] diff --git a/src/test/run-make/output-with-hyphens/foo-bar.rs b/src/test/run-make/output-with-hyphens/foo-bar.rs new file mode 100644 index 00000000000..2f93b2d1ead --- /dev/null +++ b/src/test/run-make/output-with-hyphens/foo-bar.rs @@ -0,0 +1,14 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_type = "lib"] +#![crate_type = "bin"] + +fn main() {} diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make/save-analysis/foo.rs index d2d97fbb888..5310ed25d3b 100644 --- a/src/test/run-make/save-analysis/foo.rs +++ b/src/test/run-make/save-analysis/foo.rs @@ -15,7 +15,7 @@ extern crate graphviz; // A simple rust project -extern crate "flate" as myflate; +extern crate flate as myflate; use std::collections::{HashMap,HashSet}; use std::cell::RefCell; diff --git a/src/test/run-make/weird-output-filenames/Makefile b/src/test/run-make/weird-output-filenames/Makefile index 2172ed888b1..8b69c68279d 100644 --- a/src/test/run-make/weird-output-filenames/Makefile +++ b/src/test/run-make/weird-output-filenames/Makefile @@ -12,4 +12,4 @@ all: | grep "invalid character.*in crate name:" cp foo.rs $(TMPDIR)/-foo.rs $(RUSTC) $(TMPDIR)/-foo.rs 2>&1 \ - | grep "soon cannot contain hyphens:" + | grep 'crate names cannot start with a `-`' |