diff mbox

[i-g-t,4/4] tests: Rename chamelium to kms_chamelium.

Message ID 20171116124522.4673-4-maarten.lankhorst@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst Nov. 16, 2017, 12:45 p.m. UTC 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/Makefile.am                      |  6 +++---
 tests/intel-ci/fast-feedback.testlist  | 18 +++++++++---------
 tests/{chamelium.c => kms_chamelium.c} |  0
 tests/meson.build                      |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename tests/{chamelium.c => kms_chamelium.c} (100%)

Comments

Lyude Paul Nov. 18, 2017, 12:42 a.m. UTC | #1 
Reviewed-by: Lyude Paul <lyude@redhat.com>

On Thu, 2017-11-16 at 13:45 +0100, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  tests/Makefile.am                      |  6 +++---
>  tests/intel-ci/fast-feedback.testlist  | 18 +++++++++---------
>  tests/{chamelium.c => kms_chamelium.c} |  0
>  tests/meson.build                      |  2 +-
>  4 files changed, 13 insertions(+), 13 deletions(-)
>  rename tests/{chamelium.c => kms_chamelium.c} (100%)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 89a970153992..db360523dad6 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 bf8c1e663801..f74da743ce88 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
> similarity index 100%
> rename from tests/chamelium.c
> rename to tests/kms_chamelium.c
> diff --git a/tests/meson.build b/tests/meson.build
> index c3d5372f78ac..20ff79dcb15f 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
Maarten Lankhorst Nov. 21, 2017, 2:13 p.m. UTC | #2 
Op 18-11-17 om 01:42 schreef Lyude Paul:
> Reviewed-by: Lyude Paul <lyude@redhat.com>
>
> On Thu, 2017-11-16 at 13:45 +0100, Maarten Lankhorst wrote:
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>  tests/Makefile.am                      |  6 +++---
>>  tests/intel-ci/fast-feedback.testlist  | 18 +++++++++---------
>>  tests/{chamelium.c => kms_chamelium.c} |  0
>>  tests/meson.build                      |  2 +-
>>  4 files changed, 13 insertions(+), 13 deletions(-)
>>  rename tests/{chamelium.c => kms_chamelium.c} (100%)
>>
>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>> index 89a970153992..db360523dad6 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 bf8c1e663801..f74da743ce88 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
>> similarity index 100%
>> rename from tests/chamelium.c
>> rename to tests/kms_chamelium.c
>> diff --git a/tests/meson.build b/tests/meson.build
>> index c3d5372f78ac..20ff79dcb15f 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

Pushed, thanks for review. :)
diff mbox

Patch

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89a970153992..db360523dad6 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 bf8c1e663801..f74da743ce88 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
similarity index 100%
rename from tests/chamelium.c
rename to tests/kms_chamelium.c
diff --git a/tests/meson.build b/tests/meson.build
index c3d5372f78ac..20ff79dcb15f 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