Removing gdbserver tests from BSD; creating common config class for BSD

This commit is contained in:
Sergio Durigan Junior 2015-01-23 14:28:08 -05:00
parent 0ca2c45fa0
commit 97dc582e04
2 changed files with 13 additions and 29 deletions

View file

@ -101,18 +101,6 @@
"slavenames" : [ "koobs-freebsd8", "koobs-freebsd9", "slavenames" : [ "koobs-freebsd8", "koobs-freebsd9",
"koobs-freebsd10", "koobs-freebsd11" ] }, "koobs-freebsd10", "koobs-freebsd11" ] },
{ "name" : "FreeBSD-x86_64-native-gdbserver-m64",
"type" : "NativeGDBServerBSD_c64t64",
"builddir" : "freebsd-x86-64-native-gdbserver",
"slavenames" : [ "koobs-freebsd8", "koobs-freebsd9",
"koobs-freebsd10", "koobs-freebsd11" ] },
{ "name" : "FreeBSD-x86_64-native-extended-gdbserver-m64",
"type" : "NativeExtendedGDBServerBSD_c64t64",
"builddir" : "freebsd-x86-64-native-extended-gdbserver",
"slavenames" : [ "koobs-freebsd8", "koobs-freebsd9",
"koobs-freebsd10", "koobs-freebsd11" ] },
{ "name" : "FreeBSD-x86_64-cc-with-index", { "name" : "FreeBSD-x86_64-cc-with-index",
"type" : "IndexBuildBSD", "type" : "IndexBuildBSD",
"builddir" : "freebsd-x86-64-cc-with-index", "builddir" : "freebsd-x86-64-cc-with-index",
@ -139,7 +127,10 @@
"Fedora-ppc64le-m64", "Fedora-ppc64le-m64",
"Fedora-ppc64le-native-gdbserver-m64", "Fedora-ppc64le-native-gdbserver-m64",
"Fedora-ppc64le-native-extended-gdbserver-m64", "Fedora-ppc64le-native-extended-gdbserver-m64",
"Fedora-ppc64le-cc-with-index" ] "Fedora-ppc64le-cc-with-index",
"FreeBSD-x86_64-m64",
"FreeBSD-x86_64-cc-with-index" ]
} }
] ]
} }

View file

@ -563,25 +563,18 @@ class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
# Classes needed for BSD systems # Classes needed for BSD systems
class RunTestGDBPlainBSD_c64t64 (RunTestGDBPlain_c64t64): class RunTestGDBBSD_Common (BuildAndTestGDBFactory):
"""Common BSD test configurations"""
extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
make_command = 'gmake'
class RunTestGDBPlainBSD_c64t64 (RunTestGDBPlain_c64t64, RunTestGDBBSD_Common):
"""Compiling for 64-bit, testing on 64-bit.""" """Compiling for 64-bit, testing on 64-bit."""
extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ] pass
make_command = 'gmake'
class RunTestGDBNativeGDBServerBSD_c64t64 (RunTestGDBNativeGDBServer_c64t64): class RunTestGDBIndexBuildBSD (RunTestGDBIndexBuild, RunTestGDBBSD_Common):
"""Compiling on 64-bit, testing native-gdbserver on 64-bit."""
extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
make_command = 'gmake'
class RunTestGDBNativeExtendedGDBServerBSD_c64t64 (RunTestGDBNativeExtendedGDBServer_c64t64):
"""Compiling on 64-bit, testing native-extended-gdbserver on 64-bit."""
extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
make_command = 'gmake'
class RunTestGDBIndexBuildBSD (RunTestGDBIndexBuild):
"""Testing with the "cc-with-tweaks.sh" passing -i. FIXME: include bitness here.""" """Testing with the "cc-with-tweaks.sh" passing -i. FIXME: include bitness here."""
extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ] pass
make_command = 'gmake'
# For now, we only support testing the "master" branch. # For now, we only support testing the "master" branch.
master_filter = ChangeFilter (branch = [ r'master' ]) master_filter = ChangeFilter (branch = [ r'master' ])