From 2317457e101509ca16a669d99719ae44b0c60599 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:53 +0000 Subject: 2009-12-08 Joel Sherrill * include/pmacros.h, psx01/task.c, psx02/init.c, psx02/task.c, psx03/init.c, psx03/task.c, psx04/init.c, psx04/task1.c, psx04/task2.c, psx04/task3.c, psx05/init.c, psx05/task.c, psx05/task2.c, psx05/task3.c, psx06/init.c, psx06/task.c, psx06/task2.c, psx07/init.c, psx08/init.c, psx08/task2.c, psx08/task3.c, psx09/init.c, psx10/init.c, psx10/task.c, psx10/task2.c, psx10/task3.c, psx11/init.c, psx11/task.c, psx12/init.c, psxalarm01/init.c, psxbarrier01/test.c, psxcancel01/init.c, psxchroot01/test.c, psxclock/init.c, psxfile01/test.c, psxfile01/test_cat.c, psxfile01/test_extend.c, psxfile01/test_write.c, psxitimer/init.c, psxkey01/task.c, psxkey02/init.c, psxkey03/init.c, psxmount/test.c, psxmsgq01/init.c, psxmsgq03/init.c, psxmsgq04/init.c, psxreaddir/test.c, psxrwlock01/test.c, psxsem01/init.c, psxsignal01/init.c, psxsignal01/task1.c, psxsignal02/init.c, psxsignal03/init.c, psxsignal05/init.c, psxspin01/test.c, psxspin02/test.c, psxstack01/init.c, psxstat/test.c, psxtime/test.c, psxualarm/init.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/psxtests/psxstat/test.c | 157 ++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 79 deletions(-) (limited to 'testsuites/psxtests/psxstat') diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c index 3f4c2e9481..f00407a5c8 100644 --- a/testsuites/psxtests/psxstat/test.c +++ b/testsuites/psxtests/psxstat/test.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include @@ -180,7 +179,7 @@ void stat_a_file( int minor2; - assert( file ); + rtems_test_assert( file ); printf( "stat( %s ) returned ", file ); fflush( stdout ); @@ -273,7 +272,7 @@ void make_multiple_files( while ( files[i] ) { printf( "Making file %s\n", files[i] ); status = mknod( files[i], ( S_IFREG | S_IROTH|S_IWOTH ), 0LL ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); @@ -290,7 +289,7 @@ void make_multiple_bad_files( while ( files[i] ) { printf( "Making file %s ", files[i] ); status = mknod( files[i], ( S_IFREG | S_IROTH|S_IWOTH ), 0LL ); - assert( status ); + rtems_test_assert( status ); printf( ": %s\n", strerror( errno ) ); i++; } @@ -309,16 +308,16 @@ void make_multiple_links( while ( new[i] && existing[i] ) { printf( "Making file %s\n", new[i] ); status = link( existing[i], new[i] ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); status = link( "fred", "bob" ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); status = link( existing[1], "doug/bob" ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); } @@ -329,7 +328,7 @@ void make_too_many_links(void) char name [20]; status = mkdir("/dummy", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); for (i=1; i<= LINK_MAX; i++) { @@ -337,9 +336,9 @@ void make_too_many_links(void) printf( "Making file %s\n", name ); status = link("/dummy" , name ); if( i < LINK_MAX ) - assert( !status ); + rtems_test_assert( !status ); else - assert( status == -1 ); + rtems_test_assert( status == -1 ); } } @@ -358,22 +357,22 @@ void make_a_symlink( printf( "Making file %s\n", new ); status = symlink( existing, new ); - assert( !status ); + rtems_test_assert( !status ); printf( "Verify with readlink\n"); status = readlink( new, buf, 100 ); len = strlen( existing ); - assert ( status == len ); + rtems_test_assert ( status == len ); status = readlink( new, buf, 3 ); len = strlen( existing ); if (len < 3 ) - assert( status == len ); + rtems_test_assert( status == len ); else - assert( status == 3 ); + rtems_test_assert( status == 3 ); status = strcmp( existing, buf ); - assert( !status ); + rtems_test_assert( !status ); } void make_multiple_symlinks(void) @@ -394,7 +393,7 @@ void make_multiple_symlinks(void) stat_a_file( SymLinks[4] ); status = symlink( "//links", "bob/frank" ); - assert (status == -1); + rtems_test_assert (status == -1); } /* @@ -407,9 +406,9 @@ void make_too_many_symlinks() sprintf( name1, "SymLink%d", i ); status = symlink( "/dummy", name1 ); if( i < MAXSYMLINK ) - assert( !status ); + rtems_test_assert( !status ); else - assert( status == -1 ); + rtems_test_assert( status == -1 ); } } */ @@ -453,7 +452,7 @@ void make_multiple_directories( while ( files[i] ) { printf( "Making directory %s\n", files[i] ); status = mkdir( files[i], S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); @@ -478,8 +477,8 @@ void Cause_faults(void) #if 0 printf("\n\nPass an invalid mode to chmod should fail with EPERM \n" ); status = chmod( Files[0], S_IFREG ); - assert( status == -1 ); - assert( errno == EPERM ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EPERM ); #endif /* @@ -487,12 +486,12 @@ void Cause_faults(void) */ status = chmod( Files[0], S_IXUSR ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); printf("chdir to a file should fail with ENOTDIR\n"); status = chdir( Files[0] ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); /* * Change mode to read/write on a directory. @@ -501,28 +500,28 @@ void Cause_faults(void) printf("Verify RWX permission on %s via access\n", Directories[0]); status = access( Directories[0], ( R_OK | W_OK | X_OK ) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "chmod of %s to Read/Write\n", Directories[0] ); status = chmod( Directories[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "chmod fred should fail with ENOENT\n" ); status = chmod( "fred", (S_IXGRP | S_IXOTH) ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); strcpy(longer_name, Directories[0] ); strcat(longer_name, "/BADNAME" ); printf( "Create under %s should fail with EACCES\n", Directories[0] ); status = mkdir( longer_name , S_IRWXU ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); printf("chdir to %s should fail with EACCES\n", Directories[4] ); status = chdir( Directories[4] ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); /* * Check stat with a NULL buffer. @@ -530,8 +529,8 @@ void Cause_faults(void) printf("Stat with a NULL buffer should fail with EFAULT\n"); status = stat( Directories[0], NULL ); - assert( status == -1 ); - assert( errno == EFAULT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EFAULT ); /* * Set current to a directory with no owner permissions. @@ -540,33 +539,33 @@ void Cause_faults(void) printf( "\n\nchmod of %s to Read/Write\n", Directories[0] ); status = chmod( Directories[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("mkdir %s should fail with EACCESS\n", longer_name ); status = mkdir( longer_name , S_IRWXU ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); printf("\n%s Should exist ( access )\n",Directories[0] ); status = access( Directories[0], F_OK ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("\n%s Should have read permission( access )\n",Directories[0] ); status = access( Directories[0], R_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\n%s Should have write permission( access )\n",Directories[0] ); status = access( Directories[0], W_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\n%s Should not have execute permission( access )\n",Directories[0] ); status = access( Directories[0], X_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\nRestore %s to RWX\n",Directories[0] ); status = chmod( Directories[0], S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("chdir to /my_mount_point \n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Remove one of the directories. @@ -575,21 +574,21 @@ void Cause_faults(void) printf( "Remove %s\n", Directories[5] ); status = rmdir( Directories[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); stat_a_file( Directories[5] ); status = access( Directories[5], F_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); stat_a_file( Links_to_Dirs[5] ); status = readlink( Links_to_Dirs[5], longer_name, 3 ); - assert( status == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EINVAL ); stat_a_file( Links_to_dirlinks[5] ); printf("Chdir to %s\n", Links_to_Dirs[5] ); status = chdir( Links_to_Dirs[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Verify we cannot move up from a node with no parent node. @@ -597,8 +596,8 @@ void Cause_faults(void) printf("Chdir to .. should fail with ENOENT\n" ); status = chdir( ".." ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); /* * Create a subdirectory under the dangling node. @@ -606,16 +605,16 @@ void Cause_faults(void) printf("mkdir ../t should fail with ENOENT\n" ); status = mkdir( "../t" , S_IRWXU ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); printf("mkdir t\n"); status = mkdir( "t" , S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("chdir to /my_mount_point\n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Check rmdir, rmnod, and unlink @@ -623,31 +622,31 @@ void Cause_faults(void) printf("rmdir %s should fail with ENOTDIR\n", Links_to_Dirs[5] ); status = rmdir( Links_to_Dirs[5] ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); printf("unlink %s\n", Links_to_Dirs[5] ); status = unlink( Links_to_Dirs[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unlink %s should fail with ENOTEMPTY\n", Links_to_dirlinks[5] ); status = unlink( Links_to_dirlinks[5] ); - assert( status == -1 ); - assert( errno == ENOTEMPTY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTEMPTY ); strcpy( longer_name, Links_to_dirlinks[5] ); strcat( longer_name, "/t"); printf("rmdir %s\n", longer_name ); status = rmdir( longer_name ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unlink %s\n", Links_to_Dirs[5]); status = unlink( Links_to_dirlinks[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = chdir( Directories[0] ); status = mkdir ( "my_mount_point", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("Attempting to mount IMFS file system at /dir1/my_mount_point \n"); status = mount( @@ -656,16 +655,16 @@ void Cause_faults(void) RTEMS_FILESYSTEM_READ_WRITE, NULL, "/my_mount_point/dir1/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("rmdir /dir1/my_mount_point should fail with EBUSY\n"); status = rmdir ("/my_mount_point/dir1/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY ); printf( "Unmount /my_mount_point/dir1/my_mount_point\n"); status = unmount( "/my_mount_point/dir1/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Verify write permission is checked. @@ -673,30 +672,30 @@ void Cause_faults(void) printf("chmod of %s to group and other execute\n", Files[0] ); status = chmod (Files[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("Open %s for write should fail with EACCES\n", Files[0] ); fd = open (Files[0], O_WRONLY); - assert( fd == -1 ); - assert( errno == EACCES ); + rtems_test_assert( fd == -1 ); + rtems_test_assert( errno == EACCES ); printf("chmod of %s to User Execute and Read\n", Directories[3] ); status = chmod (Directories[3], (S_IXUSR | S_IRUSR) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); strcpy(longer_name, Directories[3] ); strcat(longer_name, "/NewFile" ); printf("Mkdir of %s should fail with EACCES\n",longer_name ); status = mkdir( longer_name, S_IRWXU ); - assert( status != 0 ); - assert( errno == EACCES ); + rtems_test_assert( status != 0 ); + rtems_test_assert( errno == EACCES ); printf("Making too many hard links.\n" ); make_too_many_links( ); printf( "pass fstat a null pointer should fail with EFAULT\n"); status = fstat( fd, NULL ); - assert( status == -1 ); - assert( errno == EFAULT); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EFAULT); /* * The current directory MUST be restored at the end of this test. @@ -704,7 +703,7 @@ void Cause_faults(void) printf("chdir to /my_mount_point \n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); } @@ -748,18 +747,18 @@ int main( */ status = mkdir("/my_mount_point", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mount( &mt_entry, &IMFS_ops, RTEMS_FILESYSTEM_READ_WRITE, NULL, "my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mkdir("dev", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* -- cgit v1.2.3