andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Improved windows support. Only the tempfile is playing up.

Browse Source
This commit is contained in:
ccremers 2006-08-02 13:44:45 +00:00
parent 339b7b6368
commit ccaa6e9197
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gui/Scyther.py
View File

@ -24,12 +24,15 @@ class Scyther(object):
self.program = "scyther" self.program = "scyther"
self.options = "" self.options = ""
self.spdl = None self.spdl = None
self.inputfile = None
self.claims = None self.claims = None
def setInput(self,spdl): def setInput(self,spdl):
self.spdl = spdl self.spdl = spdl
self.inputfile = None
def setFile(self,filename): def setFile(self,filename):
self.inputfile = filename
self.spdl = "" self.spdl = ""
fp = open(filename,"r") fp = open(filename,"r")
for l in fp.readlines(): for l in fp.readlines():
@ -42,11 +45,14 @@ class Scyther(object):
self.cmd = "%s --dot-output --xml-output --plain %s" % (self.program,self.options) self.cmd = "%s --dot-output --xml-output --plain %s" % (self.program,self.options)
if self.spdl: if self.spdl:
if self.inputfile:
fp = open(self.inputfile,'r')
else:
# Write spdl to temp file # Write spdl to temp file
fp = tempfile.NamedTemporaryFile() fp = tempfile.NamedTemporaryFile()
fp.write(self.spdl) fp.write(self.spdl)
fp.flush() fp.flush()
self.cmd += " '%s'" % (fp.name) self.cmd += " %s" % (fp.name)
# If we are on windows, we don't get stderr. Maybe we need a # If we are on windows, we don't get stderr. Maybe we need a
# switch to enforce this. # switch to enforce this.
@ -56,10 +62,16 @@ class Scyther(object):
# Non-linux does not generate stderr anyway # Non-linux does not generate stderr anyway
cmdline = "%s" % (self.cmd) cmdline = "%s" % (self.cmd)
print cmdline
confirm("Run this command?")
result = os.popen(cmdline) result = os.popen(cmdline)
xmlinput = result.read() xmlinput = result.read()
result.close() result.close()
print xmlinput
confirm("Is this the correct output?")
if self.spdl: if self.spdl:
fp.close() fp.close()
@ -79,35 +91,43 @@ class Scyther(object):
return "Scyther has not been run yet." return "Scyther has not been run yet."
def basictest(): def basicTest():
# Some basic testing # Some basic testing
if sys.platform.startswith('win'): #if sys.platform.startswith('win'):
print "Dir test" # print "Dir test"
p = os.popen("dir") # p = os.popen("dir")
print p.read() # print p.read()
print p.close() # print p.close()
confirm("See the dir?") # confirm("See the dir?")
# Scyther # Scyther
x = Scyther() x = Scyther()
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
x.program = "c:\\Scyther.exe" x.program = "Scyther.exe"
if not os.path.isfile(x.program): if not os.path.isfile(x.program):
print "I can't find the Scyther executable %s" % (x.program) print "I can't find the Scyther executable %s" % (x.program)
else:
p = os.popen("%s --help" % x.program)
print p.read()
confirm("Do you see the help?")
x.setFile("ns3.spdl") x.setFile("ns3.spdl")
x.verify() x.verify()
print x print x
confirm("See the output?")
def simpleRun(args):
x = Scyther()
x.options = args
x.verify()
return x
if __name__ == '__main__': if __name__ == '__main__':
pars = sys.argv[1:] pars = sys.argv[1:]
if len(pars) == 0: if len(pars) == 0:
basictest() basicTest()
else: else:
x = Scyther() print simpleRun(" ".join(pars))
x.options = " ".join(pars)
x.verify()
print x