Changeset d0beb9b in rtems


Ignore:
Timestamp:
Nov 18, 2013, 4:54:46 PM (6 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
5124d64
Parents:
39a4574
git-author:
Joel Sherrill <joel.sherrill@…> (11/18/13 16:54:46)
git-committer:
Joel Sherrill <joel.sherrill@…> (11/18/13 16:55:24)
Message:

Misc tests: Fix scn files and adjust output

Location:
testsuites
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • testsuites/fstests/fsdosfswrite01/fsdosfswrite01.scn

    r39a4574 rd0beb9b  
     1*** TEST FSDOSFSWRITE 1 ***
     2*** END OF TEST FSDOSFSWRITE 1 ***
  • testsuites/psxtests/psxaio01/psxaio01.scn

    r39a4574 rd0beb9b  
     1*** POSIX SPINLOCK TEST 01 ***
     2pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ) -- EINVAL
     3pthread_spin_init( NULL, PTHREAD_PROCESS_SHARED ) -- EINVAL
     4pthread_spin_init( &spinlock, 0x1234 ) -- EINVAL
     5pthread_spin_init( &spinlock, PTHREAD_PROCESS_SHARED ) -- EINVAL
     6pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK
     7pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN
     8pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN
     9pthread_spin_lock( NULL ) -- EINVAL
     10pthread_spin_trylock( NULL ) -- EINVAL
     11pthread_spin_unlock( NULL ) -- EINVAL
     12pthread_spin_destroy( NULL ) -- EINVAL
     13pthread_spin_lock( &spinlock ) -- EINVAL
     14pthread_spin_trylock( &spinlock ) -- EINVAL
     15pthread_spin_unlock( &spinlock ) -- EINVAL
     16pthread_spin_destroy( &spinlock ) -- EINVAL
     17pthread_spin_unlock( &Spinlock ) -- already unlocked OK
     18pthread_spin_lock( &Spinlock ) -- OK
     19pthread_spin_lock( &Spinlock ) -- EDEADLK
     20pthread_spin_trylock( &Spinlock ) -- EDEADLK
     21pthread_spin_unlock( &Spinlock ) -- OK
     22pthread_spin_trylock( &Spinlock ) -- OK
     23pthread_spin_unlock( &Spinlock ) -- OK
     24pthread_spin_lock( &Spinlock ) from Thread -- OK
     25sleep to allow main thread to run
     26pthread_spin_lock( &Spinlock ) -- OK
     27pthread_spin_unlock( &Spinlock ) from Thread -- OK
     28pthread_spin_destroy( &Spinlock ) -- EBUSY
     29pthread_spin_unlock( &Spinlock ) -- OK
     30pthread_spin_destroy( &Spinlock ) -- OK
     31*** END OF POSIX SPINLOCK TEST 01 ***
  • testsuites/psxtests/psxaio02/init.c

    r39a4574 rd0beb9b  
    7676  puts ("\n\n*** POSIX AIO TEST 02 ***");
    7777 
    78   puts (" Init: Open files ");
     78  puts ("Init: Open files");
    7979
    8080  for (i=0; i<MAX; i++)
     
    8585    }
    8686 
    87   puts (" Init: [WQ] aio_write on 1st file ");
     87  puts ("Init: [WQ] aio_write on 1st file");
    8888  aiocbp[0] = create_aiocb (fd[0]);
    8989  status = aio_write (aiocbp[0]);
    9090  rtems_test_assert (status != -1);
    9191
    92   puts (" Init: [WQ] aio_write on 2nd file ");
     92  puts ("Init: [WQ] aio_write on 2nd file");
    9393  aiocbp[1] = create_aiocb (fd[1]);
    9494  status = aio_write (aiocbp[1]);
    9595  rtems_test_assert (status != -1);
    9696 
    97   puts (" Init: [WQ] aio_read on 2nd file add by priority ");
     97  puts ("Init: [WQ] aio_read on 2nd file add by priority");
    9898  aiocbp[2] = create_aiocb (fd[1]);
    9999  status = aio_read (aiocbp[2]);
    100100  rtems_test_assert (status != -1);
    101101 
    102   puts (" Init: [WQ] aio_write on 3rd file ");
     102  puts ("Init: [WQ] aio_write on 3rd file");
    103103  aiocbp[3] = create_aiocb (fd[2]);
    104104  status = aio_write (aiocbp[3]);
    105105  rtems_test_assert (status != -1);
    106106 
    107   puts (" Init: [WQ] aio_write on 4th file ");
     107  puts ("Init: [WQ] aio_write on 4th file");
    108108  aiocbp[4] = create_aiocb (fd[3]);
    109109  status = aio_write (aiocbp[4]);
    110110  rtems_test_assert (status != -1);
    111111 
    112   puts (" Init: [WQ] aio_write on 5th file  -- [WQ] full ");
     112  puts ("Init: [WQ] aio_write on 5th file  -- [WQ] full");
    113113  aiocbp[5] = create_aiocb (fd[4]);
    114114  status = aio_write (aiocbp[5]);
    115115  rtems_test_assert (status != -1);
    116116 
    117   puts (" Init: [IQ] aio_write on 6th file ");
     117  puts ("Init: [IQ] aio_write on 6th file");
    118118  aiocbp[6] = create_aiocb (fd[5]);
    119119  status = aio_write (aiocbp[6]);
    120120  rtems_test_assert (status != -1);
    121121 
    122   puts (" Init: [IQ] aio_write on 7th file ");
     122  puts ("Init: [IQ] aio_write on 7th file");
    123123  aiocbp[7] = create_aiocb (fd[6]);
    124124  status = aio_write (aiocbp[7]);
    125125  rtems_test_assert (status != -1);
    126126
    127   puts (" Init: [IQ] aio_read on 7th file add by priority ");
     127  puts ("Init: [IQ] aio_read on 7th file add by priority");
    128128  aiocbp[8] = create_aiocb (fd[6]);
    129129  status = aio_read (aiocbp[8]);
    130130  rtems_test_assert (status != -1);
    131131
    132   puts (" Init: [WQ] aio_sync on 1st file add by priority ");
     132  puts ("Init: [WQ] aio_sync on 1st file add by priority");
    133133  aiocbp[9] = create_aiocb (fd[0]);
    134134  status = aio_fsync (O_SYNC, aiocbp[9]);
    135135  rtems_test_assert (status != -1);
    136136
    137   puts (" Init: [NONE] aio_cancel aiocbp=NULL and invalid fildes ");
     137  puts ("Init: [NONE] aio_cancel aiocbp=NULL and invalid fildes");
    138138  status = aio_cancel (WRONG_FD, NULL);
    139139  rtems_test_assert (status == -1);
    140140
    141   puts (" Init: [NONE] aio_cancel aiocbp=NULL valid fildes not in queue ");
     141  puts ("Init: [NONE] aio_cancel aiocbp=NULL valid fildes not in queue");
    142142  status = aio_cancel (fd[7], NULL);
    143143  rtems_test_assert (status == AIO_ALLDONE);
    144144
    145   puts (" Init: [WQ] aio_cancel aiocbp=NULL fildes=fd[1] ");
     145  puts ("Init: [WQ] aio_cancel aiocbp=NULL fildes=fd[1]");
    146146  status = aio_cancel (fd[1], NULL);
    147147  rtems_test_assert (status == AIO_CANCELED);
    148148
    149   puts (" Init: [IQ] aio_cancel aiocbp=NULL fildes=fd[6] ");
     149  puts ("Init: [IQ] aio_cancel aiocbp=NULL fildes=fd[6]");
    150150  status = aio_cancel (fd[6], NULL);
    151151  rtems_test_assert (status == AIO_CANCELED);
    152152
    153   puts (" Init: [NONE] aio_cancel aiocbp->aio_fildes != fildes ");
     153  puts ("Init: [NONE] aio_cancel aiocbp->aio_fildes != fildes");
    154154  status = aio_cancel (fd[4],aiocbp[4]);
    155155  rtems_test_assert (status == -1 );
    156156 
    157   puts (" Init: [NONE] aio_cancel FD on [IQ], aiocb not on chain ");
     157  puts ("Init: [NONE] aio_cancel FD on [IQ], aiocb not on chain");
    158158  aiocbp[10] = create_aiocb (fd[9]);
    159159  status = aio_cancel (fd[9], aiocbp[10]);
    160160  rtems_test_assert (status == -1);
    161161
    162   puts (" Init: [IQ] aio_cancel 6th file only one request ");
     162  puts ("Init: [IQ] aio_cancel 6th file only one request");
    163163  status = aio_cancel (fd[5], aiocbp[6]);
    164164  rtems_test_assert (status == AIO_CANCELED);
    165165
    166   puts (" Init: [WQ] aio_cancel 1st file only one request ");
     166  puts ("Init: [WQ] aio_cancel 1st file only one request");
    167167  status = aio_cancel (fd[0], aiocbp[9]);
    168168  rtems_test_assert (status == AIO_CANCELED);
    169169
    170   puts (" Init: [NONE] aio_cancel empty [IQ] ");
     170  puts ("Init: [NONE] aio_cancel empty [IQ]");
    171171  status = aio_cancel (fd[5], aiocbp[6]);
    172172  rtems_test_assert (status == AIO_ALLDONE);
    173173
    174   puts ("\n\n*** POSIX AIO TEST 02 ***");
    175 
    176   puts ("*** END OF POSIX AIO TEST 01 ***");
     174  puts ("*** END OF POSIX AIO TEST 02 ***");
    177175
    178176  for (i = 0; i < MAX; i++)
  • testsuites/psxtests/psxaio02/psxaio02.scn

    r39a4574 rd0beb9b  
     1*** POSIX AIO TEST 02 ***
     2Init: Open files
     3Init: [WQ] aio_write on 1st file
     4Init: [WQ] aio_write on 2nd file
     5Init: [WQ] aio_read on 2nd file add by priority
     6Init: [WQ] aio_write on 3rd file
     7Init: [WQ] aio_write on 4th file
     8Init: [WQ] aio_write on 5th file  -- [WQ] full
     9Init: [IQ] aio_write on 6th file
     10Init: [IQ] aio_write on 7th file
     11Init: [IQ] aio_read on 7th file add by priority
     12Init: [WQ] aio_sync on 1st file add by priority
     13Init: [NONE] aio_cancel aiocbp=NULL and invalid fildes
     14Init: [NONE] aio_cancel aiocbp=NULL valid fildes not in queue
     15Init: [WQ] aio_cancel aiocbp=NULL fildes=fd[1]
     16Init: [IQ] aio_cancel aiocbp=NULL fildes=fd[6]
     17Init: [NONE] aio_cancel aiocbp->aio_fildes != fildes
     18Init: [NONE] aio_cancel FD on [IQ], aiocb not on chain
     19Init: [IQ] aio_cancel 6th file only one request
     20Init: [WQ] aio_cancel 1st file only one request
     21Init: [NONE] aio_cancel empty [IQ]
     22*** END OF POSIX AIO TEST 02 ***
  • testsuites/psxtests/psxspin01/psxspin01.scn

    r39a4574 rd0beb9b  
     1*** POSIX SPINLOCK TEST 01 ***
     2pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ) -- EINVAL
     3pthread_spin_init( NULL, PTHREAD_PROCESS_SHARED ) -- EINVAL
     4pthread_spin_init( &spinlock, 0x1234 ) -- EINVAL
     5pthread_spin_init( &spinlock, PTHREAD_PROCESS_SHARED ) -- EINVAL
     6pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK
     7pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN
     8pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN
     9pthread_spin_lock( NULL ) -- EINVAL
     10pthread_spin_trylock( NULL ) -- EINVAL
     11pthread_spin_unlock( NULL ) -- EINVAL
     12pthread_spin_destroy( NULL ) -- EINVAL
     13pthread_spin_lock( &spinlock ) -- EINVAL
     14pthread_spin_trylock( &spinlock ) -- EINVAL
     15pthread_spin_unlock( &spinlock ) -- EINVAL
     16pthread_spin_destroy( &spinlock ) -- EINVAL
     17pthread_spin_unlock( &Spinlock ) -- already unlocked OK
     18pthread_spin_lock( &Spinlock ) -- OK
     19pthread_spin_lock( &Spinlock ) -- EDEADLK
     20pthread_spin_trylock( &Spinlock ) -- EDEADLK
     21pthread_spin_unlock( &Spinlock ) -- OK
     22pthread_spin_trylock( &Spinlock ) -- OK
     23pthread_spin_unlock( &Spinlock ) -- OK
     24pthread_spin_lock( &Spinlock ) from Thread -- OK
     25sleep to allow main thread to run
     26pthread_spin_lock( &Spinlock ) -- OK
     27pthread_spin_unlock( &Spinlock ) from Thread -- OK
     28pthread_spin_destroy( &Spinlock ) -- EBUSY
     29pthread_spin_unlock( &Spinlock ) -- OK
     30pthread_spin_destroy( &Spinlock ) -- OK
     31*** END OF POSIX SPINLOCK TEST 01 ***
Note: See TracChangeset for help on using the changeset viewer.