This is the mail archive of the ecos-patches@sourceware.org mailing list for the eCos project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

fixes for 1000691 and 1000692

The message box handling in some of the uITRON tests depends on the
mboxt2 implementation of the kernel's message box functionality. By
default the kernel will use the mboxt implementation, not mboxt2, but
CYGIMP_UITRON_STRICT_CONFORMANCE forces the use of mboxt2.

Bart

Index: tests/test2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/test2.c,v
retrieving revision 1.8
diff -u -p -r1.8 test2.c
--- tests/test2.c	29 Jan 2009 17:47:53 -0000	1.8
+++ tests/test2.c	2 Mar 2009 21:21:01 -0000
@@ -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
Index: tests/test6.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/test6.c,v
retrieving revision 1.7
diff -u -p -r1.7 test6.c
--- tests/test6.c	29 Jan 2009 17:47:53 -0000	1.7
+++ tests/test6.c	2 Mar 2009 21:21:28 -0000
@@ -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 );
Index: tests/test7.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/test7.c,v
retrieving revision 1.7
diff -u -p -r1.7 test7.c
--- tests/test7.c	29 Jan 2009 17:47:53 -0000	1.7
+++ tests/test7.c	2 Mar 2009 21:21:48 -0000
@@ -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
Index: tests/testcx2.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/testcx2.cxx,v
retrieving revision 1.7
diff -u -p -r1.7 testcx2.cxx
--- tests/testcx2.cxx	29 Jan 2009 17:47:53 -0000	1.7
+++ tests/testcx2.cxx	2 Mar 2009 21:22:07 -0000
@@ -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
Index: tests/testcx6.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/testcx6.cxx,v
retrieving revision 1.7
diff -u -p -r1.7 testcx6.cxx
--- tests/testcx6.cxx	29 Jan 2009 17:47:53 -0000	1.7
+++ tests/testcx6.cxx	2 Mar 2009 21:22:38 -0000
@@ -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 );
Index: tests/testcx7.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/tests/testcx7.cxx,v
retrieving revision 1.9
diff -u -p -r1.9 testcx7.cxx
--- tests/testcx7.cxx	29 Jan 2009 17:47:53 -0000	1.9
+++ tests/testcx7.cxx	2 Mar 2009 21:22:58 -0000
@@ -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
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]