Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 0 insertions, 41 deletions

diff --git a/tests/run-make-fulldeps/dep-info/Makefile b/tests/run-make-fulldeps/dep-info/Makefile
deleted file mode 100644
index c76f43a8e..000000000
--- a/tests/run-make-fulldeps/dep-info/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../tools.mk
-
-# ignore-windows
-# ignore-freebsd
-# FIXME: on windows `rustc --dep-info` produces Makefile dependency with
-# windows native paths (e.g. `c:\path\to\libfoo.a`)
-# but msys make seems to fail to recognize such paths, so test fails.
-
-all:
-	cp *.rs $(TMPDIR)
-	$(RUSTC) --emit dep-info,link --crate-type=lib $(TMPDIR)/lib.rs
-	sleep 2
-	touch $(TMPDIR)/foo.rs
-	-rm -f $(TMPDIR)/done
-	$(MAKE) -drf Makefile.foo
-	sleep 2
-	rm $(TMPDIR)/done
-	pwd
-	$(MAKE) -drf Makefile.foo
-	rm $(TMPDIR)/done && exit 1 || exit 0
-
-	# When a source file is deleted `make` should still work
-	rm $(TMPDIR)/bar.rs
-	cp $(TMPDIR)/lib2.rs $(TMPDIR)/lib.rs
-	$(MAKE) -drf Makefile.foo
diff --git a/tests/run-make-fulldeps/dep-info/Makefile.foo b/tests/run-make-fulldeps/dep-info/Makefile.foo
deleted file mode 100644
index e5df31f88..000000000
--- a/tests/run-make-fulldeps/dep-info/Makefile.foo
+++ /dev/null
@@ -1,7 +0,0 @@
-LIB := $(shell $(RUSTC) --print file-names --crate-type=lib lib.rs)
-
-$(TMPDIR)/$(LIB):
-	$(RUSTC) --emit dep-info,link --crate-type=lib lib.rs
-	touch $(TMPDIR)/done
-
--include $(TMPDIR)/foo.d
diff --git a/tests/run-make-fulldeps/dep-info/bar.rs b/tests/run-make-fulldeps/dep-info/bar.rs
deleted file mode 100644
index c5c0bc606..000000000
--- a/tests/run-make-fulldeps/dep-info/bar.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub fn bar() {}
diff --git a/tests/run-make-fulldeps/dep-info/foo.rs b/tests/run-make-fulldeps/dep-info/foo.rs
deleted file mode 100644
index b76b4321d..000000000
--- a/tests/run-make-fulldeps/dep-info/foo.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub fn foo() {}
diff --git a/tests/run-make-fulldeps/dep-info/lib.rs b/tests/run-make-fulldeps/dep-info/lib.rs
deleted file mode 100644
index eb8631259..000000000
--- a/tests/run-make-fulldeps/dep-info/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_name = "foo"]
-
-pub mod foo;
-pub mod bar;
diff --git a/tests/run-make-fulldeps/dep-info/lib2.rs b/tests/run-make-fulldeps/dep-info/lib2.rs
deleted file mode 100644
index f4fda9c93..000000000
--- a/tests/run-make-fulldeps/dep-info/lib2.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![crate_name = "foo"]
-
-pub mod foo;