diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2018-06-19 10:52:13 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2018-07-07 10:52:18 +0200 |
| commit | e65db8161d39e1f27a1c525027c92f8f0aa7f97c (patch) | |
| tree | 2dd41894f273759e39f9a18bf74d9c995de9222c /src | |
| parent | 097de536e43e0040e5966ee8e4c75e84c973b2e0 (diff) | |
| download | rust-e65db8161d39e1f27a1c525027c92f8f0aa7f97c.tar.gz rust-e65db8161d39e1f27a1c525027c92f8f0aa7f97c.zip | |
Fix test
Diffstat (limited to 'src')
3 files changed, 4 insertions, 5 deletions
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile b/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile index 2ddf3aa5439..e203ec2737f 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile @@ -4,6 +4,6 @@ all: /bin/echo || exit 0 # This test requires /bin/echo to exist $(RUSTC) the_backend.rs --crate-name the_backend --crate-type dylib \ -o $(TMPDIR)/the_backend.dylib - $(RUSTC) some_crate.rs --crate-name some_crate --crate-type bin -o $(TMPDIR)/some_crate \ + $(RUSTC) some_crate.rs --crate-name some_crate --crate-type lib -o $(TMPDIR)/some_crate \ -Z codegen-backend=$(TMPDIR)/the_backend.dylib -Z unstable-options grep -x "This has been \"compiled\" successfully." $(TMPDIR)/some_crate diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs index 26ffce01b2e..bfa8b6b3ef6 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs @@ -8,6 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn main() { - ::std::process::exit(1); -} +#![feature(no_core)] +#![no_core] diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs index 439bc017fee..a3cd033f863 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs @@ -63,7 +63,7 @@ impl CodegenBackend for TheBackend { let crate_name = ongoing_codegen.downcast::<Symbol>() .expect("in join_codegen_and_link: ongoing_codegen is not a Symbol"); for &crate_type in sess.opts.crate_types.iter() { - if crate_type != CrateType::CrateTypeExecutable { + if crate_type != CrateType::CrateTypeRlib { sess.fatal(&format!("Crate type is {:?}", crate_type)); } let output_name = |