summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-10-27 14:51:55 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-10-29 13:29:32 +0100
commit9d6a2cacf6796c8e06e4b7432c5f795d4ee56d8b (patch)
tree26bb44644430d58ca1913d71194f1d425451e6aa
parent15972aa8666781ad557f17ed4b5d689cdb657d78 (diff)
Move watermark code from tests to tools
They're now igt tests, and so if you blindly run lib/igt.cocci with spatch on tests/*c they get mangled. Move them away, but still keep them as noinst targets. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r--tests/.gitignore2
-rw-r--r--tests/Makefile.sources2
-rw-r--r--tools/.gitignore2
-rw-r--r--tools/Makefile.sources5
-rw-r--r--tools/ddi_compute_wrpll.c (renamed from tests/ddi_compute_wrpll.c)0
-rw-r--r--tools/skl_ddb_allocation.c (renamed from tests/skl_ddb_allocation.c)0
6 files changed, 7 insertions, 4 deletions
diff --git a/tests/.gitignore b/tests/.gitignore
index 3b1fb8b3..b8562b62 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -3,7 +3,6 @@ core_get_client_auth
core_getclient
core_getstats
core_getversion
-ddi_compute_wrpll
drm_import_export
drm_vma_limiter
drm_vma_limiter_cached
@@ -149,6 +148,5 @@ prime_nv_test
prime_self_import
prime_udl
single-tests.txt
-skl_ddb_allocation
template
testdisplay
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 88bb854f..7724a734 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -1,8 +1,6 @@
noinst_PROGRAMS = \
gem_alive \
gem_stress \
- ddi_compute_wrpll \
- skl_ddb_allocation \
$(TESTS_progs) \
$(TESTS_progs_M) \
$(HANG) \
diff --git a/tools/.gitignore b/tools/.gitignore
index cc87bbcc..fc0426f2 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,4 +1,5 @@
# Please keep sorted alphabetically
+ddi_compute_wrpll
forcewaked
intel_audio_dump
intel_backlight
@@ -35,3 +36,4 @@ intel_reg_write
intel_stepping
intel_vga_read
intel_vga_write
+skl_ddb_allocation
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 6a73fa0a..48b89db0 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -1,3 +1,8 @@
+noinst_PROGRAMS = \
+ ddi_compute_wrpll \
+ skl_ddb_allocation \
+ $(NULL)
+
bin_PROGRAMS = \
intel_audio_dump \
intel_backlight \
diff --git a/tests/ddi_compute_wrpll.c b/tools/ddi_compute_wrpll.c
index 45c28e18..45c28e18 100644
--- a/tests/ddi_compute_wrpll.c
+++ b/tools/ddi_compute_wrpll.c
diff --git a/tests/skl_ddb_allocation.c b/tools/skl_ddb_allocation.c
index 4d8e6d18..4d8e6d18 100644
--- a/tests/skl_ddb_allocation.c
+++ b/tools/skl_ddb_allocation.c