Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1

[platform/upstream/VK-GL-CTS.git] / scripts / launchcontrol_build.py

diff --git a/scripts/launchcontrol_build.py b/scripts/launchcontrol_build.py
index 676487a..95a0ff8 100644 (file)
--- a/scripts/launchcontrol_build.py
+++ b/scripts/launchcontrol_build.py
@@ -29,7 +29,7 @@ from build_android_mustpass import *
 
 class LaunchControlConfig:
        def __init__ (self, buildArgs, checkMustpassLists):
-               self.buildArgs                  = buildArgs
+               self.buildArgs                  = buildArgs
                self.checkMustpassLists = checkMustpassLists
 
        def getBuildArgs (self):
@@ -38,21 +38,26 @@ class LaunchControlConfig:
        def getCheckMustpassLists (self):
                return self.checkMustpassLists
 
-# This is a bit silly, but CMake needs to know the word width prior to
-# parsing the project files, hence cannot use our own defines.
-X86_64_ARGS = ["-DDE_CPU=DE_CPU_X86_64", "-DCMAKE_C_FLAGS=-m64", "-DCMAKE_CXX_FLAGS=-m64"]
+COMMON_GCC_CFLAGS      = ["-Werror"]
+COMMON_CLANG_CFLAGS    = COMMON_GCC_CFLAGS + ["-Wno-error=unused-command-line-argument"]
+X86_64_GCC_CFLAGS      = COMMON_GCC_CFLAGS + ["-m64"]
+X86_64_CLANG_CFLAGS    = COMMON_CLANG_CFLAGS + ["-m64"]
+
+def makeCflagsArgs (cflags):
+       cflagsStr = " ".join(cflags)
+       return ["-DCMAKE_C_FLAGS=%s" % cflagsStr, "-DCMAKE_CXX_FLAGS=%s" % cflagsStr]
 
 BUILD_CONFIGS = {
-       "gcc-x86_64-x11_glx":   LaunchControlConfig(X86_64_ARGS + ["-DDEQP_TARGET=x11_glx"], False),
-       "clang-x86_64-x11_glx": LaunchControlConfig(X86_64_ARGS + ["-DDEQP_TARGET=x11_glx", "-DCMAKE_C_COMPILER=clang", "-DCMAKE_CXX_COMPILER=clang++"], False),
-       "gcc-x86_64-null":              LaunchControlConfig(X86_64_ARGS + ["-DDEQP_TARGET=null"], True)
+       "gcc-x86_64-x11_glx":   LaunchControlConfig(["-DDEQP_TARGET=x11_glx"] + makeCflagsArgs(X86_64_GCC_CFLAGS), False),
+       "clang-x86_64-x11_glx": LaunchControlConfig(["-DDEQP_TARGET=x11_glx", "-DCMAKE_C_COMPILER=clang", "-DCMAKE_CXX_COMPILER=clang++"] + makeCflagsArgs(X86_64_CLANG_CFLAGS), False),
+       "gcc-x86_64-null":              LaunchControlConfig(["-DDEQP_TARGET=null"] + makeCflagsArgs(X86_64_GCC_CFLAGS), True)
 }
 
 def buildWithMake (workingDir):
        pushWorkingDir(workingDir)
        # CMake docs advised this to be the best magic formula...
        threadCount = multiprocessing.cpu_count() + 1
-       print "Invoke make with %d threads" % threadCount
+       print("Invoke make with %d threads" % threadCount)
        execute(["make", "-j%d" % threadCount])
        popWorkingDir()
 
@@ -87,9 +92,9 @@ def parseOptions ():
 if __name__ == "__main__":
        options = parseOptions()
 
-       print "\n############################################################"
-       print "# %s %s BUILD" % (options.config.upper(), options.buildType.upper())
-       print "############################################################\n"
+       print("\n############################################################")
+       print("# %s %s BUILD" % (options.config.upper(), options.buildType.upper()))
+       print("############################################################\n")
 
        launchControlConfig = BUILD_CONFIGS[options.config]
        buildDir = os.path.realpath(os.path.normpath(options.buildDir))
@@ -101,4 +106,4 @@ if __name__ == "__main__":
                genMustpassLists(MUSTPASS_LISTS, MAKEFILE_GENERATOR, config)
                checkForChanges()
 
-       print "\n--- BUILD SCRIPT COMPLETE"
+       print("\n--- BUILD SCRIPT COMPLETE")