about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-make-fulldeps/alloc-extern-crates/Makefile5
-rw-r--r--src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs25
-rw-r--r--src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile4
3 files changed, 4 insertions, 30 deletions
diff --git a/src/test/run-make-fulldeps/alloc-extern-crates/Makefile b/src/test/run-make-fulldeps/alloc-extern-crates/Makefile
deleted file mode 100644
index 63f34594453..00000000000
--- a/src/test/run-make-fulldeps/alloc-extern-crates/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
--include ../tools.mk
-
-all:
-	$(RUSTC) fakealloc.rs
-	$(RUSTC) --edition=2018 --crate-type=rlib ../../../../library/alloc/src/lib.rs --cfg feature=\"external_crate\" --extern external=$(TMPDIR)/$(shell $(RUSTC) --print file-names fakealloc.rs)
diff --git a/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
deleted file mode 100644
index d4612c325d5..00000000000
--- a/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#![crate_type = "rlib"]
-#![no_std]
-
-#[inline]
-pub unsafe fn allocate(_size: usize, _align: usize) -> *mut u8 {
-    core::ptr::null_mut()
-}
-
-#[inline]
-pub unsafe fn deallocate(_ptr: *mut u8, _old_size: usize, _align: usize) { }
-
-#[inline]
-pub unsafe fn reallocate(_ptr: *mut u8, _old_size: usize, _size: usize, _align: usize) -> *mut u8 {
-    core::ptr::null_mut()
-}
-
-#[inline]
-pub unsafe fn reallocate_inplace(_ptr: *mut u8, old_size: usize, _size: usize,
-                                    _align: usize) -> usize { old_size }
-
-#[inline]
-pub fn usable_size(size: usize, _align: usize) -> usize { size }
-
-#[inline]
-pub fn stats_print() { }
diff --git a/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile b/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile
new file mode 100644
index 00000000000..c68ae40eb94
--- /dev/null
+++ b/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile
@@ -0,0 +1,4 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) --edition=2018 --crate-type=rlib ../../../../library/alloc/src/lib.rs --cfg feature=\"external_crate\" --cfg no_global_oom_handling