fio-test: fix output file path

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

1 files changed, 13 insertions, 13 deletions

diff --git a/automated/linux/fio-test/fio-test.sh b/automated/linux/fio-test/fio-test.sh
index 3440d27..ff49d1b 100755
--- a/automated/linux/fio-test/fio-test.sh
+++ b/automated/linux/fio-test/fio-test.sh
@@ -65,7 +65,7 @@ install() {
 parse_output() {
     test="$1"
     file="$2"
-    IOPS=$(grep "iops=" "${file}" | awk '{print $5}' | cut -d, -f1 | cut -d= -f2)
+    IOPS=$(grep "iops=" "${file}" | cut -d= -f4 | cut -d, -f1)
     add_metric "${test}" "pass" "${IOPS}" "iops"
 }
 
@@ -81,51 +81,51 @@ fio_existence() {
 }
 
 fio_read() {
-    file="fio_read.txt"
+    file="${OUTPUT}/fio_read.txt"
     fio -filename="${PARTITION}" -rw=read -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=4k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_read 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_read 2>&1 | tee -a "${file}"
     parse_output "fio_read" "${file}"
 
 }
 
 fio_randread() {
-    file="fio_randread.txt"
+    file="${OUTPUT}/fio_randread.txt"
     fio -filename="${PARTITION}" -rw=randread -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=4k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_randread 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_randread 2>&1 | tee -a "${file}"
     parse_output "fio_randread" "${file}"
 }
 
 fio_write() {
-    file="fio_write.txt"
+    file="${OUTPUT}/fio_write.txt"
     fio -filename="${PARTITION}" -rw=write -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=4k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_write 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_write 2>&1 | tee -a "${file}"
     parse_output "fio_write" "${file}"
 }
 
 fio_randwrite() {
-    file="fio_randwrite.txt"
+    file="${OUTPUT}/fio_randwrite.txt"
     fio -filename="${PARTITION}" -rw=randwrite -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=4k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_randwrite 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_randwrite 2>&1 | tee -a "${file}"
     parse_output "fio_randwrite" "${file}"
 }
 
 fio_512k_write() {
-    file="fio_512k_write.txt"
+    file="${OUTPUT}/fio_512k_write.txt"
     fio -filename="${PARTITION}" -rw=write -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=512k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_512k_write 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_512k_write 2>&1 | tee -a "${file}"
     parse_output "fio_512k_write" "${file}"
 }
 
 fio_512k_read() {
-    file="fio_512k_read.txt"
+    file="${OUTPUT}/fio_512k_read.txt"
     fio -filename="${PARTITION}" -rw=read -direct=1 -iodepth 1 -thread \
         -ioengine=psync -bs=512k -numjobs=1 -runtime=10 -group_reporting \
-        -name=fio_512k_read 2>&1 | tee -a "${OUTPUT}"/"${file}"
+        -name=fio_512k_read 2>&1 | tee -a "${file}"
     parse_output "fio_512k_read" "${file}"
 }