summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-12-23 15:21:56 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-12-23 16:38:50 +0000
commitb5a408bae518ededbb871d113dab89f3e15bfb45 (patch)
tree4578e64770c07280ef2ad193bda62309519147eb
parent88b2d8f796a23e8bb783076eaba711d89757a69e (diff)
llvmpipe: Install unit tests on build/xxx/bin
-rw-r--r--scons/gallium.py7
-rw-r--r--src/gallium/drivers/llvmpipe/SConscript24
2 files changed, 18 insertions, 13 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 5f149f9528..b7a14af4b1 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -156,6 +156,12 @@ def symlink(target, source, env):
os.remove(target)
os.symlink(os.path.basename(source), target)
+def install_program(env, source):
+ source = str(source[0])
+ target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'bin')
+ target_name = str(source)
+ env.InstallAs(os.path.join(target_dir, target_name), source)
+
def install_shared_library(env, source, version = ()):
source = str(source[0])
version = tuple(map(str, version))
@@ -169,6 +175,7 @@ def install_shared_library(env, source, version = ()):
last = env.Command(os.path.join(target_dir, target_name), last, action)
def createInstallMethods(env):
+ env.AddMethod(install_program, 'InstallProgram')
env.AddMethod(install_shared_library, 'InstallSharedLibrary')
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 3bd2e70013..de6156795d 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -76,19 +76,17 @@ env = env.Clone()
env.Prepend(LIBS = [llvmpipe] + auxiliaries)
-env.Program(
- target = 'lp_test_format',
- source = ['lp_test_format.c', 'lp_test_main.c'],
-)
-
-env.Program(
- target = 'lp_test_blend',
- source = ['lp_test_blend.c', 'lp_test_main.c'],
-)
+tests = [
+ 'format',
+ 'blend',
+ 'conv',
+]
-env.Program(
- target = 'lp_test_conv',
- source = ['lp_test_conv.c', 'lp_test_main.c'],
-)
+for test in tests:
+ target = env.Program(
+ target = 'lp_test_' + test,
+ source = ['lp_test_' + test + '.c', 'lp_test_main.c'],
+ )
+ env.InstallProgram(target)
Export('llvmpipe')