diff --git a/NEWS b/NEWS index 4dc6ed9966971aff652c574a2dd0e52bc2c8084d..a51d8561eb6dc700c5574bf3515eaeda7ba727cd 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ New in spot 2.3.1.dev (not yet released) can be output using --stats=%x (output automaton) or --stats=%X (input automaton). + Bugs fixed: + + - The tests using LTSmin's patched version of divine would fail + if the current (non-patched) version of divine was installed. + New in spot 2.3.1 (2017-02-20) Tools: diff --git a/THANKS b/THANKS index 3d7c104d74148fdd8ac5673adbefbf3b0d171cbb..b182df63fc782665e51bc5cde1142cadb281a8ae 100644 --- a/THANKS +++ b/THANKS @@ -14,6 +14,7 @@ Felix Klaedtke František Blahoudek Gerard J. Holzmann Heikki Tauriainen +Henrich Lauko Jan Strejček Jean-Michel Couvreur Jean-Michel Ilié diff --git a/python/spot/ltsmin.i b/python/spot/ltsmin.i index ae81916b807f9e16251ac14f7c9eaead33b6e3b5..c70da47f938f6757286d4541e6b21f37d958378d 100644 --- a/python/spot/ltsmin.i +++ b/python/spot/ltsmin.i @@ -1,5 +1,5 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2016 Laboratoire de Recherche et Développement de +// Copyright (C) 2016, 2017 Laboratoire de Recherche et Développement de // l'Epita (LRDE). // // This file is part of Spot, a model checking library. @@ -120,8 +120,13 @@ def require(*tools): if shutil.which("divine") == None: print("divine not available", file=sys.stderr) sys.exit(77) - out = subprocess.check_output(['divine', 'compile', '--help'], - stderr=subprocess.STDOUT) + try: + out = subprocess.check_output(['divine', 'compile', '--help'], + stderr=subprocess.STDOUT) + except (subprocess.CalledProcessError): + print("divine does not understand 'compile --help'", + file=sys.stderr) + sys.exit(77) if b'LTSmin' not in out: print("divine available but no support for LTSmin", file=sys.stderr)