X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=scripts%2Flaunchcontrol_build.py;h=97c2adbdc775522c23f4c767cadf5bbf2cf71e4e;hb=6cbd0fdde04085a6b91e8bd31964708473bbefa8;hp=b221d8f3535a1a8e4588871f92c74275007d52ff;hpb=a12bdeba84ae13f950b80eb39c3a7ba5d1a1497a;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/scripts/launchcontrol_build.py b/scripts/launchcontrol_build.py
index b221d8f..97c2adb 100644
--- a/scripts/launchcontrol_build.py
+++ b/scripts/launchcontrol_build.py
@@ -38,14 +38,19 @@ 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):