[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[Zhengwang Ruan]

Replace the incorrect definition of ANDROID with __ANDROID__.

Signed-off-by: Zhengwang Ruan <ruanzw@xiaopeng.com>
---
 testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
index c8252ed..bee6a62 100644
--- a/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
+++ b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
@@ -25,7 +25,7 @@
 #include "tst_test.h"
 #include "lapi/syscalls.h"
 
-#ifndef ANDROID
+#ifndef __ANDROID__
 #define SI_SIGVAL si_sigval
 #else
 #define SI_SIGVAL _sigval
-- 
2.7.4

[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[Petr Vorel]

Hi,

> Replace the incorrect definition of ANDROID with __ANDROID__.

> +++ b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
> @@ -25,7 +25,7 @@
>  #include "tst_test.h"
>  #include "lapi/syscalls.h"

> -#ifndef ANDROID
> +#ifndef __ANDROID__

Simple grep in AOSP tree would be for this change (and I'd personally prefer it as well)
I'd kindly ask android devs which one is correct :). BTW ANDROID was added by Steve.

$ cgrep '#if.* __ANDROID__' |wc -l
405

$ cgrep '#if.* ANDROID[^_]' |wc -l
22

Kind regards,
Petr

[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[=?unknown-8bit?b?6Ziu5q2j5pe6?=]

Hi Petr, Sandeep, Steve,


-------- Original Message --------
From: Petr Vorel
Sent: Thu, 11 Apr 2019 19:46:38 +0200
To: Zhengwang Ruan, Steve Muckle, Sandeep Patil
Cc: Ltp
Subject: Re: [LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition 
ANDROID with __ANDROID__
> Hi,
>
>> Replace the incorrect definition of ANDROID with __ANDROID__.
>> +++ b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
>> @@ -25,7 +25,7 @@
>>   #include "tst_test.h"
>>   #include "lapi/syscalls.h"
>> -#ifndef ANDROID
>> +#ifndef __ANDROID__
> Simple grep in AOSP tree would be for this change (and I'd personally prefer it as well)
> I'd kindly ask android devs which one is correct :). BTW ANDROID was added by Steve.

According to also [1], this patch is acceptable, right?

>
> $ cgrep '#if.* __ANDROID__' |wc -l
> 405
>
> $ cgrep '#if.* ANDROID[^_]' |wc -l
> 22
>
> Kind regards,
> Petr

Regards,

Zhengwang

[1] https://groups.google.com/forum/#!topic/android-ndk/cf9_f1SLXls

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190412/9d22423b/attachment.html>

[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[Sandeep Patil]

On Fri, Apr 12, 2019 at 11:36:46PM +0800, 阮正旺 wrote:
> Hi Petr, Sandeep, Steve,
> 
> 
> -------- Original Message --------
> From: Petr Vorel
> Sent: Thu, 11 Apr 2019 19:46:38 +0200
> To: Zhengwang Ruan, Steve Muckle, Sandeep Patil
> Cc: Ltp
> Subject: Re: [LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition
> ANDROID with __ANDROID__
> > Hi,
> > 
> > > Replace the incorrect definition of ANDROID with __ANDROID__.
> > > +++ b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
> > > @@ -25,7 +25,7 @@
> > >   #include "tst_test.h"
> > >   #include "lapi/syscalls.h"
> > > -#ifndef ANDROID
> > > +#ifndef __ANDROID__
> > Simple grep in AOSP tree would be for this change (and I'd personally prefer it as well)
> > I'd kindly ask android devs which one is correct :). BTW ANDROID was added by Steve.
> 
> According to also [1], this patch is acceptable, right?

Yes, indeed.

Acked-by: Sandeep Patil <sspatil@android.com>

[LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition ANDROID with __ANDROID__

[Petr Vorel]

Hi Sandeep, Zhengwang,

> On Fri, Apr 12, 2019 at 11:36:46PM +0800, 阮正旺 wrote:
> > Hi Petr, Sandeep, Steve,


> > -------- Original Message --------
> > From: Petr Vorel
> > Sent: Thu, 11 Apr 2019 19:46:38 +0200
> > To: Zhengwang Ruan, Steve Muckle, Sandeep Patil
> > Cc: Ltp
> > Subject: Re: [LTP] [PATCH v1] rt_tgsigqueueinfo01.c: replace definition
> > ANDROID with __ANDROID__
> > > Hi,

> > > > Replace the incorrect definition of ANDROID with __ANDROID__.
> > > > +++ b/testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c
> > > > @@ -25,7 +25,7 @@
> > > >   #include "tst_test.h"
> > > >   #include "lapi/syscalls.h"
> > > > -#ifndef ANDROID
> > > > +#ifndef __ANDROID__
> > > Simple grep in AOSP tree would be for this change (and I'd personally prefer it as well)
> > > I'd kindly ask android devs which one is correct :). BTW ANDROID was added by Steve.

> > According to also [1], this patch is acceptable, right?

> Yes, indeed.

> Acked-by: Sandeep Patil <sspatil@android.com>

Thanks for your review.
Merged (with slightly changed commit message) + I made this change in
include/tst_safe_posix_ipc.h in a separate commit.


Kind regards,
Petr