@@ -108,8 +108,10 @@ class PackageBuilder(object):

             listInstalledPackages=self.findInstalledPackages(chrootID)

             listDependentPackages=self.findBuildTimeRequiredPackages(package)

             if constants.rpmCheck and package in constants.testForceRPMS:

+                listDependentPackages.extend(self.findBuildTimeCheckRequiredPackages(package))

                 testPackages=set(constants.listMakeCheckRPMPkgtoInstall)-set(listInstalledPackages)-set([package])

                 listDependentPackages.extend(testPackages)

+                listDependentPackages=list(set(listDependentPackages))

             pkgUtils = PackageUtils(self.logName,self.logPath)

             if len(listDependentPackages) != 0:

@@ -141,6 +143,10 @@ class PackageBuilder(object):

         listRequiredPackages=constants.specData.getBuildRequiresForPackage(package)

         return listRequiredPackages

+    def findBuildTimeCheckRequiredPackages(self,package):

+        listRequiredPackages=constants.specData.getCheckBuildRequiresForPackage(package)

+        return listRequiredPackages

+

     def installPackage(self,pkgUtils,package,chrootID,destLogPath,listInstalledPackages):

         if package in listInstalledPackages:

             return

@@ -11,6 +11,7 @@ class SerializableSpecObject(object):

         self.version=""

         self.release=""

         self.buildRequirePackages=[]

+        self.checkBuildRequirePackages=[]

         self.installRequiresAllPackages=[]

         self.installRequiresPackages={}

         self.specFile=""

@@ -42,6 +43,7 @@ class SerializableSpecObjectsUtils(object):

             specObj.name=specName

             specObj.buildRequirePackages=spec.getBuildRequiresAllPackages()

             specObj.installRequiresAllPackages=spec.getRequiresAllPackages()

+            specObj.checkBuildRequirePackages=spec.getCheckBuildRequiresAllPackages()

             specObj.listPackages=spec.getPackageNames()

             specObj.specFile=specFile

             specObj.version=spec.getVersion()

@@ -90,6 +92,10 @@ class SerializableSpecObjectsUtils(object):

             return self.mapSerializableSpecObjects[specName].installRequiresPackages[package]

         return None

+    def getCheckBuildRequiresForPackage(self, package):

+        specName=self.getSpecName(package)

+        return self.mapSerializableSpecObjects[specName].checkBuildRequirePackages

+

     def addMacro(self, macroName, macroValue):

         if macroName == "":

             self.logger.error("Given invalid macro: name:"+macroName+" value:"+macroValue)

@@ -14,6 +14,7 @@ class SpecParser(object):

         self.specAdditionalContent=""

         self.globalSecurityHardening=""

         self.defs={}

+        self.conditionalCheckMacroEnabled = False

     def readPkgNameFromPackageMacro(self,data,basePkgName=None):

@@ -74,6 +75,10 @@ class SpecParser(object):

                 self.readChecksum(line, self.packages[currentPkg])

             elif self.isDefinition(line):

                 self.readDefinition(line)

+            elif self.isConditionalCheckMacro(line):

+                self.conditionalCheckMacroEnabled = True

+            elif self.conditionalCheckMacroEnabled and self.isConditionalMacroCompleted(line):

+                self.conditionalCheckMacroEnabled = False

             else:

                 self.specAdditionalContent+=line+"\n"

             i=i+1

@@ -327,7 +332,10 @@ class SpecParser(object):

             if headerName == 'conflicts':

                 pkg.conflicts.extend(dpkg)

             if headerName == 'buildrequires':

-                pkg.buildrequires.extend(dpkg)

+                if self.conditionalCheckMacroEnabled:

+                    pkg.checkbuildrequires.extend(dpkg)

+                else:

+                    pkg.buildrequires.extend(dpkg)

             if headerName == 'buildprovides':

                 pkg.buildprovides.extend(dpkg)

@@ -373,3 +381,23 @@ class SpecParser(object):

             return False

         pkg.checksums[sourceName] = value[1]

         return True;

+

+    def isConditionalCheckMacro(self,line):

+        data = line.strip()

+        words = data.split()

+        nrWords = len(words)

+        if(nrWords != 2):

+            return False

+        if(words[0] != "%if" or words[1] != "%{with_check}"):

+            return False

+        return True

+

+    def isConditionalMacroCompleted(self,line):

+        data = line.strip()

+        words = data.split()

+        nrWords = len(words)

+        if(nrWords != 1):

+            return False

+        if(words[0] != "%endif"):

+            return False

+        return True

@@ -9,18 +9,18 @@ class rpmMacro(object):

     def setName(self,name):

         self.macroName=name

-        

+

     def displayMacro(self):

         print "Macro:\n", self.macroName, " ",self.macroFlag," ",self.position," ",self.endposition

         print self.content

-    

+

 class dependentPackageData(object):

     def __init__(self):

         self.package=""

         self.version=""

         self.compare=""

-        

+

 class Package(object):

     def __init__(self, basePkg=None):

         self.summary=""

@@ -33,25 +33,26 @@ class Package(object):

         self.distribution="Photon"

         self.basePkgName=""

         self.URL=""

-        

+

         self.sources=[]

         self.checksums={}

         self.patches=[]

         self.buildrequires=[]

         self.buildprovides=[]

-        

-        

+        self.checkbuildrequires=[]

+

+

         self.requires=[]

         self.provides=[]

         self.obsoletes=[]

         self.conflicts=[]

-        

+

         self.descriptionMacro= None

         self.postMacro=None

         self.postunMacro=None

         self.filesMacro=None

         self.packageMacro=None

-        

+

         if basePkg is not None:

             self.basePkgName=basePkg.name

             self.group=basePkg.group

@@ -60,22 +61,22 @@ class Package(object):

             self.buildarch=basePkg.buildarch

             self.release=basePkg.release

             self.distribution=basePkg.distribution

-        

+

     def decodeContents(self,content):

         if content.find("%{name}") != -1:

             if self.basePkgName == "":

                 content = content.replace('%{name}',self.name)

             else:

                 content = content.replace('%{name}',self.basePkgName)

-        

+

         if content.find("%{release}") != -1:

             content = content.replace('%{release}',self.release)

-        

+

         if content.find("%{version}") != -1:

             content = content.replace('%{version}',self.version)

-        

+

         return content

-    

+

     def updatePackageMacro(self,macro):

         if macro.macroName == "%post":

             self.postMacro=macro

@@ -142,31 +142,39 @@ class Specutils(object):

         return buildArch

     def getRequiresAllPackages(self):

-        depedentPackages=[]

+        dependentPackages=[]

         for key in self.spec.packages.keys():

             pkg = self.spec.packages.get(key)

             for dpkg in pkg.requires:

-                depedentPackages.append(dpkg.package)

-        depedentPackages=list(set(depedentPackages))

+                dependentPackages.append(dpkg.package)

+        dependentPackages=list(set(dependentPackages))

         packageNames=self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in depedentPackages:

-                depedentPackages.remove(pkgName)

-        return depedentPackages

+            if pkgName in dependentPackages:

+                dependentPackages.remove(pkgName)

+        return dependentPackages

     def getBuildRequiresAllPackages(self):

-        depedentPackages=[]

+        dependentPackages=[]

         for key in self.spec.packages.keys():

             pkg = self.spec.packages.get(key)

             for dpkg in pkg.buildrequires:

-                depedentPackages.append(dpkg.package)

-        depedentPackages=list(set(depedentPackages))

+                dependentPackages.append(dpkg.package)

+        dependentPackages=list(set(dependentPackages))

         packageNames=self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in depedentPackages:

-                depedentPackages.remove(pkgName)

-        return depedentPackages

+            if pkgName in dependentPackages:

+                dependentPackages.remove(pkgName)

+        return dependentPackages

+    def getCheckBuildRequiresAllPackages(self):

+        dependentPackages=[]

+        for key in self.spec.packages.keys():

+            pkg = self.spec.packages.get(key)

+            for dpkg in pkg.checkbuildrequires:

+                dependentPackages.append(dpkg.package)

+        dependentPackages=list(set(dependentPackages))

+        return dependentPackages

     def getRequires(self,pkgName):

         dependentPackages=[]

@@ -186,8 +194,17 @@ class Specutils(object):

                     dependentPackages.append(dpkg.package)

         return dependentPackages

+    def getCheckBuildRequires(self,pkgName):

+        dependentPackages=[]

+        for key in self.spec.packages.keys():

+            pkg = self.spec.packages.get(key)

+            if pkg.name == pkgName:

+                for dpkg in pkg.checkbuildrequires:

+                    dependentPackages.append(dpkg.package)

+        return dependentPackages

+

     def getProvides(self,packageName):

-        depedentPackages=[]

+        dependentPackages=[]

         defaultPkgName=self.spec.packages['default'].name

         pkg = None

         if self.spec.packages.has_key(packageName):

@@ -196,10 +213,10 @@ class Specutils(object):

             pkg=self.spec.packages['default']

         if pkg is not None:

             for dpkg in pkg.provides:

-                depedentPackages.append(dpkg.package)

+                dependentPackages.append(dpkg.package)

         else:

             print "package not found"

-        return depedentPackages

+        return dependentPackages

     def getVersion(self):

         pkg = self.spec.packages.get('default')

@@ -325,14 +325,14 @@ class constants(object):

         constants.specData.readSpecsAndConvertToSerializableObjects(constants.specPath)

         constants.pullsourcesConfig = options.pullsourcesConfig

         constants.inputRPMSPath=options.inputRPMSPath

-        constants.updateRPMMacros()

         constants.testForceRPMS=[]

         constants.rpmCheck = options.rpmCheck

         constants.rpmCheckStopOnError = options.rpmCheckStopOnError

-	constants.publishBuildDependencies=options.publishBuildDependencies

-	constants.packageWeightsPath=options.packageWeightsPath

+        constants.publishBuildDependencies=options.publishBuildDependencies

+        constants.packageWeightsPath=options.packageWeightsPath

         if constants.rpmCheck:

             constants.testLogger=Logger.getLogger("MakeCheckTest",constants.logPath)

+        constants.updateRPMMacros()

     @staticmethod

     def updateRPMMacros():

@@ -367,6 +367,12 @@ class constants(object):

             kernelsubrelease = "."+kernelsubrelease

             constants.specData.addMacro("kernelsubrelease",kernelsubrelease)

+        #adding check rpm macro

+        if constants.rpmCheck:

+            constants.specData.addMacro("with_check","1")

+        else:

+            constants.specData.addMacro("with_check","0")

+

     @staticmethod

     def setTestForceRPMS(listsPackages):

          constants.testForceRPMS=listsPackages