@@ -1,7 +1,7 @@

 Summary:        C debugger

 Name:           gdb

 Version:        7.12.1

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        GPLv2+

 URL:            http://www.gnu.org/software/%{name}

 Source0:        http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.xz

@@ -57,9 +57,8 @@ rm %{buildroot}%{_datadir}/locale/fi/LC_MESSAGES/opcodes.mo

 rm -f $(dirname $(gcc -print-libgcc-file-name))/../specs

 # fix typo in test

 sed -i 's/hex in)/hex in )/g' gdb/testsuite/gdb.arch/i386-signal.exp

-make %{?_smp_mflags} check

 # ignore exit code and check for expected number of failures

-tail gdb/testsuite/gdb.sum  | grep "# of unexpected failures.*1216"

+make %{?_smp_mflags} check || tail gdb/testsuite/gdb.sum  | grep "# of unexpected failures.*1219\|# of unexpected failures.*1220"

 %files -f %{name}.lang

 %defattr(-,root,root)

@@ -75,6 +74,8 @@ tail gdb/testsuite/gdb.sum  | grep "# of unexpected failures.*1216"

 %{_mandir}/*/*

 %changelog

+*   Mon Sep 11 2017 Rui Gu <ruig@vmware.com> 7.12.1-6

+-   Enable make check in docker with part of checks disabled

 *   Thu Aug 10 2017 Alexey Makhalov <amakhalov@vmware.com> 7.12.1-5

 -   Make check improvements

 *   Fri Jul 21 2017 Rui Gu <ruig@vmware.com> 7.12.1-4

@@ -48,12 +48,21 @@ class BuildContainer(object):

         try:

             self.logger.info("BuildContainer-prepareBuildContainer: Starting build container: " + containerName)

             #TODO: Is init=True equivalent of --sig-proxy?

-            containerID = self.dockerClient.containers.run(self.buildContainerImage,

-                                                           detach=True,

-                                                           name=containerName,

-                                                           network_mode="host",

-                                                           volumes=mountVols,

-                                                           command="/bin/bash -l -c /wait.sh")

+            if packageName in constants.listReqPrivilegedDockerForTest:

+                containerID = self.dockerClient.containers.run(self.buildContainerImage,

+                                                               detach=True,

+                                                               privileged=True,

+                                                               name=containerName,

+                                                               network_mode="host",

+                                                               volumes=mountVols,

+                                                               command="/bin/bash -l -c /wait.sh")

+            else:

+                containerID = self.dockerClient.containers.run(self.buildContainerImage,

+                                                               detach=True,

+                                                               name=containerName,

+                                                               network_mode="host",

+                                                               volumes=mountVols,

+                                                               command="/bin/bash -l -c /wait.sh")

             self.logger.debug("Started Photon build container for task " + containerTaskName

                                + " ID: " + containerID.short_id)

             if not containerID:

@@ -328,6 +328,11 @@ class constants(object):

     listReInstallPackages=[

         "go"]

+    # List of packages that requires privileged docker

+    # to run make check.

+    listReqPrivilegedDockerForTest=[

+        "gdb"]

+

     @staticmethod

     def initialize(options):

         constants.dist = options.dist