Test suite for the NipsVM front-end.

2008-06-02  Guillaume SADEGH  <sadegh@lrde.epita.fr>

        * iface/nips/nipstest/Makefile.am, iface/nips/Makefile.am,
        configure.ac, iface/nips/nipstest/emptiness.test,
        iface/nips/nipstest/dotty.test: Test suite for the NipsVM
        front-end.
        * iface/nips/emptiness_check.cc, iface/nips/dottynips.cc:
        `catch'
        don't throw anymore an exception, but exit with 1.
        * iface/nips/common.cc, iface/nips/nips.cc (nips_interface):
        Change messages of nips_exception.
This commit is contained in:
Guillaume Sadegh 2008-06-10 03:34:40 +02:00
parent f56721107b
commit a33c1894c3
7 changed files with 26 additions and 10 deletions

View file

@ -1,3 +1,16 @@
2008-06-02 Guillaume SADEGH <sadegh@lrde.epita.fr>
Test suite for the NipsVM front-end.
* iface/nips/nipstest/Makefile.am, iface/nips/Makefile.am,
configure.ac, iface/nips/nipstest/emptiness.test,
iface/nips/nipstest/dotty.test: Test suite for the NipsVM
front-end.
* iface/nips/emptiness_check.cc, iface/nips/dottynips.cc: `catch'
don't throw anymore an exception, but exit with 1.
* iface/nips/common.cc, iface/nips/nips.cc (nips_interface):
Change messages of nips_exception.
2008-06-03 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2008-06-03 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* src/sanity/includes.test (INCDIR): Remove any trailing slash. * src/sanity/includes.test (INCDIR): Remove any trailing slash.

View file

@ -1,6 +1,6 @@
# Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire d'Informatique # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Laboratoire
# de Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), # d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
# Université Pierre et Marie Curie. # Coopératifs (SRC), Université Pierre et Marie Curie.
# #
# This file is part of Spot, a model checking library. # This file is part of Spot, a model checking library.
# #
@ -80,6 +80,8 @@ AC_CONFIG_FILES([
iface/gspn/defs iface/gspn/defs
iface/nips/Makefile iface/nips/Makefile
iface/nips/nips_vm/Makefile iface/nips/nips_vm/Makefile
iface/nips/nipstest/Makefile
iface/nips/nipstest/defs
src/Makefile src/Makefile
src/eltlast/Makefile src/eltlast/Makefile
src/eltlenv/Makefile src/eltlenv/Makefile

View file

@ -43,4 +43,4 @@ dottynips_LDADD = libspotnips.la
empt_check_SOURCES = emptiness_check.cc empt_check_SOURCES = emptiness_check.cc
empt_check_LDADD = libspotnips.la empt_check_LDADD = libspotnips.la
SUBDIRS = nips_vm SUBDIRS = nips_vm nipstest

View file

@ -29,9 +29,9 @@ namespace spot
operator<<(std::ostream& os, const nips_exception& e) operator<<(std::ostream& os, const nips_exception& e)
{ {
if (e.get_err_defined()) if (e.get_err_defined())
os << e.get_where() << " exited with " << e.get_err(); os << e.get_where() << " with exit value: " << e.get_err();
else else
os << e.get_where() << " with no exit value"; os << e.get_where();
return os; return os;
} }

View file

@ -44,5 +44,5 @@ main(int argc, char **argv)
catch (spot::nips_exception& e) catch (spot::nips_exception& e)
{ {
std::cerr << e << std::endl; std::cerr << e << std::endl;
throw; return 1;
} }

View file

@ -124,6 +124,6 @@ main(int argc, char **argv)
catch (spot::nips_exception& e) catch (spot::nips_exception& e)
{ {
std::cerr << e << std::endl; std::cerr << e << std::endl;
throw; return 1;
} }

View file

@ -384,14 +384,15 @@ namespace spot
bytecode_ = bytecode_load_from_file(filename.c_str(), 0); bytecode_ = bytecode_load_from_file(filename.c_str(), 0);
if (bytecode_ == 0) if (bytecode_ == 0)
throw nips_exception("bytecode_load_from_file()"); throw nips_exception("Unable to open `" + filename +
"' as a NIPS bytecode.");
nipsvm_ = new nipsvm_t(); nipsvm_ = new nipsvm_t();
int res = nipsvm_init(nipsvm_, bytecode_, successor_state_callback, int res = nipsvm_init(nipsvm_, bytecode_, successor_state_callback,
search_error_callback); search_error_callback);
if (res != 0) if (res != 0)
throw nips_exception("nipsvm_init()", res); throw nips_exception("Error while initializing the NIPS VM", res);
} }
nips_interface::~nips_interface() nips_interface::~nips_interface()