[LTP] [PATCH v1 1/4] lib/tst_kvercmp: Remove old distnames

[xuyang2018.jy@fujitsu.com]

Hi Petr

> Hi,
> 
>> Our travis-ci has dropped or never used them, they are useless.
>> So delete.
> They were here before CI. They were meant for using by tests
> (no CI related at all).
> 
> Added by Wanlong Gao ~10 years ago. Agree they can be dropped, but
> Cc Cyril, Li and Jan.
> 
>> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
>> ---
>>   lib/tst_kvercmp.c                                   | 12 ------------
>>   testcases/kernel/syscalls/inotify/inotify04.c       | 13 +++----------
>>   .../kernel/tracing/dynamic_debug/dynamic_debug01.sh |  3 +--
>>   3 files changed, 4 insertions(+), 24 deletions(-)
> 
>> diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
>> index dc0daa746..a01b4332b 100644
>> --- a/lib/tst_kvercmp.c
>> +++ b/lib/tst_kvercmp.c
>> @@ -134,18 +134,6 @@ const char *tst_kvcmp_distname(const char *kver)
>>   	char *ret = distname;
>>   	char *p = distname;
> 
>> -	if (strstr(kver, ".el5uek"))
>> -		return "OL5UEK";
>> -
>> -	if (strstr(kver, ".el5"))
>> -		return "RHEL5";
>> -
>> -	if (strstr(kver, ".el6uek"))
>> -		return "OL6UEK";
>> -
>> -	if (strstr(kver, ".el6"))
>> -		return "RHEL6";
>> -
>>   	if (strstr(kver, ".el7"))
>>   		return "RHEL7";
> 
>> diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c
>> index fb9f5c293..c4fce399c 100644
>> --- a/testcases/kernel/syscalls/inotify/inotify04.c
>> +++ b/testcases/kernel/syscalls/inotify/inotify04.c
>> @@ -50,11 +50,6 @@ char event_buf[EVENT_BUF_LEN];
> 
>>   int fd_notify, reap_wd_file, reap_wd_dir, wd_dir, wd_file;
> 
>> -static struct tst_kern_exv kvers[] = {
>> -	{ "RHEL5", "2.6.18-132" },
>> -	{ NULL, NULL },
>> -};
>> -
>>   static void cleanup(void)
>>   {
>>   	if (reap_wd_dir && myinotify_rm_watch(fd_notify, wd_dir) == -1)
>> @@ -110,11 +105,9 @@ void verify_inotify(void)
>>   	 * This isn't well documented in inotify(7), but it's intuitive if you
>>   	 * understand how Unix works.
>>   	 */
>> -	if (tst_kvercmp2(2, 6, 25, kvers) >= 0) {
>> -		event_set[test_cnt].mask = IN_ATTRIB;
>> -		strcpy(event_set[test_cnt].name, "");
>> -		test_cnt++;
>> -	}
>> +	event_set[test_cnt].mask = IN_ATTRIB;
>> +	strcpy(event_set[test_cnt].name, "");
>> +	test_cnt++;
> 
> Isn't this unrelated change? I guess you remove it as part of cleanup of old
> versions.

Yes, just remove this useless if statement.
> 
>>   	event_set[test_cnt].mask = IN_DELETE_SELF;
>>   	strcpy(event_set[test_cnt].name, TEST_FILE);
>> diff --git a/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh b/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
>> index 4b159517b..ca6c840b1 100755
>> --- a/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
>> +++ b/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
>> @@ -59,8 +59,7 @@ setup()
>>   		tst_brk TBROK "Unable to find $DEBUGFS_CONTROL"
>>   	fi
> 
>> -	# Both patches with changes were backported to RHEL6 kernel 2.6.32-547
>> -	if tst_kvcmp -ge '3.4 RHEL6:2.6.32-547' ; then
>> +	if tst_kvcmp -ge 3.4 ; then
>>   		NEW_INTERFACE=1
>>   		EMPTY_FLAG="=_"
>>   	fi
> 
> Maybe first remove it from tests and then from infrastructure?
> But I'm ok to keep it in single patch, but commit message should be
> adjusted to not mention CI (not related to CI at all).

Yes.

Best Regards
Yang Xu
> 
> Acked-by: Petr Vorel <pvorel@suse.cz>
> 
> Kind regards,
> Petr