projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.101' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
tools
/
testing
/
selftests
/
efivarfs
/
efivarfs.sh
diff --git
a/tools/testing/selftests/efivarfs/efivarfs.sh
b/tools/testing/selftests/efivarfs/efivarfs.sh
index 77edcdcc016bbe9e891dbee8ce27c5824caaae63..057278448515a455a17ff2b48af2bf0902c2e7fb 100755
(executable)
--- a/
tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/
tools/testing/selftests/efivarfs/efivarfs.sh
@@
-88,7
+88,11
@@
test_delete()
exit 1
fi
exit 1
fi
- rm $file
+ rm $file 2>/dev/null
+ if [ $? -ne 0 ]; then
+ chattr -i $file
+ rm $file
+ fi
if [ -e $file ]; then
echo "$file couldn't be deleted" >&2
if [ -e $file ]; then
echo "$file couldn't be deleted" >&2
@@
-111,6
+115,7
@@
test_zero_size_delete()
exit 1
fi
exit 1
fi
+ chattr -i $file
printf "$attrs" > $file
if [ -e $file ]; then
printf "$attrs" > $file
if [ -e $file ]; then
@@
-141,7
+146,11
@@
test_valid_filenames()
echo "$file could not be created" >&2
ret=1
else
echo "$file could not be created" >&2
ret=1
else
- rm $file
+ rm $file 2>/dev/null
+ if [ $? -ne 0 ]; then
+ chattr -i $file
+ rm $file
+ fi
fi
done
fi
done
@@
-174,7
+183,11
@@
test_invalid_filenames()
if [ -e $file ]; then
echo "Creating $file should have failed" >&2
if [ -e $file ]; then
echo "Creating $file should have failed" >&2
- rm $file
+ rm $file 2>/dev/null
+ if [ $? -ne 0 ]; then
+ chattr -i $file
+ rm $file
+ fi
ret=1
fi
done
ret=1
fi
done