From 3b46e73c2b9fb83c39c464d60ade393df184fc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 17 Aug 2006 18:16:23 +0000 Subject: [PATCH] Replaced DOS newlines with "real" ones :-) This lets the files compile again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18526 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../conformance/interfaces/fork/3-1.c | 4 +- .../conformance/interfaces/fork/4-1.c | 1 - .../conformance/interfaces/fork/testfrmw.c | 141 ++++++++------- .../conformance/interfaces/fork/testfrmw.h | 169 +++++++++--------- 4 files changed, 155 insertions(+), 160 deletions(-) diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/3-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/3-1.c index 4925da43f5..42432d5377 100644 --- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/3-1.c +++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/3-1.c @@ -122,8 +122,7 @@ int main(int argc, char * argv[]) output("Kill returned %d (%d: %s)\n", ret, errno, strerror(errno)); FAILED("A process group with the same PID as the child exists"); } - - + /* Test passed */ #if VERBOSE > 0 output("Test passed\n"); @@ -132,4 +131,3 @@ int main(int argc, char * argv[]) PASSED; } - diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/4-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/4-1.c index e5b5e50b1f..3ca11de544 100644 --- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/4-1.c +++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/4-1.c @@ -124,4 +124,3 @@ int main(int argc, char * argv[]) PASSED; } - diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.c index 38adaa8d90..6ecf98592a 100644 --- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.c +++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.c @@ -1,71 +1,70 @@ -/* - * Copyright (c) 2004, Bull S.A.. All rights reserved. - * Created by: Sebastien Decugis - - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., 59 - * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * - - - * This file is a wrapper to use the tests from the NPTL Test & Trace Project - * with either the Linux Test Project or the Open POSIX Test Suite. - - * The following function are defined: - * void output_init() - * void output_fini() - * void output(char * string, ...) - * - * The are used to output informative text (as a printf). - */ - -#include -#include - -/* We use a mutex to avoid conflicts in traces */ -static pthread_mutex_t m_trace = PTHREAD_MUTEX_INITIALIZER; - -/*****************************************************************************************/ -/******************************* stdout module *****************************************/ -/*****************************************************************************************/ -/* The following functions will output to stdout */ -#if (1) -void output_init() -{ - /* do nothing */ - return; -} -void output( char * string, ... ) -{ - va_list ap; - char *ts="[??:??:??]"; - struct tm * now; - time_t nw; - - pthread_mutex_lock(&m_trace); - nw = time(NULL); - now = localtime(&nw); - if (now == NULL) - printf(ts); - else - printf("[%2.2d:%2.2d:%2.2d]", now->tm_hour, now->tm_min, now->tm_sec); - va_start( ap, string); - vprintf(string, ap); - va_end(ap); - pthread_mutex_unlock(&m_trace); -} -void output_fini() -{ - /*do nothing */ - return; -} -#endif - +/* + * Copyright (c) 2004, Bull S.A.. All rights reserved. + * Created by: Sebastien Decugis + + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + + + * This file is a wrapper to use the tests from the NPTL Test & Trace Project + * with either the Linux Test Project or the Open POSIX Test Suite. + + * The following function are defined: + * void output_init() + * void output_fini() + * void output(char * string, ...) + * + * The are used to output informative text (as a printf). + */ + +#include +#include + +/* We use a mutex to avoid conflicts in traces */ +static pthread_mutex_t m_trace = PTHREAD_MUTEX_INITIALIZER; + +/*****************************************************************************************/ +/******************************* stdout module *****************************************/ +/*****************************************************************************************/ +/* The following functions will output to stdout */ +#if (1) +void output_init() +{ + /* do nothing */ + return; +} +void output( char * string, ... ) +{ + va_list ap; + char *ts="[??:??:??]"; + struct tm * now; + time_t nw; + + pthread_mutex_lock(&m_trace); + nw = time(NULL); + now = localtime(&nw); + if (now == NULL) + printf(ts); + else + printf("[%2.2d:%2.2d:%2.2d]", now->tm_hour, now->tm_min, now->tm_sec); + va_start( ap, string); + vprintf(string, ap); + va_end(ap); + pthread_mutex_unlock(&m_trace); +} +void output_fini() +{ + /*do nothing */ + return; +} +#endif diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.h b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.h index 239b7a5df4..96543ac39e 100644 --- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.h +++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/fork/testfrmw.h @@ -1,85 +1,84 @@ -/* - * Copyright (c) 2004, Bull S.A.. All rights reserved. - * Created by: Sebastien Decugis - - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., 59 - * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * - - - * This file is a wrapper to use the tests from the NPTL Test & Trace Project - * with either the Linux Test Project or the Open POSIX Test Suite. - - * The following macros are defined here: - * UNRESOLVED(ret, descr); - * where descr is a description of the error and ret is an int (error code for example) - * FAILED(descr); - * where descr is a short text saying why the test has failed. - * PASSED(); - * No parameter. - * - * Both three macros shall terminate the calling process. - * The testcase shall not terminate without calling one of those macros. - * - * - */ - -#include "posixtest.h" -#include /* for the strerror() routine */ - - -#ifdef __GNUC__ /* We are using GCC */ - - #define UNRESOLVED(x, s) \ - { output("Test %s unresolved: got %i (%s) on line %i (%s)\n", __FILE__, x, strerror(x), __LINE__, s); \ - output_fini(); \ - exit(PTS_UNRESOLVED); } - - #define FAILED(s) \ - { output("Test %s FAILED: %s\n", __FILE__, s); \ - output_fini(); \ - exit(PTS_FAIL); } - - #define PASSED \ - output_fini(); \ - exit(PTS_PASS); - - #define UNTESTED(s) \ -{ output("File %s cannot test: %s\n", __FILE__, s); \ - output_fini(); \ - exit(PTS_UNTESTED); \ -} - -#else /* not using GCC */ - - #define UNRESOLVED(x, s) \ - { output("Test unresolved: got %i (%s) on line %i (%s)\n", x, strerror(x), __LINE__, s); \ - output_fini(); \ - exit(PTS_UNRESOLVED); } - - #define FAILED(s) \ - { output("Test FAILED: %s\n", s); \ - output_fini(); \ - exit(PTS_FAIL); } - - #define PASSED \ - output_fini(); \ - exit(PTS_PASS); - - #define UNTESTED(s) \ -{ output("Unable to test: %s\n", s); \ - output_fini(); \ - exit(PTS_UNTESTED); \ -} - -#endif - +/* + * Copyright (c) 2004, Bull S.A.. All rights reserved. + * Created by: Sebastien Decugis + + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + + + * This file is a wrapper to use the tests from the NPTL Test & Trace Project + * with either the Linux Test Project or the Open POSIX Test Suite. + + * The following macros are defined here: + * UNRESOLVED(ret, descr); + * where descr is a description of the error and ret is an int (error code for example) + * FAILED(descr); + * where descr is a short text saying why the test has failed. + * PASSED(); + * No parameter. + * + * Both three macros shall terminate the calling process. + * The testcase shall not terminate without calling one of those macros. + * + * + */ + +#include "posixtest.h" +#include /* for the strerror() routine */ + + +#ifdef __GNUC__ /* We are using GCC */ + + #define UNRESOLVED(x, s) \ + { output("Test %s unresolved: got %i (%s) on line %i (%s)\n", __FILE__, x, strerror(x), __LINE__, s); \ + output_fini(); \ + exit(PTS_UNRESOLVED); } + + #define FAILED(s) \ + { output("Test %s FAILED: %s\n", __FILE__, s); \ + output_fini(); \ + exit(PTS_FAIL); } + + #define PASSED \ + output_fini(); \ + exit(PTS_PASS); + + #define UNTESTED(s) \ +{ output("File %s cannot test: %s\n", __FILE__, s); \ + output_fini(); \ + exit(PTS_UNTESTED); \ +} + +#else /* not using GCC */ + + #define UNRESOLVED(x, s) \ + { output("Test unresolved: got %i (%s) on line %i (%s)\n", x, strerror(x), __LINE__, s); \ + output_fini(); \ + exit(PTS_UNRESOLVED); } + + #define FAILED(s) \ + { output("Test FAILED: %s\n", s); \ + output_fini(); \ + exit(PTS_FAIL); } + + #define PASSED \ + output_fini(); \ + exit(PTS_PASS); + + #define UNTESTED(s) \ +{ output("Unable to test: %s\n", s); \ + output_fini(); \ + exit(PTS_UNTESTED); \ +} + +#endif