From: Dylan Baker <baker.dyla...@gmail.com> Currently the framework is pretty confusing. There's 'test' which is a package containing test classes, then there's 'tests' which contains unit tests for the framework. This is obviously not optimal. Beyond that the unittests get installed, and that isn't really necessary.
As a bonus this removes the unit tests from coverage reports, which is a nice plus. Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> --- tox.ini | 4 ++-- {framework/tests => unittests}/__init__.py | 0 {framework/tests => unittests}/backends_tests.py | 0 {framework/tests => unittests}/base_tests.py | 0 {framework/tests => unittests}/compressed_backend_tests.py | 0 {framework/tests => unittests}/core_tests.py | 0 {framework/tests => unittests}/deqp_tests.py | 0 {framework/tests => unittests}/dmesg_tests.py | 0 {framework/tests => unittests}/exceptions_tests.py | 0 {framework/tests => unittests}/gleantest_tests.py | 0 {framework/tests => unittests}/glsl_parser_test_tests.py | 0 {framework/tests => unittests}/grouptools_tests.py | 0 {framework/tests => unittests}/gtest_tests.py | 0 {framework/tests => unittests}/integration_tests.py | 0 {framework/tests => unittests}/json_backend_tests.py | 0 {framework/tests => unittests}/json_results_update_tests.py | 0 {framework/tests => unittests}/json_tests.py | 0 {framework/tests => unittests}/junit_backends_tests.py | 0 {framework/tests => unittests}/log_tests.py | 0 {framework/tests => unittests}/oglconform_tests.py | 0 {framework/tests => unittests}/opencv_tests.py | 0 {framework/tests => unittests}/opengl_tests.py | 0 {framework/tests => unittests}/options_tests.py | 0 {framework/tests => unittests}/piglit_test_tests.py | 0 {framework/tests => unittests}/profile_tests.py | 0 {framework/tests => unittests}/results_tests.py | 0 {framework/tests => unittests}/run_parser_tests.py | 0 {framework/tests => unittests}/schema/junit-7.xsd | 0 {framework/tests => unittests}/shader_test_tests.py | 0 {framework/tests => unittests}/status_tests.py | 0 {framework/tests => unittests}/summary_common_tests.py | 0 {framework/tests => unittests}/summary_console_tests.py | 0 {framework/tests => unittests}/summary_html_tests.py | 0 {framework/tests => unittests}/test_lists.py | 0 {framework/tests => unittests}/utils.py | 0 35 files changed, 2 insertions(+), 2 deletions(-) rename {framework/tests => unittests}/__init__.py (100%) rename {framework/tests => unittests}/backends_tests.py (100%) rename {framework/tests => unittests}/base_tests.py (100%) rename {framework/tests => unittests}/compressed_backend_tests.py (100%) rename {framework/tests => unittests}/core_tests.py (100%) rename {framework/tests => unittests}/deqp_tests.py (100%) rename {framework/tests => unittests}/dmesg_tests.py (100%) rename {framework/tests => unittests}/exceptions_tests.py (100%) rename {framework/tests => unittests}/gleantest_tests.py (100%) rename {framework/tests => unittests}/glsl_parser_test_tests.py (100%) rename {framework/tests => unittests}/grouptools_tests.py (100%) rename {framework/tests => unittests}/gtest_tests.py (100%) rename {framework/tests => unittests}/integration_tests.py (100%) rename {framework/tests => unittests}/json_backend_tests.py (100%) rename {framework/tests => unittests}/json_results_update_tests.py (100%) rename {framework/tests => unittests}/json_tests.py (100%) rename {framework/tests => unittests}/junit_backends_tests.py (100%) rename {framework/tests => unittests}/log_tests.py (100%) rename {framework/tests => unittests}/oglconform_tests.py (100%) rename {framework/tests => unittests}/opencv_tests.py (100%) rename {framework/tests => unittests}/opengl_tests.py (100%) rename {framework/tests => unittests}/options_tests.py (100%) rename {framework/tests => unittests}/piglit_test_tests.py (100%) rename {framework/tests => unittests}/profile_tests.py (100%) rename {framework/tests => unittests}/results_tests.py (100%) rename {framework/tests => unittests}/run_parser_tests.py (100%) rename {framework/tests => unittests}/schema/junit-7.xsd (100%) rename {framework/tests => unittests}/shader_test_tests.py (100%) rename {framework/tests => unittests}/status_tests.py (100%) rename {framework/tests => unittests}/summary_common_tests.py (100%) rename {framework/tests => unittests}/summary_console_tests.py (100%) rename {framework/tests => unittests}/summary_html_tests.py (100%) rename {framework/tests => unittests}/test_lists.py (100%) rename {framework/tests => unittests}/utils.py (100%) diff --git a/tox.ini b/tox.ini index cea28ac..663b38f 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ deps = nose coverage mock -commands = nosetests framework/tests --cover-package=framework --cover-tests +commands = nosetests unittests --cover-package=framework --cover-tests [testenv:py27-accel] passenv=HOME @@ -29,4 +29,4 @@ deps = simplejson lxml backports.lzma -commands = nosetests framework/tests --with-cover --cover-package=framework --cover-tests +commands = nosetests unittests --with-cover --cover-package=framework --cover-tests diff --git a/framework/tests/__init__.py b/unittests/__init__.py similarity index 100% rename from framework/tests/__init__.py rename to unittests/__init__.py diff --git a/framework/tests/backends_tests.py b/unittests/backends_tests.py similarity index 100% rename from framework/tests/backends_tests.py rename to unittests/backends_tests.py diff --git a/framework/tests/base_tests.py b/unittests/base_tests.py similarity index 100% rename from framework/tests/base_tests.py rename to unittests/base_tests.py diff --git a/framework/tests/compressed_backend_tests.py b/unittests/compressed_backend_tests.py similarity index 100% rename from framework/tests/compressed_backend_tests.py rename to unittests/compressed_backend_tests.py diff --git a/framework/tests/core_tests.py b/unittests/core_tests.py similarity index 100% rename from framework/tests/core_tests.py rename to unittests/core_tests.py diff --git a/framework/tests/deqp_tests.py b/unittests/deqp_tests.py similarity index 100% rename from framework/tests/deqp_tests.py rename to unittests/deqp_tests.py diff --git a/framework/tests/dmesg_tests.py b/unittests/dmesg_tests.py similarity index 100% rename from framework/tests/dmesg_tests.py rename to unittests/dmesg_tests.py diff --git a/framework/tests/exceptions_tests.py b/unittests/exceptions_tests.py similarity index 100% rename from framework/tests/exceptions_tests.py rename to unittests/exceptions_tests.py diff --git a/framework/tests/gleantest_tests.py b/unittests/gleantest_tests.py similarity index 100% rename from framework/tests/gleantest_tests.py rename to unittests/gleantest_tests.py diff --git a/framework/tests/glsl_parser_test_tests.py b/unittests/glsl_parser_test_tests.py similarity index 100% rename from framework/tests/glsl_parser_test_tests.py rename to unittests/glsl_parser_test_tests.py diff --git a/framework/tests/grouptools_tests.py b/unittests/grouptools_tests.py similarity index 100% rename from framework/tests/grouptools_tests.py rename to unittests/grouptools_tests.py diff --git a/framework/tests/gtest_tests.py b/unittests/gtest_tests.py similarity index 100% rename from framework/tests/gtest_tests.py rename to unittests/gtest_tests.py diff --git a/framework/tests/integration_tests.py b/unittests/integration_tests.py similarity index 100% rename from framework/tests/integration_tests.py rename to unittests/integration_tests.py diff --git a/framework/tests/json_backend_tests.py b/unittests/json_backend_tests.py similarity index 100% rename from framework/tests/json_backend_tests.py rename to unittests/json_backend_tests.py diff --git a/framework/tests/json_results_update_tests.py b/unittests/json_results_update_tests.py similarity index 100% rename from framework/tests/json_results_update_tests.py rename to unittests/json_results_update_tests.py diff --git a/framework/tests/json_tests.py b/unittests/json_tests.py similarity index 100% rename from framework/tests/json_tests.py rename to unittests/json_tests.py diff --git a/framework/tests/junit_backends_tests.py b/unittests/junit_backends_tests.py similarity index 100% rename from framework/tests/junit_backends_tests.py rename to unittests/junit_backends_tests.py diff --git a/framework/tests/log_tests.py b/unittests/log_tests.py similarity index 100% rename from framework/tests/log_tests.py rename to unittests/log_tests.py diff --git a/framework/tests/oglconform_tests.py b/unittests/oglconform_tests.py similarity index 100% rename from framework/tests/oglconform_tests.py rename to unittests/oglconform_tests.py diff --git a/framework/tests/opencv_tests.py b/unittests/opencv_tests.py similarity index 100% rename from framework/tests/opencv_tests.py rename to unittests/opencv_tests.py diff --git a/framework/tests/opengl_tests.py b/unittests/opengl_tests.py similarity index 100% rename from framework/tests/opengl_tests.py rename to unittests/opengl_tests.py diff --git a/framework/tests/options_tests.py b/unittests/options_tests.py similarity index 100% rename from framework/tests/options_tests.py rename to unittests/options_tests.py diff --git a/framework/tests/piglit_test_tests.py b/unittests/piglit_test_tests.py similarity index 100% rename from framework/tests/piglit_test_tests.py rename to unittests/piglit_test_tests.py diff --git a/framework/tests/profile_tests.py b/unittests/profile_tests.py similarity index 100% rename from framework/tests/profile_tests.py rename to unittests/profile_tests.py diff --git a/framework/tests/results_tests.py b/unittests/results_tests.py similarity index 100% rename from framework/tests/results_tests.py rename to unittests/results_tests.py diff --git a/framework/tests/run_parser_tests.py b/unittests/run_parser_tests.py similarity index 100% rename from framework/tests/run_parser_tests.py rename to unittests/run_parser_tests.py diff --git a/framework/tests/schema/junit-7.xsd b/unittests/schema/junit-7.xsd similarity index 100% rename from framework/tests/schema/junit-7.xsd rename to unittests/schema/junit-7.xsd diff --git a/framework/tests/shader_test_tests.py b/unittests/shader_test_tests.py similarity index 100% rename from framework/tests/shader_test_tests.py rename to unittests/shader_test_tests.py diff --git a/framework/tests/status_tests.py b/unittests/status_tests.py similarity index 100% rename from framework/tests/status_tests.py rename to unittests/status_tests.py diff --git a/framework/tests/summary_common_tests.py b/unittests/summary_common_tests.py similarity index 100% rename from framework/tests/summary_common_tests.py rename to unittests/summary_common_tests.py diff --git a/framework/tests/summary_console_tests.py b/unittests/summary_console_tests.py similarity index 100% rename from framework/tests/summary_console_tests.py rename to unittests/summary_console_tests.py diff --git a/framework/tests/summary_html_tests.py b/unittests/summary_html_tests.py similarity index 100% rename from framework/tests/summary_html_tests.py rename to unittests/summary_html_tests.py diff --git a/framework/tests/test_lists.py b/unittests/test_lists.py similarity index 100% rename from framework/tests/test_lists.py rename to unittests/test_lists.py diff --git a/framework/tests/utils.py b/unittests/utils.py similarity index 100% rename from framework/tests/utils.py rename to unittests/utils.py -- 2.6.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit