Merge remote branch 'origin/7.8'

[mesa.git] / progs / tests / SConscript

diff --git a/progs/tests/SConscript b/progs/tests/SConscript
index 3a0da62717c193a84f38bc7e1683baa7fb7adc2e..429d3bb957c2d62e520ebfaf26b635f2e841bde1 100644 (file)
--- a/progs/tests/SConscript
+++ b/progs/tests/SConscript
@@ -1,23 +1,5 @@
 Import('*')
 
-if not env['GLUT']:
-    Return()
-
-env = env.Clone()
-
-env.Prepend(CPPPATH = [
-       '../util',
-])
-
-env.Prepend(LIBS = [
-       util,
-       '$GLUT_LIB'
-])
-
-if env['platform'] == 'windows':
-    env.Append(CPPDEFINES = ['NOMINMAX'])
-    env.Prepend(LIBS = ['winmm'])
-
 linux_progs = [
     'api_speed',
 ]
@@ -27,7 +9,6 @@ glx_progs = [
     'getprocaddress',
     'jkrahntest',
     'sharedtex',
-    'texcompress2',
     'texobjshare',
 ]
 
@@ -59,14 +40,19 @@ progs = [
     'bug_3195',
     'bug_texstore_i8',
     'calibrate_rast',
+    'condrender',
     'copypixrate',
     'crossbar',
     'cva',
+    'cva_huge',
+    'cylwrap',
     'drawbuffers',
+    'drawbuffers2',
     'exactrast',
     'ext422square',
     'fbotest1',
     'fbotest2',
+    'fbotest3',
     'fillrate',
     'floattex',
     'fog',
@@ -103,6 +89,7 @@ progs = [
     'scissor-viewport',
     'seccolor',
     'shader_api',
+    'stencilreaddraw',
     'stencil_twoside',
     'stencil_wrap',
     'stencilwrap',
@@ -132,13 +119,14 @@ progs = [
     'vpwarpmesh',
     'yuvrect',
     'yuvsquare',
+    'zbitmap',
     'zcomp',
     'zdrawpix',
     'zreaddraw',
 ]
 
 for prog in progs:
-    env.Program(
+    progs_env.Program(
         target = prog,
         source = prog + '.c',
     )