diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-13 16:15:53 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-13 16:15:53 +0100 |
| commit | b483133fddd28f96430b8b5f0027644a7eef5656 (patch) | |
| tree | ea5340e710e88c010fd4abc90ebd58f763315add | |
| parent | 9eb38d3ddfa73cca87a817d3d36923b59716c202 (diff) | |
v3: Fix GLSLParserTest and ShaderTest. They both derive fromwip
PlainExecTest but only call the __init__ function of the Test
baseclass. I haven't really figured why this is and also not really
what command I should pass to PlainExecTest.__init__, so just
replicated the init code for now.
| -rwxr-xr-x | framework/glsl_parser_test.py | 1 | ||||
| -rwxr-xr-x | framework/shader_test.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/framework/glsl_parser_test.py b/framework/glsl_parser_test.py index 3b1a8936..74034e87 100755 --- a/framework/glsl_parser_test.py +++ b/framework/glsl_parser_test.py @@ -197,6 +197,7 @@ class GLSLParserTest(PlainExecTest): self.__command = None self.__filepath = filepath self.result = None + self.timeout = None def __get_config(self): """Extract the config section from the test file. diff --git a/framework/shader_test.py b/framework/shader_test.py index ea1d4626..f5a2bf95 100755 --- a/framework/shader_test.py +++ b/framework/shader_test.py @@ -145,6 +145,7 @@ class ShaderTest(PlainExecTest): self.__gl_api = None self.env = {} + self.timeout = None def __report_failure(self, message): if self.__run_standalone: |