* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
@ 2021-04-07 3:20 Wang Xin
2021-04-14 6:57 ` Li Wang
0 siblings, 1 reply; 12+ messages in thread
From: Wang Xin @ 2021-04-07 3:20 UTC (permalink / raw)
To: ltp
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.
Signed-off-by: Wang Xin <wangxin410@huawei.com>
---
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(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
index 139e9b5..f11e067 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
index 5b980be..e1ae59e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
index f380531..a243b3e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
index ed8173e..615b97d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
index 5311a4a..277573a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
index e445773..7eb6448 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
index 444555e..4e8afb6 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
index 2aea927..d1f8991 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
@@ -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:
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
index bb3ab74..d58fc8c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
index b38833b..9aef16c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
index 9d0f918..31f2109 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
index 53e89de..1879719 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
index 0280a0e..371e3b0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
@@ -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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-07 3:20 [LTP] [PATCH] openposix/conformance/interfaces: Correct typos Wang Xin
@ 2021-04-14 6:57 ` Li Wang
2021-04-14 8:15 ` [LTP] 答复: " wangxin
0 siblings, 1 reply; 12+ messages in thread
From: Li Wang @ 2021-04-14 6:57 UTC (permalink / raw)
To: ltp
Hi Xin,
Sorry for the late reply.
On Wed, Apr 7, 2021 at 11:03 AM Wang Xin <wangxin410@huawei.com> 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/59a8d5d3/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] 答复: [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 6:57 ` Li Wang
@ 2021-04-14 8:15 ` wangxin
2021-04-14 8:26 ` [LTP] " Li Wang
0 siblings, 1 reply; 12+ messages in thread
From: wangxin @ 2021-04-14 8:15 UTC (permalink / raw)
To: ltp
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:liwang@redhat.com]
????: 2021?4?14? 14:58
???: wangxin (CQ) <wangxin410@huawei.com>
??: LTP List <ltp@lists.linux.it>
??: 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 <wangxin410@huawei.com<mailto:wangxin410@huawei.com>> 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 8:15 ` [LTP] 答复: " wangxin
@ 2021-04-14 8:26 ` Li Wang
2021-04-14 8:48 ` [LTP] 答复: " wangxin
0 siblings, 1 reply; 12+ messages in thread
From: Li Wang @ 2021-04-14 8:26 UTC (permalink / raw)
To: ltp
Hi Xin,
On Wed, Apr 14, 2021 at 4:16 PM wangxin (CQ) <wangxin410@huawei.com> 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/2bf314a2/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] 答复: [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 8:26 ` [LTP] " Li Wang
@ 2021-04-14 8:48 ` wangxin
2021-04-14 9:47 ` [LTP] " Li Wang
0 siblings, 1 reply; 12+ messages in thread
From: wangxin @ 2021-04-14 8:48 UTC (permalink / raw)
To: ltp
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:liwang@redhat.com]
????: 2021?4?14? 16:27
???: wangxin (CQ) <wangxin410@huawei.com>
??: LTP List <ltp@lists.linux.it>
??: Re: [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
Hi Xin,
On Wed, Apr 14, 2021 at 4:16 PM wangxin (CQ) <wangxin410@huawei.com<mailto:wangxin410@huawei.com>> 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 8:48 ` [LTP] 答复: " wangxin
@ 2021-04-14 9:47 ` Li Wang
2021-04-15 2:11 ` [LTP] 答复: " wangxin
0 siblings, 1 reply; 12+ messages in thread
From: Li Wang @ 2021-04-14 9:47 UTC (permalink / raw)
To: ltp
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
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/c32b1759/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] 答复: [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 9:47 ` [LTP] " Li Wang
@ 2021-04-15 2:11 ` wangxin
2021-04-15 2:19 ` [LTP] " Li Wang
0 siblings, 1 reply; 12+ messages in thread
From: wangxin @ 2021-04-15 2:11 UTC (permalink / raw)
To: ltp
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:liwang@redhat.com]
????: 2021?4?14? 17:47
???: wangxin (CQ) <wangxin410@huawei.com>
??: LTP List <ltp@lists.linux.it>
??: 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>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-15 2:11 ` [LTP] 答复: " wangxin
@ 2021-04-15 2:19 ` Li Wang
0 siblings, 0 replies; 12+ messages in thread
From: Li Wang @ 2021-04-15 2:19 UTC (permalink / raw)
To: ltp
Hi Xin,
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.
>
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:)
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210415/d961b20c/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-27 2:51 Wang Xin
@ 2021-04-27 19:20 ` Petr Vorel
0 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2021-04-27 19:20 UTC (permalink / raw)
To: ltp
Hi 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.
This patch is also not applicable with git am. Not sure what you do wrong,
but simple 'git format-patch origin/master' should work.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
@ 2021-04-27 2:51 Wang Xin
2021-04-27 19:20 ` Petr Vorel
0 siblings, 1 reply; 12+ messages in thread
From: Wang Xin @ 2021-04-27 2:51 UTC (permalink / raw)
To: ltp
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.
Signed-off-by: Wang Xin <wangxin410@huawei.com>
---
v4 -> v3: rebase and resent this patch on the latest main branch.
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(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
index 139e9b5..f11e067 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/8-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
index 5b980be..e1ae59e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_read/9-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
index f380531..a243b3e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
index ed8173e..615b97d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/3-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
index 5311a4a..277573a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_write/7-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
index e445773..7eb6448 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/5-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
index 444555e..4e8afb6 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/lio_listio/7-1.c
@@ -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);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
index 2aea927..d1f8991 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/11-6.c
@@ -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:
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
index bb3ab74..d58fc8c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/32-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
index b38833b..9aef16c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/6-3.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
index 9d0f918..31f2109 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/1-2.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
index 53e89de..1879719 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/3-1.c
@@ -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) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
index 0280a0e..371e3b0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munmap/9-1.c
@@ -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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
2021-04-14 9:37 Zhao Gongyi
@ 2021-04-14 9:54 ` Li Wang
0 siblings, 0 replies; 12+ messages in thread
From: Li Wang @ 2021-04-14 9:54 UTC (permalink / raw)
To: ltp
Hi Gongyi,
This patch works well, pushed.
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210414/45657ac3/attachment.htm>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] openposix/conformance/interfaces: Correct typos
@ 2021-04-14 9:37 Zhao Gongyi
2021-04-14 9:54 ` Li Wang
0 siblings, 1 reply; 12+ messages in thread
From: Zhao Gongyi @ 2021-04-14 9:37 UTC (permalink / raw)
To: ltp
Typos in the name of the temporary files:
mmap/24-1.c: pts_mmap_24_1_* -> pts_mmap_25_1_*
sem_unlink/2-2.c: sem_unlink_9_1 -> sem_unlink_2_2
Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
.../open_posix_testsuite/conformance/interfaces/mmap/24-1.c | 2 +-
.../conformance/interfaces/sem_unlink/2-2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-1.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-1.c
index 3d9e4b180..6cc8349e1 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-1.c
@@ -43,7 +43,7 @@ int main(void)
size_t mapped_size = 0;
- snprintf(tmpfname, sizeof(tmpfname), "pts_mmap_25_1_%d", getpid());
+ snprintf(tmpfname, sizeof(tmpfname), "pts_mmap_24_1_%d", getpid());
/* Create shared object */
shm_unlink(tmpfname);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
index dae871d89..1e9096b23 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
@@ -76,7 +76,7 @@
#define VERBOSE 1
#endif
-#define SEM_NAME "/sem_unlink_9_1"
+#define SEM_NAME "/sem_unlink_2_2"
/******************************************************************************/
/*************************** Test case ***********************************/
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-04-27 19:20 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-07 3:20 [LTP] [PATCH] openposix/conformance/interfaces: Correct typos Wang Xin
2021-04-14 6:57 ` Li Wang
2021-04-14 8:15 ` [LTP] 答复: " wangxin
2021-04-14 8:26 ` [LTP] " Li Wang
2021-04-14 8:48 ` [LTP] 答复: " wangxin
2021-04-14 9:47 ` [LTP] " Li Wang
2021-04-15 2:11 ` [LTP] 答复: " wangxin
2021-04-15 2:19 ` [LTP] " Li Wang
2021-04-14 9:37 Zhao Gongyi
2021-04-14 9:54 ` Li Wang
2021-04-27 2:51 Wang Xin
2021-04-27 19:20 ` Petr Vorel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.