[LTP] [POSIX][PATCH] Fix a building error at pthread_join cases.

[LTP] [POSIX][PATCH] Fix a building error at pthread_join cases.

[Peng Haitao]

Hi Garrett,

Fix building error of pthread_join cases.

Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>

---
 .../interfaces/pthread_join/threads_scenarii.c     |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
index 479b28c..ee9ccbb 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
@@ -225,7 +225,6 @@ void scenar_init()
 
 			if (scenarii[ i ].schedparam == -1)
 				sp.sched_priority = sched_get_priority_min(old);
->>>>>>> origin
 
 			ret = pthread_attr_setschedparam(&scenarii[ i ].ta, &sp);
 
@@ -487,4 +486,4 @@ int main (int argc, char *argv[])
 
 	PASSED;
 }
-#endif
\ No newline at end of file
+#endif
-- 
1.7.0.4

-- 
Best Regards,
Peng Haitao


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [POSIX][PATCH] Fix a building error at pthread_join cases.

[Garrett Cooper]

On Wed, Jan 12, 2011 at 11:56 PM, Peng Haitao <penght@cn.fujitsu.com> wrote:
> Hi Garrett,
>
> Fix building error of pthread_join cases.
>
> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
>
> ---
>  .../interfaces/pthread_join/threads_scenarii.c     |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
> index 479b28c..ee9ccbb 100644
> --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
> +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
> @@ -225,7 +225,6 @@ void scenar_init()
>
>                        if (scenarii[ i ].schedparam == -1)
>                                sp.sched_priority = sched_get_priority_min(old);
> ->>>>>>> origin
>
>                        ret = pthread_attr_setschedparam(&scenarii[ i ].ta, &sp);
>
> @@ -487,4 +486,4 @@ int main (int argc, char *argv[])
>
>        PASSED;
>  }
> -#endif
> \ No newline at end of file
> +#endif

    This removes the conflicts marker, but it didn't fix a functional
issue with the change. I'm vetting other files you've noted to fix
issues.
Thanks,
-Garrett

------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list