diff options
Diffstat (limited to 'tests/dav1d_argon.bash')
| -rwxr-xr-x | tests/dav1d_argon.bash | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/dav1d_argon.bash b/tests/dav1d_argon.bash index 0c35663..27a8d61 100755 --- a/tests/dav1d_argon.bash +++ b/tests/dav1d_argon.bash @@ -132,7 +132,8 @@ for d in "${dirs[@]}"; do fi done -if [ ${#files[@]} -eq 0 ]; then +num_files="${#files[@]}" +if [ "$num_files" -eq 0 ]; then error "Error! No files found at ${dirs[*]}" fi @@ -148,17 +149,17 @@ for i in "${!files[@]}"; do md5=$(<"${md5/%obu/md5}") || error "Error! Can't read md5 ${md5} for file ${f}" md5=${md5/ */} - printf "\033[1K\r[%3d%% %d/%d] Verifying %s" "$(((i+1)*100/${#files[@]}))" "$((i+1))" "${#files[@]}" "$f" + printf '\033[1K\r[%3d%% %*d/%d] Verifying %s' "$(((i+1)*100/num_files))" "${#num_files}" "$((i+1))" "$num_files" "${f#"$ARGON_DIR"/}" cmd=("$DAV1D" -i "$f" --filmgrain "$FILMGRAIN" --verify "$md5" --cpumask "$CPUMASK" --threads "$THREADS" -q) if [ "$JOBS" -gt 1 ]; then "${cmd[@]}" 2>/dev/null & p=$! pids+=("$p") - declare "file$p=$f" + declare "file$p=${f#"$ARGON_DIR"/}" block_pids else if ! "${cmd[@]}" 2>/dev/null; then - fail "$f" + fail "${f#"$ARGON_DIR"/}" fi fi done @@ -166,9 +167,9 @@ done wait_all_pids if [ "$failed" -ne 0 ]; then - printf "\033[1K\r%d/%d files \033[1;91mfailed\033[0m to verify" "$failed" "${#files[@]}" + printf "\033[1K\r%d/%d files \033[1;91mfailed\033[0m to verify" "$failed" "$num_files" else - printf "\033[1K\r%d files \033[1;92msuccessfully\033[0m verified" "${#files[@]}" + printf "\033[1K\r%d files \033[1;92msuccessfully\033[0m verified" "$num_files" fi printf " in %dm%ds (%s)\n" "$((SECONDS/60))" "$((SECONDS%60))" "$ver_info" |