- Applied renaming through to other scripts.

This commit is contained in:
ccremers 2005-03-04 15:36:37 +00:00
parent ae343413e5
commit 470da10745

View File

@ -35,7 +35,7 @@ from tempfile import NamedTemporaryFile
from optparse import OptionParser from optparse import OptionParser
import tuplesdo import tuplesdo
import scyther import scythertest
import protocollist import protocollist
@ -126,13 +126,13 @@ def ScytherEval (plist):
sys.stdout.flush() sys.stdout.flush()
sys.stderr.flush() sys.stderr.flush()
args = scyther.default_arguments(plist, options.match, options.bounds) args = scythertest.default_arguments(plist, options.match, options.bounds)
n = len(plist) n = len(plist)
if not (n,args) in ArgumentsList: if not (n,args) in ArgumentsList:
ArgumentsList.append((n,args)) ArgumentsList.append((n,args))
print "Testing",n,"tuples using",args print "Testing",n,"tuples using",args
return scyther.default_parsed(plist, options.match, options.bounds) return scythertest.default_parsed(plist, options.match, options.bounds)
# ScytherEval1 # ScytherEval1
# #
@ -388,7 +388,7 @@ def SignalAttack (protocols, claim):
# Furthermore, TempFileList is created. # Furthermore, TempFileList is created.
parser = OptionParser() parser = OptionParser()
scyther.default_options(parser) scythertest.default_options(parser)
parser.add_option("-t","--tuplewidth", dest="tuplewidth", parser.add_option("-t","--tuplewidth", dest="tuplewidth",
default = 2, default = 2,
help = "number of concurrent protocols to test, >=2") help = "number of concurrent protocols to test, >=2")