Examples.py now creating all subdir build.xmls
This commit is contained in:
parent
ebd816f37e
commit
7ac83a1c8c
@ -20,6 +20,7 @@
|
|||||||
<attribute name="arguments" default=""/>
|
<attribute name="arguments" default=""/>
|
||||||
<attribute name="failOnError" default="true"/>
|
<attribute name="failOnError" default="true"/>
|
||||||
<attribute name="timeOut" default="15000"/>
|
<attribute name="timeOut" default="15000"/>
|
||||||
|
<attribute name="msg" default=""/>
|
||||||
<sequential>
|
<sequential>
|
||||||
<echo>Running: ${chapter} @{cls}</echo>
|
<echo>Running: ${chapter} @{cls}</echo>
|
||||||
<java
|
<java
|
||||||
@ -32,6 +33,7 @@
|
|||||||
<arg line="@{arguments}"/>
|
<arg line="@{arguments}"/>
|
||||||
</java>
|
</java>
|
||||||
<echo>Finished: ${chapter} @{cls}</echo>
|
<echo>Finished: ${chapter} @{cls}</echo>
|
||||||
|
<echo>@{msg}</echo>
|
||||||
<echo>--------------------------------</echo>
|
<echo>--------------------------------</echo>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
@ -175,6 +175,7 @@ class CodeFileOptions(object):
|
|||||||
def __init__(self, codeFile):
|
def __init__(self, codeFile):
|
||||||
"Should probably use regular expressions for parsing instead"
|
"Should probably use regular expressions for parsing instead"
|
||||||
self.codeFile = codeFile
|
self.codeFile = codeFile
|
||||||
|
self.msg = ""
|
||||||
|
|
||||||
self.cmdargs = None
|
self.cmdargs = None
|
||||||
if "{Args:" in self.codeFile.code:
|
if "{Args:" in self.codeFile.code:
|
||||||
@ -208,6 +209,10 @@ class CodeFileOptions(object):
|
|||||||
self.timeout = line.split("{TimeOut:")[1].strip()
|
self.timeout = line.split("{TimeOut:")[1].strip()
|
||||||
self.timeout = self.timeout.rsplit("}", 1)[0]
|
self.timeout = self.timeout.rsplit("}", 1)[0]
|
||||||
self.continue_on_error = True
|
self.continue_on_error = True
|
||||||
|
elif "//: gui/" in self.codeFile.code or "//: swt/" in self.codeFile.code:
|
||||||
|
self.timeout = "4000"
|
||||||
|
self.continue_on_error = True
|
||||||
|
self.msg = "* Timeout for testing *"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -239,8 +244,13 @@ class CodeFileOptions(object):
|
|||||||
return """timeOut='%s' """ % self.timeout
|
return """timeOut='%s' """ % self.timeout
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
def message(self):
|
||||||
|
if self.msg:
|
||||||
|
return """msg='%s' """ % self.msg
|
||||||
|
return ""
|
||||||
|
|
||||||
def createRunCommand(self):
|
def createRunCommand(self):
|
||||||
return self.classFile() + self.dirPath() + self.arguments() + self.failOnError() + self.timeOut() + "/>\n"
|
return self.classFile() + self.dirPath() + self.arguments() + self.failOnError() + self.timeOut() + self.message() + "/>\n"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user