Implementing run_testsuite option; adding new builder to test --enable-build-with-cxx

This commit implements the run_testsuite option, which can be used to
determine whether the builder should run the testsuite or not.

It also adds a new builder to test the --enable-build-with-cxx.  This
builder makes use of the new run_testsuite flag, because it doesn't
need to run the testsuite.
This commit is contained in:
Sergio Durigan Junior 2015-05-15 14:31:30 -04:00
parent c434c0699d
commit bc81518c8b
2 changed files with 37 additions and 16 deletions

View file

@ -57,6 +57,10 @@
"builddir" : "fedora-i686", "builddir" : "fedora-i686",
"slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2" ] }, "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2" ] },
{ "name" : "Fedora-x86_64-cxx-build-m64",
"type" : "PlainBuildWithCxx_c64notest",
"builddir" : "fedora-x86-64-cxx-build",
"slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2" ] },
{ "name" : "Debian-x86_64-m64", { "name" : "Debian-x86_64-m64",

View file

@ -512,6 +512,9 @@ The parameters of the class are:
CompileClass = CompileGDB CompileClass = CompileGDB
TestClass = TestGDB TestClass = TestGDB
# Set this to False to skip the test
run_testsuite = True
extra_conf_flags = None extra_conf_flags = None
extra_make_flags = None extra_make_flags = None
@ -541,7 +544,9 @@ The parameters of the class are:
descriptionDone = r"removed old build dir")) descriptionDone = r"removed old build dir"))
self.addStep (CloneOrUpdateGDBMasterRepo ()) self.addStep (CloneOrUpdateGDBMasterRepo ())
self.addStep (CloneOrUpdateGDBRepo ()) self.addStep (CloneOrUpdateGDBRepo ())
self.addStep (CopyOldGDBSumFile ())
if self.run_testsuite:
self.addStep (CopyOldGDBSumFile ())
if not self.extra_conf_flags: if not self.extra_conf_flags:
self.extra_conf_flags = [] self.extra_conf_flags = []
@ -560,24 +565,26 @@ The parameters of the class are:
if not self.extra_make_check_flags: if not self.extra_make_check_flags:
self.extra_make_check_flags = [] self.extra_make_check_flags = []
if not self.test_env:
self.test_env = {}
if self.test_parallel: if self.run_testsuite:
self.extra_make_check_flags.append (WithProperties (r"-j%s", r'jobs')) if not self.test_env:
self.extra_make_check_flags.append (r'FORCE_PARALLEL=1') self.test_env = {}
self.addStep (self.TestClass (self.make_command, self.extra_make_check_flags, if self.test_parallel:
self.test_env)) self.extra_make_check_flags.append (WithProperties (r"-j%s", r'jobs'))
self.extra_make_check_flags.append (r'FORCE_PARALLEL=1')
self.addStep (GdbCatSumfileCommand (workdir = WithProperties (r'%s/build/gdb/testsuite', self.addStep (self.TestClass (self.make_command, self.extra_make_check_flags,
r'builddir'), self.test_env))
description = r'analyze test results'))
self.addStep (FileUpload (slavesrc = WithProperties (r"%s/build/gdb/testsuite/gdb.log", self.addStep (GdbCatSumfileCommand (workdir = WithProperties (r'%s/build/gdb/testsuite',
r'builddir'), r'builddir'),
masterdest = WithProperties (r"public_html/results/%s/gdb.log", description = r'analyze test results'))
r'buildername'))) self.addStep (FileUpload (slavesrc = WithProperties (r"%s/build/gdb/testsuite/gdb.log",
self.addStep (SaveGDBResults ()) r'builddir'),
masterdest = WithProperties (r"public_html/results/%s/gdb.log",
r'buildername')))
self.addStep (SaveGDBResults ())
################## ##################
@ -670,6 +677,16 @@ class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
'RUNTESTFLAGS=--target_board unix/-m32' ] 'RUNTESTFLAGS=--target_board unix/-m32' ]
BuildAndTestGDBFactory.__init__ (self, **kwargs) BuildAndTestGDBFactory.__init__ (self, **kwargs)
# Class for only building GDB, without testing
class RunTestGDBPlainBuildWithCxx_c64notest (BuildAndTestGDBFactory):
"""Compiling for 64-bit with --enable-build-with-cxx. We do not test
anything for now."""
def __init__ (self, **kwargs):
self.extra_conf_flags = [ '--enable-build-with-cxx' ]
self.run_testsuite = False
BuildAndTestGDBFactory.__init__ (self, **kwargs)
# Classes needed for BSD systems # Classes needed for BSD systems
class RunTestGDBBSD_Common (BuildAndTestGDBFactory): class RunTestGDBBSD_Common (BuildAndTestGDBFactory):