Enable GLES1 tests in ANGLE recipe.
Adding a build flag allows us to test the compilation of the GLES
1.0 conformance tests in the standalone ANGLE recipe. This feature
was enabled from a prior change that allowed the recipe to checkout
internal sources.
Bug: angleproject:3621
Tbr: jbudorick@chromium.org
Change-Id: I94ffcf79968b0de581fdefd1143a3c4a360ec67b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1684562
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index 861ab296..231a1a4 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -3837,7 +3837,7 @@
[DEPS](/scripts/slave/recipes/angle.py#5): [goma](#recipe_modules-goma), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/depot\_tools][depot_tools/recipe_modules/depot_tools], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/gsutil][depot_tools/recipe_modules/gsutil], [depot\_tools/osx\_sdk][depot_tools/recipe_modules/osx_sdk], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time]
-— **def [RunSteps](/scripts/slave/recipes/angle.py#106)(api, target_cpu, debug, clang):**
+— **def [RunSteps](/scripts/slave/recipes/angle.py#107)(api, target_cpu, debug, clang):**
### *recipes* / [annotated\_run\_test](/scripts/slave/recipes/annotated_run_test.py)
[DEPS](/scripts/slave/recipes/annotated_run_test.py#9): [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/scripts/slave/recipes/angle.expected/linux.json b/scripts/slave/recipes/angle.expected/linux.json
index c850a11..a36782e 100644
--- a/scripts/slave/recipes/angle.expected/linux.json
+++ b/scripts/slave/recipes/angle.expected/linux.json
@@ -133,7 +133,7 @@
"--root=[CACHE]/builder/angle",
"gen",
"//out/release",
- "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]/goma/client\"",
+ "--args=build_angle_gles1_conform_tests=true is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]/goma/client\"",
"--check"
],
"cwd": "[CACHE]/builder/angle",
diff --git a/scripts/slave/recipes/angle.expected/linux_gcc.json b/scripts/slave/recipes/angle.expected/linux_gcc.json
index 07d202a..2212e66 100644
--- a/scripts/slave/recipes/angle.expected/linux_gcc.json
+++ b/scripts/slave/recipes/angle.expected/linux_gcc.json
@@ -133,7 +133,7 @@
"--root=[CACHE]/builder/angle",
"gen",
"//out/release",
- "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]/goma/client\" is_clang=false",
+ "--args=build_angle_gles1_conform_tests=true is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]/goma/client\" is_clang=false",
"--check"
],
"cwd": "[CACHE]/builder/angle",
diff --git a/scripts/slave/recipes/angle.expected/win.json b/scripts/slave/recipes/angle.expected/win.json
index 2378b3b..7b526d1 100644
--- a/scripts/slave/recipes/angle.expected/win.json
+++ b/scripts/slave/recipes/angle.expected/win.json
@@ -145,7 +145,7 @@
"--root=[CACHE]\\builder\\angle",
"gen",
"//out/release",
- "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\"",
+ "--args=build_angle_gles1_conform_tests=true is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\"",
"--check"
],
"cwd": "[CACHE]\\builder\\angle",
diff --git a/scripts/slave/recipes/angle.expected/win_clang.json b/scripts/slave/recipes/angle.expected/win_clang.json
index 3395292..97ad9b2 100644
--- a/scripts/slave/recipes/angle.expected/win_clang.json
+++ b/scripts/slave/recipes/angle.expected/win_clang.json
@@ -145,7 +145,7 @@
"--root=[CACHE]\\builder\\angle",
"gen",
"//out/release_clang",
- "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\" is_clang=true",
+ "--args=build_angle_gles1_conform_tests=true is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\" is_clang=true",
"--check"
],
"cwd": "[CACHE]\\builder\\angle",
diff --git a/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json b/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json
index 3954891..777a445 100644
--- a/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json
+++ b/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json
@@ -145,7 +145,7 @@
"--root=[CACHE]\\builder\\angle",
"gen",
"//out/release_x86",
- "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\" is_clang=false target_cpu=\"x86\"",
+ "--args=build_angle_gles1_conform_tests=true is_debug=false is_component_build=false use_goma=true goma_dir=\"[CACHE]\\goma\\client\" is_clang=false target_cpu=\"x86\"",
"--check"
],
"cwd": "[CACHE]\\builder\\angle",
diff --git a/scripts/slave/recipes/angle.py b/scripts/slave/recipes/angle.py
index cf76271..877297c 100644
--- a/scripts/slave/recipes/angle.py
+++ b/scripts/slave/recipes/angle.py
@@ -65,6 +65,7 @@
# Prepare the arguments to pass in.
args = [
+ 'build_angle_gles1_conform_tests=true',
'is_debug=%s' % gn_bool[debug],
'is_component_build=false',
'use_goma=true',
