From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 15 Oct 2017 20:37:10 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.44.0-rc1~44
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=21f685b6c1914bef2cf1e54ec5f73c7dce10a9f1;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

21f685b6c1914bef2cf1e54ec5f73c7dce10a9f1
diff --cc tests/test_one.in
index b20e207,c06211d..6ec56f5
--- a/tests/test_one.in
+++ b/tests/test_one.in
@@@ -63,7 -51,9 +60,10 @@@ f
  rm -f $test_name.ok $test_name.failed
  #echo -e -n "$test_name: $test_description:\r"
  
+ TMPFILE=$(mktemp ${TMPDIR:-/tmp}/e2fsprogs-tmp-$test_name.XXXXXX)
+ trap 'rm -f $TMPFILE ; exit' 1 2 15
+ 
 +start=$SECONDS
  if [ -f $test_dir/script ]; then
  	. $test_dir/script
  else