1.1 --- a/lplc Tue Nov 29 00:47:19 2016 +0100
1.2 +++ b/lplc Tue Nov 29 16:03:18 2016 +0100
1.3 @@ -56,10 +56,7 @@
1.4
1.5 if not success:
1.6 show_missing(i.missing)
1.7 - if "-exit" in args:
1.8 - sys.exit(1)
1.9 - else:
1.10 - sys.exit(0)
1.11 + sys.exit(1)
1.12
1.13 d = deducer.Deducer(i, "_deduced")
1.14 d.to_output()
1.15 @@ -87,17 +84,9 @@
1.16 print exc
1.17 if "-tb" in args:
1.18 raise
1.19 - elif "-exit" in args:
1.20 - sys.exit(1)
1.21 -
1.22 - except KeyboardInterrupt:
1.23 - if "-exit" in args:
1.24 - sys.exit(2)
1.25 - else:
1.26 - raise
1.27 + sys.exit(1)
1.28
1.29 else:
1.30 - if "-exit" in args:
1.31 - sys.exit(0)
1.32 + sys.exit(0)
1.33
1.34 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/test_all.sh Tue Nov 29 00:47:19 2016 +0100
2.2 +++ b/test_all.sh Tue Nov 29 16:03:18 2016 +0100
2.3 @@ -12,8 +12,7 @@
2.4 check_type_warnings() {
2.5
2.6 if [ -e "_deduced/type_warnings" ] && \
2.7 - [ `stat -c %s "_deduced/type_warnings"` -ne 0 ] && \
2.8 - ! expect_failure ; then
2.9 + [ `stat -c %s "_deduced/type_warnings"` -ne 0 ] ; then
2.10
2.11 echo "Type warnings in deduced information." 1>&2
2.12 return 1
2.13 @@ -39,14 +38,19 @@
2.14 # Run tests without an existing cache.
2.15
2.16 echo "$FILENAME..." 1>&2
2.17 - if ! ./lplc "$FILENAME" -r ; then exit 1 ; fi
2.18 + if ! ./lplc "$FILENAME" -r ; then
2.19 + if ! expect_failure; then
2.20 + exit 1
2.21 + else
2.22 + echo 1>&2
2.23 + continue
2.24 + fi
2.25 + fi
2.26
2.27 # Check for unresolved names in the cache.
2.28
2.29 echo " (depends)..." 1>&2
2.30 - if grep '<depends>' -r "_cache" && \
2.31 - ! expect_failure ; then
2.32 -
2.33 + if grep '<depends>' -r "_cache" ; then
2.34 echo "Unresolved names in the cache." 1>&2
2.35 exit 1
2.36 fi