summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBintian Wang <bintian.wang@linaro.org>2013-06-27 13:50:42 +0800
committerBintian Wang <bintian.wang@linaro.org>2013-06-27 13:50:42 +0800
commit3b7f33f2c89f041be005f024b9818490a2db1297 (patch)
treefa09a4219d2085258420ef6a02e5810fda1bd221
parentb2e92534450a8a9f95d8c3f79dcfac727d940009 (diff)
downloadlinaro-android-kernel-test-3b7f33f2c89f041be005f024b9818490a2db1297.tar.gz
Modify vfat test case based on kernel modification
Remove VFAT_IOCTL_GET_VOLUME_ID_SAFE from kernel so we also need to remove it from here Signed-off-by: Bintian Wang <bintian.wang@linaro.org>
-rw-r--r--vfat-volid/test.sh11
-rw-r--r--vfat-volid/vfat-volid.c21
2 files changed, 6 insertions, 26 deletions
diff --git a/vfat-volid/test.sh b/vfat-volid/test.sh
index 6225d45..c194273 100644
--- a/vfat-volid/test.sh
+++ b/vfat-volid/test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
FAIL_CODE=32767
@@ -58,7 +58,6 @@ function do_test() {
step=6
echo "Getting volume ID" | tee -a $LOG
v1=`/system/bin/vfat-volid --path $MPT -i`
- v2=`/system/bin/vfat-volid --path $MPT -s`
rc=$?
if [ $rc -ne 0 ]; then
echo "Error when getting volume ID" | tee -a $LOG
@@ -66,13 +65,10 @@ function do_test() {
fi
step=7
- echo "Got volume IDs $v1 and $v2, should be identical" | tee -a $LOG
+ echo "Got volume IDs $v1 and $3, should be identical" | tee -a $LOG
if [ x$v1 != x$3 ]; then
rc=$FAIL_CODE # indicate fail
fi
- if [ x$v1 != x$v2 ]; then
- rc=$FAIL_CODE # indicate fail
- fi
break
@@ -88,7 +84,6 @@ function do_test() {
}
echo "Starting"
-insmod /system/modules/loop.ko
mount -o rw,remount /
mkdir /tmp
@@ -110,5 +105,3 @@ for FTYPE in 12 16 32; do
done
done
done
-rmmod loop
-
diff --git a/vfat-volid/vfat-volid.c b/vfat-volid/vfat-volid.c
index 91cb09b..631438f 100644
--- a/vfat-volid/vfat-volid.c
+++ b/vfat-volid/vfat-volid.c
@@ -22,17 +22,11 @@
#define VFAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x12, __u32)
#endif
-#ifndef VFAT_IOCTL_GET_VOLUME_ID_SAFE
-#warning The IOCTL safe code has not been defined in public headers...
-#define VFAT_IOCTL_GET_VOLUME_ID_SAFE _IOR('r', 0x13, __u32)
-#endif
-
int main(int argc, char *argv[])
{
struct option lopt[] = {
{ "path", required_argument, NULL, 'p' },
{ "ignore-error", no_argument, NULL, 'i' },
- { "use-safe-ioctl", no_argument, NULL, 's' },
{ "use-bad-addr", no_argument, NULL, 'e' },
{ NULL, 0, NULL, 0 },
};
@@ -42,8 +36,7 @@ int main(int argc, char *argv[])
int h;
int c, opti,
ignore_ioctl_error = 0,
- use_bad_addr = 0,
- use_safe_ioctl = 0;
+ use_bad_addr = 0;
__u32 id;
while ((c = getopt_long(argc, argv, shopt, lopt, &opti)) != -1 ) {
@@ -54,9 +47,6 @@ int main(int argc, char *argv[])
case 'i':
ignore_ioctl_error = 1;
break;
- case 's':
- use_safe_ioctl = 1;
- break;
case 'e':
use_bad_addr = 1;
break;
@@ -78,12 +68,9 @@ int main(int argc, char *argv[])
return -h;
}
- if (use_safe_ioctl) {
- res = ioctl(h, VFAT_IOCTL_GET_VOLUME_ID_SAFE, use_bad_addr ? 0x1234 : &id);
- } else {
- res = ioctl(h, VFAT_IOCTL_GET_VOLUME_ID);
- id = res;
- }
+ res = ioctl(h, VFAT_IOCTL_GET_VOLUME_ID);
+ id = res;
+
if (res < 0 && !ignore_ioctl_error) {
perror("Error on ioctl");
free(device);