From 2f6c9e87b1c4cdba68ff2de6159ddfd4d05f1d8d Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 3 Apr 2017 08:33:23 -0700
Subject: Remove mount.test awk dependency.

Parsing file(1) output isn't a good way to determine file system type anyway.
---
 tests/mount.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/mount.test b/tests/mount.test
index 6590b946..19ba5654 100755
--- a/tests/mount.test
+++ b/tests/mount.test
@@ -7,8 +7,8 @@
 
 #testing "name" "command" "result" "infile" "stdin"
 
-root_fs=`df | grep "\/$" | awk '{print $1}'`
-root_fs_type=`file -sL $root_fs | awk '{print $5}'`
+root_fs=`df | grep "\/$" | cut -d' ' -f1`
+root_fs_type=`blkid -o value $root_fs | tail -1`
 
 tmp_b_fs="tmp_b_fs"
 tmp_b_fs_type="ext3"
@@ -20,6 +20,8 @@ reCreateTmpFs() {
 }
 reCreateTmpFs
 
+# TODO: replace /mnt with a directory we know exists. (Android has no /mnt.)
+
 testing "$root_fs /mnt" \
   "mount $root_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && test -e /testDir && rmdir /testDir" "" "" ""
-- 
cgit v1.2.3