tests: cleanup stat.test

* tests/stat.test: Rewrite in a more readable way.

diff --git a/tests/stat.test b/tests/stat.test
index 5c2a5780fe2b357072b04f268d8b350be91d5d80..b913c17ae2d5d93200a6016670707f3ae3bc5068 100755 (executable)
--- a/tests/stat.test
+++ b/tests/stat.test
@@ -8,27 +8,72 @@ check_prog dd
 check_prog find
 check_prog grep
 
+OUT="$LOG.out"
+size=46118400000
+sample=stat_sample
+
+rm -f $sample
 umask 022
-truncate_cmd='dd seek=46118400000 obs=1 count=0 if=/dev/null of=sample'
-$truncate_cmd > $LOG 2>&1 ||
-       { cat $LOG; framework_skip_ 'failed to create a large sparse file'; }
-rm -f sample
 
-$STRACE -edesc $truncate_cmd 2>&1 > /dev/null 2> $LOG &&
-LC_ALL=C grep -E -x 'ftruncate(64)?\(1, 46118400000\) += 0' $LOG > /dev/null ||
-       { cat $LOG; fail_ 'strace -edesc failed to trace ftruncate/ftruncate64 properly'; }
+truncate_cmd="dd seek=$size obs=1 count=0 if=/dev/null of=$sample"
+$truncate_cmd > "$OUT" 2>&1 || {
+       cat "$OUT"
+       framework_skip_ 'failed to create a large sparse file'
+}
+
+find_cmd="find $sample -quit"
+$find_cmd || framework_skip_ "$find_cmd failed"
+
+find_L_cmd="find -L $sample -quit"
+$find_L_cmd || framework_skip_ "$find_L_cmd failed"
+
+rm -f $sample
+
+$STRACE -o "$LOG" -edesc $truncate_cmd 2>&1 > "$OUT" 2>&1 || {
+       cat "$LOG" "$OUT"
+       fail_ "$STRACE -edesc $truncate_cmd failed"
+}
+
+rm -f "$OUT"
+
+r_ftruncate="ftruncate(64)?\\(1, $size\\) += 0"
+LC_ALL=C grep -E -x "$r_ftruncate" "$LOG" > /dev/null || {
+       cat "$LOG"
+       fail_ 'strace -edesc failed to trace ftruncate/ftruncate64 properly'
+}
+
+r_lseek="lseek\\(1, $size, SEEK_CUR\\) += $size"
+r_llseek="_llseek\\(1, $size, \\[$size\\], SEEK_CUR\\) += 0"
+LC_ALL=C grep -E -x "$r_lseek|$r_llseek" "$LOG" > /dev/null || {
+       cat "$LOG"
+       fail_ 'strace -edesc failed to trace lseek/_llseek properly'
+}
+
+$STRACE -o "$LOG" -efile $find_L_cmd || {
+       cat "$LOG"
+       fail_ "$STRACE -efile $find_L_cmd failed"
+}
 
-LC_ALL=C grep -E -x 'lseek\(1, 46118400000, SEEK_CUR\) += 46118400000|_llseek\(1, 46118400000, \[46118400000\], SEEK_CUR\) += 0' $LOG > /dev/null ||
-       { cat $LOG; fail_ 'strace -edesc failed to trace lseek/_llseek properly'; }
+stat="\\{st_mode=S_IFREG\\|0644, st_size=$size, \\.\\.\\.\\}"
+r_stat="stat(64)?\\(\"$sample\", $stat\\) += 0"
+r_fstatat="(new)?fstatat(64)?\\(AT_FDCWD, \"$sample\", $stat, 0\\) += 0"
+LC_ALL=C grep -E -x "$r_stat|$r_fstatat" "$LOG" > /dev/null || {
+       cat "$LOG"
+       fail_ 'strace -efile failed to trace stat/stat64 properly'
+}
 
-$STRACE -efile find -L sample > /dev/null 2> $LOG &&
-LC_ALL=C grep -E -x 'stat(64)?\("sample", \{st_mode=S_IFREG\|0644, st_size=46118400000, \.\.\.\}\) += 0|(new)?fstatat(64)?\(AT_FDCWD, "sample", \{st_mode=S_IFREG\|0644, st_size=46118400000, \.\.\.\}, 0\) += 0' $LOG > /dev/null ||
-       { cat $LOG; fail_ 'strace -efile failed to trace stat/stat64 properly'; }
+$STRACE -o "$LOG" -efile $find_cmd || {
+       cat "$LOG"
+       fail_ "$STRACE -efile $find_cmd failed"
+}
 
-$STRACE -efile find sample > /dev/null 2> $LOG &&
-LC_ALL=C grep -E -x 'lstat(64)?\("sample", \{st_mode=S_IFREG\|0644, st_size=46118400000, \.\.\.\}\) += 0|(new)?fstatat(64)?\(AT_FDCWD, "sample", \{st_mode=S_IFREG\|0644, st_size=46118400000, \.\.\.\}, AT_SYMLINK_NOFOLLOW\) += 0' $LOG > /dev/null ||
-       { cat $LOG; fail_ 'strace -efile failed to trace fstatat/fstatat64 properly'; }
+r_lstat="lstat(64)?\\(\"$sample\", $stat\\) += 0"
+r_lfstatat="(new)?fstatat(64)?\\(AT_FDCWD, \"$sample\", $stat, AT_SYMLINK_NOFOLLOW\\) += 0"
+LC_ALL=C grep -E -x "$r_lstat|$r_lfstatat" "$LOG" > /dev/null || {
+       cat "$LOG"
+       fail_ 'strace -efile failed to trace fstatat/fstatat64 properly'
+}
 
-rm -f sample
+rm -f $sample
 
 exit 0