1 files changed, 13 insertions, 19 deletions

diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh
index d3866100e884..a90f394f9aa9 100755
--- a/tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -7,6 +7,12 @@ test_guid=210be57c-9849-4fc7-a635-e6382d1aec27
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
+file_cleanup()
+{
+        chattr -i $1
+        rm -f $1
+}
+
 check_prereqs()
 {
         local msg="skip all tests:"
@@ -58,8 +64,10 @@ test_create()
 
         if [ $(stat -c %s $file) -ne 5 ]; then
                 echo "$file has invalid size" >&2
+                file_cleanup $file
                 exit 1
         fi
+        file_cleanup $file
 }
 
 test_create_empty()
@@ -72,16 +80,14 @@ test_create_empty()
                 echo "$file can not be created without writing" >&2
                 exit 1
         fi
+        file_cleanup $file
 }
 
 test_create_read()
 {
         local file=$efivarfs_mount/$FUNCNAME-$test_guid
-        if [ -f $file]; then
-                chattr -i $file
-                rm -rf $file
-        fi
         ./create-read $file
+        file_cleanup $file
 }
 
 test_delete()
@@ -96,11 +102,7 @@ test_delete()
                 exit 1
         fi
 
-        rm $file 2>/dev/null
-        if [ $? -ne 0 ]; then
-                chattr -i $file
-                rm $file
-        fi
+        file_cleanup $file
 
         if [ -e $file ]; then
                 echo "$file couldn't be deleted" >&2
@@ -154,11 +156,7 @@ test_valid_filenames()
                         echo "$file could not be created" >&2
                         ret=1
                 else
-                        rm $file 2>/dev/null
-                        if [ $? -ne 0 ]; then
-                                chattr -i $file
-                                rm $file
-                        fi
+                        file_cleanup $file
                 fi
         done
 
@@ -191,11 +189,7 @@ test_invalid_filenames()
 
                 if [ -e $file ]; then
                         echo "Creating $file should have failed" >&2
-                        rm $file 2>/dev/null
-                        if [ $? -ne 0 ]; then
-                                chattr -i $file
-                                rm $file
-                        fi
+                        file_cleanup $file
                         ret=1
                 fi
         done