89 files changed, 3 insertions, 2 deletions
diff --git a/progs/SConscript b/progs/SConscript
index 4cd35fec646..d84e0a8220a 100644
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -56,6 +56,4 @@ SConscript([
     'fp/SConscript',
     'wgl/SConscript',
     'perf/SConscript',
-    'gallium/unit/SConscript',
-#   'gallium/raw/SConscript',
 ])
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b8c04f72379..0353b05fd21 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -22,3 +22,6 @@ if platform == 'windows':
 SConscript('winsys/SConscript')
 
 SConscript('targets/SConscript')
+
+SConscript('tests/unit/SConscript')
+#SConscript('tests/raw/SConscript')
diff --git a/progs/gallium/python/retrace/README b/src/gallium/tests/python/retrace/README
index 822cd114044..822cd114044 100644
--- a/progs/gallium/python/retrace/README
+++ b/src/gallium/tests/python/retrace/README
diff --git a/progs/gallium/python/retrace/format.py b/src/gallium/tests/python/retrace/format.py
index a4285bfe075..a4285bfe075 100755
--- a/progs/gallium/python/retrace/format.py
+++ b/src/gallium/tests/python/retrace/format.py
diff --git a/progs/gallium/python/retrace/interpreter.py b/src/gallium/tests/python/retrace/interpreter.py
index 60253cfd1a4..60253cfd1a4 100755
--- a/progs/gallium/python/retrace/interpreter.py
+++ b/src/gallium/tests/python/retrace/interpreter.py
diff --git a/progs/gallium/python/retrace/model.py b/src/gallium/tests/python/retrace/model.py
index d4a079fb1e5..d4a079fb1e5 100755
--- a/progs/gallium/python/retrace/model.py
+++ b/src/gallium/tests/python/retrace/model.py
diff --git a/progs/gallium/python/retrace/parse.py b/src/gallium/tests/python/retrace/parse.py
index b08d3686715..b08d3686715 100755
--- a/progs/gallium/python/retrace/parse.py
+++ b/src/gallium/tests/python/retrace/parse.py
diff --git a/progs/gallium/python/retrace/parser.py b/src/gallium/tests/python/retrace/parser.py
index bd47c9a6b06..bd47c9a6b06 100755
--- a/progs/gallium/python/retrace/parser.py
+++ b/src/gallium/tests/python/retrace/parser.py
diff --git a/progs/gallium/python/samples/gs.py b/src/gallium/tests/python/samples/gs.py
index 936c0b3f33a..936c0b3f33a 100644
--- a/progs/gallium/python/samples/gs.py
+++ b/src/gallium/tests/python/samples/gs.py
diff --git a/progs/gallium/python/samples/tri.py b/src/gallium/tests/python/samples/tri.py
index fed929d4200..fed929d4200 100644
--- a/progs/gallium/python/samples/tri.py
+++ b/src/gallium/tests/python/samples/tri.py
diff --git a/progs/gallium/python/tests/.gitignore b/src/gallium/tests/python/tests/.gitignore
index 0dbbaeea16b..0dbbaeea16b 100644
--- a/progs/gallium/python/tests/.gitignore
+++ b/src/gallium/tests/python/tests/.gitignore
diff --git a/progs/gallium/python/tests/base.py b/src/gallium/tests/python/tests/base.py
index d8cf84db363..d8cf84db363 100755
--- a/progs/gallium/python/tests/base.py
+++ b/src/gallium/tests/python/tests/base.py
diff --git a/progs/gallium/python/tests/regress/fragment-shader/.gitignore b/src/gallium/tests/python/tests/regress/fragment-shader/.gitignore
index e33609d251c..e33609d251c 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/.gitignore
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/.gitignore
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-abs.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-abs.sh
index 103d7497f48..103d7497f48 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-abs.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-abs.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-add.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-add.sh
index bcb94205963..bcb94205963 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-add.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-add.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-cb-1d.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-cb-1d.sh
index 85fb9ea4e7f..85fb9ea4e7f 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-cb-1d.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-cb-1d.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-cb-2d.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-cb-2d.sh
index f70a5146f4e..f70a5146f4e 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-cb-2d.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-cb-2d.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-dp3.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dp3.sh
index b5281975d4a..b5281975d4a 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-dp3.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dp3.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-dp4.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dp4.sh
index d59df76e70b..d59df76e70b 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-dp4.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dp4.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-dst.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dst.sh
index fbb20fa9f62..fbb20fa9f62 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-dst.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-dst.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-ex2.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-ex2.sh
index b511288f4b6..b511288f4b6 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-ex2.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-ex2.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-flr.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-flr.sh
index 99a2f96103a..99a2f96103a 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-flr.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-flr.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-frc.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-frc.sh
index a54c2623b0a..a54c2623b0a 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-frc.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-frc.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-lg2.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lg2.sh
index 5f5b4be1092..5f5b4be1092 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-lg2.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lg2.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-lit.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lit.sh
index 6323c4712dc..6323c4712dc 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-lit.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lit.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-lrp.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lrp.sh
index 740809d22e0..740809d22e0 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-lrp.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-lrp.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-mad.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mad.sh
index 413b9dc3916..413b9dc3916 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-mad.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mad.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-max.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-max.sh
index b69f2132612..b69f2132612 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-max.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-max.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-min.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-min.sh
index df284f49e71..df284f49e71 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-min.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-min.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-mov.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mov.sh
index 64af72f381b..64af72f381b 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-mov.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mov.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-mul.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mul.sh
index bdd0b0026b9..bdd0b0026b9 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-mul.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-mul.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-rcp.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-rcp.sh
index f4b611b26ab..f4b611b26ab 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-rcp.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-rcp.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-rsq.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-rsq.sh
index d1e9b0b53be..d1e9b0b53be 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-rsq.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-rsq.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-sge.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-sge.sh
index 1f33fac4727..1f33fac4727 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-sge.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-sge.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-slt.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-slt.sh
index d58b7886a12..d58b7886a12 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-slt.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-slt.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-abs.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-abs.sh
index ecd19248c64..ecd19248c64 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-abs.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-abs.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh
index c2d99ddd15b..c2d99ddd15b 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-neg.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-neg.sh
index a08ab6d2dcb..a08ab6d2dcb 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-neg.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-neg.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-swz.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-swz.sh
index 6110647d979..6110647d979 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-swz.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-srcmod-swz.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-sub.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-sub.sh
index 673fca139aa..673fca139aa 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-sub.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-sub.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/frag-xpd.sh b/src/gallium/tests/python/tests/regress/fragment-shader/frag-xpd.sh
index 6ec8b1184cc..6ec8b1184cc 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/frag-xpd.sh
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/frag-xpd.sh
diff --git a/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py b/src/gallium/tests/python/tests/regress/fragment-shader/fragment-shader.py
index ef65a9c5a1b..ef65a9c5a1b 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py
+++ b/src/gallium/tests/python/tests/regress/fragment-shader/fragment-shader.py
diff --git a/progs/gallium/python/tests/regress/vertex-shader/.gitignore b/src/gallium/tests/python/tests/regress/vertex-shader/.gitignore
index e33609d251c..e33609d251c 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/.gitignore
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/.gitignore
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-abs.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-abs.sh
index 79c9ca69fb1..79c9ca69fb1 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-abs.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-abs.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-add.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-add.sh
index ca97ad05df0..ca97ad05df0 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-add.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-add.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-arl.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-arl.sh
index 321140e89e8..321140e89e8 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-arl.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-arl.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-arr.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-arr.sh
index d60ea46b367..d60ea46b367 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-arr.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-arr.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-cb-1d.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-cb-1d.sh
index b41fe5dd38f..b41fe5dd38f 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-cb-1d.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-cb-1d.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-cb-2d.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-cb-2d.sh
index 45f5e6b7299..45f5e6b7299 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-cb-2d.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-cb-2d.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-dp3.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dp3.sh
index caff622fe61..caff622fe61 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-dp3.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dp3.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-dp4.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dp4.sh
index 3dd2fd1c2f7..3dd2fd1c2f7 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-dp4.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dp4.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-dst.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dst.sh
index da9cc18dfc0..da9cc18dfc0 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-dst.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-dst.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-ex2.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-ex2.sh
index 4637227e5c4..4637227e5c4 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-ex2.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-ex2.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-flr.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-flr.sh
index aa80d6e394c..aa80d6e394c 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-flr.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-flr.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-frc.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-frc.sh
index 64d1a494e13..64d1a494e13 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-frc.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-frc.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-lg2.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lg2.sh
index 5cf16fd1aa8..5cf16fd1aa8 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-lg2.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lg2.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-lit.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lit.sh
index a4a752d4d23..a4a752d4d23 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-lit.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lit.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-lrp.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lrp.sh
index 4bb5f3ec3f4..4bb5f3ec3f4 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-lrp.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-lrp.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-mad.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mad.sh
index daaa941f15f..daaa941f15f 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-mad.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mad.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-max.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-max.sh
index af279ec7f4a..af279ec7f4a 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-max.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-max.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-min.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-min.sh
index 46d886c55b8..46d886c55b8 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-min.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-min.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-mov.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mov.sh
index 0ef91637e03..0ef91637e03 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-mov.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mov.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-mul.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mul.sh
index d34f6cd6e3c..d34f6cd6e3c 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-mul.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-mul.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-rcp.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-rcp.sh
index cfb3ec37dc2..cfb3ec37dc2 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-rcp.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-rcp.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-rsq.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-rsq.sh
index faf1e6e7d41..faf1e6e7d41 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-rsq.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-rsq.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-sge.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-sge.sh
index 6de1d071ef4..6de1d071ef4 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-sge.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-sge.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-slt.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-slt.sh
index 9a524229845..9a524229845 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-slt.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-slt.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-abs.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-abs.sh
index dc87ce4ae70..dc87ce4ae70 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-abs.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-abs.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh
index d82eb08fd30..d82eb08fd30 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-neg.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-neg.sh
index e39bebcd9f1..e39bebcd9f1 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-neg.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-neg.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-swz.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-swz.sh
index 6f20552f212..6f20552f212 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-swz.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-srcmod-swz.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-sub.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-sub.sh
index 0f9678b8a3e..0f9678b8a3e 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-sub.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-sub.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vert-xpd.sh b/src/gallium/tests/python/tests/regress/vertex-shader/vert-xpd.sh
index 39d42ae2a0d..39d42ae2a0d 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vert-xpd.sh
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vert-xpd.sh
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py b/src/gallium/tests/python/tests/regress/vertex-shader/vertex-shader.py
index 05e40dbd5f1..05e40dbd5f1 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py
+++ b/src/gallium/tests/python/tests/regress/vertex-shader/vertex-shader.py
diff --git a/progs/gallium/python/tests/surface_copy.py b/src/gallium/tests/python/tests/surface_copy.py
index 8d841644035..8d841644035 100755
--- a/progs/gallium/python/tests/surface_copy.py
+++ b/src/gallium/tests/python/tests/surface_copy.py
diff --git a/progs/gallium/python/tests/texture_blit.py b/src/gallium/tests/python/tests/texture_blit.py
index 77f006ea04e..77f006ea04e 100755
--- a/progs/gallium/python/tests/texture_blit.py
+++ b/src/gallium/tests/python/tests/texture_blit.py
diff --git a/progs/gallium/python/tests/texture_render.py b/src/gallium/tests/python/tests/texture_render.py
index 23f3d2a57de..23f3d2a57de 100755
--- a/progs/gallium/python/tests/texture_render.py
+++ b/src/gallium/tests/python/tests/texture_render.py
diff --git a/progs/gallium/python/tests/texture_transfer.py b/src/gallium/tests/python/tests/texture_transfer.py
index 4aa3d6c709b..4aa3d6c709b 100755
--- a/progs/gallium/python/tests/texture_transfer.py
+++ b/src/gallium/tests/python/tests/texture_transfer.py
diff --git a/progs/gallium/python/tests/tree.py b/src/gallium/tests/python/tests/tree.py
index 0c1bcda4cf2..0c1bcda4cf2 100755
--- a/progs/gallium/python/tests/tree.py
+++ b/src/gallium/tests/python/tests/tree.py
diff --git a/progs/gallium/raw/SConscript b/src/gallium/tests/raw/SConscript
index 073b97951e7..073b97951e7 100644
--- a/progs/gallium/raw/SConscript
+++ b/src/gallium/tests/raw/SConscript
diff --git a/progs/gallium/raw/clear.c b/src/gallium/tests/raw/clear.c
index 706e3be3728..706e3be3728 100644
--- a/progs/gallium/raw/clear.c
+++ b/src/gallium/tests/raw/clear.c
diff --git a/progs/gallium/trivial/.gitignore b/src/gallium/tests/trivial/.gitignore
index af6cdedbeba..af6cdedbeba 100644
--- a/progs/gallium/trivial/.gitignore
+++ b/src/gallium/tests/trivial/.gitignore
diff --git a/progs/gallium/trivial/Makefile b/src/gallium/tests/trivial/Makefile
index 2b8af1ac06c..2b8af1ac06c 100644
--- a/progs/gallium/trivial/Makefile
+++ b/src/gallium/tests/trivial/Makefile
diff --git a/progs/gallium/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 7ad157c5ac7..7ad157c5ac7 100644
--- a/progs/gallium/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
diff --git a/progs/gallium/trivial/tri.c b/src/gallium/tests/trivial/tri.c
index 6286aefe319..6286aefe319 100644
--- a/progs/gallium/trivial/tri.c
+++ b/src/gallium/tests/trivial/tri.c
diff --git a/progs/gallium/unit/Makefile b/src/gallium/tests/unit/Makefile
index f3dbd7695c6..f3dbd7695c6 100644
--- a/progs/gallium/unit/Makefile
+++ b/src/gallium/tests/unit/Makefile
diff --git a/progs/gallium/unit/SConscript b/src/gallium/tests/unit/SConscript
index 0db3bb687c6..0db3bb687c6 100644
--- a/progs/gallium/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
diff --git a/progs/gallium/unit/u_format_test.c b/src/gallium/tests/unit/u_format_test.c
index cfde6af75e0..cfde6af75e0 100644
--- a/progs/gallium/unit/u_format_test.c
+++ b/src/gallium/tests/unit/u_format_test.c
diff --git a/progs/gallium/unit/u_half_test.c b/src/gallium/tests/unit/u_half_test.c
index 00bda7f50a6..00bda7f50a6 100644
--- a/progs/gallium/unit/u_half_test.c
+++ b/src/gallium/tests/unit/u_half_test.c