summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-11-16 13:33:14 +0100
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-11-21 15:11:21 +0100
commit8809638e8e42488aac701066d7ced164854c6c9c (patch)
tree78e64e2428ba66b8c44662c72a8b8628414e1231
parent0b735f11e554fe469840ab47ed7beb557f6af11c (diff)
tests: Rename chamelium to kms_chamelium.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Acked-by: Martin Peres <martin.peres@linux.intel.com>
-rw-r--r--tests/Makefile.am6
-rw-r--r--tests/intel-ci/fast-feedback.testlist18
-rw-r--r--tests/kms_chamelium.c (renamed from tests/chamelium.c)0
-rw-r--r--tests/meson.build2
4 files changed, 13 insertions, 13 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89a97015..db360523 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@ endif
if HAVE_CHAMELIUM
TESTS_progs += \
- chamelium \
+ kms_chamelium \
$(NULL)
endif
@@ -153,8 +153,8 @@ vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS)
-chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
-chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
+kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
+kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
audio_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
audio_LDADD = $(LDADD) $(ALSA_LIBS)
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index bf8c1e66..f74da743 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -1,14 +1,5 @@
# Keep alphabetically sorted by default
-igt@chamelium@dp-hpd-fast
-igt@chamelium@dp-edid-read
-igt@chamelium@dp-crc-fast
-igt@chamelium@hdmi-hpd-fast
-igt@chamelium@hdmi-edid-read
-igt@chamelium@hdmi-crc-fast
-igt@chamelium@vga-hpd-fast
-igt@chamelium@vga-edid-read
-igt@chamelium@common-hpd-after-suspend
igt@core_auth@basic-auth
igt@core_prop_blob@basic
igt@debugfs_test@read_all_entries
@@ -208,6 +199,15 @@ igt@kms_addfb_basic@unused-pitches
igt@kms_busy@basic-flip-a
igt@kms_busy@basic-flip-b
igt@kms_busy@basic-flip-c
+igt@kms_chamelium@dp-hpd-fast
+igt@kms_chamelium@dp-edid-read
+igt@kms_chamelium@dp-crc-fast
+igt@kms_chamelium@hdmi-hpd-fast
+igt@kms_chamelium@hdmi-edid-read
+igt@kms_chamelium@hdmi-crc-fast
+igt@kms_chamelium@vga-hpd-fast
+igt@kms_chamelium@vga-edid-read
+igt@kms_chamelium@common-hpd-after-suspend
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy
igt@kms_cursor_legacy@basic-flip-after-cursor-atomic
diff --git a/tests/chamelium.c b/tests/kms_chamelium.c
index 8855a830..8855a830 100644
--- a/tests/chamelium.c
+++ b/tests/kms_chamelium.c
diff --git a/tests/meson.build b/tests/meson.build
index c3d5372f..20ff79dc 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -251,7 +251,7 @@ endif
if chamelium.found()
test_progs += [
- 'chamelium',
+ 'kms_chamelium',
]
test_deps += chamelium
endif