Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: tests/build.scons

Issue 147039: Code to load the software renderer and initialize it. Build scripts copy the ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « svn_paths.scons ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/build.scons
===================================================================
--- tests/build.scons (revision 19033)
+++ tests/build.scons (working copy)
@@ -152,6 +152,14 @@
# Adding extra line for cleaner formatting.
env.Help('\n')
+swiftshader_install = []
+if env.Bit('windows'):
+ # Copy SwiftShader to plugin dir.
+ swiftshader_path = env.subst('$SWIFTSHADER_DIR/swiftshader_d3d9.dll')
+ if os.path.exists(swiftshader_path):
+ swiftshader_install = env.Replicate('$ARTIFACTS_DIR/O3DExtras',
+ swiftshader_path)
+
# -------------------------------------------------------------------------
# Unit tests
@@ -318,6 +326,7 @@
# Also require gl related libraries based on variant.
unit_tests_req += gl_requirements
+unit_tests_req += swiftshader_install
# Add requirements for unit tests.
env.Requires(unit_tests_install, unit_tests_req)
@@ -449,7 +458,10 @@
# Also require gl related libraries based on variant.
system_tests_req += gl_requirements
-
+
+ # Require SwiftShader (only if it is available).
+ system_tests_req += swiftshader_install
+
# Add requirements for system_tests.
env.Requires(system_tests_install, system_tests_req)
@@ -592,6 +604,9 @@
'--screenshotsdir=$ARTIFACTS_DIR/selenium/screenshots_firefox'])] +
cleanup_steps,
)
+
+ # Require SwiftShader (only if it is available).
+ run_env.Requires(run_selenium_firefox, swiftshader_install)
if run_env.Bit('windows'):
run_selenium_ie = run_env.Alias(
« no previous file with comments | « svn_paths.scons ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698