- Modified some small issues, made the protocol list static, and allowed

"comment lines" starting with '#' in the test script.

spdl/multiprotocoltest.py

@@ -7,7 +7,8 @@
 # Input of this script:
 #
 # 	- A number on the commandline of stuff to test
-# 	- A list of files on stdin to be used
+# 	- A list of files on stdin to be used (lines starting with '#' are
+# 	ignored)
 #
 #
 # Tips and tricks:
@@ -36,7 +37,7 @@ ScytherProgram = "../src/scyther"
 # Scyther parameters
 ScytherDefaults	= "--summary"
 ScytherMethods	= "-m1 -a"
-ScytherBounds	= "-r4 -l40"
+ScytherBounds	= "-r4 --max-depth=20 -l15"
 
 # Build a large part of the command line (for Scyther) already
 ScytherArgs = ScytherDefaults + " " + ScytherMethods + " " + ScytherBounds
@@ -316,7 +317,7 @@ while loop:
 	if line != '':
 		# not the end of the input
 		cleanline = string.strip(line)
-		if cleanline != '' and cleanline not in SkipList:
+		if cleanline != '' and cleanline[0] != '#' and cleanline not in SkipList:
 			# not a blank line, not forbidden
 			Protocol.append(cleanline)
 			ProtocolCount = ProtocolCount + 1

spdl/protocol-list.txt

@@ -0,0 +1,48 @@
+# List of protocols to test
+#
+andrew-ban.spdl
+andrew-lowe-ban.spdl
+bke-broken.spdl
+bke-one.spdl
+bkepk-ce2.spdl
+bkepk-ce.spdl
+bkepk.spdl
+bke.spdl
+boyd.spdl
+broken1.spdl
+carkey-broken-limited.spdl
+carkey-broken.spdl
+carkey-ni2.spdl
+carkey-ni.spdl
+ccitt509-ban.spdl
+five-run-bound.spdl
+#gong-nonce-b.spdl
+#gong-nonce.spdl
+helloworld.spdl
+isoiec11770-2-13.spdl
+#kaochow-palm.spdl
+kaochow.spdl
+ns3-brutus.spdl
+ns3.spdl
+nsl3-nisynch-rep.spdl
+nsl3.spdl
+nsl7.spdl
+onetrace.spdl
+otwayrees.spdl
+samasc-broken.spdl
+simplest.spdl
+soph-keyexch.spdl
+soph.spdl
+speedtest.spdl
+splice-as-hc-cj.spdl
+#splice-as-hc.spdl
+splice-as.spdl
+tls-paulson.spdl
+tmn.spdl
+unknown2.spdl
+wmf-brutus.spdl
+woolam-ce.spdl
+woolam-cmv.spdl
+yahalom-ban.spdl
+yahalom-lowe.spdl
+yahalom.spdl