Mercurial > ecos
changeset 2839:7e4011e5ffbb
Fixes for 1000691 and 1000692, applied to trunk.
| author | bartv |
|---|---|
| date | Mon, 02 Mar 2009 21:28:48 +0000 |
| parents | 6960dfdbb4ff |
| children | 5a11571c4ed0 |
| files | packages/compat/uitron/current/ChangeLog packages/compat/uitron/current/tests/test2.c packages/compat/uitron/current/tests/test6.c packages/compat/uitron/current/tests/test7.c packages/compat/uitron/current/tests/testcx2.cxx packages/compat/uitron/current/tests/testcx6.cxx packages/compat/uitron/current/tests/testcx7.cxx |
| diffstat | 7 files changed, 38 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/compat/uitron/current/ChangeLog +++ b/packages/compat/uitron/current/ChangeLog @@ -1,3 +1,13 @@ +2009-03-02 Nick Garnett <nickg@ecoscentric.com> + + * tests/test2.c: + * tests/test6.c: + * tests/test7.c: + * tests/testcx2.c: + * tests/testcx6.c: + * tests/testcx7.c: Modify tests to either not run, or avoid mbox + functions if system is configured without strict conformance. + 2009-02-09 Bart Veer <bartv@ecoscentric.com> * cdl/tasks.cdl: clarify usage of CYGNUM_UITRON_TASKS, bug
--- a/packages/compat/uitron/current/tests/test2.c +++ b/packages/compat/uitron/current/tests/test2.c @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -55,6 +55,8 @@ #ifdef CYGPKG_UITRON // we DO want the uITRON package +#ifdef CYGIMP_UITRON_STRICT_CONFORMANCE // we DO want strict conformance + #ifdef CYGSEM_KERNEL_SCHED_MLQUEUE // we DO want prioritized threads #ifdef CYGFUN_KERNEL_THREADS_TIMER // we DO want timout-able calls @@ -953,6 +955,9 @@ void task4( unsigned int arg ) #else // ! CYGIMP_THREAD_PRIORITY - can't test without it #define N_A_MSG "no CYGSEM_KERNEL_SCHED_MLQUEUE" #endif // ! CYGSEM_KERNEL_SCHED_MLQUEUE - can't test without it +#else // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it +#define N_A_MSG "no CYGIMP_UITRON_STRICT_CONFORMANCE" +#endif // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it #else // ! CYGPKG_UITRON #define N_A_MSG "uITRON Compatibility layer disabled" #endif // CYGPKG_UITRON
--- a/packages/compat/uitron/current/tests/test6.c +++ b/packages/compat/uitron/current/tests/test6.c @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -371,7 +371,7 @@ void task1( unsigned int arg ) CYG_TEST_PASS("create/delete flags"); #endif // CYGPKG_UITRON_FLAGS_CREATE_DELETE -#ifdef CYGPKG_UITRON_MBOXES_CREATE_DELETE +#if defined(CYGPKG_UITRON_MBOXES_CREATE_DELETE) && defined(CYGIMP_UITRON_STRICT_CONFORMANCE) tests++; #ifdef CYGSEM_UITRON_BAD_PARAMS_RETURN_ERRORS ercd = del_mbx( -6 );
--- a/packages/compat/uitron/current/tests/test7.c +++ b/packages/compat/uitron/current/tests/test7.c @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -55,6 +55,8 @@ #ifdef CYGPKG_UITRON // we DO want the uITRON package +#ifdef CYGIMP_UITRON_STRICT_CONFORMANCE // we DO want strict conformance + #ifdef CYGSEM_KERNEL_SCHED_MLQUEUE // we DO want prioritized threads #ifdef CYGFUN_KERNEL_THREADS_TIMER // we DO want timout-able calls @@ -996,6 +998,9 @@ void task4( unsigned int arg ) #else // ! CYGIMP_THREAD_PRIORITY - can't test without it #define N_A_MSG "no CYGSEM_KERNEL_SCHED_MLQUEUE" #endif // ! CYGSEM_KERNEL_SCHED_MLQUEUE - can't test without it +#else // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it +#define N_A_MSG "no CYGIMP_UITRON_STRICT_CONFORMANCE" +#endif // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it #else // ! CYGPKG_UITRON #define N_A_MSG "uITRON Compatibility layer disabled" #endif // CYGPKG_UITRON
--- a/packages/compat/uitron/current/tests/testcx2.cxx +++ b/packages/compat/uitron/current/tests/testcx2.cxx @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -55,6 +55,8 @@ #ifdef CYGPKG_UITRON // we DO want the uITRON package +#ifdef CYGIMP_UITRON_STRICT_CONFORMANCE // we DO want strict conformance + #ifdef CYGSEM_KERNEL_SCHED_MLQUEUE // we DO want prioritized threads #ifdef CYGFUN_KERNEL_THREADS_TIMER // we DO want timout-able calls @@ -920,6 +922,9 @@ void task4( unsigned int arg ) #else // ! CYGIMP_THREAD_PRIORITY - can't test without it #define N_A_MSG "no CYGSEM_KERNEL_SCHED_MLQUEUE" #endif // ! CYGSEM_KERNEL_SCHED_MLQUEUE - can't test without it +#else // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it +#define N_A_MSG "no CYGIMP_UITRON_STRICT_CONFORMANCE" +#endif // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it #else // ! CYGPKG_UITRON #define N_A_MSG "uITRON Compatibility layer disabled" #endif // CYGPKG_UITRON
--- a/packages/compat/uitron/current/tests/testcx6.cxx +++ b/packages/compat/uitron/current/tests/testcx6.cxx @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -374,7 +374,7 @@ void task1( unsigned int arg ) CYG_TEST_PASS("create/delete flags"); #endif // CYGPKG_UITRON_FLAGS_CREATE_DELETE -#ifdef CYGPKG_UITRON_MBOXES_CREATE_DELETE +#if defined(CYGPKG_UITRON_MBOXES_CREATE_DELETE) && defined(CYGIMP_UITRON_STRICT_CONFORMANCE) tests++; #ifdef CYGSEM_UITRON_BAD_PARAMS_RETURN_ERRORS ercd = del_mbx( -6 );
--- a/packages/compat/uitron/current/tests/testcx7.cxx +++ b/packages/compat/uitron/current/tests/testcx7.cxx @@ -8,7 +8,7 @@ // ####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -55,6 +55,8 @@ #ifdef CYGPKG_UITRON // we DO want the uITRON package +#ifdef CYGIMP_UITRON_STRICT_CONFORMANCE // we DO want strict conformance + #ifdef CYGSEM_KERNEL_SCHED_MLQUEUE // we DO want prioritized threads #ifdef CYGFUN_KERNEL_THREADS_TIMER // we DO want timout-able calls @@ -1084,6 +1086,9 @@ void task4( unsigned int arg ) #else // ! CYGIMP_THREAD_PRIORITY - can't test without it #define N_A_MSG "no CYGSEM_KERNEL_SCHED_MLQUEUE" #endif // ! CYGSEM_KERNEL_SCHED_MLQUEUE - can't test without it +#else // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it +#define N_A_MSG "no CYGIMP_UITRON_STRICT_CONFORMANCE" +#endif // ! CYGIMP_UITRON_STRICT_CONFORMANCE - can't test without it #else // ! CYGPKG_UITRON #define N_A_MSG "uITRON Compatibility layer disabled" #endif // CYGPKG_UITRON