alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: divide the run time of parse.test by 20

Browse source 
* tests/core/readltl.cc: Process many formulas from a
file instead of one arg at a time.
* tests/core/parse.test, tests/core/parseerr.test, tests/core/utf8.test:
Adjust to supply a file as input.
This commit is contained in:
Alexandre Duret-Lutz 2016-11-29 11:51:34 +01:00
parent ad51525608
commit 7e5b336f16
4 changed files with 160 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

55
tests/core/readltl.cc
View file

@ -21,6 +21,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
#include <fstream>
#include <cassert>
#include <cstdlib>
#include <cstring>
@ -30,7 +31,7 @@
static void
syntax(char* prog)
{
std::cerr << prog << " [-d] formula" << std::endl;
std::cerr << prog << " [-d] filename\n";
exit(2);
}
@ -43,40 +44,52 @@ main(int argc, char** argv)
syntax(argv[0]);
bool debug = false;
int formula_index = 1;
int filename_index = 1;
if (!strcmp(argv[1], "-d"))
{
debug = true;
if (argc < 3)
syntax(argv[0]);
formula_index = 2;
filename_index = 2;
}
{
spot::environment& env(spot::default_environment::instance());
auto f = [&]()
std::ifstream fin(argv[filename_index]);
if (!fin)
{
auto pf = spot::parse_infix_psl(argv[formula_index], env, debug);
exit_code = pf.format_errors(std::cerr);
return pf.f;
}();
std::cerr << "Cannot open " << argv[filename_index] << '\n';
exit(2);
}
if (f)
std::string input;
while (std::getline(fin, input))
{
{
spot::environment& env(spot::default_environment::instance());
auto f = [&]()
{
auto pf = spot::parse_infix_psl(input, env, debug);
// We want the errors on std::cout for the test suite.
exit_code = pf.format_errors(std::cout);
return pf.f;
}();
if (f)
{
#ifdef DOTTY
spot::print_dot_psl(std::cout, f);
spot::print_dot_psl(std::cout, f);
#else
f.dump(std::cout) << std::endl;
f.dump(std::cout) << '\n';
#endif
}
else
{
exit_code = 1;
}
}
else
{
exit_code = 1;
}
}
assert(spot::fnode::instances_check());
}
assert(spot::fnode::instances_check());
}
return exit_code;
}