From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1RoBd2-0007fg-FZ for ltp-list@lists.sourceforge.net; Fri, 20 Jan 2012 10:23:28 +0000 Received: from multi.imgtec.com ([194.200.65.239]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1RoBcy-0007QE-6P for ltp-list@lists.sourceforge.net; Fri, 20 Jan 2012 10:23:28 +0000 Message-ID: <4F194094.7060504@imgtec.com> Date: Fri, 20 Jan 2012 10:23:16 +0000 From: Markos Chandras MIME-Version: 1.0 References: <1325672810-5247-1-git-send-email-markos.chandras@imgtec.com> <4F15A93E.10405@imgtec.com> <4F184599.5040502@st.com> In-Reply-To: <4F184599.5040502@st.com> Subject: Re: [LTP] [PATCH 12/21] syscalls/{getcontext, profil}: Multiple fixes List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: ltp-list@lists.sourceforge.net On 01/19/2012 04:32 PM, Carmelo AMOROSO wrote: > On 17/01/2012 18.00, Markos Chandras wrote: >> On 01/04/2012 10:26 AM, Markos Chandras wrote: >>> - Include test.h header even when __UCLIBC__ is defined. It is required for the >>> tst_brkm function >>> - Move TCID variable definition to the top so I can be independent of whether >>> __UCLIBC is used or not. >>> >>> Signed-off-by: Markos Chandras >>> --- >>> .../kernel/syscalls/getcontext/getcontext01.c | 7 +++++-- >>> testcases/kernel/syscalls/profil/profil01.c | 7 +++++-- >>> 2 files changed, 10 insertions(+), 4 deletions(-) >>> >>> diff --git a/testcases/kernel/syscalls/getcontext/getcontext01.c b/testcases/kernel/syscalls/getcontext/getcontext01.c >>> index 7cadc67..1cf2896 100644 >>> --- a/testcases/kernel/syscalls/getcontext/getcontext01.c >>> +++ b/testcases/kernel/syscalls/getcontext/getcontext01.c >>> @@ -34,6 +34,9 @@ >>> **********************************************************/ >>> >>> #include >>> + >>> +char *TCID = "getcontext01"; /* Test program identifier. */ >>> + >>> #if !defined(__UCLIBC__) >>> >>> #include >>> @@ -47,7 +50,6 @@ >>> void setup(); >>> void cleanup(); >>> >>> -char *TCID = "getcontext01"; /* Test program identifier. */ >>> int TST_TOTAL = 1; /* Total number of test cases. */ >>> >>> int exp_enos[] = { 0 }; /* must be a 0 terminated list */ >>> @@ -98,8 +100,9 @@ void cleanup() >>> } >>> >>> #else /* systems that dont support obsolete getcontext */ >>> +#include "test.h" >>> int main() >>> { >>> tst_brkm(TCONF, NULL, "system doesn't have getcontext support"); >>> } >>> -#endif >>> \ No newline at end of file >>> +#endif >>> diff --git a/testcases/kernel/syscalls/profil/profil01.c b/testcases/kernel/syscalls/profil/profil01.c >>> index 63bed83..571e6f0 100644 >>> --- a/testcases/kernel/syscalls/profil/profil01.c >>> +++ b/testcases/kernel/syscalls/profil/profil01.c >>> @@ -41,6 +41,9 @@ >>> #endif >>> >>> #include >>> + >>> +char *TCID = "profil01"; >>> + >>> #ifndef __UCLIBC__ >>> >>> #ifdef __arm__ >>> @@ -73,7 +76,6 @@ volatile int t_flag; >>> //char progname[]= "profil1()"; >>> >>> /***** LTP Port *****/ >>> -char *TCID = "profil01"; >>> int local_flag = PASSED; >>> int block_number; >>> FILE *temp; >>> @@ -305,9 +307,10 @@ void fail_exit() >>> /***** ** ** *****/ >>> >>> #else >>> +#include "test.h" >>> int main(void) >>> { >>> /* uClibc does not have profiling support */ >>> tst_exit(); >>> } >>> -#endif >>> \ No newline at end of file >>> +#endif >> >> Ping? >> >> Any comments on this? It fixes a build failure on uClibc platforms. >> > > Hi, > I've posted two different patch with a different approach, that got the > Ack from Mike, so likely they will be included in master shortly. > > Adding twice the "test.h" in both code path is not so clean, IMO. > > cheers, > carmelo > Hi Carmelo, Yeah I saw it. I agree that your patch is better. Thanks for fixing it ;) -- markos ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list