From c45a93969802b50b54bd58903ed34c69a41d9f63 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 19 Sep 2018 15:58:10 -0400 Subject: [PATCH] Add Solaris buildslaves. --- lib/config.json | 32 ++++++++++++++++++++++++++++---- master.cfg | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/lib/config.json b/lib/config.json index 2053119..bd8fede 100644 --- a/lib/config.json +++ b/lib/config.json @@ -43,7 +43,12 @@ { "name" : "ubuntu-aarch64-1", "arch" : "aarch64", "jobs" : "4", "admin" : "qiyaoltc@gmail.com" }, { "name" : "ubuntu-trusty-aarch32-1", "arch" : "aarch32", "jobs" : "4", - "admin" : "qiyaoltc@gmail.com" } + "admin" : "qiyaoltc@gmail.com" }, + + { "name" : "solaris11-amd64", "arch" : "x86_64", "jobs" : "4", + "admin" : "ro@cebitec.uni-bielefeld.de" }, + { "name" : "solaris11-sparcv9", "arch" : "sparcv9", "jobs" : "4", + "admin" : "ro@cebitec.uni-bielefeld.de" } ], "builders" : [ { "name" : "Fedora-x86_64-m64", "type" : "Plain_c64t64", @@ -330,7 +335,21 @@ "builddir" : "ubuntu-aarch32-native-extended-gdbserver-m32", "tags" : [ "ubuntu", "aarch32", "native-extended-gdbserver", "m32", "MAIL" ], - "slavenames" : [ "ubuntu-trusty-aarch32-1" ] } + "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }, + + { "name" : "Solaris11-amd64-m64", + "arch_triplet" : "amd64-pc-solaris2.11", + "type" : "PlainSolaris_c64", + "builddir" : "solaris11-amd64-m64", + "tags" : [ "solaris", "solaris11", "x86_64", "m64", "MAIL" ], + "slavenames" : [ "solaris11-amd64" ] }, + + { "name" : "Solaris11-sparcv9-m64", + "arch_triplet" : "sparcv9-sun-solaris2.11", + "type" : "PlainSolaris_c64", + "builddir" : "solaris11-sparcv9-m64", + "tags" : [ "solaris", "solaris11", "sparcv9", "m64", "MAIL" ], + "slavenames" : [ "solaris11-sparcv9" ] } ], "schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master", @@ -388,7 +407,10 @@ "Ubuntu-AArch32-m32", "Ubuntu-AArch32-native-gdbserver-m32", - "Ubuntu-AArch32-native-extended-gdbserver-m32" ] + "Ubuntu-AArch32-native-extended-gdbserver-m32", + + "Solaris11-amd64-m64", + "Solaris11-sparcv9-m64" ] }, { "type" : "Nightly", "name" : "racy", @@ -481,7 +503,9 @@ "Ubuntu-AArch64-native-gdbserver-m64", "Ubuntu-AArch32-m32", "Ubuntu-AArch32-native-gdbserver-m32", - "Ubuntu-AArch32-native-extended-gdbserver-m32" ] + "Ubuntu-AArch32-native-extended-gdbserver-m32", + "Solaris11-amd64-m64", + "Solaris11-sparcv9-m64" ] } ] } diff --git a/master.cfg b/master.cfg index b4c249d..3b38f27 100644 --- a/master.cfg +++ b/master.cfg @@ -1006,6 +1006,9 @@ The parameters of the class are: use_system_debuginfo = True system_debuginfo_location = "/usr/lib/debug" + # Disable the use of default_{CFLAGS,CXXFLAGS} when compiling GDB. + disable_default_compilation_flags = False + def __init__ (self, architecture_triplet = [], initial_delay = None): factory.BuildFactory.__init__ (self) @@ -1049,8 +1052,16 @@ The parameters of the class are: if self.use_system_debuginfo: self.extra_conf_flags.append ('--with-separate-debug-dir=%s' % self.system_debuginfo_location) - self.extra_conf_flags.append ("CFLAGS=%s" % default_CFLAGS + " " + ' '.join (self.extra_CFLAGS)) - self.extra_conf_flags.append ("CXXFLAGS=%s" % default_CXXFLAGS + " " + ' '.join (self.extra_CXXFLAGS)) + myCFLAGS = "CFLAGS=" + myCXXFLAGS = "CXXFLAGS=" + if not self.disable_default_compilation_flags: + myCFLAGS += default_CFLAGS + " " + myCXXFLAGS += default_CXXFLAGS + " " + myCFLAGS += ' '.join (self.extra_CFLAGS) + myCXXFLAGS += ' '.join (self.extra_CXXFLAGS) + + self.extra_conf_flags.append (myCFLAGS) + self.extra_conf_flags.append (myCXXFLAGS) self.extra_conf_flags.append (architecture_triplet) self.addStep (self.ConfigureClass (self.extra_conf_flags, haltOnFailure = True)) @@ -1269,6 +1280,28 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64): """Compiling for AIX""" pass +# Classes needed for Solaris systems + +class RunTestGDBSolaris_Common (BuildAndTestGDBFactory): + """Common Solaris test configurations""" + def __init__ (self, **kwargs): + self.enable_targets_all = False + self.make_command = 'gmake' + self.run_testsuite = False + # While a regular gdb build succeeds, a -g -D_GLIBCXX_DEBUG + # build as used by the buildbot fails as reported in PR + # build/23676. This can be avoided either by performing a -g + # -O build or with --disable-unit-tests from Sergio's proposed + # patch. + self.disable_default_compilation_flags = True + BuildAndTestGDBFactory.__init__ (self, **kwargs) + +class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common): + """Compiling for Solaris""" + def __init__ (self, **kwargs): + self.extra_CFLAGS = [ '-m64' ] + self.extra_CXXFLAGS = self.extra_CFLAGS + # Classes needed for ARM (running on Aarch64, on Yao's buildslave) class RunTestGDBARM_Common (BuildAndTestGDBFactory):