From 66796bf235914ce23a9fe5ebd727a29d4ad2ff4c Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Thu, 20 Sep 2018 17:17:38 -0400 Subject: [PATCH] Remove Aarch* builders --- lib/config.json | 52 +------------------------------------------------ master.cfg | 21 -------------------- 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/lib/config.json b/lib/config.json index 5563e00..e5eb481 100644 --- a/lib/config.json +++ b/lib/config.json @@ -40,11 +40,6 @@ { "name" : "gdb-amd64-netbsd7", "arch" : "x86_64", "jobs" : "1", "admin" : "n54@gmx.com" }, - { "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" }, - { "name" : "solaris11-amd64", "arch" : "x86_64", "jobs" : "4", "admin" : "ro@cebitec.uni-bielefeld.de" }, { "name" : "solaris11-sparcv9", "arch" : "sparcv9", "jobs" : "4", @@ -305,37 +300,6 @@ "slavenames" : [ "koobs-freebsd10" ] }, - { "name" : "Ubuntu-AArch64-m64", - "type" : "Plain_c64t64", - "builddir" : "ubuntu-aarch64-m64", - "tags" : [ "ubuntu", "aarch64", "m64", "MAIL" ], - "slavenames" : [ "ubuntu-aarch64-1" ] }, - - { "name" : "Ubuntu-AArch64-native-gdbserver-m64", - "type" : "NativeGDBServer_c64t64", - "builddir" : "ubuntu-aarch64-native-gdbserver-m64", - "tags" : [ "ubuntu", "aarch64", "native-gdbserver", "m64", "MAIL" ], - "slavenames" : [ "ubuntu-aarch64-1" ] }, - - - { "name" : "Ubuntu-AArch32-m32", - "type" : "ARMPlain", - "builddir" : "ubuntu-aarch32-m32", - "tags" : [ "ubuntu", "aarch32", "m32", "MAIL" ], - "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }, - - { "name" : "Ubuntu-AArch32-native-gdbserver-m32", - "type" : "ARMNativeGDBServer", - "builddir" : "ubuntu-aarch32-native-gdbserver-m32", - "tags" : [ "ubuntu", "aarch32", "native-gdbserver", "m32", "MAIL" ], - "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }, - - { "name" : "Ubuntu-AArch32-native-extended-gdbserver-m32", - "type" : "ARMNativeExtendedGDBServer", - "builddir" : "ubuntu-aarch32-native-extended-gdbserver-m32", - "tags" : [ "ubuntu", "aarch32", "native-extended-gdbserver", - "m32", "MAIL" ], - "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }, { "name" : "Solaris11-amd64-m64", "type" : "PlainSolaris_c64", @@ -400,13 +364,6 @@ "FreeBSD10-x86_64-m64", "FreeBSD10-x86_64-cc-with-index", - "Ubuntu-AArch64-m64", - "Ubuntu-AArch64-native-gdbserver-m64", - - "Ubuntu-AArch32-m32", - "Ubuntu-AArch32-native-gdbserver-m32", - "Ubuntu-AArch32-native-extended-gdbserver-m32", - "Solaris11-amd64-m64", "Solaris11-sparcv9-m64" ] }, @@ -458,14 +415,7 @@ "FreeBSD-x86_64-cc-with-index", "FreeBSD10-x86_64-m64", - "FreeBSD10-x86_64-cc-with-index", - - "Ubuntu-AArch64-m64", - "Ubuntu-AArch64-native-gdbserver-m64", - - "Ubuntu-AArch32-m32", - "Ubuntu-AArch32-native-gdbserver-m32", - "Ubuntu-AArch32-native-extended-gdbserver-m32" ] + "FreeBSD10-x86_64-cc-with-index" ] }, { "type" : "Nightly", "name" : "racy_daily", diff --git a/master.cfg b/master.cfg index bb412e2..ed1e1eb 100644 --- a/master.cfg +++ b/master.cfg @@ -1312,27 +1312,6 @@ class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common): self.disable_default_compilation_flags = True BuildAndTestGDBFactory.__init__ (self, **kwargs) -# Classes needed for ARM (running on Aarch64, on Yao's buildslave) - -class RunTestGDBARM_Common (BuildAndTestGDBFactory): - """Common ARM configurations (for Yao)""" - def __init__ (self, **kwargs): - self.extra_conf_flags = [ 'CC=arm-linux-gnueabihf-gcc-4.8', 'CXX=arm-linux-gnueabihf-g++-4.8', '--host=arm-linux-gnueabihf', '--enable-64-bit-bfd' ] - self.extra_make_check_flags = [ 'RUNTESTFLAGS=CC_FOR_TARGET=arm-linux-gnueabihf-gcc-4.8 CXX_FOR_TARGET=arm-linux-gnueabihf-g++-4.8' ] - BuildAndTestGDBFactory.__init__ (self, **kwargs) - -class RunTestGDBARMPlain (RunTestGDBARM_Common): - """Compiling for ARM, testing on ARM.""" - pass - -class RunTestGDBARMNativeGDBServer (RunTestGDBARM_Common, RunTestGDBNativeGDBServer_c64t64): - """Compiling for ARM native-gdbserver, testing on ARM.""" - pass - -class RunTestGDBARMNativeExtendedGDBServer (RunTestGDBARM_Common, RunTestGDBNativeExtendedGDBServer_c64t64): - """Compiling for ARM native-extended-gdbserver, testing on ARM.""" - pass - # All branches that are going to be watched. all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)