[llvm-commits] [zorg] r172309 - in /zorg/trunk/zorg/buildbot: builders/ClangBuilder.py builders/KLEEBuilder.py commands/DejaGNUCommand.py commands/SuppressionDejaGNUCommand.py commands/__init__.py

[David Blaikie]

Author: dblaikie
Date: Sat Jan 12 02:09:00 2013
New Revision: 172309

URL: http://llvm.org/viewvc/llvm-project?rev=172309&view=rev
Log:
Rename DejaGNUCommand to SuppressionDejaGNUCommand.

Moving this Command out of the way in favor of a simplified & more functional
DejaGNUCommand (I'll switch over clients that don't use the suppression list
once I add the replacement)

Added:
    zorg/trunk/zorg/buildbot/commands/SuppressionDejaGNUCommand.py
      - copied, changed from r172308, zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py
Removed:
    zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py
Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
    zorg/trunk/zorg/buildbot/builders/KLEEBuilder.py
    zorg/trunk/zorg/buildbot/commands/__init__.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=172309&r1=172308&r2=172309&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Sat Jan 12 02:09:00 2013
@@ -9,7 +9,7 @@
 from buildbot.steps.transfer import FileDownload
 from zorg.buildbot.Artifacts import GetCompilerArtifacts, uploadArtifacts
 from zorg.buildbot.builders.Util import getConfigArgs
-from zorg.buildbot.commands import DejaGNUCommand
+from zorg.buildbot.commands import SuppressionDejaGNUCommand
 from zorg.buildbot.commands.BatchFileDownload import BatchFileDownload
 from zorg.buildbot.commands.ClangTestCommand import ClangTestCommand
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
@@ -540,7 +540,7 @@
                   defaultBranch='trunk', workdir='clang-tests'))
     gcc_dg_ignores = ignores.get('gcc-4_2-testsuite', {})
     for lang in languages:
-        f.addStep(DejaGNUCommand.DejaGNUCommand(
+        f.addStep(SuppressionDejaGNUCommand.SuppressionDejaGNUCommand(
             name='test-gcc-4_2-testsuite-%s' % lang,
             command=["make", "-k", "check-%s" % lang] + make_vars,
             description="gcc-4_2-testsuite (%s)" % lang,
@@ -557,7 +557,7 @@
     f.addStep(SVN(name='svn-clang-tests', mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/clang-tests/',
                   defaultBranch='trunk', workdir='clang-tests'))
-    f.addStep(DejaGNUCommand.DejaGNUCommand(
+    f.addStep(SuppressionDejaGNUCommand.SuppressionDejaGNUCommand(
             name='test-gdb-1472-testsuite',
             command=["make", "-k", "check"] + make_vars,
             description="gdb-1472-testsuite",
@@ -581,7 +581,7 @@
                                           command=['make', WithProperties('-j%s' % jobs)],
                                           haltOnFailure=True,
                                           workdir='clang-tests/build'))
-    f.addStep(DejaGNUCommand.DejaGNUCommand(
+    f.addStep(SuppressionDejaGNUCommand.SuppressionDejaGNUCommand(
             name='gdb-75-check',
             command=['make', '-k', WithProperties('-j%s' % jobs), 'check'] + make_vars,
             workdir='clang-tests/build',

Modified: zorg/trunk/zorg/buildbot/builders/KLEEBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/KLEEBuilder.py?rev=172309&r1=172308&r2=172309&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/KLEEBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/KLEEBuilder.py Sat Jan 12 02:09:00 2013
@@ -13,7 +13,7 @@
 import LLVMBuilder
 from Util import getConfigArgs
 
-from zorg.buildbot.commands.DejaGNUCommand import DejaGNUCommand
+from zorg.buildbot.commands.SuppressionDejaGNUCommand import SuppressionDejaGNUCommand
 
 def getKLEEBuildFactory(triple, jobs='%(jobs)d', llvm_branch='trunk',
                         config_name='Release+Asserts', clean=True, llvmgccdir=None,
@@ -73,7 +73,7 @@
                                           workdir='klee'))
 
     # Test.
-    f.addStep(DejaGNUCommand(name="test",
+    f.addStep(SuppressionDejaGNUCommand(name="test",
                              command=['nice', '-n', '10',
                                       'make', 'check'],
                              haltOnFailure=True, description="test klee",

Removed: zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py?rev=172308&view=auto
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py (removed)
@@ -1,33 +0,0 @@
-import re
-import StandardizedTest
-
-class DejaGNUCommand(StandardizedTest.StandardizedTest):
-    kRunningRE = re.compile(r'Running (.*) ...')
-    kRunningRE = re.compile(r'Running (.*) ...')
-    kTestStateLineRE = re.compile(r'(FAIL|PASS|XFAIL|XPASS|UNRESOLVED): (.*)')
-
-    testLogName = 'dg.sum'
-
-    def parseLog(self, lines):
-        results = []
-
-        test_suite = None
-        for ln in lines:
-            m = self.kRunningRE.match(ln)
-            if m is not None:
-                test_suite, = m.groups()
-                continue
-
-            m = self.kTestStateLineRE.match(ln)
-            if m is not None:
-                code,name = m.groups()
-                results.append((code, name, None))
-                continue
-
-        return results
-
-if __name__ == '__main__':
-    import sys
-    t = DejaGNUCommand()
-    for res in t.parseLog(open(sys.argv[1]).readlines()):
-        print res

Copied: zorg/trunk/zorg/buildbot/commands/SuppressionDejaGNUCommand.py (from r172308, zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py)
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/SuppressionDejaGNUCommand.py?p2=zorg/trunk/zorg/buildbot/commands/SuppressionDejaGNUCommand.py&p1=zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py&r1=172308&r2=172309&rev=172309&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/DejaGNUCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/SuppressionDejaGNUCommand.py Sat Jan 12 02:09:00 2013
@@ -1,7 +1,7 @@
 import re
 import StandardizedTest
 
-class DejaGNUCommand(StandardizedTest.StandardizedTest):
+class SuppressionDejaGNUCommand(StandardizedTest.StandardizedTest):
     kRunningRE = re.compile(r'Running (.*) ...')
     kRunningRE = re.compile(r'Running (.*) ...')
     kTestStateLineRE = re.compile(r'(FAIL|PASS|XFAIL|XPASS|UNRESOLVED): (.*)')
@@ -28,6 +28,6 @@
 
 if __name__ == '__main__':
     import sys
-    t = DejaGNUCommand()
+    t = SuppressionDejaGNUCommand()
     for res in t.parseLog(open(sys.argv[1]).readlines()):
         print res

Modified: zorg/trunk/zorg/buildbot/commands/__init__.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/__init__.py?rev=172309&r1=172308&r2=172309&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/__init__.py (original)
+++ zorg/trunk/zorg/buildbot/commands/__init__.py Sat Jan 12 02:09:00 2013
@@ -2,7 +2,7 @@
 import BatchFileDownload
 import ClangTestCommand
 import LitTestCommand
-import DejaGNUCommand
+import SuppressionDejaGNUCommand
 import GTestCommand
 
 __all__ = []