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 similarity index 100% rename from progs/gallium/python/retrace/README rename to src/gallium/tests/python/retrace/README diff --git a/progs/gallium/python/retrace/format.py b/src/gallium/tests/python/retrace/format.py similarity index 100% rename from progs/gallium/python/retrace/format.py rename to src/gallium/tests/python/retrace/format.py diff --git a/progs/gallium/python/retrace/interpreter.py b/src/gallium/tests/python/retrace/interpreter.py similarity index 100% rename from progs/gallium/python/retrace/interpreter.py rename to src/gallium/tests/python/retrace/interpreter.py diff --git a/progs/gallium/python/retrace/model.py b/src/gallium/tests/python/retrace/model.py similarity index 100% rename from progs/gallium/python/retrace/model.py rename to src/gallium/tests/python/retrace/model.py diff --git a/progs/gallium/python/retrace/parse.py b/src/gallium/tests/python/retrace/parse.py similarity index 100% rename from progs/gallium/python/retrace/parse.py rename to src/gallium/tests/python/retrace/parse.py diff --git a/progs/gallium/python/retrace/parser.py b/src/gallium/tests/python/retrace/parser.py similarity index 100% rename from progs/gallium/python/retrace/parser.py rename to src/gallium/tests/python/retrace/parser.py diff --git a/progs/gallium/python/samples/gs.py b/src/gallium/tests/python/samples/gs.py similarity index 100% rename from progs/gallium/python/samples/gs.py rename to src/gallium/tests/python/samples/gs.py diff --git a/progs/gallium/python/samples/tri.py b/src/gallium/tests/python/samples/tri.py similarity index 100% rename from progs/gallium/python/samples/tri.py rename to src/gallium/tests/python/samples/tri.py diff --git a/progs/gallium/python/tests/.gitignore b/src/gallium/tests/python/tests/.gitignore similarity index 100% rename from progs/gallium/python/tests/.gitignore rename to src/gallium/tests/python/tests/.gitignore diff --git a/progs/gallium/python/tests/base.py b/src/gallium/tests/python/tests/base.py similarity index 100% rename from progs/gallium/python/tests/base.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/.gitignore rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-abs.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-add.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-cb-1d.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-cb-2d.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-dp3.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-dp4.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-dst.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-ex2.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-flr.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-frc.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-lg2.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-lit.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-lrp.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-mad.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-max.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-min.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-mov.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-mul.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-rcp.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-rsq.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-sge.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-slt.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-abs.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-neg.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-srcmod-swz.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-sub.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/frag-xpd.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/.gitignore rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-abs.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-add.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-arl.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-arr.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-cb-1d.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-cb-2d.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-dp3.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-dp4.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-dst.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-ex2.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-flr.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-frc.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-lg2.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-lit.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-lrp.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-mad.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-max.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-min.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-mov.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-mul.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-rcp.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-rsq.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-sge.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-slt.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-abs.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-neg.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-srcmod-swz.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-sub.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vert-xpd.sh rename to 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 similarity index 100% rename from progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/surface_copy.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/texture_blit.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/texture_render.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/texture_transfer.py rename to 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 similarity index 100% rename from progs/gallium/python/tests/tree.py rename to src/gallium/tests/python/tests/tree.py diff --git a/progs/gallium/raw/SConscript b/src/gallium/tests/raw/SConscript similarity index 100% rename from progs/gallium/raw/SConscript rename to src/gallium/tests/raw/SConscript diff --git a/progs/gallium/raw/clear.c b/src/gallium/tests/raw/clear.c similarity index 100% rename from progs/gallium/raw/clear.c rename to src/gallium/tests/raw/clear.c diff --git a/progs/gallium/trivial/.gitignore b/src/gallium/tests/trivial/.gitignore similarity index 100% rename from progs/gallium/trivial/.gitignore rename to src/gallium/tests/trivial/.gitignore diff --git a/progs/gallium/trivial/Makefile b/src/gallium/tests/trivial/Makefile similarity index 100% rename from progs/gallium/trivial/Makefile rename to src/gallium/tests/trivial/Makefile diff --git a/progs/gallium/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c similarity index 100% rename from progs/gallium/trivial/quad-tex.c rename to src/gallium/tests/trivial/quad-tex.c diff --git a/progs/gallium/trivial/tri.c b/src/gallium/tests/trivial/tri.c similarity index 100% rename from progs/gallium/trivial/tri.c rename to src/gallium/tests/trivial/tri.c diff --git a/progs/gallium/unit/Makefile b/src/gallium/tests/unit/Makefile similarity index 100% rename from progs/gallium/unit/Makefile rename to src/gallium/tests/unit/Makefile diff --git a/progs/gallium/unit/SConscript b/src/gallium/tests/unit/SConscript similarity index 100% rename from progs/gallium/unit/SConscript rename to src/gallium/tests/unit/SConscript diff --git a/progs/gallium/unit/u_format_test.c b/src/gallium/tests/unit/u_format_test.c similarity index 100% rename from progs/gallium/unit/u_format_test.c rename to 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 similarity index 100% rename from progs/gallium/unit/u_half_test.c rename to src/gallium/tests/unit/u_half_test.c