89 files changed, 3 insertions, 2 deletions
diff --git a/progs/SConscript b/progs/SConscript
index 4cd35fec64..d84e0a8220 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 b8c04f7237..0353b05fd2 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 822cd11404..822cd11404 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 a4285bfe07..a4285bfe07 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 60253cfd1a..60253cfd1a 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 d4a079fb1e..d4a079fb1e 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 b08d368671..b08d368671 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 bd47c9a6b0..bd47c9a6b0 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 936c0b3f33..936c0b3f33 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 fed929d420..fed929d420 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 0dbbaeea16..0dbbaeea16 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 d8cf84db36..d8cf84db36 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 e33609d251..e33609d251 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 103d7497f4..103d7497f4 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 bcb9420596..bcb9420596 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 85fb9ea4e7..85fb9ea4e7 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 f70a5146f4..f70a5146f4 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 b5281975d4..b5281975d4 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 d59df76e70..d59df76e70 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 fbb20fa9f6..fbb20fa9f6 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 b511288f4b..b511288f4b 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 99a2f96103..99a2f96103 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 a54c2623b0..a54c2623b0 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 5f5b4be109..5f5b4be109 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 6323c4712d..6323c4712d 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 740809d22e..740809d22e 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 413b9dc391..413b9dc391 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 b69f213261..b69f213261 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 df284f49e7..df284f49e7 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 64af72f381..64af72f381 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 bdd0b0026b..bdd0b0026b 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 f4b611b26a..f4b611b26a 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 d1e9b0b53b..d1e9b0b53b 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 1f33fac472..1f33fac472 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 d58b7886a1..d58b7886a1 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 ecd19248c6..ecd19248c6 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 c2d99ddd15..c2d99ddd15 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 a08ab6d2dc..a08ab6d2dc 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 6110647d97..6110647d97 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 673fca139a..673fca139a 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 6ec8b1184c..6ec8b1184c 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 ef65a9c5a1..ef65a9c5a1 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 e33609d251..e33609d251 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 79c9ca69fb..79c9ca69fb 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 ca97ad05df..ca97ad05df 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 321140e89e..321140e89e 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 d60ea46b36..d60ea46b36 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 b41fe5dd38..b41fe5dd38 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 45f5e6b729..45f5e6b729 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 caff622fe6..caff622fe6 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 3dd2fd1c2f..3dd2fd1c2f 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 da9cc18dfc..da9cc18dfc 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 4637227e5c..4637227e5c 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 aa80d6e394..aa80d6e394 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 64d1a494e1..64d1a494e1 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 5cf16fd1aa..5cf16fd1aa 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 a4a752d4d2..a4a752d4d2 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 4bb5f3ec3f..4bb5f3ec3f 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 daaa941f15..daaa941f15 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 af279ec7f4..af279ec7f4 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 46d886c55b..46d886c55b 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 0ef91637e0..0ef91637e0 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 d34f6cd6e3..d34f6cd6e3 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 cfb3ec37dc..cfb3ec37dc 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 faf1e6e7d4..faf1e6e7d4 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 6de1d071ef..6de1d071ef 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 9a52422984..9a52422984 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 dc87ce4ae7..dc87ce4ae7 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 d82eb08fd3..d82eb08fd3 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 e39bebcd9f..e39bebcd9f 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 6f20552f21..6f20552f21 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 0f9678b8a3..0f9678b8a3 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 39d42ae2a0..39d42ae2a0 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 05e40dbd5f..05e40dbd5f 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 8d84164403..8d84164403 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 77f006ea04..77f006ea04 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 23f3d2a57d..23f3d2a57d 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 4aa3d6c709..4aa3d6c709 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 0c1bcda4cf..0c1bcda4cf 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 073b97951e..073b97951e 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 706e3be372..706e3be372 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 af6cdedbeb..af6cdedbeb 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 2b8af1ac06..2b8af1ac06 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 7ad157c5ac..7ad157c5ac 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 6286aefe31..6286aefe31 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 f3dbd7695c..f3dbd7695c 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 0db3bb687c..0db3bb687c 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 cfde6af75e..cfde6af75e 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 00bda7f50a..00bda7f50a 100644
--- a/progs/gallium/unit/u_half_test.c
+++ b/src/gallium/tests/unit/u_half_test.c