Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sun, 15 Oct 2017 20:37:10 +0000 (16:37 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 15 Oct 2017 20:37:10 +0000 (16:37 -0400)
1  2 
misc/fuse2fs.c
misc/mke2fs.c
misc/tune2fs.c
tests/test_one.in

diff --cc misc/fuse2fs.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
@@@ -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