Fixed usage of backtick that broke in a previous commit.

commit that broke it: 802baf489f
This commit is contained in:
Tom Hacohen 2013-04-26 13:50:47 +01:00
parent fdb791a421
commit 50cef78346
1 changed files with 9 additions and 9 deletions

View File

@ -86,7 +86,7 @@ get_test_params () {
return 1 return 1
fi fi
local p=\`expr index "$line" \\ \` local p=`expr index "$line" \ `
if [ $p -ne 0 ] if [ $p -ne 0 ]
then then
(( p-- )) (( p-- ))
@ -208,15 +208,15 @@ compare_files () {
if [ -e "$1" ] if [ -e "$1" ]
# First file exists # First file exists
then then
local md_file1=\`md5sum $1\` local md_file1=`md5sum $1`
if [ -e "$2" ] if [ -e "$2" ]
then then
# Second file exists # Second file exists
local md_file2=\`md5sum $2\` local md_file2=`md5sum $2`
# Get md5 of both files # Get md5 of both files
local md1=\`echo "$md_file1" | cut -d ' ' -f1\` local md1=`echo "$md_file1" | cut -d ' ' -f1`
local md2=\`echo "$md_file2" | cut -d ' ' -f1\` local md2=`echo "$md_file2" | cut -d ' ' -f1`
# Increase counter of comparisons # Increase counter of comparisons
(( ncomp++ )) (( ncomp++ ))
@ -227,7 +227,7 @@ compare_files () {
if [ $comp_unavail -eq 0 ] if [ $comp_unavail -eq 0 ]
then then
# Create diff-file with 'comp_' prefix. # Create diff-file with 'comp_' prefix.
local name=\`basename "$1"\` local name=`basename "$1"`
compare "$1" "$2" "$_dest_dir"/comp_"$name" compare "$1" "$2" "$_dest_dir"/comp_"$name"
else else
echo "$name does not match." echo "$name does not match."
@ -252,7 +252,7 @@ process_compare () {
local files_list=( "$@" ) local files_list=( "$@" )
for line in "${files_list[@]}" for line in "${files_list[@]}"
do do
local name=\`basename "$line"\` local name=`basename "$line"`
DEBUG echo "comparing $name" DEBUG echo "comparing $name"
compare_files "$_orig_dir"/"$name" "$_dest_dir"/"$name" compare_files "$_orig_dir"/"$name" "$_dest_dir"/"$name"
done done
@ -288,7 +288,7 @@ do_compare () {
for test_name in $* for test_name in $*
do do
rm "$_dest_dir"/comp_"$test_name"_[0-9]*.png &> /dev/null rm "$_dest_dir"/comp_"$test_name"_[0-9]*.png &> /dev/null
files_list=( \`ls "$_dest_dir"/"$test_name"_[0-9]*.png\` ) files_list=( `ls "$_dest_dir"/"$test_name"_[0-9]*.png` )
process_compare "${files_list[@]}" process_compare "${files_list[@]}"
done done
@ -562,7 +562,7 @@ then
ls fail_*.txt &> /dev/null ls fail_*.txt &> /dev/null
if [ "$?" -eq 0 ] if [ "$?" -eq 0 ]
then then
_n_tests_failed=\`ls fail_*.txt -1 | wc -l\` _n_tests_failed=`ls fail_*.txt -1 | wc -l`
if [ "$_n_tests_failed" ] if [ "$_n_tests_failed" ]
then then