From: Volker Lendecke <vl@samba.org>
Date: Mon, 20 Jan 2020 20:19:40 +0000 (+0100)
Subject: testenv: Be more careful deleting environment tmpfiles
X-Git-Tag: samba-4.12.0rc1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f1e4f9ce3ff21ca542b87ab1a99c34729370701;p=thirdparty%2Fsamba.git

testenv: Be more careful deleting environment tmpfiles

If there is more than one server we will have for example nt4_dc.smbd,
nt4_dc.nmbd and nt4_dc.winbind as daemon environments, together with
the commandline environment "nt4_dc" coming last. Before this patch we
would have deleted all previous tmpfiles in the commandline environment.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/selftest/in_screen b/selftest/in_screen
index 5aba08d4750..9a99a3acf7f 100755
--- a/selftest/in_screen
+++ b/selftest/in_screen
@@ -29,7 +29,7 @@ fi
     done
 }
 
-rm -f $basedir/$SERVERNAME.*
+rm -f $basedir/$SERVERNAME.{launch,log,parent.pid,pid,status}
 
 # set most of the environment vars we have in the screen session too
 _ENV=""
@@ -66,7 +66,6 @@ cleanup() {
     exit 1
 }
 
-rm -f $basedir/$SERVERNAME.status $basedir/$SERVERNAME.log
 echo $$ > $basedir/$SERVERNAME.parent.pid
 trap cleanup SIGINT SIGTERM SIGPIPE