diff options
author | Jose Fonseca <jfonseca@vmware.com> | 2016-04-13 13:31:04 +0100 |
---|---|---|
committer | Jose Fonseca <jfonseca@vmware.com> | 2016-04-14 07:19:04 +0100 |
commit | 50ddf03ada3cc167f7dcb6b26f82adb20162f983 (patch) | |
tree | 4a81fcbb92eeb5cb1531fee7cb346d87d276189b /src | |
parent | 9ae0e8ee3cf5e422804dcecd248dc28bb5dc63dc (diff) | |
download | external_mesa3d-50ddf03ada3cc167f7dcb6b26f82adb20162f983.zip external_mesa3d-50ddf03ada3cc167f7dcb6b26f82adb20162f983.tar.gz external_mesa3d-50ddf03ada3cc167f7dcb6b26f82adb20162f983.tar.bz2 |
scons: Add a "check" target to run all unit tests.
Except:
- u_cache_test -- too long
- translate_test -- unreliable (it's probably testing corner cases that
translate module doesn't care about.)
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 6 | ||||
-rw-r--r-- | src/gallium/tests/unit/SConscript | 12 | ||||
-rw-r--r-- | src/util/SConscript | 7 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 8188156..fbbd22a 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -38,10 +38,6 @@ if not env['embedded']: target = testname, source = [testname + '.c', 'lp_test_main.c'], ) - env.InstallProgram(target) - - # http://www.scons.org/wiki/UnitTests - alias = env.Alias(testname, [target], target[0].abspath) - AlwaysBuild(alias) + env.UnitTest(testname, target) Export('llvmpipe') diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript index a816e2f..0650804 100644 --- a/src/gallium/tests/unit/SConscript +++ b/src/gallium/tests/unit/SConscript @@ -24,10 +24,8 @@ for progname in progs: target = progname, source = progname + '.c', ) - - env.Alias(progname, env.InstallProgram(prog)) - - # http://www.scons.org/wiki/UnitTests - test_alias = env.Alias('unit', [prog], prog[0].abspath) - AlwaysBuild(test_alias) - + if progname not in [ + 'u_cache_test', # too long + 'translate_test', # unreliable + ]: + env.UnitTest(progname, prog) diff --git a/src/util/SConscript b/src/util/SConscript index 5f3ecc1..73f3430 100644 --- a/src/util/SConscript +++ b/src/util/SConscript @@ -47,17 +47,14 @@ env.Alias('mesautil', mesautil) Export('mesautil') -# http://www.scons.org/wiki/UnitTests u_atomic_test = env.Program( target = 'u_atomic_test', source = ['u_atomic_test.c'], ) -alias = env.Alias("u_atomic_test", u_atomic_test, u_atomic_test[0].abspath) -AlwaysBuild(alias) +env.UnitTest("u_atomic_test", u_atomic_test) roundeven_test = env.Program( target = 'roundeven_test', source = ['roundeven_test.c'], ) -alias = env.Alias("roundeven_test", roundeven_test, roundeven_test[0].abspath) -AlwaysBuild(alias) +env.UnitTest("roundeven_test", roundeven_test) |