Skip to contentSkip to conversation

openposix/conformance/interfaces: Correct typos

PATCH Superseded Wang Xin 2 participants 8 messages Apr 7, 2021 – Apr 15, 2021

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Wang Xin

author
#0 lore raw

PATCH 1/1 openposix/conformance/interfaces: Correct typos

Types in the name of the temporary files: For example, in aio_cancel/8-1.c file, pts_aio_cancel_1_1 -> pts_aio_cancel_8_1.
Others like this have been modified.

---
 testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c  | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c    | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c  | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c   | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c  | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c  | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c       | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c       | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c        | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c      | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c      | 2 +-
 testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c +1 -1
index 139e9b5..f11e067 100644
@@ -50,7 +50,7 @@ int main(void)
 	if (sysconf(_SC_ASYNCHRONOUS_IO) < 200112L)
 		return PTS_UNSUPPORTED;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_cancel_1_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_cancel_8_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c +1 -1
index 5b980be..e1ae59e 100644
@@ -55,7 +55,7 @@ int main(void)
 	    || sysconf(_SC_AIO_MAX) == -1)
 		return PTS_UNSUPPORTED;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_write_4_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_read_9_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c +1 -1
index f380531..a243b3e 100644
@@ -50,7 +50,7 @@ int main(void)
 	if (sysconf(_SC_ASYNCHRONOUS_IO) < 200112L)
 		return PTS_UNSUPPORTED;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_return_2_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_return_4_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c +1 -1
index ed8173e..615b97d 100644
@@ -53,7 +53,7 @@ int main(void)
 	if (sysconf(_SC_ASYNCHRONOUS_IO) < 200112L)
 		return PTS_UNSUPPORTED;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_suspend_2_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_suspend_3_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c +1 -1
index 5311a4a..277573a 100644
@@ -55,7 +55,7 @@ int main(void)
 	    || sysconf(_SC_AIO_MAX) == -1)
 		return PTS_UNSUPPORTED;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_write_4_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_aio_write_7_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c +1 -1
index e445773..7eb6448 100644
@@ -55,7 +55,7 @@ int main(void)
 	if (sysconf(_SC_ASYNCHRONOUS_IO) < 200112L)
 		exit(PTS_UNSUPPORTED);
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_lio_listio_4_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_lio_listio_5_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c +1 -1
index 444555e..4e8afb6 100644
@@ -73,7 +73,7 @@ int main(void)
 	if (sysconf(_SC_ASYNCHRONOUS_IO) < 200112L)
 		exit(PTS_UNSUPPORTED);
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_lio_listio_4_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_lio_listio_7_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c +1 -1
index 2aea927..d1f8991 100644
@@ -59,7 +59,7 @@ int main(void)
 	/* mmap will create a partial page */
 	len = page_size / 2;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_11_5");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_11_6");
 	child = fork();
 	switch (child) {
 	case 0:
testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c +1 -1
index bb3ab74..d58fc8c 100644
@@ -31,7 +31,7 @@ int main(void)
 	void *pa;
 	int fd;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_31_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_32_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c +1 -1
index b38833b..9aef16c 100644
@@ -53,7 +53,7 @@ int main(void)
 	int status;
 	int sig_num;
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_6_2");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_mmap_6_3");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c +1 -1
index 9d0f918..31f2109 100644
@@ -73,7 +73,7 @@ int main(void)
 	len = page_size + 1;
 	/* Create tmp file */
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_1_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_1_2");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c +1 -1
index 53e89de..1879719 100644
@@ -54,7 +54,7 @@ int main(void)
 	len = page_size + 1;
 	/* Create tmp file */
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_1_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_3_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c +1 -1
index 0280a0e..371e3b0 100644
@@ -49,7 +49,7 @@ int main(void)
 	len = page_size + 1;
 	/* Create tmp file */
-	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_1_1");
+	PTS_GET_TMP_FILENAME(tmpfname, "pts_munmap_9_1");
 	unlink(tmpfname);
 	fd = open(tmpfname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd == -1) {

2.6.2

#1 lore raw

PATCH 1/1 openposix/conformance/interfaces: Correct typos

Hi Xin,

Sorry for the late reply.

Quoted 5 lines · Wang Xin

Types in the name of the temporary files: For example, in aio_cancel/8-1.c file,
pts_aio_cancel_1_1 -> pts_aio_cancel_8_1.
Others like this have been modified.

Good catch!

Since there are many changes before this patch, could you rebase this patch on the latest main branch and resend? (in order to get rid of the patch conflict :)

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/59a8d5d3/attachment.htm>
#2 lore raw

Hi Wang,

Thanks so much for your review!

I just re-checked the latest code and found that the code needed to be modified was not the same as the last time. Therefore, do you want to incorporate the patch submitted last time?
If there is a conflict, I can modify the patch submitted last time.

--
Regards,
Wang Xin

???: Li Wang [mailto:[email protected]]
????: 2021?4?14? 14:58
???: wangxin (CQ) <[email protected]>
??: LTP List <[email protected]>
??: Re: [LTP] [PATCH] openposix/conformance/interfaces: Correct typos

Hi Xin,

Sorry for the late reply.

On Wed, Apr 7, 2021 at 11:03 AM Wang Xin <[email protected]<mailto:[email protected]>> wrote:
Types in the name of the temporary files: For example, in aio_cancel/8-1.c file, pts_aio_cancel_1_1 -> pts_aio_cancel_8_1.
Others like this have been modified.

Good catch!

Since there are many changes before this patch, could you rebase this patch on the latest main branch and resend? (in order to get rid of the patch conflict :)

--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/b702708b/attachment-0001.htm>

#3 lore raw

PATCH 1/1 openposix/conformance/interfaces: Correct typos

Hi Xin,

Quoted 8 lines · wangxin (CQ)

Hi Wang,

Thanks so much for your review!

Quoted 7 lines

I just re-checked the latest code and found that the code needed to be modified was not the same as the last time.

Therefore, do you want to incorporate the patch submitted last time?

If there is a conflict, I can modify the patch submitted last time.

Feel free to make a new patch as you want, I don't insist on the previous version.
Just guarantee to rebase on the latest LTP is fine.

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/2bf314a2/attachment.htm>
#4 lore raw

Hi Wang,

I think I see what you mean. I'll submit a new patch to the community later. Thank you for the advice.

--
Regards,
Wang Xin

???: Li Wang [mailto:[email protected]]
????: 2021?4?14? 16:27
???: wangxin (CQ) <[email protected]>
??: LTP List <[email protected]>
??: Re: [LTP] [PATCH] openposix/conformance/interfaces: Correct typos

Hi Xin,

On Wed, Apr 14, 2021 at 4:16 PM wangxin (CQ) <[email protected]<mailto:[email protected]>> wrote:
Hi Wang,

Thanks so much for your review!

I just re-checked the latest code and found that the code needed to be modified was not the same as the last time. Therefore, do you want to incorporate the patch submitted last time?
If there is a conflict, I can modify the patch submitted last time.

Feel free to make a new patch as you want, I don't insist on the previous version. Just guarantee to rebase on the latest LTP is fine.

--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/37fca914/attachment.htm>

#5 lore raw

PATCH 1/1 openposix/conformance/interfaces: Correct typos

Hi Xin,

I'm sorry I don't know how did you do make a new patch, I still can NOT merge it to my local branch.

Btw, the one(about cpuset) I also solved the conflict by manual and then applied, I guess you proably need to check your git, or did you really make a patch via git format-patch?

After checking with scripts/checkpatch.pl, it repor errors like:

$ ./scripts/checkpatch.pl
~/v2-openposix-conformance-interfaces-Correct-typos.patch
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars
per line)
#73:
Types in the name of the temporary files: For example, in aio_cancel/8-1.c
file,

ERROR: patch seems to be corrupt (line wrapped?)
#109: FILE:
testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c:55:
index 5b980be..e1ae59e 100644

total: 1 errors, 1 warnings, 113 lines checked

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/c32b1759/attachment.htm>
#6 lore raw

Hi Wang,

I'm sorry. When I submitted the patch yesterday, I put a low-level error. I don't think it will happen again.
Thank you for pointing out my mistake.
Thank you again. Best wishes for you.

--
Regards,
Wang Xin

???: Li Wang [mailto:[email protected]]
????: 2021?4?14? 17:47
???: wangxin (CQ) <[email protected]>
??: LTP List <[email protected]>
??: Re: [LTP] [PATCH] openposix/conformance/interfaces: Correct typos

Hi Xin,

I'm sorry I don't know how did you do make a new patch, I still can NOT merge it to my local branch.

Btw, the one(about cpuset) I also solved the conflict by manual and then applied, I guess you proably need to check your git, or did you really make a patch via git format-patch?

After checking with scripts/checkpatch.pl<http://checkpatch.pl>, it repor errors like:

$ ./scripts/checkpatch.pl<http://checkpatch.pl> ~/v2-openposix-conformance-interfaces-Correct-typos.patch
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#73:
Types in the name of the temporary files: For example, in aio_cancel/8-1.c file,

ERROR: patch seems to be corrupt (line wrapped?)
#109: FILE: testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c:55:
index 5b980be..e1ae59e 100644

total: 1 errors, 1 warnings, 113 lines checked

--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210415/8ed1bcf8/attachment-0001.htm>

#7 lore raw

PATCH 1/1 openposix/conformance/interfaces: Correct typos

Hi Xin,

Hi Wang,

Quoted 11 lines

I'm sorry. When I submitted the patch yesterday, I put a low-level error.

I don't think it will happen again.

Thank you for pointing out my mistake.

Thank you again. Best wishes for you.

Never mind. I'm glad to merge if you can format a new one. (To be on the safe side, plz do checkpatch.pl before sending next time:)

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210415/d961b20c/attachment.htm>