From: Julian Andres Klode <jak@debian.org>
Date: Fri, 5 Aug 2016 12:32:56 +0000 (+0200)
Subject: test: Pass -maxdepth 1 when running find in methods dir
X-Git-Tag: 1.3_pre3+cmake1~12
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/782c60a6bf7dddcc71dbdbc4a0eea85824076fa9?ds=inline;hp=--cc

test: Pass -maxdepth 1 when running find in methods dir

This fixes a test failures in the cmake branch which contains
sub directories in the methods output dir.
---

782c60a6bf7dddcc71dbdbc4a0eea85824076fa9
diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation
index 18f5efa11..ec6bf4a48 100755
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -16,7 +16,7 @@ rm "$NEWMETHODS"
 mkdir "$NEWMETHODS"
 backupIFS="$IFS"
 IFS="$(printf "\n\b")"
-for METH in $(find "$OLDMETHODS" ! -type d); do
+for METH in $(find "$OLDMETHODS" -maxdepth 1 ! -type d); do
 	ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
 done
 IFS="$backupIFS"
diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index e7d4a6744..8f8216d04 100755
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -45,7 +45,7 @@ rm "$NEWMETHODS"
 mkdir "$NEWMETHODS"
 backupIFS="$IFS"
 IFS="$(printf "\n\b")"
-for METH in $(find "$OLDMETHODS" ! -type d); do
+for METH in $(find "$OLDMETHODS" -maxdepth 1 ! -type d); do
 	ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
 done
 IFS="$backupIFS"
diff --git a/test/integration/test-different-methods-for-same-source b/test/integration/test-different-methods-for-same-source
index 7b78841c6..6b3f796b1 100755
--- a/test/integration/test-different-methods-for-same-source
+++ b/test/integration/test-different-methods-for-same-source
@@ -17,7 +17,7 @@ rm "$NEWMETHODS"
 mkdir "$NEWMETHODS"
 backupIFS="$IFS"
 IFS="$(printf "\n\b")"
-for METH in $(find "$OLDMETHODS" ! -type d); do
+for METH in $(find "$OLDMETHODS" -maxdepth 1 ! -type d); do
 	ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
 done
 IFS="$backupIFS"