test: Rewrite tests.

test/expect_1

+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij
+09876543210987654321098765432109876543210987654321098765432109876543210987654321

test/expect_2

+abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij

test/expect_3

+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+abcdefghijabcdefghijabcdefghijabcdefghi

test/expect_4

+cdefghijabcdefghijabcdefghijabcdefghij
+09876543210987654321098765432109876543210987654321098765432109876543210987654321

test/mount.sh

-#!/bin/sh
-
-../fjfs testmnt.txt test.txt
-

test/test.sh

 #!/bin/sh
 
-set -e
+mount1_fjfs() {
+	echo "Using filelist.txt as input."
+	../fjfs --file mount-point filelist.txt
+}
 
-dotest()
-{
-	cat testmnt.txt
-	head -c 20 testmnt.txt
-	tail -c 20 testmnt.txt
-	head -c 160 testmnt.txt | tail -n 1
+mount2_fjfs() {
+	echo "Using glob 'test?' as input."
+	../fjfs --glob mount-point 'test?'
+}
+
+mount3_fjfs() {
+	echo "Using args 'test1 test2 test3' as input."
+	../fjfs --args mount-point test1 test2 test3
+}
+
+umount_fjfs() {
+	fusermount -u mount-point && rm mount-point
 	echo
+}
 
-	cnt1=`wc -c test1 | (read a b; echo "$a")`
-	if ! expr "x$cnt1" : 'x[0-9][0-9]*$' > /dev/null; then
-		echo 'Could not count the characters in the test1 file'
-		exit 1
+do_tests() {
+	# Direct compare
+	diff -u expect_1 mount-point
+	if [ $? = 0 ]
+	then
+		echo "test 1: OK"
+	else
+		echo "test 1: FAIL!"
 	fi
-	cnt2=`wc -c test2 | (read a b; echo "$a")`
-	if ! expr "x$cnt2" : 'x[0-9][0-9]*$' > /dev/null; then
-		echo 'Could not count the characters in the test2 file'
-		exit 1
+
+	head -n2 mount-point | tail -n1 > result_2
+	diff -u expect_2 result_2
+	if [ $? = 0 ]
+	then
+		echo "test 2: OK"
+	else
+		echo "test 2: FAIL!"
 	fi
-	cnt3=`wc -c test3 | (read a b; echo "$a")`
-	if ! expr "x$cnt3" : 'x[0-9][0-9]*$' > /dev/null; then
-		echo 'Could not count the characters in the test3 file'
-		exit 1
+	rm result_2
+
+	head -c 120 mount-point > result_3
+	diff -u expect_3 result_3
+	if [ $? = 0 ]
+	then
+		echo "test 3: OK"
+	else
+		echo "test 3: FAIL!"
 	fi
+	rm result_3
 
-	head -c "$cnt1" testmnt.txt | diff -u test1 -
-	tail -c "$cnt3" testmnt.txt | diff -u test3 -
-	cat test1 test2 test3 | diff -u - testmnt.txt
+	tail -c 120 mount-point > result_4
+	diff -u expect_4 result_4
+	if [ $? = 0 ]
+	then
+		echo "test 4: OK"
+	else
+		echo "test 4: FAIL!"
+	fi
+	rm result_4
 }
 
-rm -f testmnt.txt
-res=0
-./mount.sh
-(dotest) || res=$?
-./umount.sh
-rm -f testmnt.txt
-exit "$res"
+mount1_fjfs
+do_tests
+umount_fjfs
+
+mount2_fjfs
+do_tests
+umount_fjfs
+
+mount3_fjfs
+do_tests
+umount_fjfs

test/umount.sh

-#!/bin/sh
-
-fusermount -u testmnt.txt && rm testmnt.txt