Merge commit '7f1ebbeb3035b9a401de461969263efb6a1ad52e' into develop

harness.sh

@@ -268,16 +268,16 @@ function gabc_gtex_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                -e 's/\(\GregorioTeXAPIVersion{\)[^}]\+/\1@/' \
-                -e 's/\(\GreBeginScore{\)[^}]\+/\1@/' \
+            ${SED} -E -e 's/^(% File generated by gregorio ).*/\1@/' \
+                -e 's/(\\GregorioTeXAPIVersion\{)[^}]+/\1@/' \
+                -e 's/(\\GreBeginScore\{)[^}]+/\1@/' \
                 "$outfile" > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                    -e 's/\(\GregorioTeXAPIVersion{\)[^}]\+/\1@/' \
-                    -e 's/\(\GreBeginScore{\)[^}]\+/\1@/' \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/^(% File generated by gregorio ).*/\1@/' \
+                    -e 's/(\\GregorioTeXAPIVersion\{)[^}]+/\1@/' \
+                    -e 's/(\\GreBeginScore\{)[^}]+/\1@/' \
                     "$expfile" > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -346,12 +346,12 @@ function gabc_dump_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$outfile" \
+            ${SED} -E -e 's/[0-9]*( \((GRE_|S_|G_|L_|SP_|_))/@\1/' "$outfile" \
                 > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$expfile" \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/[0-9]*( \((GRE_|S_|G_|L_|SP_|_))/@\1/' "$expfile" \
                     > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -420,18 +420,18 @@ function gabc_gabc_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                -e 's/^\(generated-by: \).*;$/\1@;/' \
-                -e 's/^\(\GregorioTeXAPIVersion{\)[^}]*/\1@/' \
-                -e 's/^\(\GreBeginScore{\)[^}]*/\1@/' "$outfile" \
+            ${SED} -E -e 's/^(% File generated by gregorio ).*/\1@/' \
+                -e 's/^(generated-by: ).*;$/\1@;/' \
+                -e 's/^(\\GregorioTeXAPIVersion\{)[^}]*/\1@/' \
+                -e 's/^(\\GreBeginScore\{)[^}]*/\1@/' "$outfile" \
                 > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                    -e 's/^\(generated-by: \).*;$/\1@;/' \
-                    -e 's/^\(\GregorioTeXAPIVersion{\)[^}]*/\1@/' \
-                    -e 's/^\(\GreBeginScore{\)[^}]*/\1@/' "$expfile" \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/^(% File generated by gregorio ).*/\1@/' \
+                    -e 's/^(generated-by: ).*;$/\1@;/' \
+                    -e 's/^(\\GregorioTeXAPIVersion\{)[^}]*/\1@/' \
+                    -e 's/^(\\GreBeginScore\{)[^}]*/\1@/' "$expfile" \
                     > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -528,7 +528,7 @@ function typeset_and_compare {
     pdffile="$filebase.pdf"
     cmdoutfile="$filebase.cmdout"
 
-    if "$@" --output-directory="$outdir" "$texfile" >&"$outdir"/"$cmdoutfile"
+    if "$@" --output-directory="$outdir" "$texfile" >"$outdir"/"$cmdoutfile" 2>&1
     then
         if [[ "$indir/" == */should-fail/* ]]
         then