Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 17:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: fix handling of syntax errors

Browse Source 
The shell grammar does not allow empty statements in then/else part of
an if, but examples/test failed to catch the syntax errors from the
script it ran.  So exited with success anyway.

You would expect 'set -e' to suffice, but with bash 3.2 actually it
does not.  As a matter of fact, I could find a way to have this behave
properly:

    $ cat test.sh
    set -e
    cleanup ()
    {
      status=$?
      echo "cleanup: $status"
      exit $status
    }
    trap cleanup 0 1 2 13 15
    . $1
    s=$?
    echo "test.sh: $s"
    exit $s

    $ cat bistro.test
    if true; then
    fi

    $ /bin/sh ./test.sh ./bistro.test
    ./bistro.test: line 2: syntax error near unexpected token `fi'
    cleanup: 0
    $ echo $?
    0

Remove the set -e (or the trap), and tada, it works...  So we have to
deal with the error by hand.

* examples/test ($exit): Replace with...
($status): this.
Preserve the exit status of the test case.
* examples/c/bistromathic/bistromathic.test: Fix syntax error.
This commit is contained in:
Akim Demaille
2020-05-05 08:08:25 +02:00
parent b86dcaf40b
commit cb9f4cb543
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/c/bistromathic/bistromathic.test
View File

@@ -43,6 +43,7 @@ echo '0' | prog >effective
if diff perfect effective >/dev/null 2>&1; then if diff perfect effective >/dev/null 2>&1; then
# Alles ist gut. # Alles ist gut.
strip_prompt=false
elif diff ok effective >/dev/null 2>&1; then elif diff ok effective >/dev/null 2>&1; then
strip_prompt=true strip_prompt=true
else else

12
examples/test
View File

@@ -25,7 +25,7 @@ medir=$(dirname "$1" | sed -e 's,.*examples/,,')
number=1 number=1
# Exit status of this script. # Exit status of this script.
exit=true status=0
# top_builddir. # top_builddir.
cwd=$(pwd) cwd=$(pwd)
@@ -141,20 +141,20 @@ run ()
sed -e 's/^/ /' eff sed -e 's/^/ /' eff
echo "$me: diff:" echo "$me: diff:"
diff -u exp eff | sed -e 's/^/ /' diff -u exp eff | sed -e 's/^/ /'
exit=false status=1
fi fi
else else
echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)" echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"
cat err_eff cat err_eff
exit=false status=1
fi fi
number=$(expr $number + 1) number=$(expr $number + 1)
} }
# We have cd'd one level deeper. # We have cd'd one level deeper.
case $1 in case $1 in
/*) . "$1";; /*) . "$1" || status=2;;
*) . "../$1";; *) . "../$1" || status=2;;
esac esac
$exit exit $status