about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-07-05 12:37:43 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-07-05 12:46:42 -0700
commit56f71015515490b65b5fbb46ff0bbc7d7af82450 (patch)
tree23adf899f04d42d55b35334a7c29d3be3f5a6e97 /src/test
parent15b680ae86eefae754c3a348d89207fa100b4ca6 (diff)
downloadrust-56f71015515490b65b5fbb46ff0bbc7d7af82450.tar.gz
rust-56f71015515490b65b5fbb46ff0bbc7d7af82450.zip
rustc: Default #[crate_name] on input, not output
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/bad-crate-id2.rs2
-rw-r--r--src/test/run-make/weird-output-filenames/Makefile15
2 files changed, 10 insertions, 7 deletions
diff --git a/src/test/compile-fail/bad-crate-id2.rs b/src/test/compile-fail/bad-crate-id2.rs
index fcbdc6d1f24..22e98b61c61 100644
--- a/src/test/compile-fail/bad-crate-id2.rs
+++ b/src/test/compile-fail/bad-crate-id2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate bar = "#a"; //~ ERROR: invalid character in crate name: `#`
+extern crate bar = "#a"; //~ ERROR: invalid character `#` in crate name: `#a`
 
 fn main() {}
 
diff --git a/src/test/run-make/weird-output-filenames/Makefile b/src/test/run-make/weird-output-filenames/Makefile
index 37dcf9a6c4a..5d6e629ffc1 100644
--- a/src/test/run-make/weird-output-filenames/Makefile
+++ b/src/test/run-make/weird-output-filenames/Makefile
@@ -1,9 +1,12 @@
 -include ../tools.mk
 
 all:
-	$(RUSTC) foo.rs -o $(TMPDIR)/.foo 2>&1 \
-		| grep "invalid character in crate name:"
-	$(RUSTC) foo.rs -o $(TMPDIR)/.foo.bar 2>&1 \
-		| grep "invalid character in crate name:"
-	$(RUSTC) foo.rs -o $(TMPDIR)/+foo+bar 2>&1 \
-		| grep "invalid character in crate name:"
+	cp foo.rs $(TMPDIR)/.foo.rs
+	$(RUSTC) $(TMPDIR)/.foo.rs 2>&1 \
+		| grep "invalid character.*in crate name:"
+	cp foo.rs $(TMPDIR)/.foo.bar
+	$(RUSTC) $(TMPDIR)/.foo.bar 2>&1 \
+		| grep "invalid character.*in crate name:"
+	cp foo.rs $(TMPDIR)/+foo+bar
+	$(RUSTC) $(TMPDIR)/+foo+bar 2>&1 \
+		| grep "invalid character.*in crate name:"