From 97dc582e04fcaf6e5074c30043c8e1293e3a9538 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Fri, 23 Jan 2015 14:28:08 -0500
Subject: [PATCH] Removing gdbserver tests from BSD; creating common config
 class for BSD

---
 lib/config.json | 17 ++++-------------
 master.cfg      | 25 +++++++++----------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/lib/config.json b/lib/config.json
index 07a61f9..77170b3 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -101,18 +101,6 @@
 		     "slavenames" : [ "koobs-freebsd8", "koobs-freebsd9",
 				      "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",
 		     "type" : "IndexBuildBSD",
 		     "builddir" : "freebsd-x86-64-cc-with-index",
@@ -139,7 +127,10 @@
 					  "Fedora-ppc64le-m64",
 					  "Fedora-ppc64le-native-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" ]
 		     }
 		   ]
 }
diff --git a/master.cfg b/master.cfg
index 4731b33..d8db036 100644
--- a/master.cfg
+++ b/master.cfg
@@ -563,25 +563,18 @@ class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
 
 # 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."""
-    extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
-    make_command = 'gmake'
+    pass
 
-class RunTestGDBNativeGDBServerBSD_c64t64 (RunTestGDBNativeGDBServer_c64t64):
-    """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):
+class RunTestGDBIndexBuildBSD (RunTestGDBIndexBuild, RunTestGDBBSD_Common):
     """Testing with the "cc-with-tweaks.sh" passing -i.  FIXME: include bitness here."""
-    extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
-    make_command = 'gmake'
+    pass
 
 # For now, we only support testing the "master" branch.
 master_filter = ChangeFilter (branch = [ r'master' ])