ltp-aiodio: remove -r readsize parameter
remove -r from both aio_sparse, aiodio_sparse
the parameter was ignored since the testcases creation
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/runtest/ltp-aiodio.part2 b/runtest/ltp-aiodio.part2
index b939764..6ee9894 100644
--- a/runtest/ltp-aiodio.part2
+++ b/runtest/ltp-aiodio.part2
@@ -1,81 +1,80 @@
ADSP000 aiodio_sparse
ADSP001 aiodio_sparse -s 180k
-ADSP002 aiodio_sparse -dd -s 1751k -r 18k -w 11k
-ADSP003 aiodio_sparse -i 9 -d -s 180k -r 18k -w 18k
-ADSP004 aiodio_sparse -i 2 -a 2k -r 2k -w 2k -s 4k -n 2
-ADSP005 aiodio_sparse -i 2 -a 4k -r 4k -w 4k -s 8k -n 2
-ADSP006 aiodio_sparse -i 2 -a 4k -r 4k -w 4k -s 8k -n 2
-ADSP007 aiodio_sparse -i 4 -a 8k -r 8k -w 8k -s 32k -n 2
-ADSP008 aiodio_sparse -i 4 -a 8k -r 8k -w 16k -s 64k -n 2
-ADSP009 aiodio_sparse -i 4 -a 8k -r 8k -w 32k -s 128k -n 2
-ADSP010 aiodio_sparse -i 4 -a 8k -r 8k -w 64k -s 256k -n 2
-ADSP011 aiodio_sparse -i 4 -a 8k -r 8k -w 128k -s 512k -n 2
-ADSP012 aiodio_sparse -i 4 -a 8k -r 8k -w 256k -s 1024k -n 2
-ADSP013 aiodio_sparse -i 4 -a 8k -r 8k -w 512k -s 2048k -n 2
-ADSP014 aiodio_sparse -i 4 -a 8k -r 8k -w 1024k -s 4096k -n 2
-ADSP015 aiodio_sparse -i 4 -a 8k -r 8k -w 2048k -s 8192k -n 2
-ADSP016 aiodio_sparse -i 4 -a 8k -r 8k -w 4096k -s 16384k -n 2
-ADSP017 aiodio_sparse -i 4 -a 8k -r 8k -w 8192k -s 32768k -n 2
-ADSP018 aiodio_sparse -i 4 -a 8k -r 8k -w 16384k -s 65536k -n 2
-ADSP019 aiodio_sparse -i 4 -a 8k -r 8k -w 16384k -s 65536k -n 4
-ADSP020 aiodio_sparse -i 4 -a 8k -r 8k -w 16384k -s 65536k -n 6
-ADSP021 aiodio_sparse -i 4 -a 8k -r 16k -w 128k -s 512k -n 6
-ADSP022 aiodio_sparse -i 4 -a 8k -r 16k -w 256k -s 1024k -n 6
-ADSP023 aiodio_sparse -i 4 -a 8k -r 8k -w 512k -s 2048k -n 6
-ADSP024 aiodio_sparse -i 4 -a 8k -r 8k -w 1024k -s 4096k -n 6
-ADSP025 aiodio_sparse -i 4 -a 8k -r 32k -w 2048k -s 8192k -n 6
-ADSP026 aiodio_sparse -i 4 -a 8k -r 32k -w 4096k -s 16384k -n 6
-ADSP027 aiodio_sparse -i 4 -a 8k -r 8k -w 18192k -s 72768k -n 6
-ADSP028 aiodio_sparse -i 4 -a 8k -r 8k -w 18192k -s 518192k -n 6
-ADSP029 aiodio_sparse -i 4 -a 8k -r 64k -w 65536k -s 262144k -n 6
-ADSP030 aiodio_sparse -i 6 -a 8k -r 8k -w 65536k -n 6
-ADSP031 aiodio_sparse -i 8 -a 8k -r 16k -w 128k -s 1024k -n 6
-ADSP032 aiodio_sparse -i 16 -a 8k -r 16k -w 256k -s 4096k -n 6
-ADSP033 aiodio_sparse -i 32 -a 8k -r 8k -w 512k -s 16384k -n 6
-ADSP034 aiodio_sparse -i 64 -a 8k -r 8k -w 1024k -s 65536k -n 6
-ADSP035 aiodio_sparse -i 4 -a 8k -r 32k -w 4096k -s 16384k -n 32
-ADSP036 aiodio_sparse -i 4 -a 8k -r 32k -w 4096k -s 16384k -n 64
-ADSP037 aiodio_sparse -i 4 -a 8k -r 8k -w 18192k -s 72768k -n 128
-ADSP038 aiodio_sparse -i 4 -a 8k -r 8k -w 18192k -n 512
-ADSP039 aiodio_sparse -i 4 -a 8k -r 64k -w 18192k -n 1000
+ADSP002 aiodio_sparse -dd -s 1751k -w 11k
+ADSP003 aiodio_sparse -i 9 -d -s 180k -w 18k
+ADSP004 aiodio_sparse -i 2 -a 2k -w 2k -s 4k -n 2
+ADSP005 aiodio_sparse -i 2 -a 4k -w 4k -s 8k -n 2
+ADSP006 aiodio_sparse -i 2 -a 4k -w 4k -s 8k -n 2
+ADSP007 aiodio_sparse -i 4 -a 8k -w 8k -s 32k -n 2
+ADSP008 aiodio_sparse -i 4 -a 8k -w 16k -s 64k -n 2
+ADSP009 aiodio_sparse -i 4 -a 8k -w 32k -s 128k -n 2
+ADSP010 aiodio_sparse -i 4 -a 8k -w 64k -s 256k -n 2
+ADSP011 aiodio_sparse -i 4 -a 8k -w 128k -s 512k -n 2
+ADSP012 aiodio_sparse -i 4 -a 8k -w 256k -s 1024k -n 2
+ADSP013 aiodio_sparse -i 4 -a 8k -w 512k -s 2048k -n 2
+ADSP014 aiodio_sparse -i 4 -a 8k -w 1024k -s 4096k -n 2
+ADSP015 aiodio_sparse -i 4 -a 8k -w 2048k -s 8192k -n 2
+ADSP016 aiodio_sparse -i 4 -a 8k -w 4096k -s 16384k -n 2
+ADSP017 aiodio_sparse -i 4 -a 8k -w 8192k -s 32768k -n 2
+ADSP018 aiodio_sparse -i 4 -a 8k -w 16384k -s 65536k -n 2
+ADSP019 aiodio_sparse -i 4 -a 8k -w 16384k -s 65536k -n 4
+ADSP020 aiodio_sparse -i 4 -a 8k -w 16384k -s 65536k -n 6
+ADSP021 aiodio_sparse -i 4 -a 8k -w 128k -s 512k -n 6
+ADSP022 aiodio_sparse -i 4 -a 8k -w 256k -s 1024k -n 6
+ADSP023 aiodio_sparse -i 4 -a 8k -w 512k -s 2048k -n 6
+ADSP024 aiodio_sparse -i 4 -a 8k -w 1024k -s 4096k -n 6
+ADSP025 aiodio_sparse -i 4 -a 8k -w 2048k -s 8192k -n 6
+ADSP026 aiodio_sparse -i 4 -a 8k -w 4096k -s 16384k -n 6
+ADSP027 aiodio_sparse -i 4 -a 8k -w 18192k -s 72768k -n 6
+ADSP028 aiodio_sparse -i 4 -a 8k -w 18192k -s 518192k -n 6
+ADSP029 aiodio_sparse -i 4 -a 8k -w 65536k -s 262144k -n 6
+ADSP030 aiodio_sparse -i 6 -a 8k -w 65536k -n 6
+ADSP031 aiodio_sparse -i 8 -a 8k -w 128k -s 1024k -n 6
+ADSP032 aiodio_sparse -i 16 -a 8k -w 256k -s 4096k -n 6
+ADSP033 aiodio_sparse -i 32 -a 8k -w 512k -s 16384k -n 6
+ADSP034 aiodio_sparse -i 64 -a 8k -w 1024k -s 65536k -n 6
+ADSP035 aiodio_sparse -i 4 -a 8k -w 4096k -s 16384k -n 32
+ADSP036 aiodio_sparse -i 4 -a 8k -w 4096k -s 16384k -n 64
+ADSP037 aiodio_sparse -i 4 -a 8k -w 18192k -s 72768k -n 128
+ADSP038 aiodio_sparse -i 4 -a 8k -w 18192k -n 512
+ADSP039 aiodio_sparse -i 4 -a 8k -w 18192k -n 1000
ADSP040 dio_sparse
ADSP041 dio_sparse -s 180k
-ADSP042 dio_sparse -dd -s 1751k -r 18k -w 11k
-ADSP043 dio_sparse -d -s 180k -r 18k -w 18k
-ADSP044 dio_sparse -a 2k -r 2k -w 2k -s 2k -n 2
-ADSP045 dio_sparse -a 4k -r 4k -w 4k -s 2k -n 2
-ADSP046 dio_sparse -a 4k -r 4k -w 4k -s 4k -n 2
-ADSP047 dio_sparse -a 8k -r 8k -w 16k -s 16k -n 2
-ADSP048 dio_sparse -a 8k -r 8k -w 32k -s 32k -n 2
-ADSP049 dio_sparse -a 8k -r 8k -w 64k -s 64k -n 2
-ADSP050 dio_sparse -a 8k -r 8k -w 128k -s 128k -n 2
-ADSP051 dio_sparse -a 8k -r 8k -w 256k -s 256k -n 2
-ADSP052 dio_sparse -a 8k -r 8k -w 512k -s 512k -n 2
-ADSP053 dio_sparse -a 8k -r 8k -w 1024k -s 1024k -n 2
-ADSP054 dio_sparse -a 8k -r 8k -w 2048k -s 2048k -n 2
-ADSP055 dio_sparse -a 8k -r 8k -w 4096k -s 4096k -n 2
-ADSP056 dio_sparse -a 8k -r 8k -w 8192k -s 8192k -n 2
-ADSP057 dio_sparse -a 8k -r 8k -w 18192k -s 18192k -n 2
-ADSP058 dio_sparse -a 8k -r 8k -w 518192k -s 518192k -n 2
-ADSP059 dio_sparse -a 8k -r 8k -w 58192k -s 58192k -n 4
-ADSP060 dio_sparse -a 8k -r 8k -w 58192k -s 58192k -n 6
-ADSP061 dio_sparse -a 8k -r 16k -w 256k -s 256k -n 6
-ADSP062 dio_sparse -a 8k -r 16k -w 512k -s 512k -n 6
-ADSP063 dio_sparse -a 8k -r 8k -w 1024k -s 1024k -n 6
-ADSP064 dio_sparse -a 8k -r 8k -w 2048k -s 2048k -n 6
-ADSP065 dio_sparse -a 8k -r 32k -w 2048k -s 4096k -n 6
-ADSP066 dio_sparse -a 8k -r 32k -w 8192k -s 8192k -n 6
-ADSP067 dio_sparse -a 8k -r 8k -w 18192k -s 18192k -n 6
-ADSP068 dio_sparse -a 8k -r 8k -w 58192k -s 518192k -n 6
-ADSP069 dio_sparse -a 8k -r 64k -w 58192k -s 58192k -n 6
-ADSP070 dio_sparse -a 8k -r 8k -w 518192k -s 518192k -n 6
-ADSP071 dio_sparse -a 8k -r 16k -w 256k -s 256k -n 6
-ADSP072 dio_sparse -a 8k -r 16k -w 512k -s 512k -n 6
-ADSP073 dio_sparse -a 8k -r 8k -w 1024k -s 1024k -n 6
-ADSP074 dio_sparse -a 8k -r 8k -w 1024k -s 2048k -n 6
-ADSP075 dio_sparse -a 8k -r 32k -w 4096k -s 4096k -n 32
-ADSP076 dio_sparse -a 8k -r 32k -w 8192k -s 8192k -n 64
-ADSP077 dio_sparse -a 8k -r 8k -w 518192k -s 18192k -n 128
-ADSP078 dio_sparse -a 8k -r 8k -w 518192k -s 518192k -n 512
-ADSP079 dio_sparse -a 8k -r 64k -w 518192k -s 518192k -n 1000
-
+ADSP042 dio_sparse -dd -s 1751k -w 11k
+ADSP043 dio_sparse -d -s 180k -w 18k
+ADSP044 dio_sparse -a 2k -w 2k -s 2k -n 2
+ADSP045 dio_sparse -a 4k -w 4k -s 2k -n 2
+ADSP046 dio_sparse -a 4k -w 4k -s 4k -n 2
+ADSP047 dio_sparse -a 8k -w 16k -s 16k -n 2
+ADSP048 dio_sparse -a 8k -w 32k -s 32k -n 2
+ADSP049 dio_sparse -a 8k -w 64k -s 64k -n 2
+ADSP050 dio_sparse -a 8k -w 128k -s 128k -n 2
+ADSP051 dio_sparse -a 8k -w 256k -s 256k -n 2
+ADSP052 dio_sparse -a 8k -w 512k -s 512k -n 2
+ADSP053 dio_sparse -a 8k -w 1024k -s 1024k -n 2
+ADSP054 dio_sparse -a 8k -w 2048k -s 2048k -n 2
+ADSP055 dio_sparse -a 8k -w 4096k -s 4096k -n 2
+ADSP056 dio_sparse -a 8k -w 8192k -s 8192k -n 2
+ADSP057 dio_sparse -a 8k -w 18192k -s 18192k -n 2
+ADSP058 dio_sparse -a 8k -w 518192k -s 518192k -n 2
+ADSP059 dio_sparse -a 8k -w 58192k -s 58192k -n 4
+ADSP060 dio_sparse -a 8k -w 58192k -s 58192k -n 6
+ADSP061 dio_sparse -a 8k -w 256k -s 256k -n 6
+ADSP062 dio_sparse -a 8k -w 512k -s 512k -n 6
+ADSP063 dio_sparse -a 8k -w 1024k -s 1024k -n 6
+ADSP064 dio_sparse -a 8k -w 2048k -s 2048k -n 6
+ADSP065 dio_sparse -a 8k -w 2048k -s 4096k -n 6
+ADSP066 dio_sparse -a 8k -w 8192k -s 8192k -n 6
+ADSP067 dio_sparse -a 8k -w 18192k -s 18192k -n 6
+ADSP068 dio_sparse -a 8k -w 58192k -s 518192k -n 6
+ADSP069 dio_sparse -a 8k -w 58192k -s 58192k -n 6
+ADSP070 dio_sparse -a 8k -w 518192k -s 518192k -n 6
+ADSP071 dio_sparse -a 8k -w 256k -s 256k -n 6
+ADSP072 dio_sparse -a 8k -w 512k -s 512k -n 6
+ADSP073 dio_sparse -a 8k -w 1024k -s 1024k -n 6
+ADSP074 dio_sparse -a 8k -w 1024k -s 2048k -n 6
+ADSP075 dio_sparse -a 8k -w 4096k -s 4096k -n 32
+ADSP076 dio_sparse -a 8k -w 8192k -s 8192k -n 64
+ADSP077 dio_sparse -a 8k -w 518192k -s 18192k -n 128
+ADSP078 dio_sparse -a 8k -w 518192k -s 518192k -n 512
+ADSP079 dio_sparse -a 8k -w 518192k -s 518192k -n 1000
diff --git a/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c b/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
index bb9d31d..81d8c4e 100644
--- a/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
+++ b/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
@@ -277,14 +277,10 @@
static void usage(void)
{
fprintf(stderr, "usage: dio_sparse [-n children] [-s filesize]"
- " [-w writesize] [-r readsize] \n");
+ " [-w writesize]\n");
exit(1);
}
-/*
- * usage:
- * aiodio_sparse [-r readsize] [-w writesize] [-n chilren] [-a align] [-i num_aio]
- */
int main(int argc, char **argv)
{
char *filename = "aiodio_sparse";
@@ -292,14 +288,13 @@
int num_children = 1;
int i;
long alignment = 512;
- int readsize = 65536;
int writesize = 65536;
int filesize = 100*1024*1024;
int num_aio = 16;
int children_errors = 0;
int c;
- while ((c = getopt(argc, argv, "dr:w:n:a:s:i:")) != -1) {
+ while ((c = getopt(argc, argv, "dw:n:a:s:i:")) != -1) {
char *endp;
switch (c) {
case 'd':
@@ -313,10 +308,6 @@
alignment = (int)scale_by_kmg((long long)alignment,
*endp);
break;
- case 'r':
- readsize = strtol(optarg, &endp, 0);
- readsize = (int)scale_by_kmg((long long)readsize, *endp);
- break;
case 'w':
writesize = strtol(optarg, &endp, 0);
writesize = (int)scale_by_kmg((long long)writesize, *endp);
diff --git a/testcases/kernel/io/ltp-aiodio/dio_sparse.c b/testcases/kernel/io/ltp-aiodio/dio_sparse.c
index 7ebfbeb..dfdcf24 100644
--- a/testcases/kernel/io/ltp-aiodio/dio_sparse.c
+++ b/testcases/kernel/io/ltp-aiodio/dio_sparse.c
@@ -156,7 +156,7 @@
void usage(void)
{
fprintf(stderr, "usage: dio_sparse [-d] [-n children] [-s filesize]"
- " [-w writesize] [-r readsize] \n");
+ " [-w writesize]\n");
exit(1);
}
@@ -167,35 +167,30 @@
int num_children = 1;
int i;
long alignment = 512;
- int readsize = 65536;
int writesize = 65536;
int filesize = 100*1024*1024;
int c;
int children_errors = 0;
int ret;
- while ((c = getopt(argc, argv, "dr:w:n:a:s:")) != -1) {
+ while ((c = getopt(argc, argv, "dw:n:a:s:")) != -1) {
char *endp;
switch (c) {
case 'd':
debug++;
- break;
+ break;
case 'a':
alignment = strtol(optarg, &endp, 0);
alignment = scale_by_kmg(alignment, *endp);
- break;
- case 'r':
- readsize = strtol(optarg, &endp, 0);
- readsize = scale_by_kmg(readsize, *endp);
- break;
+ break;
case 'w':
writesize = strtol(optarg, &endp, 0);
writesize = scale_by_kmg(writesize, *endp);
- break;
+ break;
case 's':
filesize = strtol(optarg, &endp, 0);
filesize = scale_by_kmg(filesize, *endp);
- break;
+ break;
case 'n':
num_children = atoi(optarg);
if (num_children > NUM_CHILDREN) {
@@ -204,10 +199,10 @@
NUM_CHILDREN);
num_children = NUM_CHILDREN;
}
- break;
+ break;
case '?':
usage();
- break;
+ break;
}
}