diff --git a/Ant-Common.xml b/Ant-Common.xml index 3facc777..32e91ae9 100644 --- a/Ant-Common.xml +++ b/Ant-Common.xml @@ -20,6 +20,7 @@ + Running: ${chapter} @{cls} Finished: ${chapter} @{cls} + @{msg} -------------------------------- diff --git a/arrays/no.xml b/arrays/nobuild.xml similarity index 100% rename from arrays/no.xml rename to arrays/nobuild.xml diff --git a/gui/build.xml b/gui/nobuild.xml similarity index 100% rename from gui/build.xml rename to gui/nobuild.xml diff --git a/swt/build.xml b/swt/nobuild.xml similarity index 100% rename from swt/build.xml rename to swt/nobuild.xml diff --git a/tools/Examples.py b/tools/Examples.py index 81f8c072..21e0241b 100644 --- a/tools/Examples.py +++ b/tools/Examples.py @@ -175,6 +175,7 @@ class CodeFileOptions(object): def __init__(self, codeFile): "Should probably use regular expressions for parsing instead" self.codeFile = codeFile + self.msg = "" self.cmdargs = None if "{Args:" in self.codeFile.code: @@ -208,6 +209,10 @@ class CodeFileOptions(object): self.timeout = line.split("{TimeOut:")[1].strip() self.timeout = self.timeout.rsplit("}", 1)[0] 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 "" + def message(self): + if self.msg: + return """msg='%s' """ % self.msg + return "" + 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"