scripts: Do code generation earlier
authorChris Forbes <chrisforbes@google.com>
Tue, 28 Aug 2018 18:52:08 +0000 (11:52 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 28 Aug 2018 18:55:01 +0000 (11:55 -0700)
The actual builds are likely to fail if the framework code generation
steps were going to do anything.

Components: Framework
VK-GL-CTS Issue: 1328

Change-Id: I7ac96fb11520e028b0611e703925378a75dabd07

scripts/check_build_sanity.py

index 76830ad31af6da079d5628520ecc94cca8de91ca..d44e22183728b41cb63557ee0da04cd84fc0e5a3 100644 (file)
@@ -184,7 +184,16 @@ BUILD_TARGETS              = [
                  ANY_VS_X64_GENERATOR),
 ]
 
-SPECIAL_RECIPES                = [
+EARLY_SPECIAL_RECIPES  = [
+       ('gen-inl-files', [
+                       RunScript(os.path.join("scripts", "gen_egl.py")),
+                       RunScript(os.path.join("scripts", "opengl", "gen_all.py")),
+                       RunScript(os.path.join("external", "vulkancts", "scripts", "gen_framework.py")),
+                       RunScript(os.path.join("scripts", "gen_android_mk.py")),
+               ])
+]
+
+LATE_SPECIAL_RECIPES   = [
        ('android-mustpass', [
                        RunScript(os.path.join("scripts", "build_android_mustpass.py"),
                                          lambda env: ["--build-dir", os.path.join(env.tmpDir, "android-mustpass")]),
@@ -197,11 +206,7 @@ SPECIAL_RECIPES            = [
                        RunScript(os.path.join("external", "vulkancts", "scripts", "build_spirv_binaries.py"),
                                          lambda env: ["--build-dir", os.path.join(env.tmpDir, "spirv-binaries")]),
                ]),
-       ('gen-inl-files', [
-                       RunScript(os.path.join("scripts", "gen_egl.py")),
-                       RunScript(os.path.join("scripts", "opengl", "gen_all.py")),
-                       RunScript(os.path.join("external", "vulkancts", "scripts", "gen_framework.py")),
-                       RunScript(os.path.join("scripts", "gen_android_mk.py")),
+       ('check-all', [
                        RunScript(os.path.join("scripts", "src_util", "check_all.py")),
                ])
 ]
@@ -216,8 +221,7 @@ def getAllRecipe (recipes):
        return ("all", allSteps)
 
 def getRecipes ():
-       recipes = getBuildRecipes()
-       recipes += SPECIAL_RECIPES
+       recipes = EARLY_SPECIAL_RECIPES + getBuildRecipes() + LATE_SPECIAL_RECIPES
        return recipes
 
 def getRecipe (recipes, recipeName):