From 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:20:39 +0200
Subject: Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../many-crates-but-no-match/Makefile              | 35 ----------------------
 .../many-crates-but-no-match/crateA1.rs            |  4 ---
 .../many-crates-but-no-match/crateA2.rs            |  4 ---
 .../many-crates-but-no-match/crateA3.rs            |  4 ---
 .../many-crates-but-no-match/crateB.rs             |  1 -
 .../many-crates-but-no-match/crateC.rs             |  3 --
 6 files changed, 51 deletions(-)
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/Makefile
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
 delete mode 100644 tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs

(limited to 'tests/run-make-fulldeps/many-crates-but-no-match')

diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/Makefile b/tests/run-make-fulldeps/many-crates-but-no-match/Makefile
deleted file mode 100644
index ca0ab8e9e..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-include ../tools.mk
-
-# Modelled after ui/changing-crates.rs test, but this one puts
-# more than one (mismatching) candidate crate into the search path,
-# which did not appear directly expressible in UI testing infrastructure.
-#
-# Note that we move the built libraries into target direcrtories rather than
-# use the `--out-dir` option because the `../tools.mk` file already bakes a
-# use of `--out-dir` into the definition of $(RUSTC).
-
-A1=$(TMPDIR)/a1
-A2=$(TMPDIR)/a2
-A3=$(TMPDIR)/a3
-
-# A hack to match distinct lines of output from a single run.
-LOG=$(TMPDIR)/log.txt
-
-all:
-	mkdir -p $(A1) $(A2) $(A3)
-	$(RUSTC) --crate-type=rlib crateA1.rs
-	mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A1)
-	$(RUSTC) --crate-type=rlib -L $(A1) crateB.rs
-	$(RUSTC) --crate-type=rlib crateA2.rs
-	mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A2)
-	$(RUSTC) --crate-type=rlib crateA3.rs
-	mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A3)
-	# Ensure crateC fails to compile since A1 is "missing" and A2/A3 hashes do not match
-	$(RUSTC) -L $(A2) -L $(A3) crateC.rs >$(LOG) 2>&1 || true
-	$(CGREP) \
-		'found possibly newer version of crate `crateA` which `crateB` depends on' \
-		'note: perhaps that crate needs to be recompiled?' \
-		'crate `crateA`:' \
-		'crate `crateB`:' \
-		< $(LOG)
-	# the 'crate `crateA`' will match two entries.
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
deleted file mode 100644
index 3fed5a38e..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_name="crateA"]
-
-// Base crate
-pub fn func<T>() {}
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
deleted file mode 100644
index 8db07a015..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_name="crateA"]
-
-// Base crate
-pub fn func<T>() { println!("hello"); }
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
deleted file mode 100644
index a1e8e40a3..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![crate_name="crateA"]
-
-// Base crate
-pub fn foo<T>() { println!("world!"); }
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
deleted file mode 100644
index 4ccd65d65..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
+++ /dev/null
@@ -1 +0,0 @@
-extern crate crateA;
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs b/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs
deleted file mode 100644
index a8b817ec6..000000000
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-extern crate crateB;
-
-fn main() {}
-- 
cgit v1.2.3