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

tests: speed up recuc.test and reducpsl.test

Browse source 
... by calling valgrind less often.

* tests/core/reduc.test, tests/core/reducpsl.test: Call
valgrind only on 1 of the 12 calls to randltl, and
2 of the 7 calls to reduc.
This commit is contained in:
Alexandre Duret-Lutz 2016-11-29 15:54:08 +01:00
parent 7e5b336f16
commit 5ca1281e36
2 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/core/reduc.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2012, 2015 Laboratoire de Recherche et
# Copyright (C) 2009, 2010, 2012, 2015, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
# Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -27,21 +27,20 @@
set -e
randltl=randltl
FILE=formulae
: > $FILE
# for i in 10 11 12 13 14 15 16 17 18 19 20; do
for i in 10 12 14 16 18 20; do
run 0 $randltl --seed 0 --tree-size $i a b c -n 100 >> $FILE
run 0 $randltl --seed 100 --tree-size $i a b c d e f -n 100 >> $FILE
# Do the first run through valgrind, and the rest without
run 0 randltl --seed 0 --tree-size 10 a b c -n 100 > formulas
randltl --seed 100 --tree-size 10 a b c d e f -n 100 >> formulas
for i in 12 14 16 18 20; do
randltl --seed 0 --tree-size $i a b c -n 100 >> formulas
randltl --seed 100 --tree-size $i a b c d e f -n 100 >> formulas
done
for opt in 0 1 2 3 7; do
run 0 ../reduc -f -h $opt "$FILE"
done
# Running the above through valgrind is quite slow already.
# Don't use valgrind for the next reductions (even slower).
for opt in 8 9; do
../reduc -f -h $opt "$FILE"
for opt in 0 1 2 3 7 8 9; do
case $opt in
# Running valgrind on all these runs would be too slow. Only
# do that for 3 (all basic reductions) and 8 (containment
# checks).
3|7) run 0 ../reduc -f -h $opt formulas;;
*) ../reduc -f -h $opt formulas;;
esac
done

30
tests/core/reducpsl.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2011, 2012, 2015 Laboratoire de Recherche et
# Copyright (C) 2011, 2012, 2015, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -24,20 +24,20 @@
set -e
randltl=randltl
FILE=formulae
: > $FILE
for i in 10 12 14 16 18 20; do
run 0 $randltl --psl --seed 0 --tree-size $i a b c -n 100 >> $FILE
run 0 $randltl --psl --seed 100 --tree-size $i a b c d e f -n 100 >> $FILE
# Do the first run through valgrind, and the rest without
run 0 randltl --psl --seed 0 --tree-size 10 a b c -n 100 > formulas
randltl --psl --seed 100 --tree-size 10 a b c d e f -n 100 >> formulas
for i in 12 14 16 18 20; do
randltl --psl --seed 0 --tree-size $i a b c -n 100 >> formulas
randltl --psl --seed 100 --tree-size $i a b c d e f -n 100 >> formulas
done
for opt in 0 1 2 3 7; do
run 0 ../reduc -f -h $opt "$FILE"
done
# Running the above through valgrind is quite slow already.
# Don't use valgrind for the next reductions (even slower).
for opt in 8 9; do
../reduc -f -h $opt "$FILE"
for opt in 0 1 2 3 7 8 9; do
case $opt in
# Running valgrind on all these runs would be too slow. Only
# do that for 3 (all basic reductions) and 8 (containment
# checks).
3|7) run 0 ../reduc -f -h $opt formulas;;
*) ../reduc -f -h $opt formulas;;
esac
done