2004-02-26 Sébastien Barré <sbarre@sdelcc.com>

	PR 582/core
	* psxmsgq01/init.c, psxmsgq01/psxmsgq01.scn: Fix the POSIX message
	queue test so more of it runs now.

3 files changed, 19 insertions, 28 deletions

diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index c3989866f3..f4405b8769 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26	Sébastien Barré <sbarre@sdelcc.com>
+
+	PR 582/core
+	* psxmsgq01/init.c, psxmsgq01/psxmsgq01.scn: Fix the POSIX message
+	queue test so more of it runs now.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* psx01/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
index 26fca6c738..85866bc0c2 100644
--- a/testsuites/psxtests/psxmsgq01/init.c
+++ b/testsuites/psxtests/psxmsgq01/init.c
@@ -1008,6 +1008,7 @@ void verify_with_threads()
   char              message[100];
 
 
+#if 0
   /*
    * Create a task then block until the task sends the message.
    * Task tests set attributes so one queue will have a thread
@@ -1022,7 +1023,7 @@ void verify_with_threads()
   fatal_int_service_status( status, -1, "mq_receive error return status");
   fatal_posix_service_status( errno, EAGAIN, "mq_receive errno EAGAIN");
   print_current_time( "Init: ", "" );
-
+#endif
   /*
    * Create a task then block until the task sends the message.
    * Task tests set attributes so one queue will have a thread
@@ -1035,8 +1036,11 @@ void verify_with_threads()
   Read_msg_from_que(  BLOCKING, 0 ); /* Block until init writes */
   print_current_time( "Init: ", "" );
 
+#if 0 
   /*
-   * Create a task then block until the task reads a message.
+   * Fill the queue then create a task then block until the task receives a message.
+   * Task tests set attributes so one queue will have a thread
+   * blocked while attributes are changed.
    */
 
   Start_Test( "multi-thread Task 4 Send Test"  );
@@ -1049,7 +1053,7 @@ void verify_with_threads()
   fatal_posix_service_status( errno, EAGAIN, "mq_send errno EAGAIN");
   verify_queues_full( "Init:" );
   empty_message_queues( "Init:" );
-
+#endif
   /*
    * Create a task then block until the task reads a message.
    */
diff --git a/testsuites/psxtests/psxmsgq01/psxmsgq01.scn b/testsuites/psxtests/psxmsgq01/psxmsgq01.scn
index 8ab92b727c..9f0372b435 100644
--- a/testsuites/psxtests/psxmsgq01/psxmsgq01.scn
+++ b/testsuites/psxtests/psxmsgq01/psxmsgq01.scn
@@ -4,8 +4,8 @@ Init: mq_open - Create with maxmsg (-1) (EINVAL)
 Init: mq_open - Create with msgsize (-1) (EINVAL)
 Init: mq_open - Open new mq without create flag (ENOENT)
 Init: mq_open - Open with too long of a name (ENAMETOOLONG)
-Init: mq_open - SUCCESSFUL
 Init: mq_open - Create an Existing mq (EEXIST)
+Init: mq_open - SUCCESSFUL

 Init: mq_open - system is out of resources (ENFILE)
 Init: mq_close and mq_unlink (mq3...mqn) - SUCCESSFUL
 Init: Open Test Queues
@@ -52,7 +52,6 @@ Init: Init: mq_timedreceive - on queue Qnoblock Init: 0 sec 0 us
 Init: Init: mq_timedreceive - on queue Qblock Init: 1 sec 0 us
 Init: Init: mq_timedreceive - on queue Qdefault Init: 1 sec 0 us
 _______________mq_open functionality
-Init: mq_open - Open an existing mq ( same id )
 _______________mq_notify
 Init: mq_notify - Unopened message queue (EBADF)
 _____mq_notify - notify when Qnoblock gets a message
@@ -70,38 +69,20 @@ Init: mq_notify - Remove notification with null
 Init: Verify No Signal when send
 Init: mq_send -  to Qnoblock msg: 12345678 priority 31
 waiting on any signal for 3 seconds.
-_______________multi-thread Task 4 Receive Test
-Init: mq_receive - Empty queue changes to non-blocking (EAGAIN)
-Task_4: Fri Jan  1 00:00:18 1988
-Task_4: Set queue to non-blocking
-Task_4: Return queue to blocking
-Task_4: pthread_exit
-Init: Fri Jan  1 00:00:18 1988
 _______________multi-thread Task 1 Test
-Task_1: Fri Jan  1 00:00:18 1988
+Task_1: Fri Jan  1 00:00:20 1988

 Task_1: mq_send -  to Qblock msg: 12345678 priority 31
 Task_1: pthread_exit
-Init: Fri Jan  1 00:00:18 1988
-_______________multi-thread Task 4 Send Test
-Init: Verify Queues are empty
-Init: Fill Queues with messages
-Init: Verify Queues are full
-Init: mq_send - Full queue changes to non-blocking (EAGAIN)
-Task_4: Fri Jan  1 00:00:18 1988
-Task_4: Set queue to non-blocking
-Task_4: Return queue to blocking
-Task_4: pthread_exit
-Init: Verify Queues are full
-Init: Empty all Queues
+Init: Fri Jan  1 00:00:20 1988

 _______________multi-thread Task 2 Test
 Init: Verify Queues are empty
 Init: Fill Queues with messages
 Init: Verify Queues are full
 Init: mq_send -  to Qblock msg: Last priority 32
-Task_2: Fri Jan  1 00:00:18 1988
+Task_2: Fri Jan  1 00:00:21 1988

 Task_2: Verify Queues are full
 Task_2: pthread_exit
-Init: Fri Jan  1 00:00:18 1988
+Init: Fri Jan  1 00:00:21 1988

 Init: Verify Queues are full
 Init: Empty all Queues
 _______________multi-thread Task 3 Test
@@ -109,7 +90,7 @@ Init: Verify Queues are empty
 Init: Fill Queues with messages
 Init: Verify Queues are full
 Init: mq_send - Block while thread deletes queue (EBADF)
-Task_3: Fri Jan  1 00:00:18 1988
+Task_3: Fri Jan  1 00:00:21 1988

 _______________Unlink and Close All Files
 Task_3: pthread_exit
 *** END OF POSIX MESSAGE QUEUE TEST ***