Merge branch 'master' into ltp-broom

Checkpoint work.

Conflicts:
	doc/man3/tst_res.3
	lib/tst_res.c
	testcases/commands/ade/size/test.c
	testcases/kernel/containers/pidns/pidns04.c
	testcases/kernel/device-drivers/agp/kernel_space/tagp.c
	testcases/kernel/device-drivers/base/tbase/tbase.c
	testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c
	testcases/kernel/device-drivers/pci/tpci/tpci.c
	testcases/kernel/device-drivers/tbio/kernel_space/tbio.c
	testcases/kernel/device-drivers/usb/tusb/tusb.c
	testcases/kernel/device-drivers/usb/user_usb/user_tusb.c
	testcases/kernel/fs/acls/acl_file_test.c
	testcases/kernel/fs/acls/acl_link_test.c
	testcases/kernel/fs/doio/doio.c
	testcases/kernel/fs/doio/growfiles.c
	testcases/kernel/fs/doio/iogen.c
	testcases/kernel/fs/inode/inode02.c
	testcases/kernel/fs/mongo/mongo_compare.c
	testcases/kernel/fs/stream/stream01.c
	testcases/kernel/fs/stream/stream02.c
	testcases/kernel/fs/stream/stream04.c
	testcases/kernel/fs/stream/stream05.c
	testcases/kernel/hotplug/memory_hotplug/commands.c
	testcases/kernel/io/direct_io/diotest_routines.c
	testcases/kernel/io/disktest/parse.c
	testcases/kernel/io/ltp-aiodio/aio-stress.c
	testcases/kernel/io/ltp-aiodio/aiodio_append.c
	testcases/kernel/io/writetest/writetest.c
	testcases/kernel/ipc/pipeio/pipeio.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
	testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
	testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
	testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
	testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
	testcases/kernel/mem/mtest01/mtest01.c
	testcases/kernel/mem/vmtests/data_space.c
	testcases/kernel/module/create_module/create_module01.c
	testcases/kernel/module/create_module/create_module02.c
	testcases/kernel/module/delete_module/delete_module02.c
	testcases/kernel/module/delete_module/delete_module03.c
	testcases/kernel/module/query_module/query_module01.c
	testcases/kernel/module/query_module/query_module03.c
	testcases/kernel/numa/support_numa.c
	testcases/kernel/sched/process_stress/process.c
	testcases/kernel/security/selinux-testsuite/tests/capable_file/selinux_lease.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_chroot.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_hostname.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_nice.c
	testcases/kernel/security/selinux-testsuite/tests/capable_sys/selinux_rawio.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_fcntl.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_lock.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_mmap.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_mprotect.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_nofcntl.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_seek.c
	testcases/kernel/security/selinux-testsuite/tests/file/selinux_sigiotask.c
	testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_ioctl.c
	testcases/kernel/security/selinux-testsuite/tests/ioctl/selinux_noioctl.c
	testcases/kernel/syscalls/abort/abort01.c
	testcases/kernel/syscalls/accept/accept01.c
	testcases/kernel/syscalls/access/access01.c
	testcases/kernel/syscalls/access/access02.c
	testcases/kernel/syscalls/access/access03.c
	testcases/kernel/syscalls/access/access04.c
	testcases/kernel/syscalls/access/access05.c
	testcases/kernel/syscalls/add_key/add_key01.c
	testcases/kernel/syscalls/add_key/add_key02.c
	testcases/kernel/syscalls/adjtimex/adjtimex01.c
	testcases/kernel/syscalls/adjtimex/adjtimex02.c
	testcases/kernel/syscalls/alarm/alarm01.c
	testcases/kernel/syscalls/alarm/alarm02.c
	testcases/kernel/syscalls/alarm/alarm03.c
	testcases/kernel/syscalls/alarm/alarm05.c
	testcases/kernel/syscalls/alarm/alarm06.c
	testcases/kernel/syscalls/alarm/alarm07.c
	testcases/kernel/syscalls/asyncio/asyncio02.c
	testcases/kernel/syscalls/bdflush/bdflush01.c
	testcases/kernel/syscalls/bind/bind01.c
	testcases/kernel/syscalls/cacheflush/cacheflush01.c
	testcases/kernel/syscalls/capget/capget01.c
	testcases/kernel/syscalls/capget/capget02.c
	testcases/kernel/syscalls/capset/capset01.c
	testcases/kernel/syscalls/capset/capset02.c
	testcases/kernel/syscalls/chdir/chdir01.c
	testcases/kernel/syscalls/chdir/chdir02.c
	testcases/kernel/syscalls/chdir/chdir03.c
	testcases/kernel/syscalls/chdir/chdir04.c
	testcases/kernel/syscalls/chmod/chmod01.c
	testcases/kernel/syscalls/chmod/chmod03.c
	testcases/kernel/syscalls/chmod/chmod04.c
	testcases/kernel/syscalls/chmod/chmod05.c
	testcases/kernel/syscalls/chmod/chmod06.c
	testcases/kernel/syscalls/chmod/chmod07.c
	testcases/kernel/syscalls/chown/chown01.c
	testcases/kernel/syscalls/chown/chown02.c
	testcases/kernel/syscalls/chown/chown03.c
	testcases/kernel/syscalls/chown/chown04.c
	testcases/kernel/syscalls/chown/chown05.c
	testcases/kernel/syscalls/chroot/chroot01.c
	testcases/kernel/syscalls/chroot/chroot02.c
	testcases/kernel/syscalls/chroot/chroot03.c
	testcases/kernel/syscalls/chroot/chroot04.c
	testcases/kernel/syscalls/clock_getres/clock_getres01.c
	testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
	testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
	testcases/kernel/syscalls/clone/clone01.c
	testcases/kernel/syscalls/clone/clone02.c
	testcases/kernel/syscalls/clone/clone03.c
	testcases/kernel/syscalls/clone/clone04.c
	testcases/kernel/syscalls/clone/clone05.c
	testcases/kernel/syscalls/clone/clone06.c
	testcases/kernel/syscalls/clone/clone07.c
	testcases/kernel/syscalls/close/close01.c
	testcases/kernel/syscalls/close/close02.c
	testcases/kernel/syscalls/close/close08.c
	testcases/kernel/syscalls/connect/connect01.c
	testcases/kernel/syscalls/creat/creat01.c
	testcases/kernel/syscalls/creat/creat03.c
	testcases/kernel/syscalls/creat/creat04.c
	testcases/kernel/syscalls/creat/creat05.c
	testcases/kernel/syscalls/creat/creat06.c
	testcases/kernel/syscalls/creat/creat07.c
	testcases/kernel/syscalls/creat/creat09.c
	testcases/kernel/syscalls/dup2/dup201.c
	testcases/kernel/syscalls/dup2/dup203.c
	testcases/kernel/syscalls/dup2/dup204.c
	testcases/kernel/syscalls/dup3/dup3_01.c
	testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c
	testcases/kernel/syscalls/eventfd2/eventfd2_01.c
	testcases/kernel/syscalls/eventfd2/eventfd2_02.c
	testcases/kernel/syscalls/execl/execl01.c
	testcases/kernel/syscalls/execle/execle01.c
	testcases/kernel/syscalls/execlp/execlp01.c
	testcases/kernel/syscalls/execv/execv01.c
	testcases/kernel/syscalls/execve/execve01.c
	testcases/kernel/syscalls/execve/execve02.c
	testcases/kernel/syscalls/execve/execve03.c
	testcases/kernel/syscalls/execve/execve04.c
	testcases/kernel/syscalls/execve/execve05.c
	testcases/kernel/syscalls/execvp/execvp01.c
	testcases/kernel/syscalls/exit/exit02.c
	testcases/kernel/syscalls/exit_group/exit_group01.c
	testcases/kernel/syscalls/faccessat/faccessat01.c
	testcases/kernel/syscalls/fadvise/posix_fadvise01.c
	testcases/kernel/syscalls/fadvise/posix_fadvise02.c
	testcases/kernel/syscalls/fadvise/posix_fadvise03.c
	testcases/kernel/syscalls/fadvise/posix_fadvise04.c
	testcases/kernel/syscalls/fallocate/fallocate01.c
	testcases/kernel/syscalls/fallocate/fallocate02.c
	testcases/kernel/syscalls/fallocate/fallocate03.c
	testcases/kernel/syscalls/fchdir/fchdir01.c
	testcases/kernel/syscalls/fchdir/fchdir02.c
	testcases/kernel/syscalls/fchdir/fchdir03.c
	testcases/kernel/syscalls/fchmod/fchmod01.c
	testcases/kernel/syscalls/fchmod/fchmod02.c
	testcases/kernel/syscalls/fchmod/fchmod03.c
	testcases/kernel/syscalls/fchmod/fchmod04.c
	testcases/kernel/syscalls/fchmod/fchmod05.c
	testcases/kernel/syscalls/fchmod/fchmod06.c
	testcases/kernel/syscalls/fchmod/fchmod07.c
	testcases/kernel/syscalls/fchmodat/fchmodat01.c
	testcases/kernel/syscalls/fchown/fchown01.c
	testcases/kernel/syscalls/fchown/fchown02.c
	testcases/kernel/syscalls/fchown/fchown03.c
	testcases/kernel/syscalls/fchown/fchown04.c
	testcases/kernel/syscalls/fchown/fchown05.c
	testcases/kernel/syscalls/fchownat/fchownat01.c
	testcases/kernel/syscalls/fcntl/fcntl01.c
	testcases/kernel/syscalls/fcntl/fcntl02.c
	testcases/kernel/syscalls/fcntl/fcntl03.c
	testcases/kernel/syscalls/fcntl/fcntl04.c
	testcases/kernel/syscalls/fcntl/fcntl05.c
	testcases/kernel/syscalls/fcntl/fcntl06.c
	testcases/kernel/syscalls/fcntl/fcntl09.c
	testcases/kernel/syscalls/fcntl/fcntl10.c
	testcases/kernel/syscalls/fcntl/fcntl11.c
	testcases/kernel/syscalls/fcntl/fcntl12.c
	testcases/kernel/syscalls/fcntl/fcntl13.c
	testcases/kernel/syscalls/fcntl/fcntl14.c
	testcases/kernel/syscalls/fcntl/fcntl15.c
	testcases/kernel/syscalls/fcntl/fcntl16.c
	testcases/kernel/syscalls/fcntl/fcntl17.c
	testcases/kernel/syscalls/fcntl/fcntl18.c
	testcases/kernel/syscalls/fcntl/fcntl19.c
	testcases/kernel/syscalls/fcntl/fcntl20.c
	testcases/kernel/syscalls/fcntl/fcntl21.c
	testcases/kernel/syscalls/fcntl/fcntl22.c
	testcases/kernel/syscalls/fcntl/fcntl23.c
	testcases/kernel/syscalls/fcntl/fcntl24.c
	testcases/kernel/syscalls/fcntl/fcntl25.c
	testcases/kernel/syscalls/fcntl/fcntl26.c
	testcases/kernel/syscalls/fcntl/fcntl27.c
	testcases/kernel/syscalls/fcntl/fcntl28.c
	testcases/kernel/syscalls/fork/fork01.c
	testcases/kernel/syscalls/fork/fork02.c
	testcases/kernel/syscalls/fork/fork03.c
	testcases/kernel/syscalls/fork/fork06.c
	testcases/kernel/syscalls/fork/fork07.c
	testcases/kernel/syscalls/fork/fork08.c
	testcases/kernel/syscalls/fork/fork09.c
	testcases/kernel/syscalls/fork/fork10.c
	testcases/kernel/syscalls/fork/fork11.c
	testcases/kernel/syscalls/fork/fork12.c
	testcases/kernel/syscalls/fstat/fstat01.c
	testcases/kernel/syscalls/fstat/fstat02.c
	testcases/kernel/syscalls/fstat/fstat03.c
	testcases/kernel/syscalls/fstat/fstat04.c
	testcases/kernel/syscalls/fstat/fstat05.c
	testcases/kernel/syscalls/fstatat/fstatat01.c
	testcases/kernel/syscalls/fstatfs/fstatfs01.c
	testcases/kernel/syscalls/fstatfs/fstatfs02.c
	testcases/kernel/syscalls/fsync/fsync01.c
	testcases/kernel/syscalls/fsync/fsync02.c
	testcases/kernel/syscalls/fsync/fsync03.c
	testcases/kernel/syscalls/ftruncate/ftruncate01.c
	testcases/kernel/syscalls/ftruncate/ftruncate02.c
	testcases/kernel/syscalls/futimesat/futimesat01.c
	testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
	testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
	testcases/kernel/syscalls/getcontext/getcontext01.c
	testcases/kernel/syscalls/getcpu/getcpu01.c
	testcases/kernel/syscalls/getcwd/getcwd01.c
	testcases/kernel/syscalls/getcwd/getcwd02.c
	testcases/kernel/syscalls/getcwd/getcwd03.c
	testcases/kernel/syscalls/getdents/getdents01.c
	testcases/kernel/syscalls/getdents/getdents02.c
	testcases/kernel/syscalls/getdents/getdents03.c
	testcases/kernel/syscalls/getdents/getdents04.c
	testcases/kernel/syscalls/getdomainname/getdomainname01.c
	testcases/kernel/syscalls/getegid/getegid01.c
	testcases/kernel/syscalls/getegid/getegid02.c
	testcases/kernel/syscalls/geteuid/geteuid01.c
	testcases/kernel/syscalls/getgid/getgid01.c
	testcases/kernel/syscalls/getgid/getgid03.c
	testcases/kernel/syscalls/getgroups/getgroups02.c
	testcases/kernel/syscalls/getgroups/getgroups03.c
	testcases/kernel/syscalls/getgroups/getgroups04.c
	testcases/kernel/syscalls/gethostid/gethostid01.c
	testcases/kernel/syscalls/gethostname/gethostname01.c
	testcases/kernel/syscalls/getitimer/getitimer01.c
	testcases/kernel/syscalls/getitimer/getitimer02.c
	testcases/kernel/syscalls/getitimer/getitimer03.c
	testcases/kernel/syscalls/getpagesize/getpagesize01.c
	testcases/kernel/syscalls/getpeername/getpeername01.c
	testcases/kernel/syscalls/getpgid/getpgid01.c
	testcases/kernel/syscalls/getpgid/getpgid02.c
	testcases/kernel/syscalls/getpgrp/getpgrp01.c
	testcases/kernel/syscalls/getpid/getpid01.c
	testcases/kernel/syscalls/getpid/getpid02.c
	testcases/kernel/syscalls/getppid/getppid01.c
	testcases/kernel/syscalls/getppid/getppid02.c
	testcases/kernel/syscalls/getpriority/getpriority01.c
	testcases/kernel/syscalls/getpriority/getpriority02.c
	testcases/kernel/syscalls/getresgid/getresgid01.c
	testcases/kernel/syscalls/getresgid/getresgid02.c
	testcases/kernel/syscalls/getresgid/getresgid03.c
	testcases/kernel/syscalls/getresuid/getresuid01.c
	testcases/kernel/syscalls/getresuid/getresuid02.c
	testcases/kernel/syscalls/getresuid/getresuid03.c
	testcases/kernel/syscalls/getrusage/getrusage01.c
	testcases/kernel/syscalls/getrusage/getrusage02.c
	testcases/kernel/syscalls/getsid/getsid01.c
	testcases/kernel/syscalls/getsid/getsid02.c
	testcases/kernel/syscalls/getsockname/getsockname01.c
	testcases/kernel/syscalls/getsockopt/getsockopt01.c
	testcases/kernel/syscalls/gettid/gettid01.c
	testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
	testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
	testcases/kernel/syscalls/getuid/getuid01.c
	testcases/kernel/syscalls/getuid/getuid02.c
	testcases/kernel/syscalls/inotify/inotify01.c
	testcases/kernel/syscalls/inotify/inotify02.c
	testcases/kernel/syscalls/inotify/inotify03.c
	testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
	testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
	testcases/kernel/syscalls/io_cancel/io_cancel01.c
	testcases/kernel/syscalls/io_destroy/io_destroy01.c
	testcases/kernel/syscalls/io_getevents/io_getevents01.c
	testcases/kernel/syscalls/io_setup/io_setup01.c
	testcases/kernel/syscalls/io_submit/io_submit01.c
	testcases/kernel/syscalls/ioctl/ioctl01.c
	testcases/kernel/syscalls/ioctl/ioctl02.c
	testcases/kernel/syscalls/ioperm/ioperm01.c
	testcases/kernel/syscalls/ioperm/ioperm02.c
	testcases/kernel/syscalls/iopl/iopl01.c
	testcases/kernel/syscalls/iopl/iopl02.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
	testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
	testcases/kernel/syscalls/ipc/msgget/msgget01.c
	testcases/kernel/syscalls/ipc/msgget/msgget02.c
	testcases/kernel/syscalls/ipc/msgget/msgget03.c
	testcases/kernel/syscalls/ipc/msgget/msgget04.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
	testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
	testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
	testcases/kernel/syscalls/ipc/semctl/semctl01.c
	testcases/kernel/syscalls/ipc/semctl/semctl02.c
	testcases/kernel/syscalls/ipc/semctl/semctl03.c
	testcases/kernel/syscalls/ipc/semctl/semctl04.c
	testcases/kernel/syscalls/ipc/semctl/semctl05.c
	testcases/kernel/syscalls/ipc/semctl/semctl06.c
	testcases/kernel/syscalls/ipc/semget/semget01.c
	testcases/kernel/syscalls/ipc/semget/semget02.c
	testcases/kernel/syscalls/ipc/semget/semget03.c
	testcases/kernel/syscalls/ipc/semget/semget05.c
	testcases/kernel/syscalls/ipc/semget/semget06.c
	testcases/kernel/syscalls/ipc/semop/semop01.c
	testcases/kernel/syscalls/ipc/semop/semop02.c
	testcases/kernel/syscalls/ipc/semop/semop03.c
	testcases/kernel/syscalls/ipc/semop/semop04.c
	testcases/kernel/syscalls/ipc/semop/semop05.c
	testcases/kernel/syscalls/ipc/shmat/shmat01.c
	testcases/kernel/syscalls/ipc/shmat/shmat02.c
	testcases/kernel/syscalls/ipc/shmat/shmat03.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
	testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
	testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
	testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
	testcases/kernel/syscalls/ipc/shmget/shmget01.c
	testcases/kernel/syscalls/ipc/shmget/shmget02.c
	testcases/kernel/syscalls/ipc/shmget/shmget03.c
	testcases/kernel/syscalls/ipc/shmget/shmget04.c
	testcases/kernel/syscalls/ipc/shmget/shmget05.c
	testcases/kernel/syscalls/keyctl/keyctl01.c
	testcases/kernel/syscalls/kill/kill01.c
	testcases/kernel/syscalls/kill/kill03.c
	testcases/kernel/syscalls/kill/kill04.c
	testcases/kernel/syscalls/kill/kill05.c
	testcases/kernel/syscalls/kill/kill06.c
	testcases/kernel/syscalls/kill/kill07.c
	testcases/kernel/syscalls/kill/kill08.c
	testcases/kernel/syscalls/kill/kill11.c
	testcases/kernel/syscalls/lchown/lchown01.c
	testcases/kernel/syscalls/lchown/lchown02.c
	testcases/kernel/syscalls/linkat/linkat01.c
	testcases/kernel/syscalls/listen/listen01.c
	testcases/kernel/syscalls/llseek/llseek01.c
	testcases/kernel/syscalls/llseek/llseek02.c
	testcases/kernel/syscalls/lseek/lseek06.c
	testcases/kernel/syscalls/lseek/lseek07.c
	testcases/kernel/syscalls/lseek/lseek08.c
	testcases/kernel/syscalls/lseek/lseek09.c
	testcases/kernel/syscalls/lseek/lseek10.c
	testcases/kernel/syscalls/lstat/lstat01.c
	testcases/kernel/syscalls/lstat/lstat02.c
	testcases/kernel/syscalls/lstat/lstat03.c
	testcases/kernel/syscalls/mbind/mbind01.c
	testcases/kernel/syscalls/mkdir/mkdir01.c
	testcases/kernel/syscalls/mkdir/mkdir02.c
	testcases/kernel/syscalls/mkdir/mkdir03.c
	testcases/kernel/syscalls/mkdir/mkdir04.c
	testcases/kernel/syscalls/mkdir/mkdir05.c
	testcases/kernel/syscalls/mkdir/mkdir08.c
	testcases/kernel/syscalls/mkdirat/mkdirat01.c
	testcases/kernel/syscalls/mknod/mknod02.c
	testcases/kernel/syscalls/mknod/mknod03.c
	testcases/kernel/syscalls/mknod/mknod04.c
	testcases/kernel/syscalls/mknod/mknod05.c
	testcases/kernel/syscalls/mknod/mknod06.c
	testcases/kernel/syscalls/mknod/mknod07.c
	testcases/kernel/syscalls/mknod/mknod08.c
	testcases/kernel/syscalls/mknod/mknod09.c
	testcases/kernel/syscalls/mknodat/mknodat01.c
	testcases/kernel/syscalls/mmap/mmap001.c
	testcases/kernel/syscalls/mmap/mmap01.c
	testcases/kernel/syscalls/mmap/mmap02.c
	testcases/kernel/syscalls/mmap/mmap03.c
	testcases/kernel/syscalls/mmap/mmap04.c
	testcases/kernel/syscalls/mmap/mmap05.c
	testcases/kernel/syscalls/mmap/mmap06.c
	testcases/kernel/syscalls/mmap/mmap07.c
	testcases/kernel/syscalls/mmap/mmap08.c
	testcases/kernel/syscalls/mmap/mmap09.c
	testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
	testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
	testcases/kernel/syscalls/mount/mount01.c
	testcases/kernel/syscalls/mount/mount02.c
	testcases/kernel/syscalls/mount/mount03.c
	testcases/kernel/syscalls/mprotect/mprotect01.c
	testcases/kernel/syscalls/mprotect/mprotect02.c
	testcases/kernel/syscalls/mprotect/mprotect03.c
	testcases/kernel/syscalls/mq_notify/mq_notify01.c
	testcases/kernel/syscalls/mq_open/mq_open01.c
	testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
	testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c
	testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
	testcases/kernel/syscalls/mremap/mremap01.c
	testcases/kernel/syscalls/mremap/mremap02.c
	testcases/kernel/syscalls/mremap/mremap03.c
	testcases/kernel/syscalls/mremap/mremap04.c
	testcases/kernel/syscalls/msync/msync01.c
	testcases/kernel/syscalls/msync/msync02.c
	testcases/kernel/syscalls/msync/msync03.c
	testcases/kernel/syscalls/msync/msync04.c
	testcases/kernel/syscalls/msync/msync05.c
	testcases/kernel/syscalls/munmap/munmap01.c
	testcases/kernel/syscalls/munmap/munmap02.c
	testcases/kernel/syscalls/munmap/munmap03.c
	testcases/kernel/syscalls/nanosleep/nanosleep01.c
	testcases/kernel/syscalls/nanosleep/nanosleep02.c
	testcases/kernel/syscalls/nanosleep/nanosleep03.c
	testcases/kernel/syscalls/nanosleep/nanosleep04.c
	testcases/kernel/syscalls/newuname/newuname01.c
	testcases/kernel/syscalls/nice/nice01.c
	testcases/kernel/syscalls/nice/nice02.c
	testcases/kernel/syscalls/nice/nice03.c
	testcases/kernel/syscalls/nice/nice04.c
	testcases/kernel/syscalls/open/open01.c
	testcases/kernel/syscalls/open/open02.c
	testcases/kernel/syscalls/open/open03.c
	testcases/kernel/syscalls/open/open04.c
	testcases/kernel/syscalls/open/open05.c
	testcases/kernel/syscalls/open/open06.c
	testcases/kernel/syscalls/open/open07.c
	testcases/kernel/syscalls/open/open08.c
	testcases/kernel/syscalls/open/open10.c
	testcases/kernel/syscalls/openat/openat01.c
	testcases/kernel/syscalls/pathconf/pathconf01.c
	testcases/kernel/syscalls/pause/pause01.c
	testcases/kernel/syscalls/pause/pause02.c
	testcases/kernel/syscalls/pause/pause03.c
	testcases/kernel/syscalls/personality/personality01.c
	testcases/kernel/syscalls/personality/personality02.c
	testcases/kernel/syscalls/pipe/pipe01.c
	testcases/kernel/syscalls/pipe/pipe02.c
	testcases/kernel/syscalls/pipe/pipe03.c
	testcases/kernel/syscalls/pipe/pipe04.c
	testcases/kernel/syscalls/pipe/pipe05.c
	testcases/kernel/syscalls/pipe/pipe06.c
	testcases/kernel/syscalls/pipe/pipe07.c
	testcases/kernel/syscalls/pipe/pipe08.c
	testcases/kernel/syscalls/pipe/pipe09.c
	testcases/kernel/syscalls/pipe/pipe10.c
	testcases/kernel/syscalls/pipe/pipe11.c
	testcases/kernel/syscalls/pipe2/pipe2_01.c
	testcases/kernel/syscalls/pipe2/pipe2_02.c
	testcases/kernel/syscalls/poll/poll01.c
	testcases/kernel/syscalls/prctl/prctl01.c
	testcases/kernel/syscalls/prctl/prctl02.c
	testcases/kernel/syscalls/pread/pread01.c
	testcases/kernel/syscalls/pread/pread02.c
	testcases/kernel/syscalls/pread/pread03.c
	testcases/kernel/syscalls/ptrace/ptrace01.c
	testcases/kernel/syscalls/ptrace/ptrace02.c
	testcases/kernel/syscalls/ptrace/ptrace03.c
	testcases/kernel/syscalls/pwrite/pwrite01.c
	testcases/kernel/syscalls/pwrite/pwrite02.c
	testcases/kernel/syscalls/pwrite/pwrite03.c
	testcases/kernel/syscalls/read/read01.c
	testcases/kernel/syscalls/read/read02.c
	testcases/kernel/syscalls/read/read03.c
	testcases/kernel/syscalls/read/read04.c
	testcases/kernel/syscalls/readdir/readdir02.c
	testcases/kernel/syscalls/readlink/readlink01.c
	testcases/kernel/syscalls/readlink/readlink02.c
	testcases/kernel/syscalls/readlink/readlink03.c
	testcases/kernel/syscalls/readlink/readlink04.c
	testcases/kernel/syscalls/readlinkat/readlinkat01.c
	testcases/kernel/syscalls/readv/readv01.c
	testcases/kernel/syscalls/readv/readv02.c
	testcases/kernel/syscalls/readv/readv03.c
	testcases/kernel/syscalls/reboot/reboot01.c
	testcases/kernel/syscalls/reboot/reboot02.c
	testcases/kernel/syscalls/recv/recv01.c
	testcases/kernel/syscalls/recvfrom/recvfrom01.c
	testcases/kernel/syscalls/recvmsg/recvmsg01.c
	testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
	testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
	testcases/kernel/syscalls/rename/rename01.c
	testcases/kernel/syscalls/rename/rename02.c
	testcases/kernel/syscalls/rename/rename03.c
	testcases/kernel/syscalls/rename/rename04.c
	testcases/kernel/syscalls/rename/rename05.c
	testcases/kernel/syscalls/rename/rename06.c
	testcases/kernel/syscalls/rename/rename07.c
	testcases/kernel/syscalls/rename/rename08.c
	testcases/kernel/syscalls/rename/rename09.c
	testcases/kernel/syscalls/rename/rename10.c
	testcases/kernel/syscalls/rename/rename12.c
	testcases/kernel/syscalls/rename/rename13.c
	testcases/kernel/syscalls/rename/rename14.c
	testcases/kernel/syscalls/renameat/renameat01.c
	testcases/kernel/syscalls/rmdir/rmdir01.c
	testcases/kernel/syscalls/rmdir/rmdir02.c
	testcases/kernel/syscalls/rmdir/rmdir03.c
	testcases/kernel/syscalls/rmdir/rmdir04.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
	testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
	testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
	testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
	testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
	testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
	testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
	testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
	testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
	testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
	testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
	testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
	testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
	testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
	testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
	testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
	testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
	testcases/kernel/syscalls/sched_yield/sched_yield01.c
	testcases/kernel/syscalls/send/send01.c
	testcases/kernel/syscalls/sendfile/sendfile02.c
	testcases/kernel/syscalls/sendfile/sendfile03.c
	testcases/kernel/syscalls/sendfile/sendfile04.c
	testcases/kernel/syscalls/sendfile/sendfile05.c
	testcases/kernel/syscalls/sendfile/sendfile06.c
	testcases/kernel/syscalls/sendfile/sendfile07.c
	testcases/kernel/syscalls/sendmsg/sendmsg01.c
	testcases/kernel/syscalls/sendto/sendto01.c
	testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
	testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
	testcases/kernel/syscalls/set_thread_area/set_thread_area02.c
	testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
	testcases/kernel/syscalls/setdomainname/setdomainname02.c
	testcases/kernel/syscalls/setdomainname/setdomainname03.c
	testcases/kernel/syscalls/setfsgid/setfsgid01.c
	testcases/kernel/syscalls/setfsgid/setfsgid02.c
	testcases/kernel/syscalls/setfsgid/setfsgid03.c
	testcases/kernel/syscalls/setfsuid/setfsuid01.c
	testcases/kernel/syscalls/setfsuid/setfsuid02.c
	testcases/kernel/syscalls/setfsuid/setfsuid03.c
	testcases/kernel/syscalls/setfsuid/setfsuid04.c
	testcases/kernel/syscalls/setgid/setgid01.c
	testcases/kernel/syscalls/setgid/setgid02.c
	testcases/kernel/syscalls/setgid/setgid03.c
	testcases/kernel/syscalls/setgroups/setgroups02.c
	testcases/kernel/syscalls/setgroups/setgroups03.c
	testcases/kernel/syscalls/setgroups/setgroups04.c
	testcases/kernel/syscalls/setitimer/setitimer01.c
	testcases/kernel/syscalls/setitimer/setitimer02.c
	testcases/kernel/syscalls/setitimer/setitimer03.c
	testcases/kernel/syscalls/setpgid/setpgid01.c
	testcases/kernel/syscalls/setpgid/setpgid02.c
	testcases/kernel/syscalls/setpgid/setpgid03.c
	testcases/kernel/syscalls/setpgrp/setpgrp02.c
	testcases/kernel/syscalls/setpriority/setpriority01.c
	testcases/kernel/syscalls/setpriority/setpriority02.c
	testcases/kernel/syscalls/setpriority/setpriority03.c
	testcases/kernel/syscalls/setpriority/setpriority04.c
	testcases/kernel/syscalls/setpriority/setpriority05.c
	testcases/kernel/syscalls/setregid/setregid01.c
	testcases/kernel/syscalls/setregid/setregid02.c
	testcases/kernel/syscalls/setregid/setregid03.c
	testcases/kernel/syscalls/setregid/setregid04.c
	testcases/kernel/syscalls/setresuid/setresuid04.c
	testcases/kernel/syscalls/setreuid/setreuid01.c
	testcases/kernel/syscalls/setreuid/setreuid07.c
	testcases/kernel/syscalls/setrlimit/setrlimit01.c
	testcases/kernel/syscalls/setrlimit/setrlimit02.c
	testcases/kernel/syscalls/setrlimit/setrlimit03.c
	testcases/kernel/syscalls/setsid/setsid01.c
	testcases/kernel/syscalls/setsockopt/setsockopt01.c
	testcases/kernel/syscalls/setuid/setuid02.c
	testcases/kernel/syscalls/setuid/setuid03.c
	testcases/kernel/syscalls/setuid/setuid04.c
	testcases/kernel/syscalls/sgetmask/sgetmask01.c
	testcases/kernel/syscalls/sigaction/sigaction01.c
	testcases/kernel/syscalls/sigaction/sigaction02.c
	testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
	testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
	testcases/kernel/syscalls/signal/signal02.c
	testcases/kernel/syscalls/signal/signal03.c
	testcases/kernel/syscalls/signal/signal04.c
	testcases/kernel/syscalls/signal/signal05.c
	testcases/kernel/syscalls/signalfd4/signalfd4_01.c
	testcases/kernel/syscalls/signalfd4/signalfd4_02.c
	testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
	testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
	testcases/kernel/syscalls/socket/socket01.c
	testcases/kernel/syscalls/socket/socket02.c
	testcases/kernel/syscalls/socket/socket03.c
	testcases/kernel/syscalls/socketpair/socketpair01.c
	testcases/kernel/syscalls/socketpair/socketpair02.c
	testcases/kernel/syscalls/sockioctl/sockioctl01.c
	testcases/kernel/syscalls/splice/splice02.c
	testcases/kernel/syscalls/ssetmask/ssetmask01.c
	testcases/kernel/syscalls/stat/stat01.c
	testcases/kernel/syscalls/stat/stat02.c
	testcases/kernel/syscalls/stat/stat03.c
	testcases/kernel/syscalls/stat/stat05.c
	testcases/kernel/syscalls/statfs/statfs01.c
	testcases/kernel/syscalls/statfs/statfs02.c
	testcases/kernel/syscalls/statfs/statfs03.c
	testcases/kernel/syscalls/statvfs/statvfs01.c
	testcases/kernel/syscalls/stime/stime01.c
	testcases/kernel/syscalls/stime/stime02.c
	testcases/kernel/syscalls/swapoff/swapoff01.c
	testcases/kernel/syscalls/swapoff/swapoff02.c
	testcases/kernel/syscalls/swapon/swapon01.c
	testcases/kernel/syscalls/swapon/swapon02.c
	testcases/kernel/syscalls/swapon/swapon03.c
	testcases/kernel/syscalls/symlink/symlink02.c
	testcases/kernel/syscalls/symlink/symlink03.c
	testcases/kernel/syscalls/symlink/symlink04.c
	testcases/kernel/syscalls/symlink/symlink05.c
	testcases/kernel/syscalls/symlinkat/symlinkat01.c
	testcases/kernel/syscalls/sync/sync01.c
	testcases/kernel/syscalls/sync/sync02.c
	testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
	testcases/kernel/syscalls/sysctl/sysctl01.c
	testcases/kernel/syscalls/sysctl/sysctl04.c
	testcases/kernel/syscalls/sysctl/sysctl05.c
	testcases/kernel/syscalls/sysinfo/sysinfo01.c
	testcases/kernel/syscalls/sysinfo/sysinfo02.c
	testcases/kernel/syscalls/tee/tee01.c
	testcases/kernel/syscalls/time/time01.c
	testcases/kernel/syscalls/time/time02.c
	testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
	testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
	testcases/kernel/syscalls/timerfd/timerfd02.c
	testcases/kernel/syscalls/timerfd/timerfd03.c
	testcases/kernel/syscalls/times/times01.c
	testcases/kernel/syscalls/tkill/tkill01.c
	testcases/kernel/syscalls/tkill/tkill02.c
	testcases/kernel/syscalls/truncate/truncate01.c
	testcases/kernel/syscalls/truncate/truncate02.c
	testcases/kernel/syscalls/truncate/truncate03.c
	testcases/kernel/syscalls/truncate/truncate04.c
	testcases/kernel/syscalls/umask/umask01.c
	testcases/kernel/syscalls/umask/umask03.c
	testcases/kernel/syscalls/uname/uname01.c
	testcases/kernel/syscalls/uname/uname02.c
	testcases/kernel/syscalls/uname/uname03.c
	testcases/kernel/syscalls/unlink/unlink05.c
	testcases/kernel/syscalls/unlinkat/unlinkat01.c
	testcases/kernel/syscalls/unshare/unshare01.c
	testcases/kernel/syscalls/unshare/unshare02.c
	testcases/kernel/syscalls/ustat/ustat01.c
	testcases/kernel/syscalls/ustat/ustat02.c
	testcases/kernel/syscalls/utime/utime01.c
	testcases/kernel/syscalls/utime/utime02.c
	testcases/kernel/syscalls/utime/utime03.c
	testcases/kernel/syscalls/utime/utime04.c
	testcases/kernel/syscalls/utime/utime05.c
	testcases/kernel/syscalls/utime/utime06.c
	testcases/kernel/syscalls/utimes/utimes01.c
	testcases/kernel/syscalls/vfork/vfork01.c
	testcases/kernel/syscalls/vfork/vfork02.c
	testcases/kernel/syscalls/vmsplice/vmsplice01.c
	testcases/kernel/syscalls/wait/wait02.c
	testcases/kernel/syscalls/wait4/wait401.c
	testcases/kernel/syscalls/wait4/wait402.c
	testcases/kernel/syscalls/waitid/waitid01.c
	testcases/kernel/syscalls/waitid/waitid02.c
	testcases/kernel/timers/clock_gettime/clock_gettime03.c
	testcases/kernel/timers/clock_settime/clock_settime03.c
	testcases/kernel/timers/timer_create/timer_create04.c
	testcases/misc/math/float/exp_log/genmodf.c
	testcases/misc/math/float/main.c
	testcases/network/sockets/ltpServer.c
	testcases/network/tcp_cmds/perf_lan/pingpong6.c
	testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
	testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
	testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
	testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
	testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
	testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
	testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
	testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
	testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
	testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
	testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
	testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
diff --git a/Makefile.release b/Makefile.release
index db3785d..c81925d 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -43,4 +43,4 @@
 	$(MAKE) -f Makefile $@
 
 release: | autotools distclean
-	tar -cvz --exclude "$(TARBALL)" -f $(TARBALL) *
+	tar -cvz --exclude "$(TARBALL)" -f $(TARBALL) .
diff --git a/doc/examples/quickhit.c b/doc/examples/quickhit.c
index 43d2468..24dfc34 100644
--- a/doc/examples/quickhit.c
+++ b/doc/examples/quickhit.c
@@ -37,61 +37,61 @@
 /* $Id: quickhit.c,v 1.2 2000/10/10 21:57:51 nstraz Exp $ */
 /**********************************************************
  * 
- *    OS Test - Silicon Graphics, Inc.
+ *	OS Test - Silicon Graphics, Inc.
  * 
- *    TEST IDENTIFIER	: link03
+ *	TEST IDENTIFIER	: link03
  * 
- *    EXECUTED BY	: anyone
+ *	EXECUTED BY	: anyone
  * 
- *    TEST TITLE	: multi links tests
+ *	TEST TITLE	: multi links tests
  * 
- *    PARENT DOCUMENT	: usctpl01
+ *	PARENT DOCUMENT	: usctpl01
  * 
- *    TEST CASE TOTAL	: 2
+ *	TEST CASE TOTAL	: 2
  * 
- *    WALL CLOCK TIME	: 1
+ *	WALL CLOCK TIME	: 1
  * 
- *    CPU TYPES		: ALL
+ *	CPU TYPES		: ALL
  * 
- *    AUTHOR		: Richard Logan
+ *	AUTHOR		: Richard Logan
  * 
- *    CO-PILOT		: William Roske
+ *	CO-PILOT		: William Roske
  * 
- *    DATE STARTED	: 03/31/94
+ *	DATE STARTED	: 03/31/94
  * 
- *    INITIAL RELEASE	: UNICOS 7.0
+ *	INITIAL RELEASE	: UNICOS 7.0
  * 
- *    TEST CASES
+ *	TEST CASES
  * 
  * 	1.) link(2) returns...(See Description)
  *	
- *    INPUT SPECIFICATIONS
+ *	INPUT SPECIFICATIONS
  * 	The standard options for system call tests are accepted.
  *	(See the parse_opts(3) man page).
  *	-N #links : Use #links links every iteration
  * 
- *    OUTPUT SPECIFICATIONS
+ *	OUTPUT SPECIFICATIONS
  * 	
- *    DURATION
+ *	DURATION
  * 	Terminates - with frequency and infinite modes.
  * 
- *    SIGNALS
+ *	SIGNALS
  * 	Uses SIGUSR1 to pause before test if option set.
  * 	(See the parse_opts(3) man page).
  *
- *    RESOURCES
+ *	RESOURCES
  * 	None
  * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
+ *	ENVIRONMENTAL NEEDS
+ *	  No run-time environmental needs.
  * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
+ *	SPECIAL PROCEDURAL REQUIREMENTS
  * 	None
  * 
- *    INTERCASE DEPENDENCIES
+ *	INTERCASE DEPENDENCIES
  * 	None
  * 
- *    DETAILED DESCRIPTION
+ *	DETAILED DESCRIPTION
  *	This is a Phase I test for the link(2) system call.  It is intended
  *	to provide a limited exposure of the system call, for now.  It
  *	should/will be extended when full functional tests are written for
@@ -118,8 +118,9 @@
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <string.h>
 #include <signal.h>
+#include <string.h>
+#include <stdio.h>
  /* test.h and usctest.h are the two header files that are required by the
   * quickhit package.  They contain function and macro declarations which you
   * can use in your test programs
@@ -131,16 +132,14 @@
   * steps are usually put in separate functions for clarity.  The help function
   * is only needed when you are adding new command line options.
   */
-void setup(); 
-void help();
-void cleanup();
+static void setup(void);
+static void help(void);
+static void cleanup(void);
 
-char *TCID="link03";		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;
+char *TCID = "link03";		/* Test program identifier.	*/
+int TST_TOTAL = 2;		/* Total number of test cases. */
 
-int exp_enos[]={0, 0};
+int exp_enos[] = {0, 0};
 
 #define BASENAME	"lkfile"
 
@@ -156,12 +155,12 @@
  * option.  Long options are not supported at this time. 
  */
 char *Nlinkarg;
-int Nflag=0;
+int Nflag = 0;
 
 /* for test specific parse_opts options */
 option_t options[] = {
-        { "N:",  &Nflag, &Nlinkarg },   /* -N #links */
-        { NULL, NULL, NULL }
+		{ "N:",  &Nflag, &Nlinkarg },   /* -N #links */
+		{ NULL, NULL, NULL }
 };
 
 /***********************************************************************
@@ -170,148 +169,149 @@
 int
 main(int ac, char **av)
 {
-    int lc;		/* loop counter */
-    char *msg;		/* message returned from parse_opts */
-    struct stat fbuf, lbuf;
-    int cnt;
-    int nlinks;
-    char lname[255];
+	int lc;		/* loop counter */
+	char *msg;		/* message returned from parse_opts */
+	struct stat fbuf, lbuf;
+	int cnt;
+	int nlinks;
+	char lname[255];
 
-    Tst_nobuf=1;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    /* start off by parsing the command line options.  We provide a function
-     * that understands many common options to control looping.  If you are not
-     * adding any new options, pass NULL in place of options and &help.
-     */
-    if ( (msg=parse_opts(ac, av, options, &help)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    if ( Nflag ) {
-	if (sscanf(Nlinkarg, "%i", &Nlinks) != 1 ) {
-	    tst_brkm(TBROK, NULL, "--N option arg is not a number");
-	    tst_exit();
+	/***************************************************************
+	 * parse standard options
+	 ***************************************************************/
+	/* start off by parsing the command line options.  We provide a function
+	 * that understands many common options to control looping.  If you are
+	 * not adding any new options, pass NULL in place of options and &help.
+	 */
+	if ((msg=parse_opts(ac, av, options, &help)) != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
-	if ( Nlinks > 1000 ) {
-	    tst_resm(TWARN, "--N option arg > 1000 - may get errno:%d (EMLINK)",
-		EMLINK);
+
+	if (Nflag) {
+		if (sscanf(Nlinkarg, "%i", &Nlinks) != 1) {
+			tst_brkm(TBROK, NULL, "--N option arg is not a number");
+		}
+		if (Nlinks > 1000) {
+			tst_resm(TWARN,
+				"--N option arg > 1000 - may get errno:%d "
+				"(EMLINK)", EMLINK);
+		}
 	}
-    }
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    /* Next you should run a setup routine to make sure your environment is
-     * sane.
-     */
-    setup();
+	/***************************************************************
+	 * perform global setup for test
+	 ***************************************************************/
+	/* Next you should run a setup routine to make sure your environment is
+	 * sane.
+	 */
+	setup();
 
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
+	/* set the expected errnos... */
+	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state 
-     ***************************************************************/
-    /* TEST_LOOPING() is a macro that will make sure the test continues
-     * looping according to the standard command line args. 
-     */
-    for (lc=0; TEST_LOOPING(lc); lc++) {
+	/***************************************************************
+	 * check looping state 
+	 ***************************************************************/
+	/* TEST_LOOPING() is a macro that will make sure the test continues
+	 * looping according to the standard command line args. 
+	 */
+	for (lc=0; TEST_LOOPING(lc); lc++) {
 
 	/* reset Tst_count in case we are looping. */
 	Tst_count=0;
 
-	if ( Nlinks )
-	    nlinks = Nlinks;
+	if (Nlinks)
+		nlinks = Nlinks;
 	else
-	    /* min of 10 links and max of a 100 links */
-	    nlinks = (lc%90)+10;
+		/* min of 10 links and max of a 100 links */
+		nlinks = (lc%90)+10;
 
-	for(cnt=1; cnt < nlinks; cnt++) {
+	for (cnt=1; cnt < nlinks; cnt++) {
 	
-	    sprintf(lname, "%s%d", Basename, cnt);
-            /*
-	     *  Call link(2)
-	     */
-	    /* Use the TEST() macro to wrap your syscalls.  It saves the return
-	     * to TEST_RETURN and the errno to TEST_ERRNO
-	     */
-	    TEST(link(Fname, lname));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		/* To gather stats on errnos returned, log the errno */
-	        TEST_ERROR_LOG(TEST_ERRNO);
-		/* If you determine that testing shouldn't continue, report your
-		 * results using tst_brkm().  The remaining test cases will be
-		 * marked broken.  TFAIL is the result type for a test failure,
-		 * cleanup is the cleanup routine to call, and the rest is your
-		 * message in printf form.
+		sprintf(lname, "%s%d", Basename, cnt);
+		/*
+		 *  Call link(2)
 		 */
-	        tst_brkm(TFAIL, cleanup, "link(%s, %s) Failed, errno=%d : %s",
-		     Fname, lname, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } 
+		/* Use the TEST() macro to wrap your syscalls. It saves the
+		 * return code to TEST_RETURN and the errno to TEST_ERRNO
+		 */
+		TEST(link(Fname, lname));
+	
+		/* check return code */
+		if (TEST_RETURN == -1) {
+			/* To gather stats on errnos returned, log the errno */
+			TEST_ERROR_LOG(TEST_ERRNO);
+			/* If you determine that testing shouldn't continue,
+			 * report your results using tst_brkm(). The remaining
+			 * testcases will be marked broken.  TFAIL is the
+			 * result type for a test failure, cleanup is the
+			 * cleanup routine to call, and the rest is your
+			 * message in printf form.
+			 */
+			tst_brkm(TFAIL|TTERRNO, cleanup, "link(%s, %s) failed",
+			    Fname, lname);
+		} 
 	}
-	    
+		
 	/***************************************************************
 	 * only perform functional verification if flag set (-f not given)
 	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    stat(Fname, &fbuf);
+	if (STD_FUNCTIONAL_TEST) {
+		stat(Fname, &fbuf);
 
-	    for(cnt=1; cnt < nlinks; cnt++) {
-                sprintf(lname, "%s%d", Basename, cnt);
+		for (cnt=1; cnt < nlinks; cnt++) {
+			sprintf(lname, "%s%d", Basename, cnt);
 
-		stat(lname, &lbuf);
-		if ( fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 ||
-			(fbuf.st_nlink != lbuf.st_nlink) ) {
+			if (stat(lname, &lbuf) == -1) {
+				tst_brkm(TBROK|TERRNO, cleanup,
+				    "stat(%s) failed", lname);
+			}
+			else if ( fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 ||
+			    (fbuf.st_nlink != lbuf.st_nlink) ) {
 
-		    /* When you have results to report, and testing can
-		     * continue, use tst_resm() to record those results.  Use
-		     * TFAIL if the test case failed and your message in printf
-		     * style.
-		     */
-		    tst_resm(TFAIL,
-			"link(%s, %s[1-%d]) ret %d for %d files, stat values do not match %d %d",
-			Fname, Basename, nlinks, TEST_RETURN, nlinks,
-			fbuf.st_nlink, lbuf.st_nlink);
-		    break;
+				/* When you have results to report, and testing
+				 * can continue, use tst_resm() to record those
+				 * results. Use TFAIL if the test case failed
+				 * and your message in printf style.
+				 */
+				tst_resm(TFAIL,
+				"link(%s, %s[1-%d]) ret %d for %d files, stat "
+				"values do not match %d %d",
+				Fname, Basename, nlinks, TEST_RETURN, nlinks,
+				fbuf.st_nlink, lbuf.st_nlink);
+				break;
+			}
 		}
-	    }
-	    if ( cnt >= nlinks ) {
-		/* Here the test case passed so we use TPASS */
-		tst_resm(TPASS,
-		    "link(%s, %s[1-%d]) ret %d for %d files, stat linkcounts match %d",
-		    Fname, Basename, nlinks, TEST_RETURN, nlinks,
-		    fbuf.st_nlink);
-	    }
-	} 
-	else
-	    Tst_count++;
+		if (cnt >= nlinks) {
+			/* Here the test case passed so we use TPASS */
+			tst_resm(TPASS,
+			    "link(%s, %s[1-%d]) ret %d for %d files, stat "
+			    "linkcounts match %d",
+			    Fname, Basename, nlinks, TEST_RETURN, nlinks,
+			    fbuf.st_nlink);
+		}
+	} else
+		Tst_count++;
 
-	/* Here we clean up after the test case so we can do another iteration.
-	 */
-	for(cnt=1; cnt < nlinks; cnt++) {
-        
-            sprintf(lname, "%s%d", Basename, cnt);
+		/* Here we clean up after the test case so we can do another
+		 * iteration.
+		 */
+		for (cnt=1; cnt < nlinks; cnt++) {
+			sprintf(lname, "%s%d", Basename, cnt);
 
-	    if (unlink(lname) == -1) {
-		tst_res(TWARN, "unlink(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-	    }
-	}
+			if (unlink(lname) == -1) {
+				tst_res(TWARN, "unlink(%s) failed", Fname);
+			}
+		}
 
-    }	/* End for TEST_LOOPING */
+	}	/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
+	/***************************************************************
+	 * cleanup and exit
+	 ***************************************************************/
+	cleanup();
+	tst_exit();
 
-    return 0;
 }	/* End main */
 
 /***************************************************************
@@ -321,10 +321,10 @@
  * standard out.  Your help function will be called after the standard options
  * have been printed
  */
-void
-help()
+static void
+help(void)
 {
-    printf("  -N #links : create #links hard links every iteration\n");
+	printf("  -N #links : create #links hard links every iteration\n");
 }
 
 /***************************************************************
@@ -333,57 +333,53 @@
 void 
 setup()
 {
-    int fd;
+	int fd;
 
-    /* You will want to enable some signal handling so you can capture
-     * unexpected signals like SIGSEGV. 
-     */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
+	/* You will want to enable some signal handling so you can capture
+	 * unexpected signals like SIGSEGV. 
+	 */
+	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-    /* Pause if that option was specified */
-    /* One cavet that hasn't been fixed yet.  TEST_PAUSE contains the code to
-     * fork the test with the -c option.  You want to make sure you do this
-     * before you create your temporary directory.
-     */
-    TEST_PAUSE;
+	/* Pause if that option was specified */
+	/* One cavet that hasn't been fixed yet.  TEST_PAUSE contains the code
+	 * to fork the test with the -c option.  You want to make sure you do
+	 * this before you create your temporary directory.
+	 */
+	TEST_PAUSE;
 
-    /* If you are doing any file work, you should use a temporary directory.  We
-     * provide tst_tmpdir() which will create a uniquely named temporary
-     * directory and cd into it.  You can now create files in the current
-     * directory without worrying.
-     */
-    tst_tmpdir();
+	/* If you are doing any file work, you should use a temporary directory.
+	 * We provide tst_tmpdir() which will create a uniquely named temporary
+	 * directory and cd into it.  You can now create files in the current
+	 * directory without worrying.
+	 */
+	tst_tmpdir();
 
-    sprintf(Fname,"%s_%d", BASENAME, getpid());
-    if ((fd = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		Fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_res(TWARN, "close(%s) Failed, errno=%d : %s",
-	       Fname, errno, strerror(errno));
-    }
-    sprintf(Basename, "%s_%d.", BASENAME, getpid());
+	sprintf(Fname, "%s_%d", BASENAME, getpid());
+	if ((fd = open(Fname, O_RDWR|O_CREAT, 0700)) == -1) {
+		tst_brkm(TBROK|TERRNO, cleanup,
+		    "open(%s, O_RDWR|O_CREAT,0700) failed",
+		    Fname);
+	} else if (close(fd) == -1) {
+		tst_res(TWARN|TERRNO, "close(%s) failed", Fname);
+	}
+	sprintf(Basename, "%s_%d.", BASENAME, getpid());
 }
 
 /***************************************************************
  * cleanup() - performs all ONE TIME cleanup for this test at
  *		completion or premature exit.
  ***************************************************************/
-void 
-cleanup()
+static void 
+cleanup(void)
 {
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
+	/*
+	 * print timing stats if that option was specified.
+	 * print errno log if that option was specified.
+	 */
+	TEST_CLEANUP;
 
-    /* If you use a temporary directory, you need to be sure you remove it. Use
-     * tst_rmdir() to do it automatically.  
-     */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
+	/* If you use a temporary directory, you need to be sure you remove it.
+	 * Use tst_rmdir() to do it automatically.  
+	 */
+	tst_rmdir();
 }
diff --git a/doc/man3/tst_res.3 b/doc/man3/tst_res.3
index 32f9071..0d1bd00 100644
--- a/doc/man3/tst_res.3
+++ b/doc/man3/tst_res.3
@@ -70,9 +70,6 @@
 .br
 extern int Tst_range;
 .br
-extern int Tst_lpstart;
-.br
-extern int Tst_lptotal;
 \fR
 .SH DESCRIPTION
 .SS Introduction
@@ -81,11 +78,11 @@
 library have a distinct number of test cases, and that each test case is
 distinct and uniquely identified by the test case number.  It is also assumed
 that test case results are printed in consecutive order, starting with 1.
-The library maintains a set of global variables (\fBTCID, TST_TOTAL,
-Tst_count, Tst_range, Tst_lpstart\fR, \fBTst_lptotal\fR), which are used by
-the various functions to format the results and to keep track of the current
-result reporting state (i.e. how many total test cases there are, and how
-many have been reported so far) for the calling test.
+The library maintains a set of global variables (\fBTCID\fR, \fBTST_TOTAL\fR,
+\fBTst_count\fR), which are used by the various functions to format the
+results and to keep track of the current result reporting state (i.e. how many
+total test cases there are, and how many have been reported so far) for the
+calling test.
 .P
 The \fBTCID\fR and \fBTST_TOTAL\fR global variables are externed in the
 library, and MUST be defined/initialized by tests using the library.
@@ -96,9 +93,7 @@
 The other global variables are available as externs to tests linked with
 tst_res.o.  \fBTst_count\fR is the running count of the number of test
 results that have been reported so far.  The library initializes it to 0, and
-it should not be modified by the test.  \fBTst_range\fR, \fBTst_lpstart\fR,
-and \fBTst_lptotal\fR are used by to control how many test results are
-reported under certain conditions, by some of the functions in this library.
+it should not be modified by the test.
 The details are described below under the appropriate functions.
 .SS Arguments
 .RS 5
@@ -268,7 +263,10 @@
 
 char *TCID = "tsttcs01"; /* set test case identifier */
 int TST_TOTAL = 15;      /* set total number of test results */
+<<<<<<< HEAD
 extern int Tst_count;    /* access count of results completed */
+=======
+>>>>>>> master
 
 main()
 {
@@ -299,8 +297,6 @@
 tsttcs01    1       PASS  :  Able to create MAXUP processes
 tsttcs01    2       FAIL  :  Too many processes (MAXUP+1) created
 tsttcs01    3       BROK  :  tabinfo(PROCTAB, &tbs) failed; errno = 13: Permission denied
-tsttcs01    4-10    BROK  :  Remaining cases broken
-tsttcs01    0       WARN  :  cleanup(): kill(0, SIGALRM) failed; errno = 3: No such process
 .fi
 .SH "SEE ALSO"
 utst_res(1),
@@ -316,17 +312,9 @@
 .P
 If \fBTst_count\fR is negative.
 .P
-If \fBTst_range\fR is non-positive.
-.P
-If \fBTst_range\fR is > 1, and the test type is \fBTINFO\fR or \fBTWARN\fR.
-.P
-If one of the \fBtst_brk[loop][m]()\fR routines is called with a test type
+If one of the \fBtst_brk[m]()\fR routines is called with a test type
 other than \fBTFAIL, TBROK, TCONF\fR, or \fBTRETR\fR.
 .P
-If \fBTst_lpstart\fR is negative.
-.P
-If \fBTst_lptotal\fR is non-positive.
-.P
 If there are any problems opening/reading/writing the contents of \fIfname\fR.
 .RE
 .SH LIMITATIONS
@@ -337,4 +325,3 @@
 .P
 The programmer is free to alter the value of \fBTst_count\fR causing possible
 test result order problems.
-
diff --git a/include/test.h b/include/test.h
index c435fd5..2875e5c 100644
--- a/include/test.h
+++ b/include/test.h
@@ -63,7 +63,7 @@
  * use sysconf(_SC_CRAY_SYSTEM).  But since _SC_CRAY_SYSTEM
  * is not defined until 90, it will be define here if not already
  * defined.
- * if ( sysconf(_SC_CRAY_SYSTEM) == 1 )
+ * if (sysconf(_SC_CRAY_SYSTEM) == 1)
  *    on UMK
  * else   # returned 0 or -1
  *    on Unicos
@@ -103,8 +103,6 @@
 					/* If not set, TOUT_VERBOSE_S is assumed */
 
 #define TOUT_VERBOSE_S  "VERBOSE"	/* All test cases reported */
-#define TOUT_CONDENSE_S "CONDENSE"	/* ranges are used where identical messages*/
-					/* occur for sequential test cases */
 #define TOUT_NOPASS_S   "NOPASS"	/* No pass test cases are reported */
 #define TOUT_DISCARD_S  "DISCARD"	/* No output is reported */
 
@@ -191,9 +189,9 @@
 void tst_resm(int ttype, char *arg_fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 void tst_brk(int ttype, char *fname, void (*func)(void), char *arg_fmt, ...)
-	__attribute__ ((format (printf, 4, 5)));
+	__attribute__ ((format (printf, 4, 5))) LTP_ATTRIBUTE_NORETURN;
 void tst_brkm(int ttype, void (*func)(void), char *arg_fmt, ...)
-	__attribute__ ((format (printf, 3, 4)));
+	__attribute__ ((format (printf, 3, 4))) LTP_ATTRIBUTE_NORETURN;
 void tst_require_root(void (*func)(void));
 int  tst_environ(void);
 void tst_exit(void) LTP_ATTRIBUTE_NORETURN;
diff --git a/lib/dataascii.c b/lib/dataascii.c
index 775eb48..5bba30b 100644
--- a/lib/dataascii.c
+++ b/lib/dataascii.c
@@ -59,7 +59,7 @@
 	chr=buffer;
 	total=offset+bsize;
 
-	if ( listofchars == NULL ) {
+	if (listofchars == NULL) {
 	    charlist=CHARS;
 	    chars_size=CHARS_SIZE;
 	}
@@ -68,7 +68,7 @@
 	    chars_size=strlen(listofchars);
 	}
 
-	for(cnt=offset; cnt<total;  cnt++) {
+	for (cnt=offset; cnt<total;  cnt++) {
 		ind=cnt%chars_size;
 		*chr++=charlist[ind];
 	}
@@ -95,7 +95,7 @@
 	chr=buffer;
 	total=offset+bsize;
 
-	if ( listofchars == NULL ) {
+	if (listofchars == NULL) {
 	    charlist=CHARS;
 	    chars_size=CHARS_SIZE;
 	}
@@ -104,13 +104,13 @@
 	    chars_size=strlen(listofchars);
 	}
 
-	if ( errmsg != NULL ) {
+	if (errmsg != NULL) {
 	    *errmsg = Errmsg;
 	}
 
-	for(cnt=offset; cnt<total;  chr++, cnt++) {
+	for (cnt=offset; cnt<total;  chr++, cnt++) {
 	    ind=cnt%chars_size;
-	    if ( *chr != charlist[ind] ) {
+	    if (*chr != charlist[ind]) {
 		sprintf(Errmsg,
 		    "data mismatch at offset %d, exp:%#o, act:%#o", cnt,
 		    charlist[ind], *chr);
@@ -140,7 +140,7 @@
 int ret;
 char *errmsg;
 
-    if ((buffer=(char *)malloc(size)) == NULL ) {
+    if ((buffer=(char *)malloc(size)) == NULL) {
         perror("malloc");
         exit(2);
     }
@@ -152,7 +152,7 @@
     printf("dataasciichk(NULL, buffer, %d, 0, &errmsg) returned %d %s\n",
         size, ret, errmsg);
 
-    if ( ret == -1 )
+    if (ret == -1)
         printf("\tPASS return value is -1 as expected\n");
     else
         printf("\tFAIL return value is %d, expected -1\n", ret);
@@ -161,7 +161,7 @@
     printf("dataasciichk(NULL, &buffer[1], %d, 1, &errmsg) returned %d %s\n",
         size-1, ret, errmsg);
 
-    if ( ret == -1 )
+    if (ret == -1)
         printf("\tPASS return value is -1 as expected\n");
     else
         printf("\tFAIL return value is %d, expected -1\n", ret);
@@ -173,7 +173,7 @@
     printf("dataasciichk(NULL, &buffer[1], %d, 1, &errmsg) returned %d %s\n",
         size-1, ret, errmsg);
 
-    if ( ret == 25 )
+    if (ret == 25)
 	printf("\tPASS return value is 25 as expected\n");
     else
 	printf("\tFAIL return value is %d, expected 25\n", ret);
@@ -185,7 +185,7 @@
     printf("dataasciichk(\"this is a test of the my string\", buffer, %d, 0, &errmsg) returned %d %s\n",
         size, ret, errmsg);
 
-    if ( ret == -1 )
+    if (ret == -1)
         printf("\tPASS return value is -1 as expected\n");
     else
         printf("\tFAIL return value is %d, expected -1\n", ret);
@@ -194,7 +194,7 @@
     printf("dataasciichk(\"this is a test of the my string\", &buffer[1], %d, 1, &errmsg) returned %d %s\n",
         size-1, ret, errmsg);
 
-    if ( ret == -1 )
+    if (ret == -1)
         printf("\tPASS return value is -1 as expected\n");
     else
         printf("\tFAIL return value is %d, expected -1\n", ret);
@@ -206,7 +206,7 @@
     printf("dataasciichk(\"this is a test of the my string\", &buffer[1], %d, 1, &errmsg) returned %d %s\n",
         size-1, ret, errmsg);
 
-    if ( ret == 25 )
+    if (ret == 25)
 	printf("\tPASS return value is 25 as expected\n");
     else
 	printf("\tFAIL return value is %d, expected 25\n", ret);
diff --git a/lib/databin.c b/lib/databin.c
index 2017cb7..95649a6 100644
--- a/lib/databin.c
+++ b/lib/databin.c
@@ -105,7 +105,7 @@
 	chr=buffer;
 	total=bsize;
 
-	if ( errmsg != NULL ) {
+	if (errmsg != NULL) {
 	    *errmsg = Errmsg;
 	}
 
@@ -124,7 +124,7 @@
                 for (cnt=0;cnt< bsize;cnt++) {
 		    expbits = ((offset+cnt)%8 & 0177);
 
-		    if ( buffer[cnt] != expbits ) {
+		    if (buffer[cnt] != expbits) {
 			sprintf(Errmsg,
 			    "data mismatch at offset %d, exp:%#lo, act:%#o",
 			    offset+cnt, expbits, buffer[cnt]);
@@ -149,7 +149,7 @@
 	for (cnt=0; cnt<bsize; chr++, cnt++) {
 	    actbits = (long)*chr;
 
-	    if ( actbits != expbits ) {
+	    if (actbits != expbits) {
 		sprintf(Errmsg, "data mismatch at offset %d, exp:%#lo, act:%#lo",
 		    offset+cnt, expbits, actbits);
 		return offset+cnt;
@@ -178,7 +178,7 @@
     int ret;
     char *errmsg;
 
-    if ((buffer=(unsigned char *)malloc(size)) == NULL ) {
+    if ((buffer=(unsigned char *)malloc(size)) == NULL) {
 	perror("malloc");
 	exit(2);
     }
@@ -191,7 +191,7 @@
     ret=databinchk('a', buffer, size, 0, &errmsg);
     printf("databinchk('a', buffer, %d, 0, &errmsg) returned %d: %s\n",
 	size, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -200,7 +200,7 @@
     ret=databinchk('a', &buffer[1], size-1, offset, &errmsg);
     printf("databinchk('a', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
 	size, offset, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -212,7 +212,7 @@
     ret=databinchk('a', &buffer[1], size-1, offset+1, &errmsg);
     printf("databinchk('a', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
 	size-1, offset+1, ret, errmsg);
-    if ( ret == number )
+    if (ret == number)
 	printf("\tPASS return value of %d as expected\n", number);
     else
 	printf("\tFAIL return value %d, expected %d\n", ret, number);
@@ -226,7 +226,7 @@
     ret=databinchk('c', buffer, size, 0, &errmsg);
     printf("databinchk('c', buffer, %d, 0, &errmsg) returned %d: %s\n",
 	size, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -235,7 +235,7 @@
     ret=databinchk('c', &buffer[1], size-1, offset, &errmsg);
     printf("databinchk('c', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
 	size, offset, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -247,7 +247,7 @@
     ret=databinchk('c', &buffer[1], size-1, offset+1, &errmsg);
     printf("databinchk('c', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
 	size-1, offset+1, ret, errmsg);
-    if ( ret == number )
+    if (ret == number)
 	printf("\tPASS return value of %d as expected\n", number);
     else
 	printf("\tFAIL return value %d, expected %d\n", ret, number);
@@ -260,7 +260,7 @@
     ret=databinchk('C', buffer, size, 0, &errmsg);
     printf("databinchk('C', buffer, %d, 0, &errmsg) returned %d: %s\n",
 	size, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -269,7 +269,7 @@
     ret=databinchk('C', &buffer[18], size-18, 18, &errmsg);
     printf("databinchk('C', &buffer[18], %d, 18, &errmsg) returned %d: %s\n",
 	size-18, ret, errmsg);
-    if ( ret == -1 )
+    if (ret == -1)
 	printf("\tPASS return value of -1 as expected\n");
     else
 	printf("\tFAIL return value %d, expected -1\n", ret);
@@ -283,7 +283,7 @@
     printf("databinchk('C', &buffer[18], %d, 18, &errmsg) returned %d: %s\n",
 	size-18, ret, errmsg);
 
-    if ( ret == 20 || ret == 21 )
+    if (ret == 20 || ret == 21)
 	printf("\tPASS return value of %d or %d as expected\n",
 	    20, 21);
     else
diff --git a/lib/datapid.c b/lib/datapid.c
index c047792..bc4ec71 100644
--- a/lib/datapid.c
+++ b/lib/datapid.c
@@ -103,7 +103,7 @@
     num_full_words = bsize/NBPW;
     boff = 0;
 
-    if ( cnt=(offset % NBPW) ) {	/* partial word */
+    if (cnt=(offset % NBPW)) {	/* partial word */
 
 	woff = offset - cnt;
 #if DEBUG
@@ -131,12 +131,12 @@
 
     woff = offset+boff;
 
-    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++ ) {
+    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++) {
 
 	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
 
 	chr = (char *)&word;
-	for(tmp=0; tmp<NBPW; tmp++, chr++) {
+	for (tmp=0; tmp<NBPW; tmp++, chr++) {
 	    buffer[boff++] = *chr;
 	}
 /****** Only if wptr is a word ellined
@@ -151,7 +151,7 @@
      * partial word at end of buffer
      */
 
-    if ( cnt=((bsize-boff) % NBPW) ) {
+    if (cnt=((bsize-boff) % NBPW)) {
 #if DEBUG
 printf("partial at end\n");
 #endif
@@ -197,7 +197,7 @@
    int num_full_words;
 
 
-    if ( errmsg != NULL ) {
+    if (errmsg != NULL) {
         *errmsg = Errmsg;
     }
 
@@ -205,7 +205,7 @@
     num_full_words = bsize/NBPW;
     boff = 0;
 
-    if ( cnt=(offset % NBPW) ) {	/* partial word */
+    if (cnt=(offset % NBPW)) {	/* partial word */
 	woff = offset - cnt;
 	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
 
@@ -232,12 +232,12 @@
 
     woff = offset+boff;
 
-    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++ ) {
+    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++) {
 	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
 
 	chr = (char *)&word;
-	for(tmp=0; tmp<NBPW; tmp++, boff++, chr++) {
-	    if ( buffer[boff] != *chr ) {
+	for (tmp=0; tmp<NBPW; tmp++, boff++, chr++) {
+	    if (buffer[boff] != *chr) {
 	        sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
 	            woff, *chr, buffer[boff]);
 	        return woff;
@@ -246,7 +246,7 @@
 
 /****** only if a word elined
 	wptr = (long *)&buffer[boff];
-	if ( *wptr != word ) {
+	if (*wptr != word) {
 	    sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
 	        woff, word, *wptr);
 	    return woff;
@@ -259,7 +259,7 @@
      * partial word at end of buffer
      */
 
-    if ( cnt=((bsize-boff) % NBPW) ) {
+    if (cnt=((bsize-boff) % NBPW)) {
 #if DEBUG
 printf("partial at end\n");
 #endif
@@ -269,7 +269,7 @@
 
 
 	for (tmp=0; tmp<cnt && boff<bsize; boff++, tmp++, chr++) {
-	    if ( buffer[boff] != *chr ) {
+	    if (buffer[boff] != *chr) {
 		sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
 		    offset+boff, *chr, buffer[boff]);
 		return offset+boff;
@@ -282,7 +282,7 @@
 
 #else
 
-    if ( errmsg != NULL ) {
+    if (errmsg != NULL) {
         *errmsg = Errmsg;
     }
     sprintf(Errmsg, "Not supported on this OS.");
@@ -309,7 +309,7 @@
 int ret;
 char *errmsg;
 
-    if ((buffer=(char *)malloc(size)) == NULL ) {
+    if ((buffer=(char *)malloc(size)) == NULL) {
         perror("malloc");
         exit(2);
     }
diff --git a/lib/file_lock.c b/lib/file_lock.c
index 8b66ab5..f0a98f3 100644
--- a/lib/file_lock.c
+++ b/lib/file_lock.c
@@ -87,7 +87,7 @@
                 flocks.l_type = F_RDLCK;
         else {
                 errno = EINVAL;
-	    if ( errormsg != NULL ) {
+	    if (errormsg != NULL) {
 		sprintf(errmsg,
 		    "Programmer error, called file_lock with in valid flags\n");
 		*errormsg = errmsg;
@@ -103,8 +103,8 @@
 	while (1) {
             ret = fcntl(fd, cmd, &flocks);
 
-	    if ( ret < 0 ) {
-	        if ( cmd == F_SETLK )
+	    if (ret < 0) {
+	        if (cmd == F_SETLK)
 	            switch (errno) {
 		       /* these errors are okay */
 		        case EACCES:	/* Permission denied */
@@ -115,7 +115,7 @@
 		        case EFSEXCLWR:	/* File is write protected */
 			    continue;	/* retry getting lock */
 	        }
-	        if ( errormsg != NULL ) {
+	        if (errormsg != NULL) {
 	            sprintf(errmsg, "fcntl(%d, %d, &flocks): errno:%d %s\n",
 		        fd, cmd, errno, strerror(errno));
 		    *errormsg = errmsg;
@@ -164,7 +164,7 @@
                 flocks.l_type = F_RDLCK;
         else {
                 errno = EINVAL;
-	    if ( errormsg != NULL ) {
+	    if (errormsg != NULL) {
 		sprintf(errmsg,
 		    "Programmer error, called record_lock with in valid flags\n");
 		*errormsg = errmsg;
@@ -180,8 +180,8 @@
 	while (1) {
             ret = fcntl(fd, cmd, &flocks);
 
-	    if ( ret < 0 ) {
-	        if ( cmd == F_SETLK )
+	    if (ret < 0) {
+	        if (cmd == F_SETLK)
 	            switch (errno) {
 		       /* these errors are okay */
 		        case EACCES:	/* Permission denied */
@@ -192,7 +192,7 @@
 		        case EFSEXCLWR:	/* File is write protected */
 			    continue;	/* retry getting lock */
 	        }
-	        if ( errormsg != NULL ) {
+	        if (errormsg != NULL) {
 	            sprintf(errmsg, "fcntl(%d, %d, &flocks): errno:%d %s\n",
 		        fd, cmd, errno, strerror(errno));
 		    *errormsg = errmsg;
diff --git a/lib/forker.c b/lib/forker.c
index ad3ffbf..84d176f 100644
--- a/lib/forker.c
+++ b/lib/forker.c
@@ -136,7 +136,7 @@
 {
   switch (fork()) {
   case -1:
-    if ( prefix != NULL )
+    if (prefix != NULL)
         fprintf(stderr, "%s: In %s background(), fork() failed, errno:%d %s\n",
 	    prefix, __FILE__, errno, strerror(errno));
     exit(errno);
@@ -170,12 +170,12 @@
 
     Forker_pids[ind]=0;
 
-    for ( cnt=1; cnt < ncopies; cnt++ ) {
+    for (cnt=1; cnt < ncopies; cnt++) {
 
 	switch ( mode ) {
         case 1  :	/* only 1 direct child */
-	    if ( (pid = fork()) == -1 ) {
-		if ( prefix != NULL )
+	    if ((pid = fork()) == -1) {
+		if (prefix != NULL)
 		    fprintf(stderr, "%s: %s,forker(): fork() failed, errno:%d %s\n",
 			prefix, __FILE__, errno, strerror(errno));
 	        return 0;
@@ -185,12 +185,12 @@
 	    switch (pid ) {
             case 0:     /* child - continues the forking */
 
-		if ( Forker_npids < FORKER_MAX_PIDS )
+		if (Forker_npids < FORKER_MAX_PIDS)
                     Forker_pids[Forker_npids-1]=getpid();
                 break;
 
             default:    /* parent - stop the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
+		if (Forker_npids < FORKER_MAX_PIDS)
                     Forker_pids[Forker_npids-1]=pid;
                 return cnt-1;
             }
@@ -198,8 +198,8 @@
 	    break;
 
 	default :	/* all new processes are childern of parent */
-	    if ( (pid = fork()) == -1 ) {
-		if ( prefix != NULL )
+	    if ((pid = fork()) == -1) {
+		if (prefix != NULL)
 		    fprintf(stderr, "%s: %s,forker(): fork() failed, errno:%d %s\n",
 			prefix, __FILE__, errno, strerror(errno));
 	        return cnt-1;
@@ -208,12 +208,12 @@
 
 	    switch (pid ) {
 	    case 0:	/* child - stops the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
+		if (Forker_npids < FORKER_MAX_PIDS)
                     Forker_pids[Forker_npids-1]=getpid();
 	        return cnt;
 
 	    default:	/* parent - continues the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
+		if (Forker_npids < FORKER_MAX_PIDS)
                     Forker_pids[Forker_npids-1]=pid;
                 break;
             }
@@ -221,7 +221,7 @@
 	}
     }
 
-    if ( Forker_npids < FORKER_MAX_PIDS )
+    if (Forker_npids < FORKER_MAX_PIDS)
         Forker_pids[Forker_npids]=0;
     return cnt-1;
 
@@ -245,18 +245,18 @@
     int ret;
     int ind;
 
-    if ( argc == 1 ) {
+    if (argc == 1) {
 	printf("Usage: %s ncopies [mode]\n", argv[0]);
 	exit(1);
     }
 
-    if ( sscanf(argv[1], "%i", &ncopies) != 1 ) {
+    if (sscanf(argv[1], "%i", &ncopies) != 1) {
 	printf("%s: ncopies argument must be integer\n", argv[0]);
 	exit(1);
     }
 
-    if ( argc == 3 )
-	if ( sscanf(argv[2], "%i", &mode) != 1 ) {
+    if (argc == 3)
+	if (sscanf(argv[2], "%i", &mode) != 1) {
         printf("%s: mode argument must be integer\n", argv[0]);
         exit(1);
     }
@@ -273,7 +273,7 @@
     printf("%d My version of Forker_pids[],  Forker_npids = %d\n",
 	getpid(), Forker_npids);
 
-    for (ind=0; ind<Forker_npids; ind++){
+    for (ind=0; ind<Forker_npids; ind++) {
 	printf("%d ind:%-2d pid:%d\n", getpid(), ind, Forker_pids[ind]);
     }
 
diff --git a/lib/open_flags.c b/lib/open_flags.c
index eaa8051..6c593aa 100644
--- a/lib/open_flags.c
+++ b/lib/open_flags.c
@@ -202,14 +202,14 @@
 
    while ( 1 ) {
 
-      for(; ((*cc != ',') && (*cc != '\0')); cc++);
+      for (; ((*cc != ',') && (*cc != '\0')); cc++);
       savecc = *cc;
       *cc = '\0';
 
       found = 0;
 
-      for(ind=0; ind < sizeof(Open_flags)/sizeof(struct open_flag_t); ind++) {
-          if ( strcmp(name, Open_flags[ind].symbol) == 0 ) {
+      for (ind=0; ind < sizeof(Open_flags)/sizeof(struct open_flag_t); ind++) {
+          if (strcmp(name, Open_flags[ind].symbol) == 0) {
               bits |= Open_flags[ind].flag;
 	      found=1;
 	      break;
@@ -218,13 +218,13 @@
 
       *cc = savecc;	/* restore string */
 
-      if ( found == 0 ) {	/* invalid name */
-         if ( badname != NULL )
+      if (found == 0) {	/* invalid name */
+         if (badname != NULL)
            *badname = name;
          return -1;
       }
 
-      if ( savecc == '\0' )
+      if (savecc == '\0')
 	break;
 
       name = ++cc;
@@ -253,7 +253,7 @@
      * bits are not set, assume O_RDONLY.
      */
 
-    if ( (bits & (O_WRONLY | O_RDWR)) == 0 ) {
+    if ((bits & (O_WRONLY | O_RDWR)) == 0) {
 	strcat(Open_symbols, "O_RDONLY");
 	havesome=1;
     }
@@ -261,10 +261,10 @@
     /*
      *  Loop through all but O_RDONLY elments of Open_flags
      */
-    for(ind=1; ind < size; ind++) {
+    for (ind=1; ind < size; ind++) {
 
-	if ( (bits & Open_flags[ind].flag) == Open_flags[ind].flag ) {
-	    if ( havesome )
+	if ((bits & Open_flags[ind].flag) == Open_flags[ind].flag) {
+	    if (havesome)
 		strcat(Open_symbols, sep);
 
 	    strcat(Open_symbols, Open_flags[ind].symbol);
@@ -279,8 +279,8 @@
      * If not all bits were identified and mode was equal to 1,
      * added UNKNOWN_SYMBOL to return string
      */
-    if ( bits && mode == 1 )  {    /* not all bits were identified */
-        if ( havesome )
+    if (bits && mode == 1)  {    /* not all bits were identified */
+        if (havesome)
             strcat(Open_symbols, sep);
 	strcat(Open_symbols,  UNKNOWN_SYMBOL);
     }
@@ -306,18 +306,18 @@
     int ret;
     char *err;
 
-    if (argc == 1 ) {
+    if (argc == 1) {
 	printf("Usage: %s openflagsbits\n\t%s symbols\n", argv[0], argv[0]);
 	exit(1);
     }
 
-    if ( sscanf(argv[1], "%i", &bits) == 1 ) {
+    if (sscanf(argv[1], "%i", &bits) == 1) {
 	printf("openflags2symbols(%#o, \",\", 1) returned %s\n",
 	    bits, openflags2symbols(bits, ",", 1));
 
     } else {
 	ret=parse_open_flags(argv[1], &err);
-	if ( ret == -1 )
+	if (ret == -1)
 	    printf("parse_open_flags(%s, &err) returned -1, err = %s\n",
 	        argv[0], err);
         else
diff --git a/lib/parse_opts.c b/lib/parse_opts.c
index 191536c..f708c93 100644
--- a/lib/parse_opts.c
+++ b/lib/parse_opts.c
@@ -265,7 +265,7 @@
     /*
      *  Loop through av parsing options.
      */
-    while ( (opt = getopt(ac, av, optionstr)) > 0) {
+    while ((opt = getopt(ac, av, optionstr)) > 0) {
 
 	STD_argind = optind;
 #if DEBUG > 0
@@ -291,7 +291,7 @@
 		case 'I': /* Time duration */
 			options |= OPT_duration;
 			STD_LOOP_DURATION = atof(optarg);
-			if ( STD_LOOP_DURATION == 0.0 ) STD_INFINITE=1;
+			if (STD_LOOP_DURATION == 0.0) STD_INFINITE=1;
 			break;
 		case 'c': /* Copies */
 			options |= OPT_copies;
@@ -322,24 +322,24 @@
 
             /* Check all the user specified options */
             found=0;
-	    for(i = 0; user_optarr[i].option; ++i) {
+	    for (i = 0; user_optarr[i].option; ++i) {
 
 		if (opt == user_optarr[i].option[0]) {
                     /* Yup, This is a user option, set the flag and look for argument */
-		    if ( user_optarr[i].flag ) {
+		    if (user_optarr[i].flag) {
                         *user_optarr[i].flag=1;
 		    }
                     found++;
 
 		    /* save the argument at the user's location */
-                    if ( user_optarr[i].option[strlen(user_optarr[i].option)-1] == ':' ) {
+                    if (user_optarr[i].option[strlen(user_optarr[i].option)-1] == ':') {
                         *user_optarr[i].arg=optarg;
                     }
                     break;  /* option found - break out of the for loop */
                 }
             }
 	    /* This condition "should never happen".  SO CHECK FOR IT!!!! */
-            if ( ! found ) {
+            if (! found) {
                 sprintf(Mesg2,
 		    "parse_opts: ERROR - option:\"%c\" NOT FOUND... INTERNAL ERROR", opt);
                 return(Mesg2);
@@ -354,11 +354,11 @@
     /*
      * Turn on debug
      */
-    if ( (ptr=getenv("USC_DEBUG")) != NULL ) {
+    if ((ptr=getenv("USC_DEBUG")) != NULL) {
 	Debug=1;
         printf("env USC_DEBUG is defined, turning on debug\n");
     }
-    if ( (ptr=getenv("USC_VERBOSE")) != NULL ) {
+    if ((ptr=getenv("USC_VERBOSE")) != NULL) {
 	Debug=1;
         printf("env USC_VERBOSE is defined, turning on debug\n");
     }
@@ -368,16 +368,16 @@
      * a number, use that number as iteration count (same as -c option).
      * The -c option with arg will be used even if this env var is set.
      */
-    if ( !(options & OPT_iteration) && (ptr=getenv(USC_ITERATION_ENV)) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1) {
-            if ( k == 0 ) {   /* if arg is 0, set infinite loop flag */
+    if (!(options & OPT_iteration) && (ptr=getenv(USC_ITERATION_ENV)) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1) {
+            if (k == 0) {   /* if arg is 0, set infinite loop flag */
                 STD_INFINITE=1;
-		if ( Debug )
+		if (Debug)
 		   printf("Using env %s, set STD_INFINITE to 1\n",
 			USC_ITERATION_ENV);
             } else {            /* else, set the loop count to the arguement */
                 STD_LOOP_COUNT=k;
-		if ( Debug )
+		if (Debug)
 		   printf("Using env %s, set STD_LOOP_COUNT to %d\n",
 			USC_ITERATION_ENV, k);
             }
@@ -388,9 +388,9 @@
      * If the USC_NO_FUNC_CHECK environmental variable is set, we'll
      * unset the STD_FUNCTIONAL_TEST variable.
      */
-    if ( !(options & OPT_nofunccheck) && (ptr=getenv(USC_NO_FUNC_CHECK)) != NULL ) {
+    if (!(options & OPT_nofunccheck) && (ptr=getenv(USC_NO_FUNC_CHECK)) != NULL) {
         STD_FUNCTIONAL_TEST=0; /* Turn off functional testing */
-	if ( Debug )
+	if (Debug)
 	    printf("Using env %s, set STD_FUNCTIONAL_TEST to 0\n",
 		USC_NO_FUNC_CHECK);
     }
@@ -401,27 +401,27 @@
      * The -I option with arg will be used even if this env var is set.
      */
 
-    if ( !(options & OPT_duration) && (ptr=getenv(USC_LOOP_WALLTIME)) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
+    if (!(options & OPT_duration) && (ptr=getenv(USC_LOOP_WALLTIME)) != NULL) {
+        if (sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0) {
 	    STD_LOOP_DURATION=ftmp;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env %s, set STD_LOOP_DURATION to %f\n",
 		    USC_LOOP_WALLTIME, ftmp);
-            if ( STD_LOOP_DURATION == 0.0 ) {   /* if arg is 0, set infinite loop flag */
+            if (STD_LOOP_DURATION == 0.0) {   /* if arg is 0, set infinite loop flag */
                 STD_INFINITE=1;
-	        if ( Debug )
+	        if (Debug)
 	            printf("Using env %s, set STD_INFINITE to 1\n", USC_LOOP_WALLTIME);
 	    }
         }
     }
-    if ( !(options & OPT_duration) && (ptr=getenv("USC_DURATION")) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
+    if (!(options & OPT_duration) && (ptr=getenv("USC_DURATION")) != NULL) {
+        if (sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0) {
 	    STD_LOOP_DURATION=ftmp;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_DURATION, set STD_LOOP_DURATION to %f\n", ftmp);
-            if ( STD_LOOP_DURATION == 0.0 ) {   /* if arg is 0, set infinite loop flag */
+            if (STD_LOOP_DURATION == 0.0) {   /* if arg is 0, set infinite loop flag */
                 STD_INFINITE=1;
-	        if ( Debug )
+	        if (Debug)
 	            printf("Using env USC_DURATION, set STD_INFINITE to 1\n");
 	    }
         }
@@ -431,10 +431,10 @@
      * use that number as delay in factional seconds (same as -P option).
      * The -P option with arg will be used even if this env var is set.
      */
-    if ( !(options & OPT_delay) && (ptr=getenv(USC_LOOP_DELAY)) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
+    if (!(options & OPT_delay) && (ptr=getenv(USC_LOOP_DELAY)) != NULL) {
+        if (sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0) {
 	    STD_LOOP_DELAY=ftmp;
-	    if ( Debug )
+	    if (Debug)
 		printf("Using env %s, set STD_LOOP_DELAY = %f\n",
 		    USC_LOOP_DELAY, ftmp);
         }
@@ -445,9 +445,9 @@
      * use that number as copies (same as -c option).
      * The -c option with arg will be used even if this env var is set.
      */
-    if ( !(options & OPT_copies) && (ptr=getenv(USC_COPIES)) != NULL ) {
-        if ( sscanf(ptr, "%d", &STD_COPIES) == 1 && STD_COPIES >= 0 ) {
-	    if ( Debug )
+    if (!(options & OPT_copies) && (ptr=getenv(USC_COPIES)) != NULL) {
+        if (sscanf(ptr, "%d", &STD_COPIES) == 1 && STD_COPIES >= 0) {
+	    if (Debug)
 		printf("Using env %s, set STD_COPIES = %d\n",
 		    USC_COPIES, STD_COPIES);
         }
@@ -457,94 +457,94 @@
      * The following are special system testing envs to turn on special
      * hooks in the code.
      */
-    if ( (ptr=getenv("USC_TP_BARRIER")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_TP_BARRIER")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
 	    STD_TP_barrier=k;
 	}
         else
 	    STD_TP_barrier=1;
-	if ( Debug )
+	if (Debug)
 	    printf("using env USC_TP_BARRIER, Set STD_TP_barrier to %d\n",
 	        STD_TP_barrier);
     }
 
-    if ( (ptr=getenv("USC_LP_BARRIER")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LP_BARRIER")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
 	    STD_LP_barrier=k;
 	}
         else
 	    STD_LP_barrier=1;
-	if ( Debug )
+	if (Debug)
 	    printf("using env USC_LP_BARRIER, Set STD_LP_barrier to %d\n",
 	        STD_LP_barrier);
     }
 
-    if ( (ptr=getenv("USC_TP_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_TP_SHMEM")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
             STD_TP_shmem_sz=k;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_TP_SHMEM, Set STD_TP_shmem_sz to %d\n",
 		    STD_TP_shmem_sz);
         }
     }
 
-    if ( (ptr=getenv("USC_LP_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LP_SHMEM")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
             STD_LP_shmem=k;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_LP_SHMEM, Set STD_LP_shmem to %d\n",
 		    STD_LP_shmem);
         }
     }
 
-    if ( (ptr=getenv("USC_LD_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LD_SHMEM")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
             STD_LD_shmem=k;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_LD_SHMEM, Set STD_LD_shmem to %d\n",
 		    STD_LD_shmem);
         }
     }
 
-    if ( (ptr=getenv("USC_TP_SBRK")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_TP_SBRK")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
             STD_TP_sbrk=k;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_TP_SBRK, Set STD_TP_sbrk to %d\n",
 		    STD_TP_sbrk);
         }
     }
 
 #if !defined(UCLINUX)
-    if ( (ptr=getenv("USC_LP_SBRK")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LP_SBRK")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
             STD_LP_sbrk=k;
-	    if ( Debug )
+	    if (Debug)
 	        printf("Using env USC_LP_SBRK, Set STD_LP_sbrk to %d\n",
 		    STD_LP_sbrk);
         }
     }
 #endif /* if !defined(UCLINUX) */
 
-    if ( (ptr=getenv("USC_LP_RECFUN")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LP_RECFUN")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
 	    STD_LP_recfun=k;
-	    if ( STD_bigstack != (struct usc_bigstack_t *)NULL )
+	    if (STD_bigstack != NULL)
 		STD_bigstack=(struct usc_bigstack_t *)
 			malloc(sizeof(struct usc_bigstack_t));
-	    if ( Debug )
+	    if (Debug)
                 printf("Using env USC_LP_RECFUN, Set STD_LP_recfun to %d\n",
 		    STD_LP_recfun);
         }
     }
 
-    if ( (ptr=getenv("USC_LD_RECFUN")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
+    if ((ptr=getenv("USC_LD_RECFUN")) != NULL) {
+        if (sscanf(ptr, "%i", &k) == 1 && k >= 0) {
 	    STD_LD_recfun=k;
-	    if ( STD_bigstack != (struct usc_bigstack_t *)NULL )
+	    if (STD_bigstack != NULL)
 		STD_bigstack=(struct usc_bigstack_t *)
 			malloc(sizeof(struct usc_bigstack_t));
-	    if ( Debug )
+	    if (Debug)
                 printf("Using env USC_LD_RECFUN, Set STD_LD_recfun to %d\n",
 		    STD_LD_recfun);
         }
@@ -585,7 +585,7 @@
 {
     int i;
 
-    for(i = 0; std_options[i].optstr; ++i) {
+    for (i = 0; std_options[i].optstr; ++i) {
 	if (std_options[i].help)
 	    printf("%s", std_options[i].help);
     }
@@ -617,7 +617,7 @@
     /*
      * Fork STD_COPIES-1 copies.
      */
-    for(cnt=1;cnt<STD_COPIES;cnt++) {
+    for (cnt=1;cnt<STD_COPIES;cnt++) {
         switch(fork() ) {
 	    case -1:
 		fprintf(stderr, "%s: fork() failed, errno:%d %s\n",
@@ -635,7 +635,7 @@
     /*
      * pause waiting for sigusr1.
      */
-    if ( STD_PAUSE ) {
+    if (STD_PAUSE) {
         _TMP_FUNC = (int (*)())signal(SIGUSR1, STD_go);
         pause();
         signal(SIGUSR1, (void (*)())_TMP_FUNC);
@@ -643,13 +643,13 @@
 
 #if !defined(UCLINUX)
 
-    if ( STD_TP_sbrk || STD_LP_sbrk) {
+    if (STD_TP_sbrk || STD_LP_sbrk) {
 	STD_start_break=sbrk(0);	/* get original sbreak size */
     }
 
-    if ( STD_TP_sbrk ) {
+    if (STD_TP_sbrk) {
 	sbrk(STD_TP_sbrk);
-	if ( Debug )
+	if (Debug)
 	    printf("after sbrk(%d)\n", STD_TP_sbrk);
     }
 
@@ -717,10 +717,10 @@
      * duration of STD_LOOP_DURATION seconds (fractional) or
      * doing loop delays, get the clocks per second.
      */
-    if ( first_time ) {
+    if (first_time) {
 
 	first_time=0;
-	if ( STD_LOOP_DELAY || STD_LOOP_DURATION ) {
+	if (STD_LOOP_DELAY || STD_LOOP_DURATION) {
 	    hertz = get_timepersec();
 	}
 
@@ -729,7 +729,7 @@
 	 * clocks.
 	 */
 
-	if ( STD_LOOP_DURATION) {
+	if (STD_LOOP_DURATION) {
 	    ct=get_current_time();
 	    stop_time=(int)((float)hertz * STD_LOOP_DURATION) + ct;
 	}
@@ -738,7 +738,7 @@
 	 * If doing delay each iteration, calcuate the number
 	 * of clocks for each delay.
 	 */
-	if ( STD_LOOP_DELAY ) {
+	if (STD_LOOP_DELAY) {
 	    delay=(int)((float)hertz * STD_LOOP_DELAY);
 	}
 
@@ -750,15 +750,15 @@
      * The delay will happen before determining if
      * there will be another iteration.
      */
-    else if ( STD_LOOP_DELAY ) {
+    else if (STD_LOOP_DELAY) {
 	ct=get_current_time();
         end=ct+delay;
-        while ( ct < end ) {
+        while (ct < end) {
 	    /*
 	     * The following are special test hooks in the delay loop.
 	     */
-	    if ( STD_LD_recfun ) {
-		if ( Debug )
+	    if (STD_LD_recfun) {
+		if (Debug)
 		    printf("calling usc_recressive_func(0, %d, *STD_bigstack)\n",
 		        STD_LD_recfun);
 		usc_recressive_func(0, STD_LD_recfun, *STD_bigstack);
@@ -768,27 +768,27 @@
 	}
     }
 
-    if ( STD_INFINITE ) {
+    if (STD_INFINITE) {
 	keepgoing++;
     }
 
-    if ( STD_LOOP_COUNT && counter < STD_LOOP_COUNT ) {
+    if (STD_LOOP_COUNT && counter < STD_LOOP_COUNT) {
 	keepgoing++;
     }
 
-    if ( STD_LOOP_DURATION != 0.0 && get_current_time() < stop_time ) {
+    if (STD_LOOP_DURATION != 0.0 && get_current_time() < stop_time) {
 	keepgoing++;
     }
 
-    if ( keepgoing == 0 )
+    if (keepgoing == 0)
 	return 0;
 
     /*
      * The following code allows special system testing hooks.
      */
 
-    if ( STD_LP_recfun ) {
-	if ( Debug )
+    if (STD_LP_recfun) {
+	if (Debug)
 	    printf("calling usc_recressive_func(0, %d, *STD_bigstack)\n",
 	        STD_LP_recfun);
 	usc_recressive_func(0, STD_LP_recfun, *STD_bigstack);
@@ -796,15 +796,15 @@
 
 #if !defined(UCLINUX)
 
-    if ( STD_LP_sbrk ) {
-	if ( Debug )
+    if (STD_LP_sbrk) {
+	if (Debug)
 	    printf("about to do sbrk(%d)\n", STD_LP_sbrk);
 	sbrk(STD_LP_sbrk);
     }
 #endif
 
 
-    if ( keepgoing )
+    if (keepgoing)
 	return 1;
     else
         return 0;	/* done - stop iterating */
@@ -820,7 +820,7 @@
 int max;
 struct usc_bigstack_t bstack;
 {
-    if ( cnt < max )
+    if (cnt < max)
 	usc_recressive_func(cnt+1, max, bstack);
 
 }
diff --git a/lib/random_range.c b/lib/random_range.c
index 9c05cf7..2e4761e 100644
--- a/lib/random_range.c
+++ b/lib/random_range.c
@@ -357,7 +357,7 @@
          * If max is less than 2gb, then the value can fit in 32 bits
          * and the standard lrand48() routine can be used.
          */
-        if ( max <= (long)2147483647 ) {
+        if (max <= (long)2147483647) {
             return (long) (min + (((long)lrand48() % nmults) * mult));
         } else {
             /*
@@ -449,7 +449,7 @@
          * If max is less than 2gb, then the value can fit in 32 bits
          * and the standard lrand48() routine can be used.
          */
-        if ( max <= (long)2147483647 ) {
+        if (max <= (long)2147483647) {
             return (long) (min + (((long)lrand48() % nmults) * mult));
         } else {
             /*
@@ -540,7 +540,7 @@
 	 * If max is less than 2gb, then the value can fit in 32 bits
 	 * and the standard lrand48() routine can be used.
 	 */
-	if ( max <= (long)2147483647 ) {
+	if (max <= (long)2147483647) {
     	    return (long long) (min + (((long long)lrand48() % nmults) * mult));
 	} else {
 	    /*
@@ -577,19 +577,19 @@
      * if we get to a count of more than 32, we should have gotten
      * to 2gb.
      */
-    if ( cnt > 32 )
+    if (cnt > 32)
        return -1;
 
     /*
      * Only get a random number the first time.
      */
-    if ( cnt == 0 || rand < -1 ) {
+    if (cnt == 0 || rand < -1) {
         rand = (long long)lrand48();  /* 32 bit random number */
     }
 
     diff = max - min;
 
-    if ( diff <= 2147483647 )
+    if (diff <= 2147483647)
 	return min + rand;
 
     half = diff/(long long)2;   /* half the distance between min and max */
@@ -600,13 +600,13 @@
 printf("   diff = %lld, half = %lld,   med = %lld\n", diff, half, med);
 #endif
 
-    if ( half <= 2147483647 ) {
+    if (half <= 2147483647) {
         /*
          * If half is smaller than 2gb, we can use the random number
          * to pick the number within the min to med or med to max
          * if the cnt bit of rand is zero or one, respectively.
          */
-        if ( rand & (1<<cnt) )
+        if (rand & (1<<cnt))
 	    return med + rand;
         else
 	    return min + rand;
@@ -615,7 +615,7 @@
 	 * recursively call ourself to reduce the value to the bottom half
 	 * or top half (bit cnt is set).
          */
-        if ( rand & (1<<cnt) ) {
+        if (rand & (1<<cnt)) {
 	    return divider(med, max, cnt+1, rand);
 	} else {
 	    return divider(min, med, cnt+1, rand);
@@ -656,7 +656,7 @@
     long bit;           /* used to count bits and num of set bits choosen */
     int nshift;         /* used to count bit shifts */
 
-    if ( mask == 0 )
+    if (mask == 0)
         return 0;
 
     /*
@@ -665,8 +665,8 @@
 #ifndef CRAY
 
         bit=1L;
-        for ( nshift=0; (unsigned int)nshift<sizeof(long)*8; nshift++) {
-                if ( mask & bit )
+        for (nshift=0; (unsigned int)nshift<sizeof(long)*8; nshift++) {
+                if (mask & bit)
                         nbits++;
                 bit=bit<<1;
         }
@@ -688,7 +688,7 @@
     nshift=0;
     while (bit) {
         /* check if the current one's bit is set */
-        if ( mask & 1L ) {
+        if (mask & 1L) {
             bit--;
         }
         mask = mask >> 1;
@@ -721,7 +721,7 @@
     ret=random_bit(mask);
     printf("random_bit(%#o) returned %#o\n", mask, ret);
 
-    if ( argc >= 3 ) {
+    if (argc >= 3) {
         iter=atoi(argv[1]);
         for (ind=2; ind<argc; ind++) {
             printf("Calling random_bit %d times for mask %#o\n", iter, mask);
@@ -775,17 +775,17 @@
     long valbound[PARTNUM];
     long long lvalbound[PARTNUM];
 
-    for (ind=0; ind<PARTNUM; ind++ )
+    for (ind=0; ind<PARTNUM; ind++)
 	cntarr[ind]=0;
 
-    if ( argc < 2 ) {
+    if (argc < 2) {
         printf("Usage: %s func [iterations] \n", argv[0]);
 	printf("func can be random_range, random_rangel, random_rangell\n");
 	exit(1);
     }
 
-    if ( argc >= 3 ) {
-        if ( sscanf(argv[2], "%i", &iter) != 1 ) {
+    if (argc >= 3) {
+        if (sscanf(argv[2], "%i", &iter) != 1) {
             printf("Usage: %s [func iterations] \n", argv[0]);
 	    printf("argv[2] is not a number\n");
 	    exit(1);
@@ -796,32 +796,32 @@
     /*
      * random_rangel ()
      */
-    if ( strcmp(argv[1], "random_rangel") == 0 ) {
+    if (strcmp(argv[1], "random_rangel") == 0) {
 	ltmin=lmax;
         part = lmax/PARTNUM;
-        for(ind=0; ind<PARTNUM; ind++) {
+        for (ind=0; ind<PARTNUM; ind++) {
 	    valbound[ind]=part*ind;
         }
 
-	for(cnt=0; cnt<iter; cnt++) {
+	for (cnt=0; cnt<iter; cnt++) {
 	    lret=random_rangel(lmin, lmax, lmult, NULL);
-	    if ( iter < 100 )
+	    if (iter < 100)
 	        printf("%ld\n", lret);
-	    if ( lret < ltmin )
+	    if (lret < ltmin)
 		ltmin = lret;
-	    if ( lret > ltmax )
+	    if (lret > ltmax)
 		ltmax = lret;
-	    for(ind=0; ind<PARTNUM-1; ind++) {
-		if ( valbound[ind]  < lret && lret <= valbound[ind+1] ) {
+	    for (ind=0; ind<PARTNUM-1; ind++) {
+		if (valbound[ind]  < lret && lret <= valbound[ind+1]) {
 		    cntarr[ind]++;
 		    break;
 		}
 	    }
-	    if ( lret > valbound[PARTNUM-1] ) {
+	    if (lret > valbound[PARTNUM-1]) {
 		cntarr[PARTNUM-1]++;
 	    }
         }
-        for(ind=0; ind<PARTNUM-1; ind++) {
+        for (ind=0; ind<PARTNUM-1; ind++) {
 	    printf("%2d %-13ld to  %-13ld   %5ld %4.4f\n", ind+1,
 	        valbound[ind], valbound[ind+1], cntarr[ind],
 	        (float)(cntarr[ind]/(float)iter));
@@ -831,36 +831,36 @@
 	    (float)(cntarr[PARTNUM-1]/(float)iter));
 	printf("  min=%ld,  max=%ld\n", ltmin, ltmax);
 
-    } else if ( strcmp(argv[1], "random_rangell") == 0 ) {
+    } else if (strcmp(argv[1], "random_rangell") == 0) {
        /*
 	* random_rangell() unit test
         */
 	 lltmin=llmax;
         lpart = llmax/PARTNUM;
-        for(ind=0; ind<PARTNUM; ind++) {
+        for (ind=0; ind<PARTNUM; ind++) {
 	    lvalbound[ind]=(long long)(lpart*ind);
         }
 
-	for(cnt=0; cnt<iter; cnt++) {
+	for (cnt=0; cnt<iter; cnt++) {
 	    llret=random_rangell(llmin, llmax, llmult, NULL);
-	    if ( iter < 100 )
+	    if (iter < 100)
 	        printf("random_rangell returned %lld\n", llret);
-            if ( llret < lltmin )
+            if (llret < lltmin)
                 lltmin = llret;
-            if ( llret > lltmax )
+            if (llret > lltmax)
                 lltmax = llret;
 
-	    for(ind=0; ind<PARTNUM-1; ind++) {
-		if ( lvalbound[ind]  < llret && llret <= lvalbound[ind+1] ) {
+	    for (ind=0; ind<PARTNUM-1; ind++) {
+		if (lvalbound[ind]  < llret && llret <= lvalbound[ind+1]) {
 		    cntarr[ind]++;
 		    break;
 		}
 	    }
-	    if ( llret > lvalbound[PARTNUM-1] ) {
+	    if (llret > lvalbound[PARTNUM-1]) {
 		cntarr[PARTNUM-1]++;
 	    }
         }
-        for(ind=0; ind<PARTNUM-1; ind++) {
+        for (ind=0; ind<PARTNUM-1; ind++) {
             printf("%2d %-13lld to  %-13lld   %5ld %4.4f\n", ind+1,
                 lvalbound[ind], lvalbound[ind+1], cntarr[ind],
                 (float)(cntarr[ind]/(float)iter));
@@ -876,30 +876,30 @@
          */
 	itmin=imax;
         part = imax/PARTNUM;
-        for(ind=0; ind<PARTNUM; ind++) {
+        for (ind=0; ind<PARTNUM; ind++) {
 	    valbound[ind]=part*ind;
         }
 
-	for(cnt=0; cnt<iter; cnt++) {
+	for (cnt=0; cnt<iter; cnt++) {
 	    lret=random_range(imin, imax, imult, NULL);
-	    if ( iter < 100 )
+	    if (iter < 100)
 	        printf("%ld\n", lret);
-            if ( lret < itmin )
+            if (lret < itmin)
                 itmin = lret;
-            if ( lret > itmax )
+            if (lret > itmax)
                 itmax = lret;
 
-	    for(ind=0; ind<PARTNUM-1; ind++) {
-		if ( valbound[ind]  < lret && lret <= valbound[ind+1] ) {
+	    for (ind=0; ind<PARTNUM-1; ind++) {
+		if (valbound[ind]  < lret && lret <= valbound[ind+1]) {
 		    cntarr[ind]++;
 		    break;
 		}
 	    }
-	    if ( lret > valbound[PARTNUM-1] ) {
+	    if (lret > valbound[PARTNUM-1]) {
 		cntarr[PARTNUM-1]++;
 	    }
         }
-        for(ind=0; ind<PARTNUM-1; ind++) {
+        for (ind=0; ind<PARTNUM-1; ind++) {
 	    printf("%2d %-13ld to  %-13ld   %5ld %4.4f\n", ind+1,
 	        valbound[ind], valbound[ind+1], cntarr[ind],
 	        (float)(cntarr[ind]/(float)iter));
diff --git a/lib/rmobj.c b/lib/rmobj.c
index a779060..03f4fcf 100644
--- a/lib/rmobj.c
+++ b/lib/rmobj.c
@@ -101,8 +101,8 @@
    static char   err_msg[1024];     /* error message */
 
    /* Determine the file type */
-   if ( lstat(obj, &statbuf) < 0 ) {
-      if ( errmsg != NULL ) {
+   if (lstat(obj, &statbuf) < 0) {
+      if (errmsg != NULL) {
          sprintf(err_msg, "lstat(%s) failed; errno=%d: %s",
                  obj, errno, SYSERR);
          *errmsg = err_msg;
@@ -111,12 +111,12 @@
    }
 
    /* Take appropriate action, depending on the file type */
-   if ( (statbuf.st_mode & S_IFMT) == S_IFDIR ) {
+   if ((statbuf.st_mode & S_IFMT) == S_IFDIR) {
       /* object is a directory */
 
       /* Do NOT perform the request if the directory is "/" */
-      if ( !strcmp(obj, "/") ) {
-         if ( errmsg != NULL ) {
+      if (!strcmp(obj, "/")) {
+         if (errmsg != NULL) {
             sprintf(err_msg, "Cannot remove /");
             *errmsg = err_msg;
          }
@@ -124,9 +124,9 @@
       }
 
       /* Open the directory to get access to what is in it */
-      if ( (dir = opendir(obj)) == NULL ) {
-         if ( rmdir(obj) != 0 ) {
-            if ( errmsg != NULL ) {
+      if ((dir = opendir(obj)) == NULL) {
+         if (rmdir(obj) != 0) {
+            if (errmsg != NULL) {
                sprintf(err_msg, "rmdir(%s) failed; errno=%d: %s",
                        obj, errno, SYSERR);
                *errmsg = err_msg;
@@ -138,17 +138,17 @@
       }
 
       /* Loop through the entries in the directory, removing each one */
-      for ( dir_ent = (struct dirent *)readdir(dir);
+      for (dir_ent = (struct dirent *)readdir(dir);
             dir_ent != NULL;
             dir_ent = (struct dirent *)readdir(dir)) {
 
          /* Don't remove "." or ".." */
-         if ( !strcmp(dir_ent->d_name, ".") || !strcmp(dir_ent->d_name, "..") )
+         if (!strcmp(dir_ent->d_name, ".") || !strcmp(dir_ent->d_name, ".."))
             continue;
 
          /* Recursively call this routine to remove the current entry */
          sprintf(dirobj, "%s/%s", obj, dir_ent->d_name);
-         if ( rmobj(dirobj, errmsg) != 0 )
+         if (rmobj(dirobj, errmsg) != 0)
             ret_val = -1;
       }
 
@@ -157,12 +157,12 @@
 
       /* If there were problems removing an entry, don't attempt to
          remove the directory itself */
-      if ( ret_val == -1 )
+      if (ret_val == -1)
          return -1;
 
       /* Get the link count, now that all the entries have been removed */
-      if ( lstat(obj, &statbuf) < 0 ) {
-         if ( errmsg != NULL ) {
+      if (lstat(obj, &statbuf) < 0) {
+         if (errmsg != NULL) {
             sprintf(err_msg, "lstat(%s) failed; errno=%d: %s",
                     obj, errno, SYSERR);
             *errmsg = err_msg;
@@ -171,10 +171,10 @@
       }
 
       /* Remove the directory itself */
-      if ( statbuf.st_nlink >= 3 ) {
+      if (statbuf.st_nlink >= 3) {
          /* The directory is linked; unlink() must be used */
-         if ( unlink(obj) < 0 ) {
-            if ( errmsg != NULL ) {
+         if (unlink(obj) < 0) {
+            if (errmsg != NULL) {
                sprintf(err_msg, "unlink(%s) failed; errno=%d: %s",
                        obj, errno, SYSERR);
                *errmsg = err_msg;
@@ -183,8 +183,8 @@
          }
       } else {
          /* The directory is not linked; remove() can be used */
-         if ( remove(obj) < 0 ) {
-            if ( errmsg != NULL ) {
+         if (remove(obj) < 0) {
+            if (errmsg != NULL) {
                sprintf(err_msg, "remove(%s) failed; errno=%d: %s",
                        obj, errno, SYSERR);
                *errmsg = err_msg;
@@ -194,8 +194,8 @@
       }
    } else {
       /* object is not a directory; just use unlink() */
-      if ( unlink(obj) < 0 ) {
-         if ( errmsg != NULL ) {
+      if (unlink(obj) < 0) {
+         if (errmsg != NULL) {
             sprintf(err_msg, "unlink(%s) failed; errno=%d: %s",
                     obj, errno, SYSERR);
             *errmsg = err_msg;
diff --git a/lib/search_path.c b/lib/search_path.c
index a35f046..444a1fb 100644
--- a/lib/search_path.c
+++ b/lib/search_path.c
@@ -108,13 +108,13 @@
     char path[PATH_MAX];
     int ind;
 
-    if (argc <= 1 ) {
+    if (argc <= 1) {
 	printf("missing argument\n");
 	exit(1);
     }
 
-    for(ind=1;ind < argc; ind++) {
-	if ( search_path(argv[ind], path, F_OK, 0) < 0 ) {
+    for (ind=1;ind < argc; ind++) {
+	if (search_path(argv[ind], path, F_OK, 0) < 0) {
 	    printf("ERROR: %s\n", path);
 	}
 	else {
@@ -151,15 +151,15 @@
     /*
      * full or relative path was given
      */
-    if ( (cmd[0] == '/') || ( (cp=strchr(cmd, '/')) != NULL )) {
-	if ( access(cmd, access_mode) == 0 ) {
+    if ((cmd[0] == '/') || ( (cp=strchr(cmd, '/')) != NULL )) {
+	if (access(cmd, access_mode) == 0) {
 
-	    if ( cmd[0] != '/' ) { /* relative path */
-		if ( getcwd(curpath, PATH_MAX) == NULL ) {
+	    if (cmd[0] != '/') { /* relative path */
+		if (getcwd(curpath, PATH_MAX) == NULL) {
 		    strcpy(res_path, curpath);
 		    return -1;
 		}
-		if ( (strlen(curpath) + strlen(cmd) + 1) > (size_t)PATH_MAX ) {
+		if ((strlen(curpath) + strlen(cmd) + 1) > (size_t)PATH_MAX) {
 		    sprintf(res_path, "cmd (as relative path) and cwd is longer than %d",
 			PATH_MAX);
 		    return -1;
@@ -177,7 +177,7 @@
     }
 
     /* get the PATH variable */
-    if ( (pathenv=getenv("PATH")) == NULL) {
+    if ((pathenv=getenv("PATH")) == NULL) {
         /* no path to scan, return */
 	sprintf(res_path, "Unable to get PATH env. variable");
         return -1;
@@ -198,10 +198,10 @@
     lastpath = 0;
     for (;;) {
 
-	if ( lastpath )
+	if (lastpath)
 	    break;
 
-	if ( cp != pathenv )
+	if (cp != pathenv)
 	    path = ++cp;	 /* already set on first iteration */
 
 	/* find end of current path */
@@ -218,11 +218,11 @@
 printf("search_path: tmppath = %s\n", tmppath);
 #endif
 
-	if ( *cp == '\0' )
+	if (*cp == '\0')
 	    lastpath=1;		/* this is the last path entry */
 
 	/* Check lengths so not to overflow res_path */
-	if ( strlen(tmppath) + strlen(cmd) + 2 > (size_t)PATH_MAX ) {
+	if (strlen(tmppath) + strlen(cmd) + 2 > (size_t)PATH_MAX) {
 	    toolong++;
 	    continue;
 	}
@@ -239,14 +239,14 @@
 	     * directory.
 	     */
 
-	if ( fullpath && res_path[0] != '/' ) {	/* not a full path */
-	    if ( curpath[0] == '\0' ) {
-		if ( getcwd(curpath, PATH_MAX) == NULL ) {
+	if (fullpath && res_path[0] != '/') {	/* not a full path */
+	    if (curpath[0] == '\0') {
+		if (getcwd(curpath, PATH_MAX) == NULL) {
                     strcpy(res_path, curpath);
                     return -1;
 	 	}
             }
-            if ( (strlen(curpath) + strlen(res_path) + 2) > (size_t)PATH_MAX ) {
+            if ((strlen(curpath) + strlen(res_path) + 2) > (size_t)PATH_MAX) {
 		toolong++;
 	        continue;
             }
@@ -259,7 +259,7 @@
 	}
 
 
-	if ( (ret=access(res_path, access_mode)) == 0 ) {
+	if ((ret=access(res_path, access_mode)) == 0) {
 #if DEBUG
 printf("search_path: found res_path = %s\n", res_path);
 #endif
@@ -268,7 +268,7 @@
     }
 
     /* return failure */
-    if ( toolong )
+    if (toolong)
         sprintf(res_path,
 	    "Unable to find file, %d path/file strings were too long", toolong);
     else
diff --git a/lib/str_to_bytes.c b/lib/str_to_bytes.c
index 5bbfb8d..a45e3f9 100644
--- a/lib/str_to_bytes.c
+++ b/lib/str_to_bytes.c
@@ -82,7 +82,7 @@
     float   num;
 
     nconv = sscanf(s, "%f%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
+    if (nconv == 0 || nconv == 3)
 	return -1;
 
     if (nconv == 1)
@@ -117,7 +117,7 @@
     float   num;
 
     nconv = sscanf(s, "%f%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
+    if (nconv == 0 || nconv == 3)
 	return -1;
 
     if (nconv == 1)
@@ -157,7 +157,7 @@
     double  num;
 
     nconv = sscanf(s, "%lf%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
+    if (nconv == 0 || nconv == 3)
 	return -1;
 
     if (nconv == 1)
@@ -189,7 +189,7 @@
 {
     int ind;
 
-    if (argc == 1 ) {
+    if (argc == 1) {
 	fprintf(stderr, "missing str_to_bytes() parameteres\n");
 	exit(1);
     }
diff --git a/lib/string_to_tokens.c b/lib/string_to_tokens.c
index 09be8c0..fceeed6 100644
--- a/lib/string_to_tokens.c
+++ b/lib/string_to_tokens.c
@@ -82,23 +82,23 @@
    int num_toks = 0;  /* number of tokens found */
    char *strtok();
 
-   if ( arg_array == NULL || array_size <= 1 || separator == NULL )
+   if (arg_array == NULL || array_size <= 1 || separator == NULL)
 	return -1;
 
    /*
     * Use strtok() to parse 'arg_string', placing pointers to the
     * individual tokens into the elements of 'arg_array'.
     */
-   if ( (arg_array[num_toks] = strtok(arg_string, separator)) == NULL ) {
+   if ((arg_array[num_toks] = strtok(arg_string, separator)) == NULL) {
 	return 0;
    }
 
    for (num_toks=1;num_toks<array_size; num_toks++) {
-	if ( (arg_array[num_toks] = strtok(NULL, separator)) == NULL )
+	if ((arg_array[num_toks] = strtok(NULL, separator)) == NULL)
 	    break;
    }
 
-   if ( num_toks == array_size )
+   if (num_toks == array_size)
 	arg_array[num_toks] = NULL;
 
    /*
diff --git a/lib/tlibio.c b/lib/tlibio.c
index 7ea4fd1..09c1fbb 100644
--- a/lib/tlibio.c
+++ b/lib/tlibio.c
@@ -290,15 +290,15 @@
     /*
      * Determine if token is a valid string.
      */
-    for(ind=0; ind<sizeof(Lio_info1)/sizeof(struct lio_info_type); ind++) {
-        if ( strcmp(string, Lio_info1[ind].token) == 0 ) {
+    for (ind=0; ind<sizeof(Lio_info1)/sizeof(struct lio_info_type); ind++) {
+        if (strcmp(string, Lio_info1[ind].token) == 0) {
             mask |= Lio_info1[ind].bits;
             found = 1;
             break;
         }
     }
 
-    if ( found == 0 ) {
+    if (found == 0) {
 	return -1;
     }
 
@@ -317,7 +317,7 @@
 {
     unsigned int ind;
 
-    for(ind=0; ind<sizeof(Lio_info1)/sizeof(struct lio_info_type); ind++) {
+    for (ind=0; ind<sizeof(Lio_info1)/sizeof(struct lio_info_type); ind++) {
         printf("%s %s : %s\n", prefix,
             Lio_info1[ind].token, Lio_info1[ind].desc);
     }
@@ -347,7 +347,7 @@
    unsigned int ind;
    char chr;
 
-   if ( token == NULL )
+   if (token == NULL)
         return -1;
 
    for (;;) {
@@ -361,8 +361,8 @@
 	 * Determine if token is a valid string or number and if
 	 * so, add the bits to the mask.
           */
-        for(ind=0; ind<sizeof(Lio_info2)/sizeof(struct lio_info_type); ind++) {
-	    if ( strcmp(token, Lio_info2[ind].token) == 0 ) {
+        for (ind=0; ind<sizeof(Lio_info2)/sizeof(struct lio_info_type); ind++) {
+	    if (strcmp(token, Lio_info2[ind].token) == 0) {
 	        mask |= Lio_info2[ind].bits;
 	        found = 1;
 	        break;
@@ -373,8 +373,8 @@
 	 * If token does not match one of the defined tokens, determine
          * if it is a number, if so, add the bits.
 	 */
-	if ( !found ) {
-	    if (sscanf(token, "%i%c", &tmp, &chr) == 1 ) {
+	if (!found) {
+	    if (sscanf(token, "%i%c", &tmp, &chr) == 1) {
                 mask |= tmp;
 	        found=1;
 	    }
@@ -383,7 +383,7 @@
         *cc = savecc;
 
         if (!found) {  /* token is not valid */
-            if ( badtoken != NULL)
+            if (badtoken != NULL)
                 *badtoken = token;
             return(-1);
         }
@@ -409,7 +409,7 @@
 {
     unsigned int ind;
 
-    for(ind=0; ind<sizeof(Lio_info2)/sizeof(struct lio_info_type); ind++) {
+    for (ind=0; ind<sizeof(Lio_info2)/sizeof(struct lio_info_type); ind++) {
 	printf("%s %s : %s\n", prefix,
 	    Lio_info2[ind].token, Lio_info2[ind].desc);
     }
@@ -424,7 +424,7 @@
 static void
 lio_async_signal_handler(int sig)
 {
-	if ( Debug_level )
+	if (Debug_level)
 	    printf("DEBUG %s/%d: received signal %d, a signal caught %d times\n",
 		__FILE__, __LINE__, sig, Received_signal+1);
 
@@ -442,7 +442,7 @@
 static void
 lio_async_callback_handler(sigval_t sigval)
 {
-	if ( Debug_level )
+	if (Debug_level)
 	    printf("DEBUG %s/%d: received callback, nbytes=%ld, a callback called %d times\n",
 		__FILE__, __LINE__, (long)sigval.sival_int, Received_callback+1);
 
@@ -567,15 +567,15 @@
     /*
      * If LIO_RANDOM bit specified, get new method randomly.
      */
-    if ( method & LIO_RANDOM ) {
-	if( Debug_level > 3 )
+    if (method & LIO_RANDOM) {
+	if (Debug_level > 3)
 		printf("DEBUG %s/%d: method mask to choose from: %#o\n", __FILE__, __LINE__, method );
 	method = lio_random_methods(method);
-	if ( Debug_level > 2 )
+	if (Debug_level > 2)
 	    printf("DEBUG %s/%d: random chosen method %#o\n", __FILE__, __LINE__, method);
     }
 
-    if ( errmsg != NULL )
+    if (errmsg != NULL)
 	*errmsg = Errormsg;
 
     Rec_signal=Received_signal;	/* get the current number of signals received */
@@ -614,22 +614,22 @@
 #endif
     aiolist[0] = &aiocbp;
 
-    if( (ret = lseek( fd, 0, SEEK_CUR )) == -1 ){
+    if ((ret = lseek( fd, 0, SEEK_CUR )) == -1) {
 	ret = 0;
 	/* If there is an error and it is not ESPIPE then kick out the error.
 	 * If the fd is a fifo then we have to make sure that
 	 * lio_random_methods() didn't select pwrite/pread; if it did then
 	 * switch to write/read.
 	 */
-	if( errno == ESPIPE ){
-		if( method & LIO_IO_SYNCP ){
-			if( omethod & LIO_RANDOM ){
+	if (errno == ESPIPE) {
+		if (method & LIO_IO_SYNCP) {
+			if (omethod & LIO_RANDOM) {
 				method &= ~LIO_IO_SYNCP;
 				method |= LIO_IO_SYNC;
-				if( Debug_level > 2 )
+				if (Debug_level > 2)
 					printf("DEBUG %s/%d: random chosen method switched to %#o for fifo\n", __FILE__, __LINE__, method );
 			}
-			else if( Debug_level ){
+			else if (Debug_level) {
 				printf("DEBUG %s/%d: pwrite will fail when it writes to a fifo\n",
 				       __FILE__, __LINE__ );
 			}
@@ -655,14 +655,14 @@
      * Otherwise there is not necessary a signal handler to trap
      * the signal.
      */
-    if ( sig && !(method & LIO_USE_SIGNAL) &&
-	! (method & LIO_WAIT_SIGTYPES) ){
+    if (sig && !(method & LIO_USE_SIGNAL) &&
+	! (method & LIO_WAIT_SIGTYPES) ) {
 
 	sig=0;	/* ignore signal parameter */
     }
 
 #if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__))
-    if ( sig && (method & LIO_WAIT_CBTYPES) )
+    if (sig && (method & LIO_WAIT_CBTYPES))
 	sig=0; /* ignore signal parameter */
 #endif
 
@@ -674,7 +674,7 @@
      *** restoring the signal handler could be added ***
      */
 
-    if ( sig &&  (method & LIO_WAIT_SIGTYPES) ){
+    if (sig &&  (method & LIO_WAIT_SIGTYPES)) {
 #ifdef CRAY
         sigctl(SCTL_REG, sig, lio_async_signal_handler);
 #endif
@@ -685,7 +685,7 @@
 #endif /* sgi */
     }
 #if defined(sgi)
-    else if( method & LIO_WAIT_CBTYPES ){
+    else if (method & LIO_WAIT_CBTYPES) {
 	/* sival_int just has to be something that I can use
 	 * to identify the callback, and "size" happens to be handy...
 	 */
@@ -695,7 +695,7 @@
     }
 #endif
 #if defined(__linux__) && !defined(__UCLIBC__)
-	else if( method & LIO_WAIT_CBTYPES ){
+	else if (method & LIO_WAIT_CBTYPES) {
 		/* sival_int just has to be something that I can use
 		 * to identify the callback, and "size" happens to be handy...
 		 */
@@ -713,7 +713,7 @@
      * bytes written/read.
      */
 
-	if ( (method & LIO_IO_SYNC) || (method & (LIO_IO_TYPES | LIO_IO_ATYPES)) == 0 ){
+	if ((method & LIO_IO_SYNC) || (method & (LIO_IO_TYPES | LIO_IO_ATYPES)) == 0) {
 	/*
 	 * write(2) is used if LIO_IO_SYNC bit is set or not none
          * of the LIO_IO_TYPES bits are set (default).
@@ -723,10 +723,10 @@
 	    "write(%d, buf, %d)", fd, size);
 	io_type="write";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
-        while(1) {
+        while (1) {
           if (((ret = write(fd, buffer, size)) == -1) && errno!=EAGAIN && errno!=EINTR) {
             sprintf(Errormsg, "%s/%d write(%d, buf, %d) ret:-1, errno=%d %s",
                     __FILE__, __LINE__,
@@ -734,8 +734,8 @@
             return -errno;
           }
 
-          if(ret!=-1) {
-            if ( ret != size ) {
+          if (ret!=-1) {
+            if (ret != size) {
               sprintf(Errormsg,
                       "%s/%d write(%d, buf, %d) returned=%d",
                       __FILE__, __LINE__,
@@ -744,7 +744,7 @@
               buffer+=ret;
             }
             else {
-              if ( Debug_level > 1 )
+              if (Debug_level > 1)
                 printf("DEBUG %s/%d: write completed without error (ret %d)\n",
                        __FILE__, __LINE__, ret);
 
@@ -756,13 +756,13 @@
 
     }
 
-    else if ( method & LIO_IO_ASYNC ) {
+    else if (method & LIO_IO_ASYNC) {
 #ifdef CRAY
 	sprintf(Lio_SysCall,
 	    "writea(%d, buf, %d, &status, %d)", fd, size, sig);
 	io_type="writea";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
@@ -781,25 +781,25 @@
 	    "aio_write(fildes=%d, buf, nbytes=%d, signo=%d)", fd, size, sig);
 	io_type="aio_write";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 		sighold( sig );
 	if ((ret = aio_write(&aiocbp)) == -1) {
 	    sprintf(Errormsg,
 		"%s/%d aio_write(fildes=%d, buf, nbytes=%d, signo=%d) ret:-1, errno=%d %s",
 		    __FILE__, __LINE__,
 		fd, size, sig, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
 	    return -errno;
 	}
 #endif
     } /* LIO_IO_ASYNC */
 
-    else if ( method & LIO_IO_SLISTIO ) {
+    else if (method & LIO_IO_SLISTIO) {
 #ifdef CRAY
 	request.li_opcode = LO_WRITE;
 	request.li_fildes = fd;
@@ -818,12 +818,12 @@
 		"listio(LC_WAIT, &req, 1) LO_WRITE, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
 	sigoff();
-	if ( listio(listio_cmd, &request, 1) == -1 ) {
+	if (listio(listio_cmd, &request, 1) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
@@ -831,7 +831,7 @@
             return -errno;
         }
 
-	if ( Debug_level > 1 )
+	if (Debug_level > 1)
             printf("DEBUG %s/%d: %s did not return -1\n",
 		__FILE__, __LINE__, Lio_SysCall);
 
@@ -849,22 +849,22 @@
 		"lio_listio(LIO_WAIT, aiolist, 1, NULL) LIO_WRITE, fd:%d, nbyte:%d, sig:%d",
                 fd, size, sig );
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 	    sighold( sig );
-	if ( lio_listio(listio_cmd, aiolist, 1, NULL) == -1 ) {
+	if (lio_listio(listio_cmd, aiolist, 1, NULL) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
             return -errno;
         }
 
-	if ( Debug_level > 1 )
+	if (Debug_level > 1)
             printf("DEBUG %s/%d: %s did not return -1\n",
 		__FILE__, __LINE__, Lio_SysCall);
 
@@ -873,7 +873,7 @@
 #endif
     } /* LIO_IO_SLISTIO */
 
-    else if ( method & LIO_IO_ALISTIO ) {
+    else if (method & LIO_IO_ALISTIO) {
 #ifdef CRAY
 	request.li_opcode = LO_WRITE;
 	request.li_fildes = fd;
@@ -892,12 +892,12 @@
 		"listio(LC_START, &req, 1) LO_WRITE, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
 	sigoff();
-	if ( listio(listio_cmd, &request, 1) == -1 ) {
+	if (listio(listio_cmd, &request, 1) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
@@ -914,17 +914,17 @@
 		"lio_listio(LIO_NOWAIT, aiolist, 1, NULL) LIO_WRITE, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 		sighold( sig );
-	if ( lio_listio(listio_cmd, aiolist, 1, NULL) == -1 ) {
+	if (lio_listio(listio_cmd, aiolist, 1, NULL) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
             return -errno;
         }
@@ -932,13 +932,13 @@
     }/* LIO_IO_ALISTIO */
 
 #ifndef CRAY
-    else if ( method & LIO_IO_SYNCV ) {
+    else if (method & LIO_IO_SYNCV) {
 	io_type="writev(2)";
 
 	sprintf(Lio_SysCall,
 		"writev(%d, &iov, 1) nbyte:%d", fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 	if ((ret = writev(fd, &iov, 1)) == -1) {
@@ -948,13 +948,13 @@
 	    return -errno;
 	}
 
-	if ( ret != size ) {
+	if (ret != size) {
             sprintf(Errormsg,
 		"%s/%d writev(%d, iov, 1) nbyte:%d returned=%d",
 		    __FILE__, __LINE__,
 		    fd, size, ret);
         }
-        else if ( Debug_level > 1 )
+        else if (Debug_level > 1)
             printf("DEBUG %s/%d: writev completed without error (ret %d)\n",
                 __FILE__, __LINE__, ret);
 
@@ -963,13 +963,13 @@
 #endif
 
 #if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__))
-    else if ( method & LIO_IO_SYNCP ) {
+    else if (method & LIO_IO_SYNCP) {
 	io_type="pwrite(2)";
 
 	sprintf(Lio_SysCall,
 						"pwrite(%d, buf, %d, %lld)", fd, size, (long long)poffset);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 	if ((ret = pwrite(fd, buffer, size, poffset)) == -1) {
@@ -979,13 +979,13 @@
 	    return -errno;
 	}
 
-	if ( ret != size ) {
+	if (ret != size) {
             sprintf(Errormsg,
 		"%s/%d pwrite(%d, buf, %d, %lld) returned=%d",
 		    __FILE__, __LINE__,
 							fd, size, (long long)poffset, ret);
         }
-        else if ( Debug_level > 1 )
+        else if (Debug_level > 1)
             printf("DEBUG %s/%d: pwrite completed without error (ret %d)\n",
                 __FILE__, __LINE__, ret);
 
@@ -1013,7 +1013,7 @@
      * return the error value (errno) to the caller.
      * Note: Errormsg should already have been updated.
      */
-    if ( ret < 0 ) {
+    if (ret < 0) {
 	return ret;
     }
 
@@ -1021,7 +1021,7 @@
      * If i/o was not waited for (may not have been completed at this time),
      * return the size that was requested.
      */
-    if ( ret == 1 )
+    if (ret == 1)
 	return size;
 
     /*
@@ -1117,15 +1117,15 @@
     /*
      * If LIO_RANDOM bit specified, get new method randomly.
      */
-    if ( method & LIO_RANDOM ) {
-	if( Debug_level > 3 )
+    if (method & LIO_RANDOM) {
+	if (Debug_level > 3)
 		printf("DEBUG %s/%d: method mask to choose from: %#o\n", __FILE__, __LINE__, method );
 	method = lio_random_methods(method);
-	if ( Debug_level > 2 )
+	if (Debug_level > 2)
 	    printf("DEBUG %s/%d: random chosen method %#o\n", __FILE__, __LINE__, method);
     }
 
-    if ( errmsg != NULL )
+    if (errmsg != NULL)
 	*errmsg = Errormsg;
 
     Rec_signal=Received_signal;	/* get the current number of signals received */
@@ -1164,22 +1164,22 @@
 #endif
     aiolist[0] = &aiocbp;
 
-    if( (ret = lseek( fd, 0, SEEK_CUR )) == -1 ){
+    if ((ret = lseek( fd, 0, SEEK_CUR )) == -1) {
 	ret = 0;
 	/* If there is an error and it is not ESPIPE then kick out the error.
 	 * If the fd is a fifo then we have to make sure that
 	 * lio_random_methods() didn't select pwrite/pread; if it did then
 	 * switch to write/read.
 	 */
-	if( errno == ESPIPE ){
-		if( method & LIO_IO_SYNCP ){
-			if( omethod & LIO_RANDOM ){
+	if (errno == ESPIPE) {
+		if (method & LIO_IO_SYNCP) {
+			if (omethod & LIO_RANDOM) {
 				method &= ~LIO_IO_SYNCP;
 				method |= LIO_IO_SYNC;
-				if( Debug_level > 2 )
+				if (Debug_level > 2)
 					printf("DEBUG %s/%d: random chosen method switched to %#o for fifo\n", __FILE__, __LINE__, method );
 			}
-			else if( Debug_level ){
+			else if (Debug_level) {
 				printf("DEBUG %s/%d: pread will fail when it reads from a fifo\n",
 				       __FILE__, __LINE__ );
 			}
@@ -1205,14 +1205,14 @@
      * Otherwise there is not necessarily a signal handler to trap
      * the signal.
      */
-    if ( sig && !(method & LIO_USE_SIGNAL) &&
-        ! (method & LIO_WAIT_SIGTYPES) ){
+    if (sig && !(method & LIO_USE_SIGNAL) &&
+        ! (method & LIO_WAIT_SIGTYPES) ) {
 
         sig=0;  /* ignore signal parameter */
     }
 
 #if defined(sgi) || (defined(__linux__)&& !defined(__UCLIBC__))
-    if ( sig && (method & LIO_WAIT_CBTYPES) )
+    if (sig && (method & LIO_WAIT_CBTYPES))
 	sig=0; /* ignore signal parameter */
 #endif
 
@@ -1224,7 +1224,7 @@
      *** restoring the signal handler could be added ***
      */
 
-    if ( sig &&  (method & LIO_WAIT_SIGTYPES) ){
+    if (sig &&  (method & LIO_WAIT_SIGTYPES)) {
 #ifdef CRAY
 	    sigctl(SCTL_REG, sig, lio_async_signal_handler);
 #endif
@@ -1235,7 +1235,7 @@
 #endif /* CRAY */
     }
 #if defined(sgi)
-    else if( method & LIO_WAIT_CBTYPES ){
+    else if (method & LIO_WAIT_CBTYPES) {
 	    aiocbp.aio_sigevent.sigev_notify = SIGEV_CALLBACK;
 	    aiocbp.aio_sigevent.sigev_func = lio_async_callback_handler;
 	    /* sival_int just has to be something that I can use
@@ -1245,7 +1245,7 @@
     }
 #endif
 #if defined(__linux__) && !defined(__UCLIBC__)
-	else if( method & LIO_WAIT_CBTYPES ){
+	else if (method & LIO_WAIT_CBTYPES) {
 		aiocbp.aio_sigevent.sigev_notify = SIGEV_THREAD;
 		aiocbp.aio_sigevent.sigev_notify_function = lio_async_callback_handler;
 		/* sival_int just has to be something that I can use
@@ -1264,7 +1264,7 @@
      * bytes written/read.
      */
 
-	if ( (method & LIO_IO_SYNC) || (method & (LIO_IO_TYPES | LIO_IO_ATYPES)) == 0 ){
+	if ((method & LIO_IO_SYNC) || (method & (LIO_IO_TYPES | LIO_IO_ATYPES)) == 0) {
 	/*
 	 * read(2) is used if LIO_IO_SYNC bit is set or not none
          * of the LIO_IO_TYPES bits are set (default).
@@ -1274,11 +1274,11 @@
 	    "read(%d, buf, %d)", fd, size);
 	io_type="read";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-        while(1) {
+        while (1) {
           if (((ret = read(fd, buffer, size)) == -1) && errno!=EINTR && errno!=EAGAIN) {
             sprintf(Errormsg, "%s/%d read(%d, buf, %d) ret:-1, errno=%d %s",
                     __FILE__, __LINE__,
@@ -1286,9 +1286,9 @@
             return -errno;
           }
 
-          if(ret==0) return 0;
-          if(ret!=-1) {
-            if ( ret != size ) {
+          if (ret==0) return 0;
+          if (ret!=-1) {
+            if (ret != size) {
               sprintf(Errormsg,
                       "%s/%d read(%d, buf, %d) returned=%d",
                       __FILE__, __LINE__,
@@ -1297,7 +1297,7 @@
               buffer+=ret;
             }
             else {
-              if ( Debug_level > 1 )
+              if (Debug_level > 1)
                 printf("DEBUG %s/%d: read completed without error (ret %d)\n",
                        __FILE__, __LINE__, ret);
 
@@ -1309,13 +1309,13 @@
 
     }
 
-    else if ( method & LIO_IO_ASYNC ) {
+    else if (method & LIO_IO_ASYNC) {
 #ifdef CRAY
 	sprintf(Lio_SysCall,
 	    "reada(%d, buf, %d, &status, %d)", fd, size, sig);
 	io_type="reada";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
@@ -1334,25 +1334,25 @@
 	    "aio_read(fildes=%d, buf, nbytes=%d, signo=%d)", fd, size, sig);
 	io_type="aio_read";
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 		sighold( sig );
 	if ((ret = aio_read(&aiocbp)) == -1) {
 	    sprintf(Errormsg,
 		"%s/%d aio_read(fildes=%d, buf, nbytes=%d, signo=%d) ret:-1, errno=%d %s",
 		    __FILE__, __LINE__,
 		fd, size, sig, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
 	    return -errno;
 	}
 #endif
     } /* LIO_IO_ASYNC */
 
-    else if ( method & LIO_IO_SLISTIO ) {
+    else if (method & LIO_IO_SLISTIO) {
 #ifdef CRAY
 	request.li_opcode = LO_READ;
 	request.li_fildes = fd;
@@ -1371,12 +1371,12 @@
 		"listio(LC_WAIT, &req, 1) LO_READ, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
 	sigoff();
-	if ( listio(listio_cmd, &request, 1) == -1 ) {
+	if (listio(listio_cmd, &request, 1) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
@@ -1384,7 +1384,7 @@
             return -errno;
         }
 
-	if ( Debug_level > 1 )
+	if (Debug_level > 1)
             printf("DEBUG %s/%d: %s did not return -1\n",
 		__FILE__, __LINE__, Lio_SysCall);
 
@@ -1400,22 +1400,22 @@
 		"lio_listio(LIO_WAIT, aiolist, 1, NULL) LIO_READ, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 		sighold( sig );
-	if ( lio_listio(listio_cmd, aiolist, 1, NULL) == -1 ) {
+	if (lio_listio(listio_cmd, aiolist, 1, NULL) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
             return -errno;
         }
 
-	if ( Debug_level > 1 )
+	if (Debug_level > 1)
             printf("DEBUG %s/%d: %s did not return -1\n",
 		__FILE__, __LINE__, Lio_SysCall);
 
@@ -1424,7 +1424,7 @@
 #endif
     }/* LIO_IO_SLISTIO */
 
-    else if ( method & LIO_IO_ALISTIO ) {
+    else if (method & LIO_IO_ALISTIO) {
 #ifdef CRAY
 	request.li_opcode = LO_READ;
 	request.li_fildes = fd;
@@ -1443,12 +1443,12 @@
 		"listio(LC_START, &req, 1) LO_READ, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
 	sigoff();
-	if ( listio(listio_cmd, &request, 1) == -1 ) {
+	if (listio(listio_cmd, &request, 1) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
@@ -1465,17 +1465,17 @@
 		"lio_listio(LIO_NOWAIT, aiolist, 1, NULL) LIO_READ, fd:%d, nbyte:%d",
                 fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 
-	if( sig )
+	if (sig)
 		sighold( sig );
-	if ( lio_listio(listio_cmd, aiolist, 1, NULL) == -1 ) {
+	if (lio_listio(listio_cmd, aiolist, 1, NULL) == -1) {
             sprintf(Errormsg, "%s/%d %s failed, fd:%d, nbyte:%d errno=%d %s",
 		    __FILE__, __LINE__,
 		Lio_SysCall, fd, size, errno, strerror(errno));
-	    if( sig )
+	    if (sig)
 		sigrelse( sig );
             return -errno;
         }
@@ -1483,13 +1483,13 @@
     } /* LIO_IO_ALISTIO */
 
 #ifndef CRAY
-    else if ( method & LIO_IO_SYNCV ) {
+    else if (method & LIO_IO_SYNCV) {
 	io_type="readv(2)";
 
 	sprintf(Lio_SysCall,
 		"readv(%d, &iov, 1) nbyte:%d", fd, size);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 	if ((ret = readv(fd, &iov, 1)) == -1) {
@@ -1499,13 +1499,13 @@
 	    return -errno;
 	}
 
-	if ( ret != size ) {
+	if (ret != size) {
             sprintf(Errormsg,
 		"%s/%d readv(%d, iov, 1) nbyte:%d returned=%d",
 		    __FILE__, __LINE__,
 		    fd, size, ret);
         }
-        else if ( Debug_level > 1 )
+        else if (Debug_level > 1)
             printf("DEBUG %s/%d: readv completed without error (ret %d)\n",
                 __FILE__, __LINE__, ret);
 
@@ -1514,13 +1514,13 @@
 #endif
 
 #if defined(sgi) || (defined(__linux__) && !defined(__UCLIBC__))
-    else if ( method & LIO_IO_SYNCP ) {
+    else if (method & LIO_IO_SYNCP) {
 	io_type="pread(2)";
 
 	sprintf(Lio_SysCall,
 						"pread(%d, buf, %d, %lld)", fd, size, (long long)poffset);
 
-        if ( Debug_level ) {
+        if (Debug_level) {
 	    printf("DEBUG %s/%d: %s\n", __FILE__, __LINE__, Lio_SysCall);
         }
 	if ((ret = pread(fd, buffer, size, poffset)) == -1) {
@@ -1530,13 +1530,13 @@
 	    return -errno;
 	}
 
-	if ( ret != size ) {
+	if (ret != size) {
             sprintf(Errormsg,
 		"%s/%d pread(%d, buf, %d, %lld) returned=%d",
 		    __FILE__, __LINE__,
 							fd, size, (long long)poffset, ret);
         }
-        else if ( Debug_level > 1 )
+        else if (Debug_level > 1)
             printf("DEBUG %s/%d: pread completed without error (ret %d)\n",
                 __FILE__, __LINE__, ret);
 
@@ -1565,7 +1565,7 @@
      * return the error value (errno) to the caller.
      * Note: Errormsg should already have been updated.
      */
-    if ( ret < 0 ) {
+    if (ret < 0) {
 	return ret;
     }
 
@@ -1573,7 +1573,7 @@
      * If i/o was not waited for (may not have been completed at this time),
      * return the size that was requested.
      */
-    if ( ret == 1 )
+    if (ret == 1)
 	return size;
 
     /*
@@ -1617,20 +1617,20 @@
     int ret;
 
 #ifdef CRAY
-    if ( status->sw_error ) {
+    if (status->sw_error) {
         sprintf(Errormsg,
             "%s/%d %s, sw_error set = %d %s, sw_count = %d",
 		__FILE__, __LINE__, io_type,
             status->sw_error, strerror(status->sw_error), status->sw_count);
         return -status->sw_error;
     }
-    else if ( status->sw_count != size ) {
+    else if (status->sw_count != size) {
         sprintf(Errormsg,
             "%s/%d %s, sw_count not as expected(%d), but actual:%d",
 		__FILE__, __LINE__, io_type,
             size, status->sw_count);
     }
-    else if ( Debug_level > 1 ) {
+    else if (Debug_level > 1) {
         printf("DEBUG %s/%d: %s completed without error (sw_error == 0, sw_count == %d)\n",
             __FILE__, __LINE__, io_type, status->sw_count);
     }
@@ -1646,16 +1646,16 @@
      * completion signal here otherwise it'll hang around and bite us
      * later.
      */
-    if( aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL )
+    if (aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL)
 	sigrelse( aiocbp->aio_sigevent.sigev_signo );
 
     ret = aio_error( aiocbp );
 
-    while( ret == EINPROGRESS ){
+    while (ret == EINPROGRESS) {
 	ret = aio_error( aiocbp );
 	++cnt;
     }
-    if( cnt > 1 ){
+    if (cnt > 1) {
 	sprintf(Errormsg,
 		"%s/%d %s, aio_error had to loop on EINPROGRESS, cnt=%d; random method %#o; sigev_notify=%s",
 		__FILE__, __LINE__, io_type, cnt, method,
@@ -1669,7 +1669,7 @@
 	return -ret;
     }
 
-    if( ret != 0 ){
+    if (ret != 0) {
 	sprintf(Errormsg,
 		"%s/%d %s, aio_error = %d %s; random method %#o",
 		__FILE__, __LINE__, io_type,
@@ -1678,16 +1678,16 @@
 	return -ret;
     }
     ret = aio_return( aiocbp );
-    if( ret != size ){
+    if (ret != size) {
 	sprintf(Errormsg,
 		"%s/%d %s, aio_return not as expected(%d), but actual:%d",
 		__FILE__, __LINE__, io_type,
 		size, ret);
 
 #ifdef BUG1_workaround
-	if( ret == 0 ){
+	if (ret == 0) {
 		ret = size;
-		if( Debug_level > 1 ){
+		if (Debug_level > 1) {
 			printf("WARN %s/%d: %s completed with bug1_workaround (aio_error == 0, aio_return now == %d)\n",
 			       __FILE__, __LINE__, io_type, ret);
 		}
@@ -1695,7 +1695,7 @@
 #endif /* BUG1_workaround */
 
     }
-    else if( Debug_level > 1 ){
+    else if (Debug_level > 1) {
         printf("DEBUG %s/%d: %s completed without error (aio_error == 0, aio_return == %d)\n",
             __FILE__, __LINE__, io_type, ret);
     }
@@ -1741,28 +1741,28 @@
 	const struct aiocb *aioary[1];
 #endif
 
-    if ( (method & LIO_WAIT_RECALL)
+    if ((method & LIO_WAIT_RECALL)
 #if defined(sgi) || (defined(__linux__)&& !defined(__UCLIBC__))
 	|| (method & LIO_WAIT_CBSUSPEND)
 	|| (method & LIO_WAIT_SIGSUSPEND)
 #endif
-	|| ((method & LIO_WAIT_TYPES) == 0) ){
+	|| ((method & LIO_WAIT_TYPES) == 0) ) {
 	/*
 	 * If method has LIO_WAIT_RECALL bit set or method does
 	 * not have any wait method bits set (default), use recall/aio_suspend.
          */
 #ifdef CRAY
-        if ( Debug_level > 2 )
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : recall\n", __FILE__, __LINE__);
         sigon();
-        if ( recall(fd, 1, statptr) ) {
+        if (recall(fd, 1, statptr)) {
 	    sprintf(Errormsg, "%s/%d recall(%d, 1, stat) failed, errno:%d %s",
 		    __FILE__, __LINE__,
 		fd, errno, strerror(errno));
 	    return -errno;
 	}
 #else
-        if ( Debug_level > 2 )
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : aio_suspend, sigev_notify=%s\n", __FILE__, __LINE__,
     		(aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL ? "signal" :
 		 aiocbp->aio_sigevent.sigev_notify == SIGEV_NONE ? "none" :
@@ -1774,9 +1774,9 @@
 
 	aioary[0] = aiocbp;
 	ret = aio_suspend( aioary, 1, NULL );
-	if( (ret == -1) && (errno == EINTR) ){
-		if( aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL ){
-			if( Debug_level > 2 ){
+	if ((ret == -1) && (errno == EINTR)) {
+		if (aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL) {
+			if (Debug_level > 2) {
 				printf("DEBUG %s/%d: aio_suspend received EINTR, sigev_notify=SIGEV_SIGNAL -- ok\n",
 				       __FILE__, __LINE__ );
 			}
@@ -1794,7 +1794,7 @@
 			return -errno;
 		}
 	}
-	else if ( ret ) {
+	else if (ret) {
 	    sprintf(Errormsg, "%s/%d aio_suspend(fildes=%d, aioary, 1, NULL) failed, errno:%d %s",
 		    __FILE__, __LINE__,
 		fd, errno, strerror(errno));
@@ -1802,8 +1802,8 @@
 	}
 #endif
 
-    } else if ( method & LIO_WAIT_ACTIVE ) {
-        if ( Debug_level > 2 )
+    } else if (method & LIO_WAIT_ACTIVE) {
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : active\n", __FILE__, __LINE__);
 #ifdef CRAY
         sigon();
@@ -1812,7 +1812,7 @@
 	 * change to non-zero.
  	 */
         cnt=0;
-        while ( (*statptr)->sw_flag == 0 &&
+        while ((*statptr)->sw_flag == 0 &&
 		(*statptr)->sw_count == 0 &&
 		(*statptr)->sw_error == 0 ) {
 	   cnt++;
@@ -1820,25 +1820,25 @@
 #else
 	/* loop while aio_error() returns EINPROGRESS */
 	cnt=0;
-	while(1){
+	while (1) {
 		ret = aio_error( aiocbp );
-		if( (ret == 0) || (ret != EINPROGRESS) ){
+		if ((ret == 0) || (ret != EINPROGRESS)) {
 			break;
 		}
 		++cnt;
 	}
 
 #endif
-	if ( Debug_level > 5 && cnt && (cnt % 50) == 0 )
+	if (Debug_level > 5 && cnt && (cnt % 50) == 0)
 		printf("DEBUG %s/%d: wait active cnt = %d\n",
 		    __FILE__, __LINE__, cnt);
 
-    } else if ( method & LIO_WAIT_SIGPAUSE ) {
-        if ( Debug_level > 2 )
+    } else if (method & LIO_WAIT_SIGPAUSE) {
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : sigpause\n", __FILE__, __LINE__);
 #ifdef sgi
 	/* note: don't do the sigon() for CRAY in this case.  why? -- roehrich 6/11/97 */
-	if( aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL )
+	if (aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL)
 		sigrelse( aiocbp->aio_sigevent.sigev_signo );
 	else {
 		printf("DEBUG %s/%d: sigev_notify != SIGEV_SIGNAL\n", __FILE__, __LINE__ );
@@ -1847,13 +1847,13 @@
 #endif
         pause();
 
-    } else if ( method & LIO_WAIT_SIGACTIVE ) {
-        if ( Debug_level > 2 )
+    } else if (method & LIO_WAIT_SIGACTIVE) {
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : sigactive\n", __FILE__, __LINE__);
 #ifdef CRAY
         sigon();
 #else
-	if( aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL )
+	if (aiocbp->aio_sigevent.sigev_notify == SIGEV_SIGNAL)
 		sigrelse( aiocbp->aio_sigevent.sigev_signo );
 	else {
 		printf("DEBUG %s/%d: sigev_notify != SIGEV_SIGNAL\n", __FILE__, __LINE__ );
@@ -1861,7 +1861,7 @@
 	}
 #endif
 	/* loop waiting for signal */
-        while ( Received_signal == Rec_signal ){
+        while (Received_signal == Rec_signal) {
 #ifdef CRAY
                 sigon();
 #else
@@ -1869,8 +1869,8 @@
 #endif
 	}
 
-    } else if ( method & LIO_WAIT_NONE ) {
-        if ( Debug_level > 2 )
+    } else if (method & LIO_WAIT_NONE) {
+        if (Debug_level > 2)
             printf("DEBUG %s/%d: wait method : none\n", __FILE__, __LINE__);
 	/* It's broken because the aiocb/iosw is an automatic variable in
 	 * lio_{read,write}_buffer, so when the function returns and the
@@ -1888,7 +1888,7 @@
         return -1;
     }
     else {
-	if( Debug_level > 2 )
+	if (Debug_level > 2)
 	    printf("DEBUG %s/%d: no wait method was chosen\n", __FILE__, __LINE__ );
 	return -1;
     }
@@ -1952,35 +1952,35 @@
     char *symbols = NULL;
     int die_on_err = 0;
 
-    while( (c = getopt(argc,argv,"s:di:")) != -1 ){
-	switch(c){
+    while ((c = getopt(argc,argv,"s:di:")) != -1) {
+	switch(c) {
 	case 's': symbols = optarg; break;
 	case 'd': ++die_on_err; break;
 	case 'i': iter = atoi(optarg); break;
 	}
     }
 
-    if ((fd=open("unit_test_file", O_CREAT|O_RDWR|O_TRUNC, 0777)) == -1 ) {
+    if ((fd=open("unit_test_file", O_CREAT|O_RDWR|O_TRUNC, 0777)) == -1) {
 	perror("open(unit_test_file, O_CREAT|O_RDWR|O_TRUNC, 0777) failed");
 	exit(1);
     }
 
     Debug_level=9;
 
-    if ( symbols != NULL ) {
-        if ( (method=lio_parse_io_arg2(symbols,  &err)) == -1 ){
+    if (symbols != NULL) {
+        if ((method=lio_parse_io_arg2(symbols,  &err)) == -1) {
 	    printf("lio_parse_io_arg2(%s, &err) failed, bad token starting at %s\n",
 	    symbols, err);
-	    if( die_on_err )
+	    if (die_on_err)
 		exit(1);
 	}
 	else
 	    printf("lio_parse_io_arg2(%s, &err) returned %#o\n", symbols, method);
 
 	exit_status = 0;
-        for(ind=0; ind < iter; ind++ ) {
+        for (ind=0; ind < iter; ind++) {
 	  memset( buffer, 'A', 4096 );
-	  if( lseek(fd, 0, 0) == -1 ){
+	  if (lseek(fd, 0, 0) == -1) {
 		printf("lseek(fd,0,0), %d, failed, errno %d\n",
 		       __LINE__, errno );
 		++exit_status;
@@ -1992,7 +1992,7 @@
             printf("lio_write_buffer returned %d\n", ret);
 
 	  memset( buffer, 'B', 4096 );
-          if( lseek(fd, 0, 0) == -1 ){
+          if (lseek(fd, 0, 0) == -1) {
 		printf("lseek(fd,0,0), %d, failed, errno %d\n",
 		       __LINE__, errno );
 		++exit_status;
@@ -2003,15 +2003,15 @@
           } else
             printf("lio_read_buffer returned %d\n", ret);
 
-	  for( i = 0; i < 4096; ++i ){
-		if( buffer[i] != 'A' ){
+	  for (i = 0; i < 4096; ++i) {
+		if (buffer[i] != 'A') {
 			printf("  buffer[%d] = %d\n", i, buffer[i] );
 			++exit_status;
 			break;
 		}
 	  }
 
-	  if( exit_status )
+	  if (exit_status)
 		exit(exit_status);
 
 	}
@@ -2020,10 +2020,10 @@
 	exit(0);
     }
 
-    for(ind=0; ind < sizeof(Unit_info)/sizeof(struct unit_info_t); ind++ ) {
+    for (ind=0; ind < sizeof(Unit_info)/sizeof(struct unit_info_t); ind++) {
 
 	printf("\n********* write %s ***************\n", Unit_info[ind].str);
-	if( lseek(fd, 0, 0) == -1 ){
+	if (lseek(fd, 0, 0) == -1) {
 		printf("lseek(fd,0,0), %d, failed, errno %d\n",
 		       __LINE__, errno );
 		++exit_status;
@@ -2035,14 +2035,14 @@
 	    printf(">>>>> lio_write_buffer(fd,0%x,buffer,%d,%d,err,0) returned -1,\n   err = %s\n",
 		   Unit_info[ind].method, size, Unit_info[ind].sig, err);
 	    ++exit_status;
-	    if( die_on_err )
+	    if (die_on_err)
 		exit(exit_status);
         } else{
 	    printf("lio_write_buffer returned %d\n", ret);
 	}
 
 	printf("\n********* read %s ***************\n", Unit_info[ind].str);
-	if( lseek(fd, 0, 0) == -1 ){
+	if (lseek(fd, 0, 0) == -1) {
 		printf("lseek(fd,0,0), %d, failed, errno %d\n",
 		       __LINE__, errno );
 		++exit_status;
@@ -2053,17 +2053,17 @@
 	    printf(">>>>> lio_read_buffer(fd,0%x,buffer,%d,%d,err,0) returned -1,\n   err = %s\n",
 		   Unit_info[ind].method, size, Unit_info[ind].sig, err);
 	    ++exit_status;
-	    if( die_on_err )
+	    if (die_on_err)
 		exit(exit_status);
         } else {
 	    printf("lio_read_buffer returned %d\n", ret);
 	}
 
-	  for( i = 0; i < 4096; ++i ){
-		if( buffer[i] != 'A' ){
+	  for (i = 0; i < 4096; ++i) {
+		if (buffer[i] != 'A') {
 			printf("  buffer[%d] = %d\n", i, buffer[i] );
 			++exit_status;
-			if( die_on_err )
+			if (die_on_err)
 				exit(exit_status);
 			break;
 		}
diff --git a/lib/tst_res.c b/lib/tst_res.c
index c44adf9..9ee936d 100644
--- a/lib/tst_res.c
+++ b/lib/tst_res.c
@@ -45,12 +45,7 @@
  *                        and break remaining test cases
  *      tst_brkm() -      Print result message and break remaining test
  *                        cases
- *      tst_brkloop() -   Print result message (include file contents)
- *                        and break test cases remaining in current loop
- *      tst_brkloopm() -  Print result message and break test case
- *                        remaining in current loop
- *      tst_flush() -     Print any messages pending because of
- *                        CONDENSE mode, and flush output stream
+ *      tst_flush() -     Print any messages pending in the output stream
  *      tst_exit() -      Exit test with a meaningful exit value.
  *      tst_environ() -   Keep results coming to original stdout
  *
@@ -79,17 +74,6 @@
  *      void (*cleanup)();
  *      char *tmesg;
  *
- *      void tst_brkloop(ttype, fname, cleanup, char *tmesg, [,argv]...)
- *      int  ttype;
- *      char *fname;
- *      void (*cleanup)();
- *      char *tmesg;
- *
- *      void tst_brkloopm(ttype, cleanup, tmesg [,arg]...)
- *      int  ttype;
- *      void (*cleanup)();
- *      char *tmesg;
- *
  *      void tst_flush()
  *
  *      void tst_exit()
@@ -127,7 +111,6 @@
 #endif
 
 #define VERBOSE      1     /* flag values for the T_mode variable */
-#define CONDENSE     2
 #define NOPASS       3
 #define DISCARD      4
 
@@ -159,7 +142,7 @@
  */
 static void check_env(void);
 static void tst_condense(int tnum, int ttype, char *tmesg);
-static void tst_print(char *tcid, int tnum, int trange, int ttype, char *tmesg);
+static void tst_print(char *tcid, int tnum, int ttype, char *tmesg);
 static void cat_file(char *filename);
 
 /*
@@ -169,7 +152,7 @@
 static char *File;            /* file whose contents is part of result */
 static int  T_exitval = 0;    /* exit value used by tst_exit() */
 static int  T_mode = VERBOSE; /* flag indicating print mode: VERBOSE, */
-                              /* CONDENSE, NOPASS, DISCARD */
+                              /* NOPASS, DISCARD */
 
 static int  Expand_varargs = TRUE;  /* if TRUE, expand varargs stuff */
 static char Warn_mesg[MAXMESG];  /* holds warning messages */
@@ -190,7 +173,6 @@
  */
 int Tst_count = 0;      /* current count of test cases executed; NOTE: */
                         /* Tst_count may be externed by other programs */
-int Tst_range = 1;      /* for specifying multiple results */
 int Tst_nobuf = 1;      /* this is a no-op; buffering is never done, but */
                         /* this will stay for compatibility reasons */
 
@@ -201,16 +183,6 @@
 extern int  TST_TOTAL;  /* Total number of test cases from the test */
                         /* source */
 
-/*
- * This global is used by the temp. dir. maintenance functions,
- * tst_tmpdir()/tst_rmdir(), tst_wildcard()/tst_tr_rmdir().  It is the
- * name of the directory created (if any).  It is defined here, so that
- * it only has to be declared once and can then be referenced from more
- * than one module.  Also, since the temp. dir. maintenance functions
- * rely on the tst_res.c package this seemed like a reasonable place.
- */
-char *TESTDIR = NULL;
-
 struct pair {
 	const char *name;
 	int val;
@@ -295,13 +267,12 @@
  */
 void tst_res(int ttype, char *fname, char *arg_fmt, ...)
 {
-	int  i;
 	char tmesg[USERMESG];
 	int ttype_result = TTYPE_RESULT(ttype);
 
 #if DEBUG
-	printf( "IN tst_res; Tst_count = %d; Tst_range = %d\n",
-		Tst_count, Tst_range); fflush(stdout);
+	printf("IN tst_res; Tst_count = %d\n", Tst_count);
+	fflush(stdout);
 #endif
 
 	EXPAND_VAR_ARGS(tmesg, arg_fmt, USERMESG);
@@ -325,12 +296,6 @@
 	 */
 	check_env();
 
-	if (Tst_range <= 0) {
-		Tst_range = 1;
-		tst_print(TCID, 0, 1, TWARN,
-			  "tst_res(): Tst_range must be positive");
-	}
-
 	if (fname != NULL && access(fname, F_OK) == 0)
 		File = fname;
 
@@ -339,48 +304,35 @@
 	 * display type.
 	 */
 	if (ttype_result == TWARN || ttype_result == TINFO) {
-		if (Tst_range > 1)
-			tst_print(TCID, 0, 1, TWARN,
-				  "tst_res(): Range not valid for TINFO or "
-				  "TWARN types");
-		tst_print(TCID, 0, 1, ttype, tmesg);
+		tst_print(TCID, 0, ttype, tmesg);
 	} else {
 		if (Tst_count < 0)
-			tst_print(TCID, 0, 1, TWARN,
-				  "tst_res(): Tst_count < 0 is not valid");
+			tst_print(TCID, 0, TWARN,
+			    "tst_res(): Tst_count < 0 is not valid");
 
 		/*
 		 * Process each display type.
 		 */
 		switch (T_mode) {
-			case DISCARD:	/* do not print any results */
+		case DISCARD:
 			break;
-
-			case NOPASS:	/* 
-					 * passing result types are filtered
-					 * by tst_print()
-					 */
-			case CONDENSE:
-				tst_condense(Tst_count + 1, ttype, tmesg);
+		case NOPASS: /* filtered by tst_print() */
+			tst_condense(Tst_count+1, ttype, tmesg);
 			break;
-
-			default:      /* VERBOSE */
-				for (i = 1 ; i <= Tst_range ; i++)
-					tst_print(TCID, Tst_count + i,
-						  Tst_range, ttype, tmesg);
+		default:      /* VERBOSE */
+			tst_print(TCID, Tst_count+1, ttype, tmesg);
 			break;
 		}
 
-		Tst_count += Tst_range;
+		Tst_count++;
 	}
 
-	Tst_range = 1;
 	Expand_varargs = TRUE;
 }
 
 
 /*
- * tst_condense() - Handle test cases in CONDENSE or NOPASS mode (i.e.
+ * tst_condense() - Handle test cases in NOPASS mode (i.e.
  *                  buffer the current result and print the last result
  *                  if different than the current).  If a file was
  *                  specified, print the current result and do not
@@ -403,7 +355,7 @@
 	 */
 	if (Buffered == TRUE) {
 		if (strcmp(Last_tcid, TCID) == 0 && Last_type == ttype_result &&
-		    strcmp(Last_mesg, tmesg) == 0 && File == NULL )
+		    strcmp(Last_mesg, tmesg) == 0 && File == NULL)
 			return;
 
 		/*
@@ -412,8 +364,7 @@
 		 */
 		file = File;
 		File = NULL;
-		tst_print(Last_tcid, Last_num, tnum - Last_num, Last_type,
-			  Last_mesg);
+		tst_print(Last_tcid, Last_num, Last_type, Last_mesg);
 		free(Last_tcid);
 		free(Last_mesg);
 		File = file;
@@ -425,7 +376,7 @@
 	 * results.  Otherwise, buffer the current result info for next time.
 	 */
 	if (File != NULL) {
-		tst_print(TCID, tnum, Tst_range, ttype, tmesg);
+		tst_print(TCID, tnum, ttype, tmesg);
 		Buffered = FALSE;
 	} else {
 		Last_tcid = (char *)malloc(strlen(TCID) + 1);
@@ -440,7 +391,7 @@
 
 
 /*
- * tst_flush() - Print any messages pending because of CONDENSE mode,
+ * tst_flush() - Print any messages pending because due to tst_condense,
  *               and flush T_out.
  */
 void tst_flush(void)
@@ -451,11 +402,10 @@
 #endif
 
 	/*
-	 * Print out last line if in CONDENSE or NOPASS mode.
+	 * Print out last line if in NOPASS mode.
 	 */
-	if (Buffered == TRUE && (T_mode == CONDENSE || T_mode == NOPASS)) {
-		tst_print(Last_tcid, Last_num, Tst_count - Last_num + 1,
-			  Last_type, Last_mesg);
+	if (Buffered == TRUE && T_mode == NOPASS) {
+		tst_print(Last_tcid, Last_num, Last_type, Last_mesg);
 		Buffered = FALSE;
 	}
 
@@ -464,10 +414,9 @@
 
 
 /*
- * tst_print() - Actually print a line or range of lines to the output
- *               stream.
+ * tst_print() - Print a line to the output stream.
  */
-static void tst_print(char *tcid, int tnum, int trange, int ttype, char *tmesg)
+static void tst_print(char *tcid, int tnum, int ttype, char *tmesg)
 {
 	/*
 	 * avoid unintended side effects from failures with fprintf when
@@ -499,9 +448,8 @@
 #endif
 
 #if DEBUG
-	printf( "IN tst_print: tnum = %d, trange = %d, ttype = %d, tmesg = "
-		"%s\n",
-		tnum, trange, ttype, tmesg);
+	printf("IN tst_print: tnum = %d, ttype = %d, tmesg = %s\n",
+	    tnum, ttype, tmesg);
 	fflush(stdout);
 #endif
 
@@ -531,12 +479,8 @@
 	if (T_mode == VERBOSE) {
 		fprintf(T_out, "%-8s %4d  %s  :  %s", tcid, tnum, type, tmesg);
 	} else {
-		if (trange > 1)
-			fprintf(T_out, "%-8s %4d-%-4d  %s  :  %s",
-				tcid, tnum, tnum + trange - 1, type, tmesg);
-		else
-			fprintf(T_out, "%-8s %4d       %s  :  %s",
-				tcid, tnum, type, tmesg);
+		fprintf(T_out, "%-8s %4d       %s  :  %s",
+			tcid, tnum, type, tmesg);
 	}
 	if (ttype & TERRNO) {
 		fprintf(T_out, ": errno=%s(%i): %s", strerrnodef(err),
@@ -563,9 +507,9 @@
 /*
  * check_env() - Check the value of the environment variable TOUTPUT and
  *               set the global variable T_mode.  The TOUTPUT environment
- *               variable should be set to "VERBOSE", "CONDENSE",
- *               "NOPASS", or "DISCARD".  If TOUTPUT does not exist or
- *               is not set to a valid value, the default is "VERBOSE".
+ *               variable should be set to "VERBOSE", "NOPASS", or "DISCARD".
+ *               If TOUTPUT does not exist or is not set to a valid value, the
+ *               default is "VERBOSE".
  */
 static void check_env(void)
 {
@@ -588,11 +532,6 @@
 		return;
 	}
 
-	if (strcmp(value, TOUT_CONDENSE_S) == 0) {
-		T_mode = CONDENSE;
-		return;
-	}
-
 	if (strcmp(value, TOUT_NOPASS_S) == 0) {
 		T_mode = NOPASS;
 		return;
@@ -623,15 +562,10 @@
 	fflush(stdout);
 #endif
 
-	/*
-	 * Call tst_flush() flush any ouput in the buffer or the last
-	 * result not printed because of CONDENSE mode.
-	 */
+	/* Call tst_flush() flush any output in the buffer. */
 	tst_flush();
 
-	/*
-	 * Mask out TRETR, TINFO, and TCONF results from the exit status.
-	 */
+	/* Mask out TRETR, TINFO, and TCONF results from the exit status. */
 	exit(T_exitval & ~(TRETR | TINFO | TCONF));
 }
 
@@ -672,7 +606,7 @@
 	    ttype_result != TCONF && ttype_result != TRETR) {
 		sprintf(Warn_mesg, "tst_brk(): Invalid Type: %d. Using TBROK",
 			ttype_result);
-		tst_print(TCID, 0, 1, TWARN, Warn_mesg);
+		tst_print(TCID, 0, TWARN, Warn_mesg);
 		ttype = TBROK;
 	}
 
@@ -680,28 +614,21 @@
 	if (Tst_count < TST_TOTAL)
 		tst_res(ttype, fname, "%s", tmesg);
 
-	/* Determine the number of results left to report. */
-	Tst_range = TST_TOTAL - Tst_count;
-
-	/* Print the rest of the results, if necessary. */
-	if (Tst_range > 0) {
-		if (ttype == TCONF) {
-			tst_res(ttype, NULL,
-				"Remaining cases not appropriate for "
-				"configuration");
-		} else {
-			if (ttype == TRETR)
-				tst_res(ttype, NULL,
-					"Remaining cases retired");
-			else
-				tst_res(TBROK, NULL,
-					"Remaining cases broken");
-		}
+	if (ttype == TCONF) {
+		tst_res(ttype, NULL,
+			"Remaining cases not appropriate for configuration");
 	} else {
-		Tst_range = 1;
-		Expand_varargs = TRUE;
+		if (ttype == TRETR)
+			tst_res(ttype, NULL, "Remaining cases retired");
+		else
+			tst_res(TBROK, NULL, "Remaining cases broken");
 	}
+	Expand_varargs = TRUE;
 
+	/*
+	 * If no cleanup function was specified, just return to the caller.
+	 * Otherwise call the specified function.
+	 */
 	if (func != NULL) {
 		(*func)();
 	}
@@ -771,7 +698,7 @@
 		sprintf(Warn_mesg,
 			"tst_res(): fopen(%s, \"r\") failed; errno = %d: %s",
 			filename, errno, strerror(errno));
-			tst_print(TCID, 0, 1, TWARN, Warn_mesg);
+			tst_print(TCID, 0, TWARN, Warn_mesg);
 		return;
 	}
 
@@ -783,7 +710,7 @@
 				"tst_res(): While trying to cat \"%s\", "
 				"fwrite() wrote only %d of %d bytes",
 				filename, b_written, b_read);
-			tst_print(TCID, 0, 1, TWARN, Warn_mesg);
+			tst_print(TCID, 0, TWARN, Warn_mesg);
 			break;
 		}
 	}
@@ -793,7 +720,7 @@
 			"tst_res(): While trying to cat \"%s\", fread() "
 			"failed, errno = %d: %s",
 			filename, errno, strerror(errno));
-		tst_print(TCID, 0, 1, TWARN, Warn_mesg);
+		tst_print(TCID, 0, TWARN, Warn_mesg);
 	}
 
 	if (fclose(fp) != 0) {
@@ -801,7 +728,7 @@
 			"tst_res(): While trying to cat \"%s\", fclose() "
 			"failed, errno = %d: %s",
 			filename, errno, strerror(errno));
-		tst_print(TCID, 0, 1, TWARN, Warn_mesg);
+		tst_print(TCID, 0, TWARN, Warn_mesg);
 	}
 }
 
@@ -821,22 +748,21 @@
 int main(void)
 {
 	int  ttype;
-	int  range;
 	char chr;
 	char fname[MAXMESG];
 
-	printf( "UNIT TEST of tst_res.c.  Options for ttype:\n"
-		"-1 : call tst_exit()\n"
-		"-2 : call tst_flush()\n"
-		"-3 : call tst_brk()\n"
-		"-5 : call tst_res() with a range\n"
-		"%2i : call tst_res(TPASS, ...)\n"
-		"%2i : call tst_res(TFAIL, ...)\n"
-		"%2i : call tst_res(TBROK, ...)\n"
-		"%2i : call tst_res(TWARN, ...)\n"
-		"%2i : call tst_res(TRETR, ...)\n"
-		"%2i : call tst_res(TINFO, ...)\n"
-		"%2i : call tst_res(TCONF, ...)\n\n",
+	printf("UNIT TEST of tst_res.c.  Options for ttype:\n\
+	       -1 : call tst_exit()\n\
+	       -2 : call tst_flush()\n\
+	       -3 : call tst_brk()\n\
+	       -4 : call tst_res()\n\
+	       %2i : call tst_res(TPASS, ...)\n\
+	       %2i : call tst_res(TFAIL, ...)\n\
+	       %2i : call tst_res(TBROK, ...)\n\
+	       %2i : call tst_res(TWARN, ...)\n\
+	       %2i : call tst_res(TRETR, ...)\n\
+	       %2i : call tst_res(TINFO, ...)\n\
+	       %2i : call tst_res(TCONF, ...)\n\n",
 		TPASS, TFAIL, TBROK, TWARN, TRETR, TINFO, TCONF);
 
 	while (1) {
@@ -854,8 +780,7 @@
 			break;
 
 		case -3:
-			printf("Enter the current type (%i=FAIL, %i=BROK, "
-				"%i=RETR, %i=CONF): ",
+			printf("Enter the current type (%i=FAIL, %i=BROK, %i=RETR, %i=CONF): ",
 				TFAIL, TBROK, TRETR, TCONF);
 			scanf("%d%c", &ttype, &chr);
 			printf("Enter file name (<cr> for none): ");
@@ -863,17 +788,12 @@
 			if (strcmp(fname, "") == 0)
 				tst_brkm(ttype, tst_exit, RESM, ttype);
 			else
-				tst_brk(ttype, fname, tst_exit, RES, ttype,
-					fname);
-			break;
+				tst_brk(ttype, fname, tst_exit, RES, ttype, fname);
+		break;
 
-		case -5:
-			printf("Enter the size of the range: ");
-			scanf("%d%c", &Tst_range, &chr);
-			printf("Enter the current type "
-				"(%i,%i,%i,%i,%i,%i,%i): "
-				TPASS, TFAIL, TBROK, TWARN, TRETR, TINFO,
-				TCONF);
+		case -4:
+			printf("Enter the current type (%i,%i,%i,%i,%i,%i,%i): ",
+				TPASS, TFAIL, TBROK, TWARN, TRETR, TINFO, TCONF);
 			scanf("%d%c", &ttype, &chr);
 		default:
 			printf("Enter file name (<cr> for none): ");
diff --git a/lib/tst_tmpdir.c b/lib/tst_tmpdir.c
index 9c9809e..3fffe78 100644
--- a/lib/tst_tmpdir.c
+++ b/lib/tst_tmpdir.c
@@ -34,51 +34,52 @@
 
 /**********************************************************
  *
- *    OS Testing - Silicon Graphics, Inc.
+ *	 OS Testing - Silicon Graphics, Inc.
  *
- *    FUNCTION NAME     : tst_tmpdir, tst_rmdir
+ *	 FUNCTION NAME	  : tst_tmpdir, tst_rmdir
  *
- *    FUNCTION TITLE    : Create/remove a testing temp dir
+ *	 FUNCTION TITLE	 : Create/remove a testing temp dir
  *
- *    SYNOPSIS:
- *      void tst_tmpdir();
- *      void tst_rmdir();
+ *	 SYNOPSIS:
+ *		void tst_tmpdir();
+ *		void tst_rmdir();
  *
- *    AUTHOR            : Dave Fenner
+ *	 AUTHOR		 : Dave Fenner
  *
- *    INITIAL RELEASE   : UNICOS 8.0
+ *	 INITIAL RELEASE	: UNICOS 8.0
  *
- *    DESCRIPTION
- *      tst_tmpdir() is used to create a unique, temporary testing
- *      directory, and make it the current working directory.
- *      tst_rmdir() is used to remove the directory created by
- *      tst_tmpdir().
+ *	 DESCRIPTION
+ *		tst_tmpdir() is used to create a unique, temporary testing
+ *		directory, and make it the current working directory.
+ *		tst_rmdir() is used to remove the directory created by
+ *		tst_tmpdir().
  *
- *      Setting the env variable "TDIRECTORY" will override the creation
- *      of a new temp dir.  The directory specified by TDIRECTORY will
- *      be used as the temporary directory, and no removal will be done
- *      in tst_rmdir().
+ *		Setting the env variable "TDIRECTORY" will override the creation
+ *		of a new temp dir.  The directory specified by TDIRECTORY will
+ *		be used as the temporary directory, and no removal will be done
+ *		in tst_rmdir().
  *
- *    RETURN VALUE
- *      Neither tst_tmpdir() or tst_rmdir() has a return value.
+ *	 RETURN VALUE
+ *		Neither tst_tmpdir() or tst_rmdir() has a return value.
  *
  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
-#include <stdlib.h>        /* for getenv() */
-#include <string.h>        /* for string functions */
-#include <unistd.h>        /* for sysconf(), getcwd(), rmdir() */
-#include <sys/types.h>     /* for mkdir() */
-#include <sys/stat.h>      /* for mkdir() */
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include "test.h"
 #include "rmobj.h"
 
 /*
  * Define some useful macros.
  */
-#define PREFIX_SIZE     4
-#define STRING_SIZE     256
-#define DIR_MODE        0777  /* mode of tmp dir that will be created */
+#define PREFIX_SIZE	  4
+#define STRING_SIZE	  256
+#define DIR_MODE	0777  /* mode of tmp dir that will be created */
 
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
@@ -96,55 +97,51 @@
 /*
  * Define global variables.
  */
-extern char *TCID;            /* defined/initialized in main() */
-extern int  TST_TOTAL;        /* defined/initialized in main() */
-extern char *TESTDIR;         /* the directory created; defined in */
-                              /* tst_res.c */
+extern char *TCID;		 /* defined/initialized in main() */
+extern int  TST_TOTAL;	/* defined/initialized in main() */
+static char *TESTDIR;	 /* the directory created */
 
 /*
  * tst_tmpdir() - Create a unique temporary directory and chdir() to it.
- *                It expects the caller to have defined/initialized the
- *                TCID/TST_TOTAL global variables.  The TESTDIR global
- *                variable will be set to the directory that gets used
- *                as the testing directory.
+ *		It expects the caller to have defined/initialized the
+ *		TCID/TST_TOTAL global variables.  The TESTDIR global
+ *		variable will be set to the directory that gets used
+ *		as the testing directory.
  *
- *                NOTE: This function must be called BEFORE any activity
- *                that would require CLEANUP.  If tst_tmpdir() fails, it
- *                cleans up afer itself and calls tst_exit() (i.e. does
- *                not return).
+ *		NOTE: This function must be called BEFORE any activity
+ *		that would require CLEANUP.  If tst_tmpdir() fails, it
+ *		cleans up afer itself and calls tst_exit() (i.e. does
+ *		not return).
  */
-#undef   FN_NAME
+#undef	FN_NAME
 #define  FN_NAME  "tst_tmpdir()"
 
 void tst_tmpdir(void)
 {
- 	char template[PATH_MAX];      /* template for mkstemp, mkdtemp */
-  	int  no_cleanup = 0;          /* !0 means TDIRECTORY env var was set */
-	char *env_tmpdir;            /* temporary storage for TMPDIR env var */
-/* This is an AWEFUL hack to figure out if mkdtemp() is available */
-#if defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2,2)
-#  define HAVE_MKDTEMP 1
-# else
-#  define HAVE_MKDTEMP 0
-	int tfd;
-# endif
-#else
-# define HAVE_MKDTEMP 0
-	int tfd;
+ 	char template[PATH_MAX];		/* template for mkstemp, mkdtemp */
+  	int  no_cleanup = 0;	  /* !0 means TDIRECTORY env var was set */
+	char *env_tmpdir;		 /* temporary storage for TMPDIR env var */
+	/* This is an AWFUL hack to figure out if mkdtemp() is available */
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2,2)
+#define HAVE_MKDTEMP 1
 #endif
-   	/*
+
+		/*
 	 * If the TDIRECTORY env variable is not set, a temp dir will be
 	 * created.
 	 */
-	if ((TESTDIR = getenv(TDIRECTORY))) {
+	if ((TESTDIR = getenv(TDIRECTORY)) != NULL) {
 		/*
 		 * The TDIRECTORY env. variable is set, so no temp dir is created.
-		 * Also, no clean up will be done via tst_rmdir().
 		 */
-                mkdir(TESTDIR,DIR_MODE); /*Try to create the directory if it does not exist already,
-                                           user might forget to create one before exporting TDIRECTORY,
-                                           Will fail if it already exists, no issues in that*/
+		if (mkdir(TESTDIR, DIR_MODE) == -1 && errno != EEXIST) {
+			tst_brkm(TBROK, NULL, "mkdir(%s, %o) failed",
+			    TESTDIR, DIR_MODE);
+		}
+		/*
+		 * Try to create the directory if it does not exist already;
+		 * user might forget to create one before exporting TDIRECTORY.
+		 */
 		no_cleanup++;
 #if UNIT_TEST
 		printf("TDIRECTORY env var is set\n");
@@ -162,50 +159,41 @@
 		}
 
 
-#if HAVE_MKDTEMP
-		/*
-		 * Make the temporary directory in one shot using mkdtemp()
-		 */
+#ifdef HAVE_MKDTEMP
+		/* Make the temporary directory in one shot using mkdtemp. */
 		if (mkdtemp(template) == NULL)
-			tst_brkm(TBROK, tmpdir_cleanup,
-				"%s: mkdtemp(%s) failed; errno = %d: %s",
-				FN_NAME, template, errno, strerror(errno));
-                if ( (TESTDIR = strdup(template)) == NULL ) { //Error Handling for strdup()
-                        tst_brkm(TBROK, tmpdir_cleanup,
-                                "%s: strdup(%s) failed; errno = %d: %s",
-                                FN_NAME, template, errno, strerror(errno));
-                }
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: mkdtemp(%s) failed", FN_NAME, template);
+		if ((TESTDIR = strdup(template)) == NULL) {
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: strdup(%s) failed", FN_NAME, template);
+		}
 #else
-		/*
-		 * Make the template name, then the directory
-		 */
+		int tfd;
+
+		/* Make the template name, then the directory */
 		if ((tfd = mkstemp(template)) == -1)
-			tst_brkm(TBROK, tmpdir_cleanup,
-				"%s: mkstemp(%s) failed; errno = %d: %s",
-				FN_NAME, template, errno, strerror(errno));
-                if ( close(tfd) == -1 ) {
-                        tst_brkm(TBROK, tmpdir_cleanup,
-                                "%s: close() failed; errno = %d: %s",
-                                FN_NAME, errno, strerror(errno));
-                }
-                if ( unlink(template) == -1) {
-                        tst_brkm(TBROK, tmpdir_cleanup,
-                                "%s: unlink(%s) failed; errno = %d: %s",
-                                FN_NAME, template, errno, strerror(errno));
-                }
-                if ( (TESTDIR = strdup(template)) == NULL ) {
-                        tst_brkm(TBROK, tmpdir_cleanup,
-                                "%s: strdup(%s) failed; errno = %d: %s",
-                                FN_NAME, template, errno, strerror(errno));
-                }
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: mkstemp(%s) failed", FN_NAME, template);
+		if (close(tfd) == -1) {
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: close() failed", FN_NAME);
+		}
+		if (unlink(template) == -1) {
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: unlink(%s) failed", FN_NAME, template);
+		}
+		if ((TESTDIR = strdup(template)) == NULL) {
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: strdup(%s) failed", FN_NAME, template);
+		}
 		if (mkdir(TESTDIR, DIR_MODE)) {
 			/* If we start failing with EEXIST, wrap this section in
 			 * a loop so we can try again.
 			 */
-			tst_brkm(TBROK, tmpdir_cleanup,
-				"%s: mkdir(%s, %#o) failed; errno = %d: %s",
-				FN_NAME, TESTDIR, DIR_MODE, errno,
-				strerror(errno));
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"%s: mkdir(%s, %#o) failed",
+				FN_NAME, TESTDIR, DIR_MODE);
 		}
 #endif
 
@@ -213,14 +201,13 @@
 		 * Change the group on this temporary directory to be that of the
 		 * gid of the person running the tests and permissions to 777.
 		 */
-		if ( chown(TESTDIR, -1, getgid()) == -1 )
-			tst_brkm(TBROK, tmpdir_cleanup,
-				"chown(%s, -1, %d) failed; errno = %d: %s",
-				TESTDIR, getgid(), errno, strerror(errno));
-		if ( chmod(TESTDIR,S_IRWXU | S_IRWXG | S_IRWXO) == -1 )
-			tst_brkm(TBROK, tmpdir_cleanup,
-				"chmod(%s,777) failed; errno %d: %s",
-				TESTDIR, errno, strerror(errno));
+		if (chown(TESTDIR, -1, getgid()) == -1)
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"chown(%s, -1, %d) failed", TESTDIR, getgid());
+		if (chmod(TESTDIR,S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
+			tst_brkm(TBROK|TERRNO, tmpdir_cleanup,
+				"chmod(%s,777) failed", TESTDIR);
+		}
  	}
 
 #if UNIT_TEST
@@ -229,18 +216,19 @@
 
  	/*
   	 * Change to the temporary directory.  If the chdir() fails, issue
-   	 * TBROK messages for all test cases, attempt to remove the
+	 * TBROK messages for all test cases, attempt to remove the
 	 * directory (if it was created), and exit.  If the removal also
 	 * fails, also issue a TWARN message.
 	 */
-	if ( chdir(TESTDIR) == -1 ) {
-		tst_brkm(TBROK, NULL, "%s: chdir(%s) failed; errno = %d: %s",
-				FN_NAME, TESTDIR, errno, strerror(errno) );
+	if (chdir(TESTDIR) == -1) {
+		tst_brkm(TBROK|TERRNO, NULL, "%s: chdir(%s) failed",
+		    FN_NAME, TESTDIR);
 
 		/* Try to remove the directory */
-		if ( !no_cleanup && rmdir(TESTDIR) == -1 )
-			tst_resm(TWARN, "%s: rmdir(%s) failed; errno = %d: %s",
-				FN_NAME, TESTDIR, errno, strerror(errno) );
+		if (!no_cleanup && rmdir(TESTDIR) == -1) {
+			tst_resm(TWARN|TERRNO, "%s: rmdir(%s) failed",
+			    FN_NAME, TESTDIR);
+		}
 
 		tmpdir_cleanup();
 	}
@@ -249,110 +237,118 @@
 	printf("CWD is %s\n", getcwd((char *)NULL, PATH_MAX));
 #endif
 
-	/*
-	 *  If we made through all this stuff, return.
-	 */
-	return;
 }  /* tst_tmpdir() */
 
 
 /*
  *
  * tst_rmdir() - Recursively remove the temporary directory created by
- *               tst_tmpdir().  This function is intended ONLY as a
- *               companion to tst_tmpdir().  If the TDIRECTORY
- *               environment variable is set, no cleanup will be
- *               attempted.
+ *			 tst_tmpdir().  This function is intended ONLY as a
+ *			 companion to tst_tmpdir().  If the TDIRECTORY
+ *			 environment variable is set, no cleanup will be
+ *			 attempted.
  */
-#undef   FN_NAME
+#undef	FN_NAME
 #define  FN_NAME  "tst_rmdir()"
 
 void tst_rmdir(void)
 {
-   char *errmsg;
-   char *tdirectory;
-   char current_dir[PATH_MAX];   /* current working directory */
-   char parent_dir[PATH_MAX];    /* directory above TESTDIR */
-   char *basename;               /* basename of the TESTDIR */
+	struct stat buf1;
+	struct stat buf2;
+	char current_dir[PATH_MAX];
+	char *errmsg;
+	char *parent_dir;
+	char *tdirectory;
 
-   /*
-    * If the TDIRECTORY env variable is set, this indicates that no
-    * temp dir was created by tst_tmpdir().  Thus no cleanup will be
-    * necessary.
-    */
-   if ( (tdirectory = getenv(TDIRECTORY)) != NULL ) {
+	/*
+	 * If the TDIRECTORY env variable is set, this indicates that no
+	 * temp dir was created by tst_tmpdir().  Thus no cleanup will be
+	 * necessary.
+	 */
+	if ((tdirectory = getenv(TDIRECTORY)) != NULL) {
 #if UNIT_TEST
-      printf("\"TDIRECORY\" env variable is set; no cleanup was performed\n");
+		printf("\"TDIRECORY\" env variable is set; no cleanup was performed\n");
 #endif
-      return;
-   }
+		return;
+	}
 
-   /*
-    * Check that TESTDIR is not NULL.
-    */
-   if ( TESTDIR == NULL ) {
-      tst_resm(TWARN, "%s: TESTDIR was NULL; no removal attempted",
-               FN_NAME);
-      return;
-   }
+	/*
+	 * Check that TESTDIR is not NULL.
+	 */
+	if (TESTDIR == NULL) {
+		tst_resm(TWARN, "%s: TESTDIR was NULL; no removal attempted",
+			 FN_NAME);
+		return;
+	}
 
-   /*
-    * Check that the value of TESTDIR is not "*" or "/".  These could
-    * have disastrous effects in a test run by root.
-    */
-   if ( strcmp(TESTDIR, "/") == 0 ) {
-      tst_resm(TWARN,
-               "%s: Recursive remove of root directory not attempted",
-               FN_NAME);
-      return;
-   }
+	if ((parent_dir = malloc(PATH_MAX))) {
+		tst_brkm(TBROK|TERRNO, NULL, "%s: malloc(%d) failed",
+		    FN_NAME, PATH_MAX);
+		/* Make sure that we exit quickly and noisily. */
+		exit(1);
+	}
 
-   if ( strchr(TESTDIR, '*') != NULL ) {
-      tst_resm(TWARN, "%s: Recursive remove of '*' not attempted",
-               FN_NAME);
-      return;
-   }
+	/*
+	 * Check that the value of TESTDIR is not "*" or "/".  These could
+	 * have disastrous effects in a test run by root.
+	 */
+	/* XXX: a temp directory that's '/' seems stupid and dangerous anyways. */
+	if (stat(TESTDIR, &buf1) == 0 && stat("/", &buf2) &&
+	    buf1.st_ino == buf2.st_ino) {
+		tst_resm(TWARN, "%s: will not remove /", FN_NAME);
+		return;
+	}
 
-   /*
-    * Get the directory name of TESTDIR.  If TESTDIR is a relative path,
-    * get full path.
-    */
-   if ( TESTDIR[0] != '/' ) {
-      if ( getcwd(current_dir,PATH_MAX) == NULL )
-         strcpy(parent_dir, TESTDIR);
-      else
-         sprintf(parent_dir, "%s/%s", current_dir, TESTDIR);
-   } else {
-      strcpy(parent_dir, TESTDIR);
-   }
-   if ( (basename = strrchr(parent_dir, '/')) != NULL ) {
-      *basename='\0';   /* terminate at end of parent_dir */
-   }
+	/* 
+	 * XXX: this just reeks of bad programming; all shell characters should
+	 * be escaped in invocations of rm(1)/rmdir(1).
+	 */
+	if (strchr(TESTDIR, '*') != NULL) {
+		tst_resm(TWARN, "%s: will not remove *", FN_NAME);
+		return;
+	}
 
-   /*
-    * Change directory to parent_dir (The dir above TESTDIR).
-    */
-   if ( chdir(parent_dir) != 0 )
-      tst_resm(TWARN,
-               "%s: chdir(%s) failed; errno = %d: %s\nAttempting to remove temp dir anyway",
-               FN_NAME, parent_dir, errno, strerror(errno));
+	/*
+	 * Get the directory name of TESTDIR.  If TESTDIR is a relative path,
+	 * get full path.
+	 */
+	if (TESTDIR[0] != '/') {
+		if (getcwd(current_dir, PATH_MAX) == NULL)
+			strncpy(parent_dir, TESTDIR, sizeof(parent_dir));
+		else
+			sprintf(parent_dir, "%s/%s", current_dir, TESTDIR);
+	} else {
+		strcpy(parent_dir, TESTDIR);
+	}
+	if ((parent_dir = dirname(parent_dir)) == NULL) {
+		tst_resm(TWARN|TERRNO, "%s: dirname failed", FN_NAME);
+		return;
+	}
 
-   /*
-    * Attempt to remove the "TESTDIR" directory, using rmobj().
-    */
-   if ( rmobj(TESTDIR, &errmsg) == -1 )
-      tst_resm(TWARN, "%s: rmobj(%s) failed: %s",
-               FN_NAME, TESTDIR, errmsg);
+	/*
+	 * Change directory to parent_dir (The dir above TESTDIR).
+	 */
+	if (chdir(parent_dir) != 0) {
+		tst_resm(TWARN|TERRNO,
+			 "%s: chdir(%s) failed\nAttempting to remove temp dir anyway",
+			 FN_NAME, parent_dir);
+	}
 
-   return;
+	/*
+	 * Attempt to remove the "TESTDIR" directory, using rmobj().
+	 */
+	if (rmobj(TESTDIR, &errmsg) == -1)
+		tst_resm(TWARN, "%s: rmobj(%s) failed: %s",
+			 FN_NAME, TESTDIR, errmsg);
+
 }  /* tst_rmdir() */
 
 
 /*
  * tmpdir_cleanup() - This function is used when tst_tmpdir()
- *                    encounters an error, and must cleanup and exit.
- *                    It prints a warning message via tst_resm(), and
- *                    then calls tst_exit().
+ *			 encounters an error, and must cleanup and exit.
+ *			 It prints a warning message via tst_resm(), and
+ *			 then calls tst_exit().
  */
 #undef  FN_NAME
 #define FN_NAME "tst_tmpdir()"
@@ -360,50 +356,46 @@
 static void
 tmpdir_cleanup()
 {
-   /*
-    * Print a warning message and call tst_exit() to exit the test.
-    */
-   tst_resm(TWARN, "%s: No user cleanup function called before exiting",
-            FN_NAME);
-   tst_exit();
+	tst_brkm(TWARN, NULL,
+	    "%s: no user cleanup function called before exiting", FN_NAME);
 }  /* tmpdir_cleanup() */
 
 
 #ifdef UNIT_TEST
 /****************************************************************************
  * Unit test code: Takes input from stdin and can make the following
- *                 calls: tst_tmpdir(), tst_rmdir().
+ *		 calls: tst_tmpdir(), tst_rmdir().
  ****************************************************************************/
 int  TST_TOTAL = 10;
 char *TCID = "TESTTCID";
 
 main()
 {
-   int  option;
-   char *chrptr;
+	int  option;
+	char *chrptr;
 
-   printf("UNIT TEST of tst_tmpdir.c.  Options to try:\n\
-   -1 : call tst_exit()\n\
-    0 : call tst_tmpdir()\n\
-    1 : call tst_rmdir()\n\n");
+	printf("UNIT TEST of tst_tmpdir.c.  Options to try:\n\
+		-1 : call tst_exit()\n\
+		0 : call tst_tmpdir()\n\
+		1 : call tst_rmdir()\n\n");
 
-   while ( 1 ) {
-      printf("Enter options (-1, 0, 1): ");
-      (void) scanf("%d%c", &option, &chrptr);
+	while (1) {
+		printf("Enter options (-1, 0, 1): ");
+		(void)scanf("%d%c", &option, &chrptr);
 
-      switch ( option ) {
-      case -1:
-         tst_exit();
-         break;
+		switch (option) {
+		case -1:
+			tst_exit();
+			break;
 
-      case 0:
-         tst_tmpdir();
-         break;
+		case 0:
+			tst_tmpdir();
+			break;
 
-      case 1:
-         tst_rmdir();
-         break;
-      }  /* switch() */
-   }  /* while() */
+		case 1:
+			tst_rmdir();
+			break;
+		}  /* switch() */
+	}  /* while () */
 }
 #endif  /* UNIT_TEST */
diff --git a/lib/write_log.c b/lib/write_log.c
index 0600b10..5fced89 100644
--- a/lib/write_log.c
+++ b/lib/write_log.c
@@ -226,14 +226,14 @@
 	    wbuf[reclen+1] = reclen % 256;
 	    reclen += 2;
 
-            if ( write(wfile->w_afd, wbuf, reclen) == -1 ) {
+            if (write(wfile->w_afd, wbuf, reclen) == -1) {
                   sprintf(Wlog_Error_String,
                           "Could not write log - write(%s, %s, %d) failed:  %s\n",
                            wfile->w_file, wbuf, reclen, strerror(errno));
                   return -1;
             } else {
                  offset = lseek(wfile->w_afd, 0, SEEK_CUR) - reclen;
-                 if ( offset == -1 ) {
+                 if (offset == -1) {
                        sprintf(Wlog_Error_String,
                                "Could not reposition file pointer - lseek(%s, 0, SEEK_CUR) failed:  %s\n",
                                 wfile->w_file, strerror(errno));
@@ -241,13 +241,13 @@
                  }
             }
     } else {
-            if ( (lseek(wfile->w_rfd, offset, SEEK_SET)) == -1 ) {
+            if ((lseek(wfile->w_rfd, offset, SEEK_SET)) == -1) {
                   sprintf(Wlog_Error_String,
                           "Could not reposition file pointer - lseek(%s, %ld, SEEK_SET) failed:  %s\n",
                            wfile->w_file, offset, strerror(errno));
                   return -1;
             } else {
-                  if ( (write(wfile->w_rfd, wbuf, reclen)) == -1 ) {
+                  if ((write(wfile->w_rfd, wbuf, reclen)) == -1) {
                         sprintf(Wlog_Error_String,
                                 "Could not write log - write(%s, %s, %d) failed:  %s\n",
                                  wfile->w_file, wbuf, reclen, strerror(errno));
@@ -285,14 +285,14 @@
 	 * Move to EOF.  offset will always hold the current file offset
 	 */
 
-        if ( (lseek(fd, 0, SEEK_END)) == -1 ) {
+        if ((lseek(fd, 0, SEEK_END)) == -1) {
               sprintf(Wlog_Error_String,
                       "Could not reposition file pointer - lseek(%s, 0, SEEK_END) failed:  %s\n",
                        wfile->w_file, strerror(errno));
               return -1;
         }
 	offset = lseek(fd, 0, SEEK_CUR);
-        if ( (offset == -1) ) {
+        if ((offset == -1)) {
               sprintf(Wlog_Error_String,
                       "Could not reposition file pointer - lseek(%s, 0, SEEK_CUR) failed:  %s\n",
                        wfile->w_file, strerror(errno));
@@ -320,7 +320,7 @@
 		/*
 		 * Move to the proper file offset, and read into buf
 		 */
-                if ( (lseek(fd, offset, SEEK_SET)) ==-1  ) {
+                if ((lseek(fd, offset, SEEK_SET)) ==-1) {
                       sprintf(Wlog_Error_String,
                               "Could not reposition file pointer - lseek(%s, %d, SEEK_SET) failed:  %s\n",
                                wfile->w_file, offset, strerror(errno));
diff --git a/pan/debug.c b/pan/debug.c
index a89303c..d67c46f 100644
--- a/pan/debug.c
+++ b/pan/debug.c
@@ -56,26 +56,26 @@
 
     d_area = optarg;
 
-    while(*d_area) {
+    while (*d_area) {
 	d_level= strchr(d_area,':');
 	*d_level++ = '\0';
 	db_level= atoi(d_level);
 	db_area=atoi(d_area);
 
-	if(db_area > MAXDEBUG) {
+	if (db_area > MAXDEBUG) {
 	    printf("Error - Debug area %s > maximum of %d\n", d_area, 
 		   MAXDEBUG);
 	    exit(-1);
 	}
 
-	while(d_area != NULL) {
+	while (d_area != NULL) {
 	    db_area = atoi(d_area);
 	    printf("Debug area %d set to %d\n", db_area, db_level);
 	    Debug[db_area] = db_level;
-	    if((d_area = strchr(d_area, ',')) != NULL)
+	    if ((d_area = strchr(d_area, ',')) != NULL)
 		d_area++;
 	} 
-	if( (d_area = strchr(d_level, ',')) == NULL )
+	if ((d_area = strchr(d_level, ',')) == NULL)
 	    break;
     }
 #else
diff --git a/pan/debug.h b/pan/debug.h
index d0fa145..996c964 100644
--- a/pan/debug.h
+++ b/pan/debug.h
@@ -45,13 +45,13 @@
 
 extern int Debug[];
 #define MAXDEBUG        30
-#define DEBUG(a,l)      if(Debug[a] >= l)
-#define DEBUGO(a,l,c)   if(Debug[a] >= l || c)
+#define DEBUG(a,l)      if (Debug[a] >= l)
+#define DEBUGO(a,l,c)   if (Debug[a] >= l || c)
 
 #else
 
-#define	DEBUG(a,l)	if(0)
-#define DEBUGO(a,l,c)   if(0)
+#define	DEBUG(a,l)	if (0)
+#define DEBUGO(a,l,c)   if (0)
 
 #endif
 
diff --git a/pan/ltp-bump.c b/pan/ltp-bump.c
index 5ab6584..29d3480 100644
--- a/pan/ltp-bump.c
+++ b/pan/ltp-bump.c
@@ -50,7 +50,7 @@
 	zoo_t zoo;
 	int sig = SIGINT;
 
-	while((c = getopt(argc, argv, "a:s:12")) != -1) {
+	while ((c = getopt(argc, argv, "a:s:12")) != -1) {
 		switch(c) {
 			case 'a':
 				active = (char*)malloc(strlen(optarg)+1);
diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c
index 86cd154..c894de7 100644
--- a/pan/ltp-pan.c
+++ b/pan/ltp-pan.c
@@ -323,7 +323,7 @@
     }
 
     coll = get_collection(filename, optind, argc, argv);
-    if(!coll)
+    if (!coll)
         exit(1);
     if (coll->cnt == 0) {
 	fprintf(stderr,
@@ -501,7 +501,7 @@
 		if (++c >= coll->cnt)
 		    c = 0;
 
-	} /* while( (num_active < keep_active) && (starts != 0) ) */
+	} /* while ((num_active < keep_active) && (starts != 0)) */
 
 	if (starts == 0)
 	{ 
@@ -942,7 +942,7 @@
     /* if the child couldn't go through with the exec, 
      * clean up the mess, note it, and move on
      */
-    if(read(errpipe[0], &errlen, sizeof(errlen))) {
+    if (read(errpipe[0], &errlen, sizeof(errlen))) {
 	int status;
 	time_t end_time;
 	int termid;
@@ -1033,7 +1033,7 @@
     int i;
 
     buf = slurp(file);
-    if(!buf)
+    if (!buf)
         return NULL;
 
     coll = (struct collection *) malloc(sizeof(struct collection));
@@ -1295,21 +1295,21 @@
 {
     static int lastsent = 0;
 
-    if( sig == 0 ){
+    if (sig == 0) {
 	lastsent = 0;
     } else {
 	rec_signal = sig;
-	if( sig == SIGUSR2 )
+	if (sig == SIGUSR2)
 	    return;
-	if( lastsent == 0 )
+	if (lastsent == 0)
 	    send_signal = sig;
-	else if( lastsent == SIGUSR1 )
+	else if (lastsent == SIGUSR1)
 	    send_signal = SIGINT;
-	else if( lastsent == sig )
+	else if (lastsent == sig)
 	    send_signal = SIGTERM;
-	else if( lastsent == SIGTERM )
+	else if (lastsent == SIGTERM)
 	    send_signal = SIGHUP;
-	else if( lastsent == SIGHUP )
+	else if (lastsent == SIGHUP)
 	    send_signal = SIGKILL;
 	lastsent = send_signal;
     }
diff --git a/pan/reporter.c b/pan/reporter.c
index 114eeee..1c970c6 100644
--- a/pan/reporter.c
+++ b/pan/reporter.c
@@ -110,7 +110,7 @@
     tl = taglist;
     sym_seq(tags, &Key, &Data, R_FIRST);
     do {
-        if(tagcount == ntags) {
+        if (tagcount == ntags) {
             /* exceeded tag array size -- realloc */
             ntags += NTAGS_START;
             taglist= (char **)realloc(taglist, sizeof(char *) * ntags);
@@ -119,9 +119,9 @@
 
         *tl++ = Key.data;
         tagcount++;
-    } while(sym_seq(tags, &Key, &Data, R_NEXT)==0);
+    } while (sym_seq(tags, &Key, &Data, R_NEXT)==0);
 
-    if(tagcount == ntags) {
+    if (tagcount == ntags) {
         /* exceeded tag array size -- realloc */
         ntags += NTAGS_START;
         taglist= (char **)realloc(taglist, sizeof(char *) * ntags);
@@ -131,10 +131,10 @@
     *tl++ = NULL;
     ntags = tagcount;
     /* Retrieve one "stime" to get the date. */
-    for(tl=taglist; *tl != NULL; tl++) {
+    for (tl=taglist; *tl != NULL; tl++) {
         strcpy(key_get, *tl);
         strcat(key_get, ",_keys,stime");
-        if((info = (char *)sym_get(tags, key_get)) != NULL) {
+        if ((info = (char *)sym_get(tags, key_get)) != NULL) {
             clock = atoi(info);
             tm = gmtime(&clock);
             strftime(key_get, KEYSIZE, "%x", tm);
@@ -150,18 +150,18 @@
      * internals of the sym_* data structure.
      */
     /* dump 'em all */
-    for(tl=taglist; *tl != NULL; tl++) {
-        if(!strcmp(*tl, "_RTS"))
+    for (tl=taglist; *tl != NULL; tl++) {
+        if (!strcmp(*tl, "_RTS"))
             continue;
 
         strcpy(key_get, *tl);
         strcat(key_get, ",_keys");
-        if((Keys = sym_get(tags, key_get)) == NULL) {
+        if ((Keys = sym_get(tags, key_get)) == NULL) {
             return 0;
         }
 
         strcpy(key_get, *tl);
-        if((Tag = sym_get(tags, key_get)) != NULL) {
+        if ((Tag = sym_get(tags, key_get)) != NULL) {
             tag_report(NULL, Tag, Keys);
         }
     }
@@ -192,14 +192,14 @@
     SYM rm;                     /* pointer to old tag -- to remove it */
 
 
-    if(alltags == NULL || keys == NULL || ctag == NULL)
+    if (alltags == NULL || keys == NULL || ctag == NULL)
         return -1;                       /* for really messed up test output */
 
     /* insert keys into tag */
     sym_put(ctag, "_keys", (void *)keys, 0);
 
     /* get the tag, or build a new one */
-    if((tag=(char *)sym_get(keys, "tag")) == NULL) {
+    if ((tag=(char *)sym_get(keys, "tag")) == NULL) {
         /* this is an "impossible" situation: test_output checks for this
          * and creates a dummy tag. */
         sprintf(tagname, "no_tag_%d", notag++);
@@ -212,9 +212,9 @@
      * Special case: duplicate tag that has an initiation_status failure
      * is thrown away.
      */
-    if((rm=(SYM)sym_get(alltags, tag)) != NULL) {
-        if( (status=(char *)sym_get(keys, "initiation_status")) != NULL ) {
-            if(strcmp(status, "ok")) {
+    if ((rm=(SYM)sym_get(alltags, tag)) != NULL) {
+        if ((status=(char *)sym_get(keys, "initiation_status")) != NULL) {
+            if (strcmp(status, "ok")) {
                 /* do not take new data.  remove new data */
                 sym_rm(ctag, RM_KEY | RM_DATA);
                 return 1;
@@ -247,7 +247,7 @@
 iscanner_test_end(alltags, ctag, keys)
     SYM alltags, ctag, keys;
 {
-    if(alltags == NULL || keys == NULL || ctag == NULL)
+    if (alltags == NULL || keys == NULL || ctag == NULL)
         return -1;                       /* for really messed up test output */
 
     /* insert keys into tag */
diff --git a/pan/splitstr.c b/pan/splitstr.c
index 6c4cea8..14f2f00 100644
--- a/pan/splitstr.c
+++ b/pan/splitstr.c
@@ -73,9 +73,9 @@
      * In most recoverable errors, if argcount is not NULL,
      * set argcount to 0. Then return NULL.
      */
-    if ( str == NULL )
+    if (str == NULL)
     {
-      if ( argcount != NULL )
+      if (argcount != NULL)
         *argcount = 0;
       return(NULL);
     }
@@ -85,9 +85,9 @@
      */
     arg_string = strdup( str );
 
-    if ( arg_string == NULL )
+    if (arg_string == NULL)
     {
-      if ( argcount != NULL )
+      if (argcount != NULL)
         *argcount = 0;
       return(NULL);
     }
@@ -97,14 +97,14 @@
      */
     arg_array = (char **)malloc( sizeof(char *) * max_toks );
 
-    if ( arg_array == NULL )
+    if (arg_array == NULL)
     {
-      if ( argcount != NULL )
+      if (argcount != NULL)
         *argcount = 0;
       return(NULL);
     }
 
-    if(separator==NULL)
+    if (separator==NULL)
       separator = " \t";
 
     /*
@@ -113,11 +113,11 @@
      * 'arg_array' if necessary.
      */
     cur_tok = strtok(arg_string, separator);
-    while ( cur_tok != NULL )
+    while (cur_tok != NULL)
     {
       arg_array[num_toks++] = cur_tok;
       cur_tok = strtok(NULL, separator);
-      if ( num_toks == max_toks )
+      if (num_toks == max_toks)
       {
         max_toks += 20;
         arg_array = (char **)realloc((void *)arg_array, sizeof(char *)*max_toks );
@@ -128,14 +128,14 @@
     /*
      * If there are any spaces left in our array, make them NULL
      */
-    for(i=num_toks+1;i<max_toks;i++)
+    for (i=num_toks+1;i<max_toks;i++)
       arg_array[i] = NULL;
 
     /* This seems nice, but since memory is allocated on a page basis, this
      * isn't really helpful:
      * arg_array = (char **)realloc((void *)arg_array, sizeof(char *)*num_toks+1 );*/
 
-    if ( argcount != NULL )
+    if (argcount != NULL)
       *argcount = num_toks;
 
     /*
@@ -154,9 +154,9 @@
  */
 void splitstr_free( const char **p_return )
 {
-  if ( *p_return != NULL )
+  if (*p_return != NULL)
     free( (char *)*p_return );
-  if ( p_return != NULL )
+  if (p_return != NULL)
     free( (char **)p_return );
 }
 
@@ -170,23 +170,23 @@
   char *test_str_array[test_size];
   const char **ret;
 
-  for(i=0;i<test_size;i++)
+  for (i=0;i<test_size;i++)
   {
     snprintf(buf,16,"arg%d",i);
     test_str_array[i] = strdup(buf);
   }
 
-  for(i=0;i<test_size;i++)
+  for (i=0;i<test_size;i++)
   {
     test_str[0]='\0';
-    for(y=0;y<i;y++)
+    for (y=0;y<i;y++)
     {
       snprintf(buf,16,"arg%d ",y);
       strncat(test_str,buf,16);
     }
     ret = splitstr(test_str,NULL,&size_ret);
     assert(size_ret == i);
-    for(y=0;y<i;y++)
+    for (y=0;y<i;y++)
       assert( strcmp(ret[y],test_str_array[y])==0 );
 
     splitstr_free(ret);
diff --git a/pan/symbol.c b/pan/symbol.c
index fa9e8aa..bdd5843 100644
--- a/pan/symbol.c
+++ b/pan/symbol.c
@@ -86,7 +86,7 @@
 {
     SYM h;
 
-    if((h=(SYM)malloc(sizeof(struct symh))) == NULL) {
+    if ((h=(SYM)malloc(sizeof(struct symh))) == NULL) {
         sym_error="sym header malloc failed!";
         return(NULL);
     }
@@ -102,7 +102,7 @@
 {
     struct sym *n;
 
-    if((n=(struct sym *)malloc(sizeof(struct sym))) == NULL) {
+    if ((n=(struct sym *)malloc(sizeof(struct sym))) == NULL) {
       sym_error="sym node malloc failed!";
       return(NULL);
     }
@@ -111,7 +111,7 @@
     n->key  = strdup(key);
     n->data = data;
 
-    if(n->key == NULL) {
+    if (n->key == NULL) {
       sym_error="sym node strdup(key) failed!";
       return(NULL);
     }
@@ -124,8 +124,8 @@
 static struct sym *
 find_key1(struct sym *sym, char *key)
 {
-    while(sym != NULL)
-      if(strcmp(sym->key, key) == 0)
+    while (sym != NULL)
+      if (strcmp(sym->key, key) == 0)
         return(sym);
     else
       sym=sym->next;
@@ -140,20 +140,20 @@
 {
     register struct sym *sn;
 
-    if(sym->sym == NULL)
+    if (sym->sym == NULL)
     {
       sym->sym = mknode(NULL, key, data);
-      if(sym->sym == NULL)
+      if (sym->sym == NULL)
       {
         return(-1);
       }
     }
     else
     {
-      for( sn=sym->sym; sn!=NULL && sn->next != NULL; sn=sn->next );
+      for (sn=sym->sym; sn!=NULL && sn->next != NULL; sn=sn->next);
       sn->next = mknode(NULL, key, data);
       assert(sn->next != NULL);
-      if(sn->next == NULL)
+      if (sn->next == NULL)
         return(-1);
     }
     return(0);
@@ -206,39 +206,39 @@
     SYM csym, ncsym;		/* search: current symbol table */
     struct sym *nsym = NULL;	/* search: found symbol entry */
 
-    if(sym == NULL)
+    if (sym == NULL)
       return(EINVAL);
 
     nkey = strdup(key);
     keys = splitstr(key, ",",NULL);
 
-    if(keys == NULL)
+    if (keys == NULL)
       return(EINVAL);
 
-    for(kk=(char **)keys, csym = sym;
+    for (kk=(char **)keys, csym = sym;
       *kk != NULL && (nsym=find_key1(csym->sym, *kk)) != NULL;
       csym=nsym->data) {
 
-      if(*++kk == NULL)
+      if (*++kk == NULL)
         break;
 
-	if(nsym->data == NULL) { /* fatal error */
+	if (nsym->data == NULL) { /* fatal error */
 	    free(nkey);
 	    splitstr_free(keys);
 	    return(ENOTDIR);
 	}
-	if( ((SYM) (nsym->data))->magic != SYM_MAGIC ) {
+	if (((SYM) (nsym->data))->magic != SYM_MAGIC) {
 	    free(nkey);
 	    splitstr_free(keys);
 	    return(ENOTDIR);
 	}
     }
 
-    if(*kk == NULL) {		/* found a complete match */
+    if (*kk == NULL) {		/* found a complete match */
 	free(nkey);
 	splitstr_free(keys);
 
-	if(flags == PUT_REPLACE) {
+	if (flags == PUT_REPLACE) {
 	    nsym->data = data;
 	    return(0);
 	} else {
@@ -247,8 +247,8 @@
     }
 
     /* csym is a ptr to a list */
-    for(;*kk != NULL; kk++) {
-	if(*(kk+1) != NULL) {
+    for (;*kk != NULL; kk++) {
+	if (*(kk+1) != NULL) {
 	    add_key(csym, *kk, (void *)(ncsym=newsym()));
 	    csym = ncsym;
 	} else {
@@ -275,34 +275,34 @@
     SYM csym;			/* search: current symbol table */
     struct sym *nsym = NULL;	/* search: found symbol entry */
 
-    if(sym == NULL)
+    if (sym == NULL)
 	return(NULL);
 
     nkey=strdup(key);
     keys = splitstr(nkey, ",", NULL);
-    if(keys == NULL)
+    if (keys == NULL)
 	return(NULL);
 
-    for(kk=(char **)keys, csym = sym;
+    for (kk=(char **)keys, csym = sym;
 	*kk != NULL && (nsym=find_key1(csym->sym, *kk)) != NULL;
 	csym=nsym->data) {
 
-	if(*++kk == NULL)
+	if (*++kk == NULL)
 	    break;
 
-	if(nsym->data == NULL) { /* fatal error */
+	if (nsym->data == NULL) { /* fatal error */
 	    free(nkey);
 	    splitstr_free(keys);
 	    return(NULL);
 	}
-	if( ((SYM)(nsym->data))->magic != SYM_MAGIC ) {
+	if (((SYM)(nsym->data))->magic != SYM_MAGIC) {
 	    free(nkey);
 	    splitstr_free(keys);
 	    return(NULL);
 	}
     }
 
-    if(*kk == NULL) {		/* found a complete match */
+    if (*kk == NULL) {		/* found a complete match */
 	splitstr_free(keys);
 	free(nkey);
 	return(nsym->data);
@@ -338,11 +338,11 @@
 	 */
     case R_CURSOR:
 	csym = (SYM) sym_get(sym, (char *)key->data);
-	if( csym == NULL || csym->magic != SYM_MAGIC ) {
+	if (csym == NULL || csym->magic != SYM_MAGIC) {
 	    return(2);
 	}
 	sym->cursor = csym->sym;
-	if(sym->cursor == NULL)
+	if (sym->cursor == NULL)
 	    return(1);
 	key->data = sym->cursor->key;
 	data->data = sym->cursor->data;
@@ -351,7 +351,7 @@
 
     case R_FIRST:
 	sym->cursor = sym->sym;
-	if(sym->cursor == NULL)
+	if (sym->cursor == NULL)
 	    return(1);
 	key->data = sym->cursor->key;
 	data->data = sym->cursor->data;
@@ -359,11 +359,11 @@
 	return(0);
 
     case R_NEXT:
-	if(sym->cursor == NULL)
+	if (sym->cursor == NULL)
 	    return(1);
 	sym->cursor = sym->cursor->next;
 
-	if(sym->cursor == NULL)
+	if (sym->cursor == NULL)
 	    return(1);
 
 	key->data = sym->cursor->key;
@@ -390,11 +390,11 @@
     register struct sym *se;	/* symbol entry */
     register int d;
 
-    if(sym == NULL || sym->magic != SYM_MAGIC)
+    if (sym == NULL || sym->magic != SYM_MAGIC)
 	return -1;
 
-    for(se=sym->sym;se != NULL;se=se->next) {
-	for(d=0;d < depth; d++) {
+    for (se=sym->sym;se != NULL;se=se->next) {
+	for (d=0;d < depth; d++) {
 	    putchar('"');	putchar(' ');
 	}
 	printf("%s\n", se->key);
@@ -413,23 +413,23 @@
     register struct sym *se;	/* symbol entry */
     register int d;
 
-    if(sym == NULL)
+    if (sym == NULL)
 	return 0;
 
-    if(sym->magic != SYM_MAGIC) {
-	for(d=0;d < depth; d++) {
+    if (sym->magic != SYM_MAGIC) {
+	for (d=0;d < depth; d++) {
 	    putchar('"');	putchar(' ');
 	}
 	printf(" = %s\n", (char *)sym);
 	return 0;
     }
 
-    for(se=sym->sym;se != NULL;se=se->next) {
-	for(d=0;d < depth; d++) {
+    for (se=sym->sym;se != NULL;se=se->next) {
+	for (d=0;d < depth; d++) {
 	    putchar('"');	putchar(' ');
 	}
 	printf("%s", se->key);
-	if(((SYM)se->data)->magic == SYM_MAGIC) {
+	if (((SYM)se->data)->magic == SYM_MAGIC) {
 	    putchar('\n');
 	    sym_dump_s((SYM)se->data, depth+1);
 	} else {
@@ -447,26 +447,26 @@
 {
     register struct sym *se, *nse;	/* symbol entry */
 
-    if(sym == NULL)
+    if (sym == NULL)
 	return 0;
 
-    if(sym->magic != SYM_MAGIC) {
-	if(!(flags&RM_DATA))
+    if (sym->magic != SYM_MAGIC) {
+	if (!(flags&RM_DATA))
 	    free(sym);
 	return 0;
     }
 
-    for(se=sym->sym;se != NULL;) {
+    for (se=sym->sym;se != NULL;) {
 	sym_rm((SYM)se->data, flags);
 	nse=se->next;
-	if(flags & RM_KEY)
+	if (flags & RM_KEY)
 	    free(se->key);
-	if(flags & RM_DATA)
+	if (flags & RM_DATA)
 	    free(se->data);
 	free(se);
 	se=nse;
     }
-    if(!(flags&RM_DATA))
+    if (!(flags&RM_DATA))
 	free(sym);
     return 0;
 }
diff --git a/pan/tag_report.c b/pan/tag_report.c
index 0389e71..9065f50 100644
--- a/pan/tag_report.c
+++ b/pan/tag_report.c
@@ -63,33 +63,33 @@
     char **cont;
     const char **cont_save;
 
-    if(tcid == NULL)
+    if (tcid == NULL)
 	tcid = "-";
-    if(tc == NULL)
+    if (tc == NULL)
 	tc = "-";
-    if(tag == NULL)
+    if (tag == NULL)
 	tag = "test_result: no tag";
-    if(result == NULL)
+    if (result == NULL)
 	result = "(RESULT IS NULL)";
 
     strcpy(expkey, "contacts");
     /* note: the sym_get here does _not_ change the "cursor" */
-    if((expert = (char *)sym_get(tags, expkey)) == NULL) {
+    if ((expert = (char *)sym_get(tags, expkey)) == NULL) {
 	expert = "UNKNOWN";
     }
 
     /* ' tr " " "_" ' */
-    for(c = result; *c; c++) {
-	if(*c == ' ') {
+    for (c = result; *c; c++) {
+	if (*c == ' ') {
 	    *c = '_';
 	}
     }
-    if(*result == '\0')
+    if (*result == '\0')
 	result = "?";
 
     /* split contacts on "," and print out a line for each */
     cont_save = splitstr(expert, ",", NULL);
-    for(cont=(char **)cont_save;*cont != NULL; cont++) {
+    for (cont=(char **)cont_save;*cont != NULL; cont++) {
 	    printf(FORMAT, tag, tcid, tc, result, *cont);
     }
     splitstr_free(cont_save);
@@ -133,7 +133,7 @@
 
     /* parse analysis type: cuts:tc-count */
     ant = splitstr((dat=strdup(at)), ":",NULL);
-    if(ant[1] != NULL)
+    if (ant[1] != NULL)
 	tccount=atoi(ant[1]);
     else
 	tccount=0;
@@ -148,22 +148,22 @@
     tl = taglist;
     sym_seq(tags, &Key, &Data, R_FIRST);
     do {
-	if(tagcount == ntags) {
+	if (tagcount == ntags) {
 	    /* exceeded tag array size -- realloc */
 	    ntags += NTCID_START;
 	    taglist= (char **)realloc(taglist, sizeof(char *) * ntags);
 	    tl = taglist+tagcount;
 	}
 
-	if(strcmp((char *)Key.data, "_keys")==0)
+	if (strcmp((char *)Key.data, "_keys")==0)
 	    continue;
 	DEBUG(D_REPORT, 10)
 	    printf("cuts_report: tcid %s\n", (char *)Key.data);
 	*tl++ = Key.data;
 	tagcount++;
-    } while(sym_seq(tags, &Key, &Data, R_NEXT)==0);
+    } while (sym_seq(tags, &Key, &Data, R_NEXT)==0);
 
-    if(tagcount == ntags) {
+    if (tagcount == ntags) {
 	/* exceeded tag array size -- realloc */
 	ntags++;	/* need just one more */
 	taglist= (char **)realloc(taglist, sizeof(char *) * ntags);
@@ -176,7 +176,7 @@
 
     /* dump all found records */
     tcnum=0;
-    for(tl=taglist; *tl != NULL; tl++) {
+    for (tl=taglist; *tl != NULL; tl++) {
 
 	strcpy(key_get, *tl);
 	Key.data = (void *) key_get;
@@ -190,14 +190,14 @@
                         (char *)Data.data);
 	    result = worst_case(result, (char *)Data.data);
 	    test_result(tag, *tl, (char *)Key.data, (char *)Data.data, keys);
-	    if(atoi((char *)Key.data))
+	    if (atoi((char *)Key.data))
 		tcnum++;
-	} while(sym_seq(tags, &Key, &Data, R_NEXT)==0);
+	} while (sym_seq(tags, &Key, &Data, R_NEXT)==0);
     }
 
     test_result(tag, "*", "*", result, keys);
 
-    if(tccount != 0 && tccount != tcnum)
+    if (tccount != 0 && tccount != tcnum)
 	test_result(tag, "-", "-", "TC count wrong", keys);
 
     free(taglist);
@@ -243,39 +243,39 @@
     
     /* Check all driver-level status first */
     strcpy(key_get, "tag");
-    if((tag = (char *)sym_get(keys, key_get)) == NULL) {
+    if ((tag = (char *)sym_get(keys, key_get)) == NULL) {
 	return -1;
     }
     
     /* Check all driver-level status first */
     strcpy(key_get, "initiation_status");
-    if((is = (char *)sym_get(keys, key_get)) == NULL) {
+    if ((is = (char *)sym_get(keys, key_get)) == NULL) {
 	test_result(tag, NULL, NULL, "no init status", keys);
 	return -1;
     }
     
-    if(strcmp(is, "ok")) {
+    if (strcmp(is, "ok")) {
 	test_result(tag, NULL, NULL, is, keys);
     } else {
 	
 	strcpy(key_get, "corefile");
-	if((info = (char *)sym_get(keys, key_get)) != NULL)
-	    if(strcmp(info, "no") != 0) {
+	if ((info = (char *)sym_get(keys, key_get)) != NULL)
+	    if (strcmp(info, "no") != 0) {
 		test_result(tag, NULL, NULL, "coredump", keys);
 	    }
 	
 	strcpy(key_get, "termination_type");
-	if((tt = (char *)sym_get(keys, key_get))==NULL) {
+	if ((tt = (char *)sym_get(keys, key_get))==NULL) {
 	    test_result(tag, NULL, NULL, "no Term Type", keys);
 	    return -1;
 	}
 	
-	if(strcmp(tt, "exited")) {
+	if (strcmp(tt, "exited")) {
 	    test_result(tag, NULL, NULL, tt, keys);
 	}
 	
 	strcpy(key_get, "analysis");
-	if((info = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((info = (char *)sym_get(keys, key_get)) == NULL) {
 	    test_result(tag, NULL, NULL, "no Analysis Type", keys);
 	    return -1;
 	}
@@ -284,25 +284,25 @@
 	 * errors.  Do the kind of reporting requested by the test.
 	 */
 	
-	if(strncmp(info, "none", 4) == 0 ) {
+	if (strncmp(info, "none", 4) == 0) {
             /*
              * If analysis is 'none', alway report the test as
              * a pass regardless of output or exit status.
              */
 	    test_result(tag, NULL, NULL, "pass", keys);
 
-	} else if(strncmp(info, "cuts", 4)) {
+	} else if (strncmp(info, "cuts", 4)) {
 
             /*
              * If analysis is not cuts, assume it is 'exit', thus
              * the termination_id is used to determine pass/fail result.
              */
-	    if ( strcmp(tt, "timeout") ) {
+	    if (strcmp(tt, "timeout")) {
 	        strcpy(key_get, "termination_id");
-	        if((info = (char *)sym_get(keys, key_get)) == NULL) {
+	        if ((info = (char *)sym_get(keys, key_get)) == NULL) {
 		    test_result(tag, NULL, NULL, "no_Term_Id", keys);
 	        } else {
-		    if(strcmp(info, "0")) {
+		    if (strcmp(info, "0")) {
 		        test_result(tag, NULL, NULL, "fail", keys);
 		    } else {
 		        test_result(tag, NULL, NULL, "pass", keys);
@@ -328,40 +328,40 @@
      *	End Line
      */
     
-    if(extended) {
+    if (extended) {
 
 	strcpy(key_get, "termination_id");
-	if((ti = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((ti = (char *)sym_get(keys, key_get)) == NULL) {
 	    ti = "No_Termination_ID";
 	}
 
 	strcpy(key_get, "termination_type");
-	if((tt = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((tt = (char *)sym_get(keys, key_get)) == NULL) {
 	    tt = "No_Termination_Type";
 	}
 
 	strcpy(key_get, "duration");
-	if((duration = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((duration = (char *)sym_get(keys, key_get)) == NULL) {
 	    duration = "No_Duration";
 	}
 
 	strcpy(key_get, "_Start_line");
-	if((sl = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((sl = (char *)sym_get(keys, key_get)) == NULL) {
 	    sl = "No_Start_line";
 	}
 
 	strcpy(key_get, "_End_line");
-	if((el = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((el = (char *)sym_get(keys, key_get)) == NULL) {
 	    el = "No_End_line";
 	}
 
 	strcpy(key_get, "contacts");
-	if((contact = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((contact = (char *)sym_get(keys, key_get)) == NULL) {
 	    contact = "No_Contacts";
 	}
 
 	strcpy(key_get, "stime");
-	if((mystime = (char *)sym_get(keys, key_get)) == NULL) {
+	if ((mystime = (char *)sym_get(keys, key_get)) == NULL) {
 	    mystime = "No_stime";
 	}
 
@@ -388,7 +388,7 @@
 
     extern int extended;
 
-    if(extended)
+    if (extended)
 	out = stderr;
     else
 	out = stdout;
@@ -397,12 +397,12 @@
     /* build header out of RTS keywords */
     sprintf(key_get, "_RTS");
     Key.data = (void *) key_get;
-    if(sym_seq(tags, &Key, &Data, R_CURSOR) == 0) {
+    if (sym_seq(tags, &Key, &Data, R_CURSOR) == 0) {
 	do {
-	    if(strcmp((char *)Key.data, "PATH")==0)
+	    if (strcmp((char *)Key.data, "PATH")==0)
 		continue;
 	    fprintf(out, "%-20.20s %s\n", (char *)Key.data, (char *)Data.data);
-	} while(sym_seq(tags, &Key, &Data, R_NEXT)==0);
+	} while (sym_seq(tags, &Key, &Data, R_NEXT)==0);
     }
 
     fprintf(out, "\n");
@@ -429,7 +429,7 @@
     extern char yytext[];
 
     cuts_info[tok_num] = strtok(yytext, "\t ");
-    while(tok_num < 5 &&
+    while (tok_num < 5 &&
 	  (cuts_info[++tok_num] = strtok(NULL, "\t ")) != NULL )
 	;
 
@@ -445,7 +445,7 @@
   }
 #endif
 
-    if((oldresult=(char *)sym_get(tag, key)) != NULL) {
+    if ((oldresult=(char *)sym_get(tag, key)) != NULL) {
 	/* Duplicate -- assume mulitple runs */
 	/* keep "worst case" */
 	newresult = worst_case(oldresult, cuts_info[2]);
@@ -474,13 +474,13 @@
 
     /* Search the table for each status, then use the index to determine
        which has a lower precedence */
-    for(w1=worst; *w1 != NULL && strcmp(t1,*w1); w1++)
+    for (w1=worst; *w1 != NULL && strcmp(t1,*w1); w1++)
 	;
 
-    for(w2=worst; *w2 != NULL && strcmp(t2,*w2); w2++)
+    for (w2=worst; *w2 != NULL && strcmp(t2,*w2); w2++)
 	;
 
-    if(w1 < w2)
+    if (w1 < w2)
 	return(t1);
     else
 	return(t2);
diff --git a/pan/zoolib.c b/pan/zoolib.c
index 8f7bf6f..1685b94 100644
--- a/pan/zoolib.c
+++ b/pan/zoolib.c
@@ -260,7 +260,7 @@
     if (zoo_unlock(z))
 	return -1;
 
-    if(!found) {
+    if (!found) {
 	snprintf(zoo_error, ZELEN, 
 			"zoo_clear() did not find pid(%d)", 
 			p);
@@ -387,12 +387,12 @@
     int a, size;
     char *cmd;
 
-    for( size = a = 0; a < argc; a++) {
+    for (size = a = 0; a < argc; a++) {
 	size += strlen(argv[a]);
 	size++;
     }
 
-    if( (cmd = (char *)malloc(size)) == NULL ) {
+    if ((cmd = (char *)malloc(size)) == NULL) {
 	snprintf(zoo_error, ZELEN, 
 			"Malloc Error, %s/%d", 
 			__FILE__, __LINE__);
@@ -400,8 +400,8 @@
     }
 
     *cmd='\0';
-    for(a = 0; a < argc ; a++) {
-	if(a != 0)
+    for (a = 0; a < argc ; a++) {
+	if (a != 0)
 	    strcat(cmd, " ");
 	strcat(cmd, argv[a]);
     }
@@ -450,12 +450,12 @@
     zoo_mark_args(test_zoo, getpid(), test_tag, argc, argv);
     
 
-    for(j = 0; j < 5; j++) {
-	for(i = 0; i < 20; i++) {
+    for (j = 0; j < 5; j++) {
+	for (i = 0; i < 20; i++) {
 	    zt_add(test_zoo, i);
 	}
 	
-	for(; i >=0; i--) {
+	for (; i >=0; i--) {
 	    zoo_clear(test_zoo, i);
 	}
     }
diff --git a/runtest/ballista b/runtest/ballista
deleted file mode 100644
index 0fa30ef..0000000
--- a/runtest/ballista
+++ /dev/null
@@ -1 +0,0 @@
-ballista_test cd $LTPROOT/testcases/ballista/ballista; perl ostest_new.pl 75
diff --git a/testcases/Makefile b/testcases/Makefile
index 8c5657e..61993fe 100644
--- a/testcases/Makefile
+++ b/testcases/Makefile
@@ -25,32 +25,17 @@
 include $(top_srcdir)/include/mk/env_pre.mk
 
 # XXX (garrcoop):
-# 1. ballista is broken (working on it).
-# 2. kdump shouldn't be compiled by default, because it's runtime based and
+# 1. kdump shouldn't be compiled by default, because it's runtime based and
 #    WILL crash the build host (the tests need to be fixed to just build, not
 #    run).
-FILTER_OUT_DIRS		:= ballista kdump open%
+FILTER_OUT_DIRS		:= kdump
+
+ifneq ($(WITH_OPEN_POSIX_TESTSUITE),yes)
+FILTER_OUT_DIRS		+= open_posix_testsuite
+endif
 
 ifneq ($(WITH_REALTIME_TESTSUITE),yes)
 FILTER_OUT_DIRS		+= realtime
 endif
 
-#
-# XXX (garrcoop): disabling the open_posix_testsuite by request from Subrata
-# due to build times (open_posix_testsuite runs serially by design to
-# deterministically catch build errors -- see
-# testcases/open_posix_testsuite/Makefile for more details).
-#
-#trunk-all: open_posix_testsuite-all
-#
-#trunk-clean:: open_posix_testsuite-clean
-#
-#trunk-install: open_posix_testsuite-install
-
-open_posix_testsuite:
-	mkdir -p $@
-
-open_posix_testsuite-%: open_posix_testsuite
-	$(MAKE) -C $^ top_srcdir=$(abs_top_srcdir)/testcases/$^ $*
-
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/ballista/Makefile b/testcases/ballista/Makefile
deleted file mode 100644
index 43f31d8..0000000
--- a/testcases/ballista/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-ifeq ($(shell perl -v > /dev/null 2>&1 && echo yes),yes)
-
-all: bal
-
-install:
-	./do_nothing.sh
-
-else
-
-all install:
-	@echo "WARNING: No perl detected; skipping ballista tests"
-
-endif
-
-.configured:
-	cd ballista ; ./configure
-	touch .configured
-
-bal: .configured
-	$(MAKE) -i -C ballista
-
-clean:
-	$(MAKE) -C ballista clean
-	rm -f .configured
diff --git a/testcases/ballista/README b/testcases/ballista/README
deleted file mode 100644
index 7ff65b0..0000000
--- a/testcases/ballista/README
+++ /dev/null
@@ -1,24 +0,0 @@
-he ballista test suite is designed to provide numerous combinations of
-erroneous input parameters to system calls.  It can be built by issuing
-the make command in the ballista directory, however can also be built
-by giving the make command in the top LTP directory (recommended)
-
-The command to run ballista issue the following command:
-
-        runltp -f ballista
-
-
-OR
-
-     you can go into the /root/ltp/testcases/ballista/ballista
-     directory and run
-
-        perl ostest_new.pl #
-
-
-The value of '#' should be between the values of 1 and 100.  This is the
-percentage of test combinations you will run for each system call. By default in the /runtest/ballista file the value is 100.
-
-
-The results will be placed in an outfile directory.  You can view the
-results in an os_results.txt file or in a html document called index.html.
diff --git a/testcases/ballista/ballista/Makefile b/testcases/ballista/ballista/Makefile
deleted file mode 100644
index 084c44d..0000000
--- a/testcases/ballista/ballista/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# MakefileHost.dist: Makefile for Ballista Test Harness
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-########################
-#
-# Entry Conditions:
-# 	The following environment variables are set:
-#	 ${TARGET} : the name of the os specific Test Manager
-#
-########################
-
-# compiler info for the host
-CC=${CXX} -Wno-deprecated
-CFLAGS += -w ${TARGET_DEF}
-CLIBS = -lpthread -ldl -lnsl -rdynamic
-TEST_MAN_FILE = selfHost
-TARGET_DEF    = -DB_SELFHOST
-
-OBJS = match.o line.o hack.o ballistaRPC.o ballistaXDR.o ${TEST_MAN_FILE}.o \
-	ballistaUtil.o marshal.o testCaseIterator.o\
-	serverCommunication.o parseArguments.o ballistaError.o
-
-# build everything by default
-all : callGen callGen_standAlone genCodeCreator replacer ballista
-
-# run-of-of-the-mill rules for utility programs
-callGen: callGen.cpp
-	${CC} ${CFLAGS} callGen.cpp -o callGen
-
-callGen_standAlone: callGen_standAlone.cpp
-	${CC} ${CFLAGS} callGen_standAlone.cpp -o callGen_standAlone
-
-genCodeCreator: genCodeCreator.cpp
-	${CC} ${CFLAGS} genCodeCreator.cpp -o genCodeCreator
-
-replacer: replacer.cpp
-	${CC} ${CFLAGS} replacer.cpp -o replacer
-
-# run-of-of-the-mill rules for harness components
-hack.o : hack.cpp
-	${CC} ${CFLAGS} -c $?
-
-line.o : line.cpp
-	${CC} ${CFLAGS} -c $?
-
-ballistaRPC.o : ballistaRPC.c
-	${CC} ${CFLAGS} -c $?
-
-ballistaXDR.o : ballistaXDR.c
-	${CC} ${CFLAGS} -c $?
-
-ballistaUtil.o : ballistaUtil.cpp
-	${CC} ${CFLAGS} -c $?
-
-testCaseIterator.o : testCaseIterator.cpp 
-	${CC} ${CFLAGS} -c $?
-
-serverCommunication.o : serverCommunication.cpp 
-	${CC} ${CFLAGS} -c $?
-
-parseArguments.o : parseArguments.cpp
-	${CC} ${CFLAGS} -c $?
-
-ballistaError.o : ballistaError.cpp
-	${CC} ${CFLAGS} -c $?
-
-marshal.o : marshal.cpp
-	${CC} ${CFLAGS} -c $?
-
-match.o : match.cpp
-	${CC} ${CFLAGS} -c $?
-
-# the Test Manager is OS dependant, so is built from the ${TEST_MAN_FILE}
-#  environment variable
-${TEST_MAN_FILE}.o : ${TEST_MAN_FILE}.h ${TEST_MAN_FILE}.cpp
-	${CC} ${CFLAGS} -c ${TEST_MAN_FILE}.cpp
-
-# ballista is built from several static components, but the Test Manager
-#  (${TEST_MAN_FILE}) is platform dependant
-ballista : ballista.cpp ${OBJS}
-	${CC} ${CFLAGS} ${CLIBS} ballista.cpp ${OBJS} -o ballista
-
-# rules that are only used for testing purposes
-unmarshal.o : unmarshal.cpp
-	${CC} ${CFLAGS} -c $?
-
-testmarshal.o : testmarshal.cpp 
-	${CC} ${CFLAGS} -c $?
-
-testmarshal : marshal.o unmarshal.o testmarshal.o
-	${CC} marshal.o unmarshal.o testmarshal.o -o testmarshal
-
-test_parse_arguments.o : test_parse_arguments.cpp
-	${CC} ${CC_OPTS} -c $?
-
-test_parse_arguments : test_parse_arguments.o parseArguments.o \
-	ballistaUtil.o
-	${CC} test_parse_arguments.o parseArguments.o ballistaUtil.o \
-	-o test_parse_arguments
-
-pause_harness : pause_harness.cpp ${OBJS}
-	${CC} -Itemplates ${CFLAGS} pause_harness.cpp ${OBJS} -o pause_harness 
-
-# clean up everything that we build
-clean:
-	$(MAKE) -C templates clean
-	$(RM) -f *.o *.out ballista blexer bparser callGen callGen_standAlone \
-	            genCodeCreator replacer testmarshal MakefileHost MakefileTarget
diff --git a/testcases/ballista/ballista/MakefileHost.dist b/testcases/ballista/ballista/MakefileHost.dist
deleted file mode 100644
index 5e0c553..0000000
--- a/testcases/ballista/ballista/MakefileHost.dist
+++ /dev/null
@@ -1,123 +0,0 @@
-# MakefileHost.dist: Makefile for Ballista Test Harness
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-########################
-#
-# Entry Conditions:
-# 	The following environment variables are set:
-#	 ${TARGET} : the name of the os specific Test Manager
-#
-########################
-
-# compiler info for the host
-@host-CC@
-@host-CFLAGS@
-@host-CLIBS@
-@host-TEST_MAN_FILE@
-@TARGET_DEF@
-
-OBJS = match.o line.o hack.o ballistaRPC.o ballistaXDR.o ${TEST_MAN_FILE}.o \
-	ballistaUtil.o marshal.o testCaseIterator.o\
-	serverCommunication.o parseArguments.o ballistaError.o
-	
-
-# build everything by default
-all : callGen callGen_standAlone genCodeCreator replacer ballista
-
-# run-of-of-the-mill rules for utility programs
-callGen: callGen.cpp
-	${CC} -O callGen.cpp -o callGen
-
-callGen_standAlone: callGen_standAlone.cpp
-	${CC} -O callGen_standAlone.cpp -o callGen_standAlone
-
-genCodeCreator: genCodeCreator.cpp
-	${CC} -O genCodeCreator.cpp -o genCodeCreator
-
-replacer: replacer.cpp
-	${CC} -O replacer.cpp -o replacer
-
-# run-of-of-the-mill rules for harness components
-hack.o : hack.cpp
-	${CC} ${CFLAGS} -c $?
-
-line.o : line.cpp
-	${CC} ${CFLAGS} -c $?
-
-ballistaRPC.o : ballistaRPC.c
-	${CC} ${CFLAGS} -c $?
-
-ballistaXDR.o : ballistaXDR.c
-	${CC} ${CFLAGS} -c $?
-
-ballistaUtil.o : ballistaUtil.cpp
-	${CC} ${CFLAGS} -c $?
-
-testCaseIterator.o : testCaseIterator.cpp 
-	${CC} ${CFLAGS} -c $?
-
-serverCommunication.o : serverCommunication.cpp 
-	${CC} ${CFLAGS} -c $?
-
-parseArguments.o : parseArguments.cpp
-	${CC} ${CFLAGS} -c $?
-
-ballistaError.o : ballistaError.cpp
-	${CC} ${CFLAGS} -c $?
-
-marshal.o : marshal.cpp
-	${CC} ${CFLAGS} -c $?
-
-match.o : match.cpp
-	${CC} ${CFLAGS} -c $?
-
-# the Test Manager is OS dependant, so is built from the ${TEST_MAN_FILE}
-#  environment variable
-${TEST_MAN_FILE}.o : ${TEST_MAN_FILE}.h ${TEST_MAN_FILE}.cpp
-	${CC} ${CFLAGS} -c ${TEST_MAN_FILE}.cpp
-
-# ballista is built from several static components, but the Test Manager
-#  (${TEST_MAN_FILE}) is platform dependant
-ballista : ballista.cpp ${OBJS}
-	${CC} ${CFLAGS} ${CLIBS} ballista.cpp ${OBJS} -o ballista
-
-# rules that are only used for testing purposes
-unmarshal.o : unmarshal.cpp
-	${CC} ${CFLAGS} -c $?
-
-testmarshal.o : testmarshal.cpp 
-	${CC} ${CFLAGS} -c $?
-
-testmarshal : marshal.o unmarshal.o testmarshal.o
-	${CC} marshal.o unmarshal.o testmarshal.o -o testmarshal
-
-test_parse_arguments.o : test_parse_arguments.cpp
-	${CC} ${CC_OPTS} -c $?
-
-test_parse_arguments : test_parse_arguments.o parseArguments.o \
-	ballistaUtil.o
-	${CC} test_parse_arguments.o parseArguments.o ballistaUtil.o \
-	-o test_parse_arguments
-
-pause_harness : pause_harness.cpp ${OBJS}
-	${CC} -Itemplates ${CFLAGS} pause_harness.cpp ${OBJS} -o pause_harness 
-
-
-# clean up everything that we build
-clean :
-	rm -f *.o ballista callGen callGen_standAlone genCodeCreator replacer testmarshal
-
diff --git a/testcases/ballista/ballista/MakefileTarget.dist b/testcases/ballista/ballista/MakefileTarget.dist
deleted file mode 100644
index e76cc55..0000000
--- a/testcases/ballista/ballista/MakefileTarget.dist
+++ /dev/null
@@ -1,133 +0,0 @@
-# MakefileTarget.dist: Makefile for Ballista Test Execution subsystem  
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-########################
-#
-# Entry Conditions: 
-# 	The following environment variables are set:
-#	 ${OBLIST} : a list of the datatype files to be linked into mut.out
-#	 ${FUNCTION} : the name of the MuT
-#	 ${LLIST} : library list
-#
-#	The utility programs callGen and replacer have been built
-#
-########################
-
-# declare all the environment variables needed by the target compiler
-@target-CC@
-@target-CFLAGS@
-@target-LDFLAGS@
-@target-MISC_VARS@
-@target-MUT_O@
-@target-MUNCH@
-@target-RECURSIVE_FLAGS@
-@TARGET_DEF@
-
-OBJS =	executeTestCase.o \
-	unmarshal.o \
-	templates/bTypes.o \
-	${OBLIST} \
-	${LLIST}
-
-#  Define suffixes to be recognized by make
-.SUFFIXES: .tpl .o .cpp
-
-# any <datatype>.o file is dependant on a <datatype>.tpl file
-# call make recursively 
-.tpl.o :
-	cd templates; ${MAKE} ${@F} ${RECURSIVE_FLAGS}
-
-.cpp.o :
-	${CC} ${CFLAGS} -c $<
-
-# make mut.out by default
-all: mut.out
-
-# callInclude.cpp (the actual call the the MuT) is dynamicly generated
-#  by callGen
-# NOTE - we have a dependancy on the file mut.  makeBallista stores the name
-#  of the mut being built in the mut file, and changes the file when the mut
-#  name changes, thus this rule gets invoked when the mut we are building
-#  against changes
-callInclude.cpp : callTable dataTypes mut userCatches.cpp
-	./callGen "${FUNCTION}"
-	mv callInclude.cpp callInclude.old
-	./replacer < callInclude.old > callInclude.cpp
-
-
-# special rule for bTypes.o, as there is no bTypes.tpl
-templates/bTypes.o : templates/bTypes.cpp
-	cd templates; ${MAKE} ${@F} ${RECURSIVE_FLAGS}
-
-# touch user created files to make sure they exist, if the user didn't
-#  create them manually
-userSetup.cpp :
-	touch $@
-
-userCatches.cpp :
-	touch $@
-
-userShutdown.cpp :
-	touch $@
-
-# the user-defined-includes file is automaticly generated from the
-#  dataTypes file
-executeTestCase.h : dataTypes
-	/bin/echo "//executeTestCase.h: automatically generated header file - executes Ballista test" > executeTestCase.h
-	/bin/echo "// Copyright (C) 1998-2001  Carnegie Mellon University" >> executeTestCase.h
-	/bin/echo " " >> executeTestCase.h
-	/bin/echo "// This program is free software; you can redistribute it and/or" >> executeTestCase.h
-	/bin/echo "// modify it under the terms of the GNU General Public License" >> executeTestCase.h
-	/bin/echo "// as published by the Free Software Foundation; either version 2" >> executeTestCase.h
-	/bin/echo "// of the License, or (at your option) any later version." >> executeTestCase.h
-	/bin/echo " " >> executeTestCase.h
-	/bin/echo "// This program is distributed in the hope that it will be useful," >> executeTestCase.h
-	/bin/echo "// but WITHOUT ANY WARRANTY; without even the implied warranty of" >> executeTestCase.h
-	/bin/echo "// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" >> executeTestCase.h
-	/bin/echo "// GNU General Public License for more details." >> executeTestCase.h
-	/bin/echo " " >> executeTestCase.h
-	/bin/echo "// You should have received a copy of the GNU General Public License" >> executeTestCase.h
-	/bin/echo "// along with this program; if not, write to the Free Software" >> executeTestCase.h
-	/bin/echo "// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA." >> executeTestCase.h
-	/bin/echo " " >> executeTestCase.h
-	/bin/echo '#'include \"userIncludes.h\" >> executeTestCase.h
-	@set -e; for A in `echo ${OBLIST:.o=.h}`; do \
-		/bin/echo '#'include \"$$A\" >> executeTestCase.h; \
-	done
-
-# the bulk of the executeTestCase code is built by replacer
-executeTestCase.cpp : executeTestCase.fresh userSetup.cpp userCatches.cpp userShutdown.cpp callInclude.cpp
-	./replacer < executeTestCase.fresh > executeTestCase.cpp
-
-# once the executeTestCase code is generated, build the object file
-# NOTE - ${OBLIST} is included as a dependancy to take advantage of its
-#  side effect of generating .h files for the datatypes
-executeTestCase.o : executeTestCase.cpp unmarshal.h executeTestCase.h ${OBLIST} userIncludes.h
-	${CC} ${CFLAGS} -c executeTestCase.cpp
-
-# mut.out contains all of the code to be loaded onto the target
-# NOTE - we must to C++ munching in order for the C++ code to work on the
-#  target machine
-mut.out : ${OBJS}
-	${CC} ${LDFLAGS} ${OBJS} ${MUT_O}
-	${MUNCH}
-
-# clean up everything that is generated
-clean :
-	rm -f mut.o executeTestCase.o unmarshal.o mut.out __mut.* mut \
-		callInclude.cpp vardefs.cpp executeTestCase.cpp \
-		executeTestCase.h
-	cd templates; ${MAKE} clean	
diff --git a/testcases/ballista/ballista/ballista.cpp b/testcases/ballista/ballista/ballista.cpp
deleted file mode 100644
index 76a609d..0000000
--- a/testcases/ballista/ballista/ballista.cpp
+++ /dev/null
@@ -1,1045 +0,0 @@
-// ballista.cpp  Main file for ballista test harness
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#include <errno.h>
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
-#include <signal.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <values.h>
-#include <ctype.h>
-
-#undef _XOPEN_SOURCE //dec unix hack
-#include <unistd.h>
-#include <vector>
-#include <assert.h>
-#include <sys/stat.h>
-
-#include "line.h"
-
-#include "ballistaRPC.h"
-
-#include "ballista.h"
-#include "ballistaUtil.h"
-#include "ballistaError.h"
-#include "parseArguments.h"
-#include "serverCommunication.h"
-#include "testCaseIterator.h"
-#include "testManager.h"
-
-using namespace std;
-
-#ifdef B_VXWORKS
-    #include "vxworks.h"
-#else
-    #include "selfHost.h"
-#endif
-
-#define NO_SERVER   
-#ifdef NO_SERVER   
-int LCVs[MAXP];
-int MAXs[MAXP];
-#endif
-
-
-// the file that holds the test execution
-#define MUT_OUT "./mut.out"
-#define NO_SERVER 
-
-// This is a kludge to set an upper bound on the number of test cases
-#define MAXIMUM_TEST_CASES 4000
-
-//This macro deletes a dynamically allocated object if it exists, and sets
-//its handle to NULL.
-#define DELETE_NULL(ptr) if (ptr) { \
-                              delete ptr; \
-                              ptr = NULL; \
-                         }
-
-
-char     pBuf[1048];       //don't want to pay the overhead of creating
-                           //and deleting many times
-
-//These are global so they can be destroyed properly when aborting
-//Since only one of each is created during the entire program, having them
-//as global should not be a problem.
-Test_manager *test_manager_obj = NULL;
-Parse_arguments * arguments = NULL;
-Server_communication *server = NULL;
-Test_case_iterator *biterator = NULL;
-
-vector<line> vec[MAXP];    //contains array of all setting for each arg
-
-int parameterize(b_param param[],line l);
-
-int checkLCVs(int numParam)
-//This returns 1 if LCV is maxed out, 0 if not
-//according to the values stored in LCVs and the max's stored in MAXs
-//
-//PRE: MAXs and LCV initialized to something
-{
-    int max_found=1;
-    int index=0;
-    while (max_found && index<numParam)  //do it until we have checked all or found one not maxed out
-    {
-        max_found=LCVs[index]==(MAXs[index]-1);
-        index++;
-    }
-//      for (int ii=0;ii<numParam;ii++)
-//              cout<<LCVs[ii]<<" - ";
-//      cout<<endl;
-    return max_found;
-}
-
-int incLCVs(int numParam)
-//this function increments the LCVs and indicates if it overflowed by returning a 1
-//ie, if it overflowed stop.  Like reaching EOF
-{
-    int done=0;
-    int index=0;
-
-    if (checkLCVs(numParam)) return 1;   //already maxed out
-
-    while (!done && index<numParam)  
-    {
-        LCVs[index]++;
-        if (LCVs[index]==MAXs[index]) //carry - set to zero inc next place
-        {
-            LCVs[index]=0;
-        }
-        else
-            done=1; //no carry
-        index++;
-    }
-    return 0;   //since we were not maxed out at the start, we are guaranteed to be able
-    //to inc at least once
-}
-
-/************************
- *
- * Function:  two_dim_to_marshalled_data
- * Description: convert a two dim into a marshalled_data
- * Function Inputs: marshal - destination MARSHAL_DATA_TYPE
-                    parameter_list - source two_dim
- * Global Inputs:
- * Return Values: none
- * Global Outputs:
- * Errors:  
- * Pre-Conditions:
- * Post-Conditions: marshal contains the equivalent of parameter_list
- * Design:  copy all of the characters from the parameter list into the 
-            marshal.  Null terminate each list of test value attributes as
-	    well as the list of dial settings
- * Notes:
- *
- ************************/
-void two_dim_to_marshalled_data(MARSHAL_DATA_TYPE marshal, 
-				const two_dim *parameter_list)
-{
-    int parameter;
-    int attribute;
-
-    assert(marshal != NULL);
-    assert(parameter_list != NULL);
-
-    // check that we won't overflow the array
-    assert(parameter_list->two_dim_len <= MAXP);
-
-    for(parameter=0;parameter < parameter_list->two_dim_len;parameter++) 
-    {
-      for(attribute = 0; 
-  	  attribute < parameter_list->two_dim_val[parameter].one_dim_len;
-	  attribute++) 
-      {
-
-          // check that we don't overflow the array
-          assert(parameter_list->two_dim_val[parameter].one_dim_len <= MAXD);
-
-          safe_strncpy(marshal[parameter][attribute],
-		       parameter_list->two_dim_val[parameter].
-		       one_dim_val[attribute],
-		       sizeof(marshal[parameter][attribute]));
-        }
-        // null terminate attribute list
-        marshal[parameter][attribute][0] = 0; 
-    }
-    // null parameter attribute list
-    marshal[parameter][0][0] = 0; // null terminate
-}
-
-/************************
- *
- * Function: ballista_1
- * Description: This function iterates through all of the required tests and 
-                executes them with the supplied test manager.  Then it sends 
-		the results of the tests to the server.
-
-		There is a kludge to set an upper bound on the number of tests
-		using MAXIMUM_TEST_CASES.
-		
- * Function Inputs:  server_name - name of the ballista server
-		     function_name - name of the MuT that is being tested
-		     timeout - how long to wait in microseconds for a restart
-		     sample_size - what percent of tests should be run (1-100)
-		     NumArg - number of arguments to the parameter
-		     myvec - contains all of the data from the param files
- * Global Inputs: biterator, server, test_manager_obj, arguments
- * Return Values: 0 if successful, nonzero if any errors
- * Global Outputs:
- * Errors: If an object cannot be created or the test manager fails, 
-           then the function will return -1
- * Pre-Conditions: test_manager_obj has been created
- * Post-Conditions: tests have been executed and results have 
-                    been sent to server
- * Design:  Create a server and iterator object.  
-            Iterate through all of the tests and
-            send the results to the server.
- * Notes:
- *
- ************************/
-int ballista_1(const char *server_name,
-	   char *function_name,
-	   int timeout,
-	   double sample_size, 
-	   int number_arguments,
-	   vector<line> myvec[MAXP])
-{
-    two_dim *parameter_list = NULL;
-    MARSHAL_DATA_TYPE marshalled_data;
-    int i;
-    int j;
-    int test_results;
-    char pass_status[255];
-    int call_ret;
-    char sys_err[255];
-    char mut_return[MAX_RETURN];
-    struct data_from_client data;
-    int test_count = 0;
-    int comb_number=0;  //combination number of the test actually executed as test_count #
-    int test_total=1;
-
-    struct stat tmp_stat_struct;
-
-    assert(! stat(MUT_OUT, &tmp_stat_struct));
-    assert(server_name != NULL);
-    assert(function_name != NULL);
-    assert(myvec != NULL);
-
-
-   
-
-#ifdef NO_SERVER //no server to communicate with
-    try
-    {
-        //first initialize all the LCV arrays   
-        //not really needed to zero it all, only to num_arguments, but CYA
-        for (int ii=0;ii<MAXP;ii++)
-            LCVs[ii]=MAXs[ii]=0;
- 
-        //now setup the maximums
-        for (int ii=0;ii<number_arguments;ii++)
-        {
-            MAXs[ii]=vec[ii].size();
-            test_total*=vec[ii].size();
-        }
-        int done_testing=0;
-        double side1,side2;
-        int rnum;
-        while (!done_testing)
-        { 
-            comb_number++;
-            rnum = rand();
-            side1 = (double)rnum/(double)RAND_MAX;
-            //side2 = (double)MAXIMUM_TEST_CASES/(double)test_total;
-            
-            // Note old side (above) did not take into consideration the percentage
-            
-            if (MAXIMUM_TEST_CASES < (test_total*sample_size/100.0))
-            {
-              side2 = (double)MAXIMUM_TEST_CASES/(double)test_total;
-            }
-            else
-            {
-              side2 = (double) sample_size/100.0;
-            }
-
-            // normally the second part of if (after the or) would be here but wanted to 
-            // perform at least 1 test.
-            if ((side1<side2) || ((test_count == 0) && (comb_number == test_total -1)))
-            {
-    
-                test_count++;
-                // here we print out the dial settings used for this test, and setup the marshalled
-                // data
-                for (i=0;i<number_arguments;i++)
-                {
-                    j=parameterize(marshalled_data[i],vec[i][LCVs[i]]);
-                    cout <<"#param:";
-                    for (int jj=0;jj<j;jj++)
-                        cout<<marshalled_data[i][jj]<<"\t";
-                    cout<<endl;
-                }
-                // remove template Log File
-                FILE* filePtr = NULL;
-                if ((filePtr = fopen("/tmp/templateLog.txt","r")) != NULL)
-                {
-                    fclose(filePtr);
-                    system ("rm -f /tmp/templateLog.txt");
-                }
-
-                test_results = test_manager_obj->manage_test(marshalled_data,
-                                                             (long)timeout,
-                                                             pass_status,
-                                                             sizeof(pass_status),
-                                                             &call_ret,
-                                                             sys_err,
-                                                             sizeof(sys_err),
-                                                             mut_return,
-                                                             sizeof(mut_return));
-                if (!test_results)
-                {
-                    cout<<"rval:" << mut_return << endl;
-                    cout<<pass_status;
-                    cout<<"\t"<<call_ret<<endl;
-                    if((call_ret!=-1) && (call_ret!=0))
-                    {
-                        if (call_ret == 99) //problem in setup
-                        {
-                            char str[256];
-                            if ((filePtr = fopen("/tmp/templateLog.txt","r")) != NULL)
-                            {
-                                while(!feof(filePtr))
-                                {
-                                    if (fgets(str,254,filePtr))
-                                    {
-                                        cout << str << endl;
-                                    }
-                                }                                
-                                fclose (filePtr);
-                                system ("rm /tmp/templateLog.txt");
-                            }
-                            else
-                            {
-                                cout <<sys_err<<endl;
-                            }
-                        }   
-                        else
-                        {
-                            //intentionally changed for ostest - push button
-                            //cerr <<sys_err<<endl;
-                            cout <<sys_err<<endl;
-                        }
-                   }
-
-                } // if test succeeded
-                else
-                {
-                    cerr <<"Error in the test manager" << endl << sys_err << endl;
-                    return -1;
-                }
-                if (MAXIMUM_TEST_CASES < (test_total*sample_size/100.0))
-                {
-                  cout<<"------- "<<test_count<<" of ~"<<MAXIMUM_TEST_CASES<<" Combination #"<<comb_number
-                      <<" of "<<test_total<<"----"<<endl;
-                }
-                else
-                {
-                  cout<<"------- "<<test_count<<" of ~"<< test_total * sample_size/100.0 <<" Combination #"<<comb_number
-                      <<" of "<<test_total<<"----"<<endl;
-                }
-   
-            }
-            done_testing=incLCVs(number_arguments);
-                        
-        } // while there are still tests
-    } // try
-    catch (Ballistic_error be)
-    {
-        cerr << be.get_error_message();
-        return -1;
-    }
-#else  //running with server
-
-    try 
-    {
-        server = new Server_communication(server_name);
-        if(!server) 
-        {
-            cerr << "Error: Out of memory while allocating server ";
-            cerr << "communication objects." << endl;
-            return -1;
-        }
-    }
-    catch (Ballistic_error be) 
-    {
-        cerr << be.get_error_message() << endl;
-        return -1;
-    }
-
-    try 
-    {
-        biterator = new Test_case_iterator(server,sample_size,
-	              			   number_arguments,myvec);
-        if(!biterator) 
-        {
-            cerr << "Error: Out of memory while allocating iterator." << endl;
-            return -1;
-        }
-        test_count = 0;
-        while(test_count < MAXIMUM_TEST_CASES && 
-	     (parameter_list = biterator->next())) 
-        {
-            test_count++;
-
-            two_dim_to_marshalled_data(marshalled_data,parameter_list);
-
-            // here we print out the dial settings used for this test
-            for(i=0;marshalled_data[i][0][0];i++) 
-            {
-	        for(j=0;marshalled_data[i][j][0];j++) 
-                {
-	            cout<<marshalled_data[i][j]<<"\t";
-	        }
-	        cout<<endl;
-            }
-            // remove template Log File
-            FILE* filePtr = NULL;
-            if ((filePtr = fopen("/tmp/templateLog.txt","r")) != NULL)
-            {
-                system ("rm -f /tmp/templateLog.txt");
-            }    
-            test_results = test_manager_obj->manage_test(marshalled_data,
-  					                (long)timeout,
-					                pass_status,
-					                sizeof(pass_status),
-					                &call_ret,
-					                sys_err,
-					                sizeof(sys_err),
-					                mut_return,
-					                sizeof(mut_return));
-            if(!test_results) 
-            {
-
-  	        cout<<"rval:" << mut_return << endl;
-	        cout<<pass_status;
-	        cout<<"\t"<<call_ret<<endl;
-	        if((call_ret!=-1) && (call_ret!=0))
-                {
-                    if (call_ret == 99) //problem in setup
-                    {
-                        char str[256];
-                        if ((filePtr = fopen("/tmp/templateLog.txt","r")) != NULL)
-                        {
-                            while(!feof(filePtr))
-                            {
-                                if (fgets(str,254,filePtr))
-                                {
-                                    cout << str << endl;
-                                }
-                            }
-                            fclose (filePtr);
-                            system ("rm /tmp/templateLog.txt");
-                        }
-                        else
-                        {
-                            cout <<sys_err<<endl;
-                        }
-                    }
-                    else
-                    {
-                        //intentionally changed for ostest - push button
-	                //cerr <<sys_err<<endl;
-	                cout <<sys_err<<endl;
-                    }
-	        }    
-	
- 	        // now start packing the results into "data" to send to the server
-	        // in Ballistic we no longer have a NULL, but rather an empty string
-	        // XDR cannot handle NULL string so send over the word NULL instead
-	        if(pass_status[0] == '\0') 
-                {
-	            data.passtatus="NULL";
-	        }
-	        else 
-                {
-	            data.passtatus = pass_status;
-	        }
-
-	        data.call_ret = call_ret;
-	
-	        // in Ballistic we no longer have a NULL, but rather an empty string
- 	        //XDR cannot handle NULL string so send over the word NULL instead
-	        if(sys_err[0] == '\0') 
-                {
-	            data.sys_err="NULL";
-	        }
-	        else 
-                {
-	            data.sys_err = sys_err;
-	        }
-
-	        data.params=*parameter_list;
-
-	        data.NumArg=number_arguments;
-	        data.function=function_name;
-	
-	        //Send the results of this test over to the server
-	        server->send_test_results(&data);
-            } // if test succeeded
-            else 
-            {
-	        cerr <<"Error in the test manager" << endl << sys_err << endl;
-	        return -1;
-            }
-      
-            cout<<"----"<<endl;
-
-      /*      char dummy;
-	      printf("Press return to continue...");
-	      scanf ("%c", &dummy);
-      */
-        } // while there are still tests
-    } // try
-    catch(Ballistic_error be) 
-    {
-        cerr << be.get_error_message();
-        return -1;
-    }
-#endif //NO_SERVER
-
-    return 0;
-}
-
-void lineVecTest()
-  //test the line vector template
-{
-  vector <line> lineVec;
-
-  vector<line>::iterator i;
-
-  lineVec.push_back( line("This is"));
-  lineVec.push_back( line(" a"));
-  lineVec.push_back( line(" test.\n"));
-
-  for (i=lineVec.begin();i!=lineVec.end();i++)
-    cout<<*i;
-}
-
-
-/************************
- *
- * Function: lineIn
- * Description: reads a line and inserts it into a line vector
- * Function Inputs: ins - input stream, v - line vector
- * Global Inputs:
- * Return Values: 
- * Global Outputs:pBuf will be set to the line read in from the stream
- * Errors:
- * Pre-Conditions:
- * Post-Conditions: the next line from ins will be added to v if it 
-                    has text in it.
- * Design:
-            read in the next line from the stream
-	    check if there is a non space character in the line
-	    if so, then copy the line into l and then put l in v
-
- * Notes:   This function was written by the ECE department
-            It had to be modified by the Ballistic team to accomodate 
-	    blank lines in the .param files, since they are common when
-	    creating .param files by hand for testing Ballistic
- *
- ************************/
-int lineIn(istream& ins,vector<line> &v)
-  //this function reads in a string and stores it in the linevector
-  //read in from ins, store in v
-
-{
-    line l;
-    int i;
-    int length;
-    BOOL_TYPE hasText;
-
-    ins.getline(pBuf,sizeof(pBuf),'\n');
-
-    hasText = BOOL_FALSE;
-    length = strlen(pBuf);
-    for(i=0;i<length && !hasText;i++) 
-    {
-        if(!isspace(pBuf[i])) 
-        {
-            hasText = BOOL_TRUE;
-        }
-    }
-    if(hasText) 
-    {
-        l = pBuf;
-        if (ins.gcount()>0) 
-        {
-            v.push_back(l);
-        }
-    }
-
-    return (ins.gcount());
-}
-
-void getVec(istream& ins,vector<line> &v)
-  // This function reads an entire file (ins) and stores it
-  // line by line in vector v
-{
-    while (!ins.eof())
-    {
-        lineIn(ins,v);
-    } 
-}
-
-void test()
-{
-    //just run a few short tests
-
-    vector<line> v;
-    int i;
-    line l;
-    char *t=NULL;
-
-    lineVecTest();
-
-    getVec(cin,v);
-    for (i=0;i<v.size();i++)
-        cout<<v[i].p<<endl;
-
-    cout<<"\n\nTokenization of:\n"<<v[1]<<"\n\n";
-    t=strtok(v[1].p,"\t");
-    while (t!=NULL)
-    {
-        cout<<t<<endl;
-        t=strtok(NULL,"\t");
-    }
-  
-}
-
-int parameterize(b_param param[],line l)
-    //this function breaks a given line into its components
-    //seperated by a tab (/t)
-{
-    char *t=NULL;
-    int i=0;
-    int firstOne=1;
-
-    t=strtok(l.p,"\t");
-    while (t!=NULL)
-    {
-        if (!(i==1 && firstOne==1)) //skip the number of dials datum
-  	    strcpy(param[i++],t);
-        else
-	    firstOne=0;
-
-
-        if (i==MAXP)
-	{
-	    cerr<<"Error, attempted to parameterize string with more than <<"<<MAXD
-	        <<" dial components\n"<<l<<endl;
-	    exit(1);
-	}
-        t=strtok(NULL,"\t");
-    }
-    return i;
-  
-}
-
-
-/************************
- *
- * Function: usage
- * Description: display the usage message.
- * Function Inputs: executable_name
- * Global Inputs:
- * Return Values: 
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Conditions:
- * Design:
-          display the usage of the program.  use ifdefs to show the differences
-	  between different operating systems
-
- * Notes:
- *
- ************************/
-void usage(char *executable_name) 
-{
-    assert(executable_name != NULL);
-
-#ifdef B_VXWORKS
-    cerr<<"Usage: "<<executable_name;
-    cerr<<" server function_name [-r percent][-t timeout] ";
-    cerr<<"-i target_address -n target_name [-m number | -c {yes,no}] "; 
-    cerr<<"<param file>..." << endl;
-    cerr<<"Where" << endl;
-  
-    cerr<<"  server is the ballista server" << endl;
-    cerr<<"  function_name is the function to be tested" << endl;
-    cerr<<"  -r percent is the percent of tests to be run." << endl;
-    cerr<<"     valid range --  1 to 100 (default 100)" << endl;
-  
-    cerr<<"  -t timeout is maximum time in microseconds for restarts " << endl;
-    cerr<<"     and catastrophics failures" << endl;
-    cerr<<"     valid range --  100000 to 100000000 (default 10,000,000)" << endl;
-    
-    cerr<<"  -i target_address is the IP address of the target machine" << endl;
-    cerr<<"     * This is required. *" << endl;
-  
-    cerr<<"  -n target_name is the target's name that is registered ";
-    cerr<<"with Tornado." << endl;
-    cerr<<"     * This is required. *"<<endl;
-  
-    cerr<<"  -m number is the maximum number of reboots. " << endl;
-    cerr<<"     Use -1 (default) for unlimited rebooting."<<endl;
-  
-    cerr<<"  -c {yes,no} - Specify a clean test each time or not. " << endl;
-    cerr<<"     yes will reboot the target after each test."<<endl;
-  
-    cerr<<"  param file is the data type defined by file."<<endl;
-#else
-    cerr<<"Usage: "<<executable_name<<" server function_name ";
-    cerr<<"[-r percent] [-t timeout] ";
-    cerr<<"<type file>..."<<endl;
-    cerr<<"Where"<<endl;
-    cerr<<"  server is the ballista server"<<endl;
-    cerr<<"  function_name is the function to be tested" << endl;
-    cerr<<"  percent is between 1 and 100 (default 100)"<<endl;
-    cerr<<"  timeout is maximum time in microseconds for restarts ";
-    cerr<<"(default 10,000,000)"<<endl;
-    cerr<<"  type is the data type defined by file."<<endl;
-#endif    
-}
-
-
-/************************
- *
- * Function: clean_up
- * Description: clean up after catching signals
- * Function Inputs: int exit status
- * Global Inputs: biterator, server, test_manager_obj, arguments
- * Return Values: N/A
- * Global Outputs: exits with exit_status
- * Errors: N/A
- * Pre-Conditions: N/A
- * Post-Conditions: Program has cleaned-up after itself.  Then exit is
- *                  called with the status input to the function
- * Design: N/A
- * Notes: Author: Mina Atanacio
- *
- ************************/
-
-void clean_up (int exit_status) 
-{
-    DELETE_NULL(biterator)
-    DELETE_NULL(server)
-    DELETE_NULL(test_manager_obj)
-    DELETE_NULL(arguments)
-    exit(exit_status); 
-}
-
-/************************
- *
- * Function: catch_signal
- * Description: clean up after catching signals
- * Function Inputs: int signal_number
- * Global Inputs: N/A
- * Return Values: N/A
- * Global Outputs: N/A
- * Errors: N/A
- * Pre-Conditions: Signal was caught
- * Post-Conditions: Program has cleaned-up after itself.  This is done
- *                  by calling clean_up with exit status 2
- * Design: N/A
- * Notes: Author: Mina Atanacio
- *
- ************************/
-
-void catch_signal (int signal_number) 
-{
-    cerr << "Caught signal "<< signal_number<< ", cleaning up..." << endl;
-    clean_up(2);
-}
-
-
-/************************
- *
- * Function: main
- * Description: main function of the harness
- * Function Inputs: argc, argv
- * Global Inputs:
- * Return Values: 0 upon success
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Conditions:
- * Design:
-          Set up signal-handling procedure
-          Parse the command line arguements.  
-	  Some arguments are always used
-	  others are OS specific.  All OS specific stuff is ifdefed
-	  Do error checking on command line arguments.
-	  Create a test manager object, read param files, 
-	  and pass them to ballista_1
-
- * Notes:
- *
- ************************/
-
-int main(int argc,char *argv[])
-{
-    char *server_name;
-    char *function_name;
-    int timeout;
-    int numParam=0;
-    int numP=0;
-
-    double sample=100.0;        //random sampling vs exhaustive
-    int startArg;    //where the file arguments start
-    int numArg;
-    int ballista_return = 0;  //return value of ballista_1, the testing function
-
-    struct sigaction action;   //signal-handling struct
-
-    struct stat tmp_stat_struct;  // temp structure for call to stat()
-
-    // could not have specified server and function name
-    if(argc < 3) 
-    {
-        usage(argv[0]);
-        clean_up(1);
-    }
-
-    //Set up signal-handling for entire program.  Signals caught are:
-    //SIGINT, SIGQUIT, SIGTERM, SIGABRT.
-    sigemptyset (&action.sa_mask);
-    action.sa_handler = catch_signal;  //catch_signal is signal-handler
-    (void) sigaction (SIGINT, &action, NULL);
-    (void) sigaction (SIGQUIT, &action, NULL);
-    (void) sigaction (SIGTERM, &action, NULL);
-    (void) sigaction (SIGABRT, &action, NULL);
-    // End of signal handling set-up
-
-
-    arguments = new Parse_arguments;
-    assert(arguments);
-
-    startArg = arguments->init_and_find_index(3,argc,argv);
-  
-    if(arguments->get_and_validate_float(&sample,"r",100.0,0.0,100.0)) 
-    {
-        cout<<"Start random sample - ~ "<<sample<<"% of space." << endl;
-    }
-  
-    if(arguments->get_and_validate_integer(&timeout,
-  					   "t", 
-					   10000000,
-					   100000,
-					   100000000)) 
-    {
-        cout <<"Timeout set to " << timeout << endl;
-    }
-  
-    cout.flush();
-
-    if (stat(MUT_OUT, &tmp_stat_struct)) 
-    {
-        cerr << "Could not find test execution file " << MUT_OUT << endl;
-        clean_up(1);
-    }
-
-#ifdef B_VXWORKS
-    char ip_address[255];
-    char target_name[255];
-    int maximum_number_of_reboots;
-    BOOL_TYPE reboot_after_each_test;
-    char clean_temp[255];
-
-    if(arguments->get_argument("i",ip_address,sizeof(ip_address))) 
-    {
-        cout << "Target IP address is " << ip_address << endl;
-    }
-    else 
-    {
-        cerr << "Target IP address was not specified. Use -i option." << endl;
-        clean_up(1);
-    }
-
-    if(arguments->get_argument("n",target_name,sizeof(target_name))) 
-    {
-        cout << "Target name is " << target_name << endl;
-    }
-    else 
-    {
-        cerr << "Target name was not specified. Use -n option." << endl;
-        clean_up(1);
-    }
-
-    reboot_after_each_test = BOOL_FALSE;
-
-    if(arguments->get_argument("c",clean_temp,sizeof(clean_temp))) 
-    {
-        if(!strcasecmp(clean_temp,"yes"))  
-        { // if  case insensitive equal
-            reboot_after_each_test = BOOL_TRUE;
-            cout << "Rebooting after each test" << endl;
-        }
-        else 
-        {
-            cout << "Not rebooting after each test" << endl;
-        }
-    }
-
-    if(arguments->get_and_validate_integer(&maximum_number_of_reboots,
-					 "m",
-					 -1,
-					 -1,
-					 MAXINT)) 
-    {
-        if(maximum_number_of_reboots == -1) 
-        {
-            cout << "Unlimited number of reboots allowed." << endl;
-        }
-        else 
-        {
-            cout << "Maximum number of reboots is " << 
-	    maximum_number_of_reboots << endl;
-        }
-    }
-
-    // if we are rebooting after each test, but yet there is a maximum
-    // limit on the number of reboots, give an error and exit
-    if((reboot_after_each_test) && (maximum_number_of_reboots != -1)) 
-    {
-        cerr << "Error: cannot specify maximum number of reboots and ";
-        cerr << "reboot after each test options together" << endl;
-        clean_up(1);
-    }
-
-    cout.flush();
-
-    // if no param files
-    if (argc == startArg) 
-    {
-        usage(argv[0]);
-        clean_up(1);
-    }
-  
-    test_manager_obj = new Vxworks_test_manager(MUT_OUT,
-					      target_name,
-					      ip_address,
-					      maximum_number_of_reboots,
-					      reboot_after_each_test);
-    if(!test_manager_obj) 
-    {
-        cerr << "Error: could not create test manager."<<endl;
-        clean_up(1);
-    }
-#else
-  
-    if (argc==startArg) 
-    {
-        usage(argv[0]);
-        clean_up(1);
-    }
-
-    try 
-    {
-        /* Prepend a ./ to avoid having the user set their LD_LIBRARY_PATH 
-           environment variable.*/
-        test_manager_obj = new Selfhost_test_manager(MUT_OUT);
-    }
-    catch (Ballistic_error be) 
-    {
-        cerr << "Error in creating the test manager:" << endl;
-        cerr << be.get_error_message() << endl;
-        cerr << "Exiting" << endl;
-        clean_up(1);
-    }
-    if(!test_manager_obj) 
-    {
-        cerr<< "Error: could not create test manager. Exiting..."<<endl;
-        clean_up(1);
-    }
-
-#endif //B_VXWORKS
-  
-    numArg = argc-startArg;
-    for (int i=startArg;i<argc;i++) 
-    {
-		 ifstream is;
-        is.open(argv[i]);
-        if(is.bad()) 
-        {
-            cerr<<"Could not open the file "<<argv[i]<<".\n";
-            clean_up(1);
-        }
-        getVec(is,vec [i-startArg]);
-        is.close();
-        numParam++;
-        if (numParam==MAXP) 
-        {
-            cerr<<"Error, only "<<MAXP<<" parameters supported.\n";
-            clean_up(1);
-        }
-    }
-  
-    //numP=parameterize(b,vec[0][2]);
-  
-    vector<line>::iterator iter[MAXP];
-  
-    for (int ji=0;ji<numArg;ji++)
-        iter[ji]= vec[ji].begin();
-
-    int caseNum=1;
-  
-    server_name=argv[1];
-    function_name = argv[2];
-
-#ifdef UNIT_TEST
-    // these two files are used when unit testing.  They should be identical
-    // after running if sample == 100
-    unlink("server.txt");
-    unlink("iterator.txt");
-#endif
-
-    ballista_return = ballista_1(server_name,function_name,
-  			         timeout,sample, numArg, vec);
-
-    //Call clean-up macro to delete objects
-    DELETE_NULL(biterator)
-    DELETE_NULL(server)
-    DELETE_NULL(test_manager_obj)
-    DELETE_NULL(arguments)
-  
-    return ballista_return;
-}
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/ballista.h b/testcases/ballista/ballista/ballista.h
deleted file mode 100644
index 96a0ab8..0000000
--- a/testcases/ballista/ballista/ballista.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// ballista.h : Main Ballista test harness header file
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef _BALLISTIC_H_ 
-#define _BALLISTIC_H_
-
-// we have to use BOOL_TRUE and BOOL_FALSE since
-// TRUE and FALSE are defined in rpc.h
-typedef int BOOL_TYPE;
-#define BOOL_TRUE -1
-#define BOOL_FALSE 0
-
-#define MAXP 16            //arbitrary parameter max
-#define MAXD 32            //arbitrary max number of dials
-#define MAX_RETURN 2048    //This is the array max size for rval returns.
-
-typedef char b_param[255];
-
-// extra elements are required to ensure null termination of both 
-// lists of test value attributes and lists of dial settings
-typedef b_param MARSHAL_DATA_TYPE[MAXP+1][MAXD+1]; 
-
-#endif // _BALLISTIC_H_
-
diff --git a/testcases/ballista/ballista/ballistaError.cpp b/testcases/ballista/ballista/ballistaError.cpp
deleted file mode 100644
index 076b3cb..0000000
--- a/testcases/ballista/ballista/ballistaError.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// ballistaError.cpp : Ballista Error Class for exceptions
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/****************/
-#include <assert.h>
-
-#include "ballistaError.h"
-#include "ballistaUtil.h"
-
-/************************
- *
- * Function: Ballistic_error constructor
- * Description:
- * Function Inputs: error message
- * Global Inputs:
- * Return Values:
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Conditions: error message is copied into class buffer
- * Design: copy the error message
- * Notes:
- *
- ************************/
-Ballistic_error::Ballistic_error(const char *exception_message) 
-{
-  assert(exception_message != NULL);
-
-  safe_strncpy(error_message,exception_message,sizeof(error_message));
-}
-
-/************************
- *
- * Function: get_error_message
- * Description: return the error message
- * Function Inputs:
- * Global Inputs:
- * Return Values: pointer to error_message array
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Conditions:
- * Design:
- * Notes: this should be used to display the error message to the screen,
-          not to obtain a pointer to the buffer for modification
- *
- ************************/
-char *Ballistic_error::get_error_message(void)
-{
-  return error_message;
-}
diff --git a/testcases/ballista/ballista/ballistaError.h b/testcases/ballista/ballista/ballistaError.h
deleted file mode 100644
index a85291d..0000000
--- a/testcases/ballista/ballista/ballistaError.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// ballistaError.h : Ballista Error Class for Exceptions
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef _BALLISTIC_ERROR_H_
-#define _BALLISTIC_ERROR_H_
-
-class Ballistic_error {
-private:
-  char error_message[255];
-public:
-  Ballistic_error(const char *exception_message);
-  char *get_error_message(void);
-};
-
-#endif // _BALLISTIC_ERROR_H_
diff --git a/testcases/ballista/ballista/ballistaRPC.c b/testcases/ballista/ballista/ballistaRPC.c
deleted file mode 100644
index 3e71d25..0000000
--- a/testcases/ballista/ballista/ballistaRPC.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-/* ballistaRPC.c : Ballista RPC specification
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <sys/time.h>
-#include <memory.h> /* for memset */
-#include "ballistaRPC.h"
-
-/* Default timeout can be changed using clnt_control() */
-#ifdef HP
-enum clnt_stat clnt_call2(CLIENT *rh, u_long proc, xdrproc_t xargs, caddr_t argsp, xdrproc_t xres,caddr_t resp, struct timeval timeout){
-  rh->cl_ops->cl_call(rh,proc,xargs,argsp,xres,resp,timeout);
-};
-
-#endif
-static struct timeval TIMEOUT = { 1000, 0 };
-
-
-return_info *
-get_array_3(info *argp, CLIENT *clnt)
-{
-	static return_info clnt_res;
-
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
-#ifndef HP
-	if (clnt_call(clnt, get_array,(xdrproc_t) xdr_info, (caddr_t)argp, (xdrproc_t)xdr_return_info, (caddr_t)&clnt_res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-#else
-	if (clnt_call2(clnt, get_array,(xdrproc_t) xdr_info, (caddr_t)argp, (xdrproc_t)xdr_return_info, (caddr_t)&clnt_res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-#endif
-	return (&clnt_res);
-}
-
-int *
-send_data_3(data_from_client *argp, CLIENT *clnt)
-{
-	static int clnt_res;
-
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
-	if (clnt_call(clnt, send_data, (xdrproc_t)xdr_data_from_client, (caddr_t)argp, (xdrproc_t)xdr_int, (caddr_t)&clnt_res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&clnt_res);
-}
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/ballistaRPC.h b/testcases/ballista/ballista/ballistaRPC.h
deleted file mode 100644
index e817c85..0000000
--- a/testcases/ballista/ballista/ballistaRPC.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-/* ballistaRPC.c : Ballista RPC specification
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
-#ifndef _NEWGO_H_RPCGEN
-#define _NEWGO_H_RPCGEN
-
-#ifdef SUN
-//define portmap so it includes the .h for clnttcp_create()
-#define PORTMAP
-
-#endif
-
-#include <rpc/rpc.h>
-
-#include "ballista.h"
-
-#ifdef __cplusplus 
-extern "C" bool_t xdr_b_param(XDR *, b_param);
-#elif __STDC__ 
-extern  bool_t xdr_b_param(XDR *, b_param);
-#else /* Old Style C */ 
-bool_t xdr_b_param();
-#endif /* Old Style C */ 
-
-
-typedef char *my_line;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_my_line(XDR *, my_line*);
-#elif __STDC__ 
-extern  bool_t xdr_my_line(XDR *, my_line*);
-#else /* Old Style C */ 
-bool_t xdr_my_line();
-#endif /* Old Style C */ 
-
-
-typedef struct {
-	u_int my_vector_lines_len;
-	my_line *my_vector_lines_val;
-} my_vector_lines;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_my_vector_lines(XDR *, my_vector_lines*);
-#elif __STDC__ 
-extern  bool_t xdr_my_vector_lines(XDR *, my_vector_lines*);
-#else /* Old Style C */ 
-bool_t xdr_my_vector_lines();
-#endif /* Old Style C */ 
-
-
-typedef struct {
-	u_int my_arr_vec_line_len;
-	my_vector_lines *my_arr_vec_line_val;
-} my_arr_vec_line;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_my_arr_vec_line(XDR *, my_arr_vec_line*);
-#elif __STDC__ 
-extern  bool_t xdr_my_arr_vec_line(XDR *, my_arr_vec_line*);
-#else /* Old Style C */ 
-bool_t xdr_my_arr_vec_line();
-#endif /* Old Style C */ 
-
-
-typedef struct {
-	u_int one_dim_len;
-	b_param *one_dim_val;
-} one_dim;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_one_dim(XDR *, one_dim*);
-#elif __STDC__ 
-extern  bool_t xdr_one_dim(XDR *, one_dim*);
-#else /* Old Style C */ 
-bool_t xdr_one_dim();
-#endif /* Old Style C */ 
-
-
-typedef struct {
-	u_int two_dim_len;
-	one_dim *two_dim_val;
-} two_dim;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_two_dim(XDR *, two_dim*);
-#elif __STDC__ 
-extern  bool_t xdr_two_dim(XDR *, two_dim*);
-#else /* Old Style C */ 
-bool_t xdr_two_dim();
-#endif /* Old Style C */ 
-
-
-typedef struct {
-	u_int three_dim_len;
-	two_dim *three_dim_val;
-} three_dim;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_three_dim(XDR *, three_dim*);
-#elif __STDC__ 
-extern  bool_t xdr_three_dim(XDR *, three_dim*);
-#else /* Old Style C */ 
-bool_t xdr_three_dim();
-#endif /* Old Style C */ 
-
-
-struct info {
-	my_arr_vec_line mvl;
-	int NumArg;
-	double sample_size;
-};
-typedef struct info info;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_info(XDR *, info*);
-#elif __STDC__ 
-extern  bool_t xdr_info(XDR *, info*);
-#else /* Old Style C */ 
-bool_t xdr_info();
-#endif /* Old Style C */ 
-
-
-struct return_info {
-	three_dim my_three_dim;
-	int total;
-};
-typedef struct return_info return_info;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_return_info(XDR *, return_info*);
-#elif __STDC__ 
-extern  bool_t xdr_return_info(XDR *, return_info*);
-#else /* Old Style C */ 
-bool_t xdr_return_info();
-#endif /* Old Style C */ 
-
-
-struct data_from_client {
-	char *passtatus;
-	int call_ret;
-	char *sys_err;
-	two_dim params;
-	int NumArg;
-	char *function;
-};
-typedef struct data_from_client data_from_client;
-#ifdef __cplusplus 
-extern "C" bool_t xdr_data_from_client(XDR *, data_from_client*);
-#elif __STDC__ 
-extern  bool_t xdr_data_from_client(XDR *, data_from_client*);
-#else /* Old Style C */ 
-bool_t xdr_data_from_client();
-#endif /* Old Style C */ 
-
-
-#define BALLISTA ((u_long)0x50000000)
-#define BALLISTAVERS ((u_long)4)
-
-#ifdef __cplusplus
-#define get_array ((u_long)1)
-extern "C" return_info * get_array_3(info *, CLIENT *);
-extern "C" return_info * get_array_3_svc(info *, struct svc_req *);
-#define send_data ((u_long)2)
-extern "C" int * send_data_3(data_from_client *, CLIENT *);
-extern "C" int * send_data_3_svc(data_from_client *, struct svc_req *,struct sockaddr_in *);
-
-#elif __STDC__
-#define get_array ((u_long)1)
-extern  return_info * get_array_3(info *, CLIENT *);
-extern  return_info * get_array_3_svc(info *, struct svc_req *);
-#define send_data ((u_long)2)
-extern  int * send_data_3(data_from_client *, CLIENT *);
-extern  int * send_data_3_svc(data_from_client *, struct svc_req *);
-
-#else /* Old Style C */ 
-#define get_array ((u_long)1)
-extern  return_info * get_array_3();
-extern  return_info * get_array_3_svc();
-#define send_data ((u_long)2)
-extern  int * send_data_3();
-extern  int * send_data_3_svc();
-#endif /* Old Style C */ 
-
-#endif /* !_NEWGO_H_RPCGEN */
diff --git a/testcases/ballista/ballista/ballistaUtil.cpp b/testcases/ballista/ballista/ballistaUtil.cpp
deleted file mode 100644
index 699a62c..0000000
--- a/testcases/ballista/ballista/ballistaUtil.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ballistaUtil.cpp : Ballista general purpose utility functions
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <assert.h>
-#include <string.h>
-#include <sys/time.h> //for get_time_in_microseconds
-#include <iostream>
-#include <stdlib.h>
-
-#include "ballistaUtil.h"
-#include "ballista.h"
-
-using namespace std;
-
-/************************
- *
- * Function: safe_strncpy
- * Description: wrapper function for strncpy
-                does a strncpy and assures that the resulting string is null
-                terminated.  strncpy alone will not NULL terminate the string
-		if strlen(dst) >= n
- * Function Inputs: see description of strncpy
-      dst - destination buffer
-      src - source buffer
-      n - maximum length of dst
- * Global Inputs:
- * Return Values:  dst
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *    make sure that the absolute last character is NULL, then call
- *    strncpy
- ************************/
-char *safe_strncpy(char *dst, const char *src, size_t n)
-{
-  assert(dst != NULL);
-
-  if(n > 0) {
-    dst[n-1] = 0;
-    return strncpy(dst,src,n-1);
-  }
-  else
-    return dst;
-}
-
-/************************
- *
- * Function: get_time_in_microseconds
- * Description: gets the current time of day and converts that to microseconds
- * Function Inputs: none
- * Global Inputs: none
- * Return Values:  a double long (long long) containing time of day in microsec.
- * Global Outputs: none
- * Errors: exits if we cannot get the time of day
- * Pre-Conditions: none
- * Post-Contidions: none
- * Design: Made because we were using gethrtime before, which is not
- *         supported by Linux.  gettimeofday works on Linux and still works
- *         on Solaris.
- * Notes:
- ************************/
-long long get_time_in_microseconds(void)
-{
-  struct timeval timeofday;
-  struct timezone tz;
-  long long time;
-
-  if(gettimeofday(&timeofday,&tz) != 0) {
-    cerr << "Error getting time." << endl;
-    exit(-100);
-  }
-  time = timeofday.tv_sec;
-  time *= 1000000;
-  time += timeofday.tv_usec;
-  return time;
-}
-
-
-
diff --git a/testcases/ballista/ballista/ballistaUtil.h b/testcases/ballista/ballista/ballistaUtil.h
deleted file mode 100644
index c3834f5..0000000
--- a/testcases/ballista/ballista/ballistaUtil.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ballistaRPC.c : Ballista RPC specification
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _BALLISTIC_UTIL_H_ 
-#define _BALLISTIC_UTIL_H_
-
-#include <string.h>
-
-char *safe_strncpy(char *dst, const char *src, size_t n);
-
-long long get_time_in_microseconds(void);
-
-#endif // _BALLISTIC_UTIL_H_
diff --git a/testcases/ballista/ballista/ballistaXDR.c b/testcases/ballista/ballista/ballistaXDR.c
deleted file mode 100644
index 0e7c6e8..0000000
--- a/testcases/ballista/ballista/ballistaXDR.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-/* ballistaXDR.c : Ballista RPC specification
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#include "ballistaRPC.h"
-
-bool_t
-xdr_b_param(XDR *xdrs, b_param objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_vector(xdrs, (char *)objp, 255, sizeof(char), (xdrproc_t)xdr_char)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_my_line(XDR *xdrs, my_line *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_string(xdrs, objp, ~0)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_my_vector_lines(XDR *xdrs, my_vector_lines *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_array(xdrs, (char **)&objp->my_vector_lines_val, (u_int *)&objp->my_vector_lines_len, ~0, sizeof(my_line), (xdrproc_t)xdr_my_line)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_my_arr_vec_line(XDR *xdrs, my_arr_vec_line *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_array(xdrs, (char **)&objp->my_arr_vec_line_val, (u_int *)&objp->my_arr_vec_line_len, ~0, sizeof(my_vector_lines), (xdrproc_t)xdr_my_vector_lines)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_one_dim(XDR *xdrs, one_dim *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_array(xdrs, (char **)&objp->one_dim_val, (u_int *)&objp->one_dim_len, ~0, sizeof(b_param), (xdrproc_t)xdr_b_param)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_two_dim(XDR *xdrs, two_dim *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_array(xdrs, (char **)&objp->two_dim_val, (u_int *)&objp->two_dim_len, ~0, sizeof(one_dim), (xdrproc_t)xdr_one_dim)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_three_dim(XDR *xdrs, three_dim *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_array(xdrs, (char **)&objp->three_dim_val, (u_int *)&objp->three_dim_len, ~0, sizeof(two_dim), (xdrproc_t)xdr_two_dim)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_info(XDR *xdrs, info *objp)
-{
-
-	 register long *buf;
-	 if (!xdr_my_arr_vec_line(xdrs, &objp->mvl)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_int(xdrs, &objp->NumArg)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_double(xdrs, &(objp->sample_size))) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_return_info(XDR *xdrs, return_info *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_three_dim(xdrs, &objp->my_three_dim)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_int(xdrs, &objp->total)) {
-		 return (FALSE);
-	 }
-	return (TRUE);
-}
-
-bool_t
-xdr_data_from_client(XDR *xdrs, data_from_client *objp)
-{
-
-	 register long *buf;
-
-	 if (!xdr_string(xdrs, &objp->passtatus, ~0)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_int(xdrs, &objp->call_ret)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_string(xdrs, &objp->sys_err, ~0)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_two_dim(xdrs, &objp->params)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_int(xdrs, &objp->NumArg)) {
-		 return (FALSE);
-	 }
-	 if (!xdr_string(xdrs, &objp->function, ~0)) {
-		 return (FALSE);
-	 }
-	 return (TRUE);
-}
diff --git a/testcases/ballista/ballista/batchcode b/testcases/ballista/ballista/batchcode
deleted file mode 100755
index 3b6cd20..0000000
--- a/testcases/ballista/ballista/batchcode
+++ /dev/null
@@ -1,237 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-# batchcode: sort output results and generate simple statistics
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-use strict;
-
-# hash to record the order that we want to sort results
-my (%status) = ( Catastrophic => 1,
-		 Restart => 2,
-		 Abort => 3,
-		 Pass => 4,
-		 );
-
-# function to yank the status out of a string
-sub status {
-    return ( ($_[0] =~ m/Done - (\w+)/s)[0] );
-}
-
-# function to compare two strings with statuses imbeded in them
-sub comp1 {
-    return $status{status($a)} <=> $status{status($b)};
-}
-
-# function to compare two status strings
-sub comp2 {
-    return $status{$a} <=> $status{$b};
-}
-
-#############################################
-#
-# main line starts here
-#
-#############################################
-
-# set the input record seperator to make reading records easier
-$/ = "----\n";
-
-my %global_results;     # hash to count each type of result
-my $global_total;       # total number of tests run;
-
-# process each input file
-foreach my $input (@ARGV) {
-    my @tests;       # array of all the test results
-    my %results;     # hash to count each type of result
-    my $total;       # total number of tests run;
-
-    my $new_status;  # temporary variables to determine where to 
-    my $old_status;  #  put seperators between types of results
-    
-    # Create path for Ballista output file from function name
-    my $dir_name = $input;
-    if ($dir_name =~ /.*\-\>.*/) {
-	$dir_name =~ s/\-\>/\./;
-    }
-    print "dir name = $dir_name\n";
-
-    my $input_file = "test_defs/$dir_name/$input" . ".out";
-
-    # open the current input file
-    open(INPUT, $input_file) || die "Can't open input file $input_file: $!";
-    
-    # read in each record
-  RECORD:
-    while(<INPUT>) {
-	# chop off any information about talking to the server
-	#s/^.*Got the data\n//s;
-	# skip the record if it's empty
-	next RECORD unless length $_;
-
-	# store the record on the stack
-	push @tests, $_;
-    }
-
-    # sort the records based on the order in %status
-    @tests = sort comp1 @tests;
-
-    # get a count of the number of tests run
-    #$total = @tests;
-    #$global_total += $total;
-
-    #my @func_name_array = split(/\//, $input);
-
-    # input variable is the function name
-    my $function_name = $input;
-
-    #$function_name =~ s/\..*//;
-    #print "function = $function_name \n";
-
-    # Copy dataTypes file for this function from its directory
-    system("cp test_defs/$dir_name/dataTypes .");
-
-#    system("cp test_defs/$function_name/userLibs .");
-#    system("cp test_defs/$function_name/osLibs .");
-
-    print "Generating code for $function_name ...";
-    # print out the newly sorted list
-    foreach (@tests) {
-
-	# put seperators between different types of results
-	$new_status = status($_);
-
-#	unless ($new_status eq $old_status) {
-#	    print '=' x 75, "\n";
-#	}
-	$old_status = $new_status;
-
-	# count each individual type of result
-	$results{$new_status}++;
-	$global_results{$new_status}++;
-
-	# Create code for all failures but not for passes
-	if ($new_status ne "Pass") {
-	    my @strings;
-
-	    #split record by lines
-	    @strings = split(/\n+/, $_);
-
-	    my $i;
-	    my $j;
-	    #for ($i = 0; $i < @strings; $i++) {
-		#print "@strings[$i] \n";
-	    #}	    
-	    #print "\n";
-	    
-	    my @temparray;
-	    my @types;
-	    my @testcase;
-	    my $count = 0;
-
-	    for ($i = 0; $i < @strings; $i++) {
-		# last if @strings[$i] =~ /.*rval:.*/;
-		last if @strings[$i] =~ /Done/;
-
-		# Each line before "rval" contains a Ballista datatype
-		# and specific test case parameter
-		# Split off each and format them for the create_code.pl script
-
-		if (@strings[$i] =~ /\S./) {
-		    @temparray = split(/\s+/, @strings[$i]);
-		    @types[$count] = shift(@temparray);
-		    print "type = @types[$count] \n";
-		    
-		    @testcase[$count] = "";
-		    for ($j = 0; $j < @temparray; $j++) {
-			@temparray[$j] =~ s/.*@types[$count]_//;
-			@testcase[$count] .= @temparray[$j] . "lNw";
-		    }
-		    print "testcase = @testcase[$count] \n";
-		    $count++;
-		}
-	    }
-	    
-	    #print "@types |\n @testcase |\n";
-	    #print "$new_status \n";
-	    #print "\n";
-	    
-	    # print the current record
-	    # print;
-
-	    my $numparams = @types;
-	    my $commandline;
-
-	    # Create command line string for executing create_code.pl
-	    $commandline = "create_code.pl $function_name $new_status "; 
-	    $commandline .= "$numparams ";
-
-	    my $filename = "test_defs/$dir_name/$dir_name";
-
-	    for ($i = 0; $i < $numparams; $i++) {
-		$commandline .= "@types[$i] @testcase[$i] ";
-		$filename .= "_@testcase[$i]";
-	    }
-
-	    $filename .= ".cpp";
-	    $commandline =~ s/\>/\\\>/g;
-	    $filename =~ s/\>/\\\>/g;
-	    print "$commandline > $filename\n\n";
-	    system("$commandline > $filename");
-	}
-    }
-    print "done\n";
-    
-#    # print a seperator so we can easily find the summary info 
-#    print '*' x 75, "\n";
-#    print "file: $input\n\n";
-
-#    # print statistics for each type of result
-#    foreach (sort comp2 keys %results) {
-#	# the count of this type of result
-#	print "$results{$_}\t";
-#	# te percentage
-#	printf ("%3i%%\t", int ($results{$_} / $total * 100 ));
-#	# the type of result
-#	print "$_\n";
-#    }
-
-#    # print the total number of tests for this file
-#    print "--\n$total\t100%\ttotal tests\n";
-    
-#    # print another seperator, so we can seperate it from the next file
-#    print '*' x 75, "\n";
-}
-
-## print global statistics for each type of result
-#print '*' x 75, "\n";
-#print "Global statistics\n\n";
-
-#foreach (sort comp2 keys %global_results) {
-#    # the count of this type of result
-#    print "$global_results{$_}\t";
-#    # te percentage
-#    printf ("%3i%%\t", int ($global_results{$_} / $global_total * 100 ));
-#    # the type of result
-#    print "$_\n";
-#}
-
-## print the total number of global tests for this file
-#print "--\n$global_total\t100%\ttotal tests\n";
diff --git a/testcases/ballista/ballista/bdc_standalone b/testcases/ballista/ballista/bdc_standalone
deleted file mode 100755
index a9b9b19..0000000
--- a/testcases/ballista/ballista/bdc_standalone
+++ /dev/null
@@ -1,95 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-# bdc_standalone: Compiles specified template file into cpp and h files - no server
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-use strict;
-use LWP::UserAgent;
-use HTTP::Request::Common;
-
-#determine the name by which we were invoked
-my $ARGV0 = $0;
-$ARGV0 =~ s/.*\///;
-
-# check usage
-unless  (@ARGV)   {
-     die "usage:  $ARGV0 <template file> ...\n";
-}
-
-##################################
-# Assign default values
-###################################
-
-my $FORM_SITE = 'http://ballista.ece.cmu.edu/compile';  # site of Ballista compiler form
-my $CGI_SITE = "$FORM_SITE/fup.cgi";                    # Ballista compiler
-my $ua = LWP::UserAgent->new;
-
-################################
-# Compile each specified dataType
-################################
-foreach my $tpl_file (@ARGV) {
-
-    # extract directory and filename from arguments
-    my ($tpl_dir, $template) = $tpl_file =~ m#(.*/)?([\w]+).tpl$#;
-
-    # do some error checking to insure values were extracted properly
-    unless ($template){
-	die "didn't extract template filename from command line: $!\n";
-    }
-
-    my $result_dir;  #web site of successfully generated .cpp and .h file
-
-    print "$tpl_dir";
-    print " do_parse $tpl_file\n";
-    system ("do_parse $tpl_file");
-} # end of foreach
-exit(0);
-
-################################# 
-# Get the file specified URL at $html
-#   and print the content to $file.
-#################################
-sub get_and_save{
-    my ($html,$file) = @_;
-    my $ua = LWP::UserAgent->new;    
-    my $response = $ua->request(GET $html);
-    
-    unless($response->is_success) {
-	print "Error: Can't get $html\n";
-	return 0;
-    }
-
-    if ($file eq "STDOUT") {
-
-	print $response->content;
-
-    } else {
-
-	unless (open (FILE, ">$file")){
-	print "Error: Can't open $file:  $!\n";
-	return 0;
-        }
-    
-	print FILE $response->content;
-	close FILE;
-    }
-    return 1;
-}
diff --git a/testcases/ballista/ballista/callGen.cpp b/testcases/ballista/ballista/callGen.cpp
deleted file mode 100644
index 304c099..0000000
--- a/testcases/ballista/ballista/callGen.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// callGen.cpp: generates the function call - Ballista
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
-#include <string.h>
-#define qt (char)34 
-
-using namespace std;
-
-char *temp=tempnam(NULL,"cg");
-
-int main(int argc,char *argv[])
-{
-  char s[255];
-  char v[64][255];
-  char rt[1024];
-  char ft[64]; //function type - function or constructor
-  char fname[255];
-  ofstream os("callInclude.cpp",ios::out);
-  ofstream def("vardefs.cpp",ios::out);
-  int rval=0;
-  int argnum=0;
-  int extras=0;
-
-  if (argc==1)
-    {
-      cout<<"Usage: "<<argv[0]<<" <callName>"<<endl;
-      cout<<"Where callname is the name fo the function to test.\n";
-      exit(1);
-    }
-
-  sprintf(s,"grep -w %s callTable > %s",argv[1],temp);
-  if (system(s))
-    {
-      cout<<"Error - could not locate"<<argv[1]<<"  in the calltable.\n";
-      exit(1);
-    }
-  cout<<s<<endl;
-
-  ifstream is(temp,ios::in);
-
-  is>>s; //get the include file
-
-  if (strcmp(s,"NULL")!=0)  //include a file
-  {
-    os<<"#include <"<<s<<">  //included from calltable include field\n";
-  }
-  os<<"#include <signal.h>\n";
-  
-  is>>ft; //get the function type
-  is>>rt; //get return type
-  
-  // check for a "cout"able return type
-  if ((strcmp(rt,"NULL")!=0) && 
-      (strcmp(rt,"void")!=0) &&
-      (strcmp(rt,"div_t")!=0) &&
-      (strcmp(rt,"ldiv_t")!=0)) 
-    {
-      rval=1;
-      def <<rt<<"\trval;\n";
-    }
-
-
-  is>>fname; //get function call
-
-  
-  while (is >> ws, !is.eof())
-    {
-      is>>s;//get param?
-
-      if(strcmp(s,"+")==0)
-	extras=1;  //extra type for creation follow, but not passed as args
-      else
-      {
-      if (strlen(s)>0)
-	{
-	  argnum++;
-	  if (extras!=0)extras++;
-	  strcpy(v[argnum],s);
-	  def<<s<<" param"<<argnum<<";\n";
-	  os<<"ref["<<argnum<<"] = (void **)"<<" param"<<argnum<<".access(params["<<argnum-1<<"]);\n";
-	  
-	  //find the real type of the parameter
-	  ifstream ins("dataTypes");
-	  char z[255];
-	  int flag=0;
-	  while (!ins.eof()&&!flag)
-	    {
-	      ins>>z;
-	      if (strcmp(s,z)==0)  //found it?
-		{
-		  ins>>z;
-		  flag=1;
-		}
-	    }
-
-	  if (!flag) //didn't find it
-	    {
-	      cerr<<"Error, could not find type associated with "<<s<<" in dataType file\n";
-	      exit(1);
-	    }
-
-	  os<<z<<" *temp"<<argnum<<" = ("<<z<<"*) ref["<<argnum<<"];\n";
-
-	}
-      }
-    }
-
-  for (int i=1;i<=(argnum);i++)
-    os<<"param"<<i<<".commit(params["<<i-1<<"][0]);\n";
-
-  //output try catch framework
-
-  os<<"\n";
-
-  // add turning off signal handling so that the call is actually producing the abort, restarts
-  // that are being counted.
-  os<< "struct sigaction setup_action;\n";
-  os<< "sigemptyset(&setup_action.sa_mask);\n";
-  os <<"setup_action.sa_handler = SIG_DFL;\n";
-  os <<"(void) sigaction (SIGINT, &setup_action, NULL);\n";
-  os<<"(void) sigaction (SIGQUIT, &setup_action, NULL);\n";
-  os<<"(void) sigaction (SIGTERM, &setup_action, NULL);\n";
-  os<<"(void) sigaction (SIGABRT, &setup_action, NULL);\n";
-  os<<"(void) sigaction (SIGBUS, &setup_action, NULL);\n";
-  os<<"(void) sigaction (SIGSEGV, &setup_action, NULL);\n";
-  
-  
-
-
-
-  if (rval==1)
-    os<<"rval = ";
-
-  if (strcmp(ft,"constructor")==0) //its a constructor
-      os <<"new ";
-
-
-  os<<fname<<"(";
-  
-  
-  for (int i=1;i<=(argnum-(extras==0?0:extras-1));i++)
-    {
-      if (i>1) os<<" , ";
-      os<<"*temp"<<i;
-    }
-  os<<");\n";
-
-  for (int i=1;i<=argnum;i++)
-    os<<"param"<<i<<".cleanup(params["<<i-1<<"][0]);\n";
-
-  os<<"\t //done\n";
-
-  if (rval==1)
-  {
-    os<<"cout<<"<<qt<<"rval:"<<qt<<"<<rval<<endl;\n";
-  }
-
-  //finish try-catch framework
-  os<<"\n//replacetoken\n#include "<<qt<<"userCatches.cpp"<<qt<<endl<<endl;
-
-  is.close();
-  os.close();
-  def.close();
- 
-  // delete temporary file - normally with remove or unlink but these don't
-  // work in Digital Unix
-
-  char buffer[64];
-  sprintf(buffer,"rm %s",temp);
-  system(buffer);
-
-}
diff --git a/testcases/ballista/ballista/callGen_standAlone.cpp b/testcases/ballista/ballista/callGen_standAlone.cpp
deleted file mode 100644
index eae01f8..0000000
--- a/testcases/ballista/ballista/callGen_standAlone.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// callGen_standAlone.cpp: generates the function call - no server 
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
-#include <string.h>
-#define qt (char)34 
-
-using namespace std;
-
-char *temp=tempnam(NULL,"cg");
-
-int main(int argc,char *argv[])
-{
-  char s[255];
-  char v[64][255];
-  char rt[1024];
-  char ft[64]; //function type - function or constructor
-  char fname[255];
-  ofstream os("callInclude.cpp",ios::out);
-  ofstream def("vardefs.cpp",ios::out);
-  int rval=0;
-  int argnum=0;
-  int extras=0;
-
-  if (argc==1)
-    {
-      cout<<"Usage: "<<argv[0]<<" <callName>"<<endl;
-      cout<<"Where callname is the name fo the function to test.\n";
-      exit(1);
-    }
-
-  sprintf(s,"grep -w %s callTable > %s",argv[1],temp);
-  if (system(s))
-    {
-      cout<<"Error - could not locate"<<argv[1]<<"  in the calltable.\n";
-      exit(1);
-    }
-  cout<<s<<endl;
-
-  ifstream is(temp,ios::in);
-
-  is>>s; //get the include file
-
-  if (strcmp(s,"NULL")!=0)  //include a file
-  {
-//    cout <<"inside if statement" << endl;
-    os<<"#include <"<<s<<">  //included from calltable include field\n";
-//    cout <<" after writing out to os:" << endl;
-//    cout<<"#include <"<<s<<">  //included from calltable include field\n\n" <<endl;
-  }
-  
-  is>>ft; //get the function type
-  is>>rt; //get return type
-  
-  // Check if there is a printable return type
-  if ((strcmp(rt,"NULL")!=0) && 
-      (strcmp(rt,"void")!=0) &&
-      (strcmp(rt,"div_t")!=0) &&
-      (strcmp(rt,"ldiv_t")!= 0))
-  {
-      rval=1;
-      def <<rt<<"\trval;\n";
-      // standalone addition
-      os <<rt<<" rval;\n";
-  }
-  else  // added for standalone
-  {
-      os <<"\n";
-  }
-
-
-  is>>fname; //get function call
-  //cout <<"after fname set " <<fname <<endl;
-
-  
-  while (is >> ws, !is.eof())
-    {
-      is>>s;//get param?
-//      cout <<"s is set to " <<s << endl;      
-
-      if(strcmp(s,"+")==0)
-	extras=1;  //extra type for creation follow, but not passed as args
-      else
-      {
-      if (strlen(s)>0)
-	{
- //         cout << "strlen > 0" << endl;
-	  argnum++;
-	  if (extras!=0)extras++;
-	  strcpy(v[argnum],s);
-	  def<<s<<" param"<<argnum<<";\n";
-//	  
-          os<<"ref["<<argnum<<"] = (void **)"<<" param"<<argnum<<".access(params["<<argnum-1<<"]);\n";
-	  
-	  //find the real type of the parameter
-	  ifstream ins("dataTypes");
-	  char z[255];
-	  int flag=0;
-	  while (!ins.eof()&&!flag)
-	    {
-	      ins>>z;
-	      if (strcmp(s,z)==0)  //found it?
-		{
-		  ins>>z;
-		  cout<<"found it: "<<s<<" = "<<z<<endl;
-		  flag=1;
-		}
-	    }
-
-	  if (!flag) //didn't find it
-	    {
-	      cerr<<"Error, could not find type associated with "<<s<<" in dataType file\n";
-	      exit(1);
-	    }
-
-//	  
-          os<<z<<"* temp"<<argnum<<" = ("<<z<<"*) ref["<<argnum<<"];\n";
-
-	}
-      }
-    }
-
-// 2 lines
-  for (int i=1;i<=(argnum);i++)
-    os<<"param"<<i<<".commit(params["<<i-1<<"][0]);\n";
-
-  //output try catch framework
-
-  os<<"\n";
-
-
-  if (rval==1)
-    os<<"rval = ";
-
-  if (strcmp(ft,"constructor")==0) //its a constructor
-      os <<"new ";
-
-
-  os<<fname<<"(";
-  
-  
-  for (int i=1;i<=(argnum-(extras==0?0:extras-1));i++)
-    {
-      if (i>1) os<<" , ";
-      os<<"*temp"<<i;
-    }
-  os<<");\n";
-
-  if (rval ==1)
-  {
-    os <<"/* cout statement needed so that function call is not optimized out */ \n";
-    os <<"cout<<"<<qt<<"rval:"<<qt<<"<<rval<<endl;\n";
-  }
-
-// 2 lines
-  for (int i=1;i<=argnum;i++)
-    os<<"param"<<i<<".cleanup(params["<<i-1<<"][0]);\n";
-
-  os<<"\t //done\n";
-
-  if (rval==1)
-    os<<"cout<<"<<qt<<"rval:"<<qt<<"<<rval<<endl;\n";
-  
-  //finish try-catch framework
-  os<<"\n//replacetoken\n#include "<<qt<<"userCatches.cpp"<<qt<<endl<<endl;
-
-  is.close();
-  os.close();
-  def.close();
-}
diff --git a/testcases/ballista/ballista/callInclude.cpp b/testcases/ballista/ballista/callInclude.cpp
deleted file mode 100644
index d201752..0000000
--- a/testcases/ballista/ballista/callInclude.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <signal.h>  //included from calltable include field
-#include <signal.h>
-ref[1] = (void **) param1.access(params[0]);
-sigset_t* *temp1 = (sigset_t**) ref[1];
-ref[2] = (void **) param2.access(params[1]);
-siginfo_t* *temp2 = (siginfo_t**) ref[2];
-ref[3] = (void **) param3.access(params[2]);
-structtimespecptr *temp3 = (structtimespecptr*) ref[3];
-ref[4] = (void **) param4.access(params[3]);
-structtimespecptr *temp4 = (structtimespecptr*) ref[4];
-param1.commit(params[0][0]);
-param2.commit(params[1][0]);
-param3.commit(params[2][0]);
-param4.commit(params[3][0]);
-
-struct sigaction setup_action;
-sigemptyset(&setup_action.sa_mask);
-setup_action.sa_handler = SIG_DFL;
-(void) sigaction (SIGINT, &setup_action, NULL);
-(void) sigaction (SIGQUIT, &setup_action, NULL);
-(void) sigaction (SIGTERM, &setup_action, NULL);
-(void) sigaction (SIGABRT, &setup_action, NULL);
-(void) sigaction (SIGBUS, &setup_action, NULL);
-(void) sigaction (SIGSEGV, &setup_action, NULL);
-rval = sigtimedwait(*temp1 , *temp2 , *temp3 , *temp4);
-param1.cleanup(params[0][0]);
-param2.cleanup(params[1][0]);
-param3.cleanup(params[2][0]);
-param4.cleanup(params[3][0]);
-	 //done
-cout<<"rval:"<<rval<<endl;
-
-//inlining userCatches
-
-
-
diff --git a/testcases/ballista/ballista/callTable b/testcases/ballista/ballista/callTable
deleted file mode 100644
index b3f0048..0000000
--- a/testcases/ballista/ballista/callTable
+++ /dev/null
@@ -1 +0,0 @@
-signal.h	function	int	sigtimedwait	b_ptr_sigset_t	b_ptr_siginfo_t	b_ptr_timespec
diff --git a/testcases/ballista/ballista/callTable.all b/testcases/ballista/ballista/callTable.all
deleted file mode 100644
index 7350529..0000000
--- a/testcases/ballista/ballista/callTable.all
+++ /dev/null
@@ -1,272 +0,0 @@
-# callTable.all: function definition file used by Ballista
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#------------------------------------------------------------------------
-#Calltable file
-#This file is ported to Digital UNIX 4.0
-#The file format is as follows
-#
-# include file name  callType  return type  function name  ballista type
-#
-# callType can be:
-# constructor   -   puts a new before method name ie: result = new widget;
-# function - normal function
-#------------------------------------------------------------------------
-
-syscall.h	function	int nfsservctl b_int b_ptr_void b_ptr_void 
-grp.h		function	int getgroups b_int b_ptr_gid_t
-grp.h		function	int setgroups b_unsigned_long b_ptr_gid_t
-unistd.h	function	int getdents b_unsigned_int b_ptr_void b_unsigned_int
-unistd.h	function	int bdflush b_int b_ptr_long
-unistd.h	function	int bdflush b_int b_long
-unistd.h	function	int exit b_int
-unistd.h	function	int mount b_ptr_buf b_ptr_buf b_ptr_buf
-unistd.h	function	int umount b_ptr_buf b_int
-unistd.h        function	int nice b_int
-unistd.h	function	int chroot b_ptr_buf
-unistd.h	function	int readlink b_ptr_buf b_ptr_char b_int
-unistd.h	function	int uselib b_ptr_char
-unistd.h	function	int swapon b_ptr_char b_int
-unistd.h	function	int swapoff b_ptr_char
-unistd.h	function	int reboot b_int b_int b_int b_ptr_void
-sys/mman.h	function	int mumap b_ptr_void b_unsigned_long
-unistd.h	function	int fchown b_int b_pid b_pid
-unistd.h	function	int fsync b_fd
-unistd.h	function	int sigreturn b_unsigned_long
-unistd.h	function	int    getresgid  b_ptr_gid_t b_ptr_gid_t b_ptr_gid_t
-unistd.h        function        int    ioperm b_unsigned_long b_unsigned_long b_int
-unistd.h        function        int    ipc b_unsigned_int b_int b_int b_int b_ptr_void b_long
-sys/file.h      function        int     flock b_fd b_int
-sys/mman.h      function        void*    mremap b_ptr_void b_unsigned_long b_unsigned_long b_unsigned_long
-sys/socket.h        function       ssize_t send b_int b_ptr_void b_unsigned_long b_int
-
-# from LTP
-unistd.h        function        int     acct    b_fname
-unistd.h        function        int   setfsgid b_pid
-unistd.h        function        int   setfsuid b_pid
-unistd.h        function        int     brk     b_ptr_void
-#unistd.h       function        int     b_unsigned_int b_unsigned_long b_unsigned_long b_unsigned_int
-sys/socket.h        function        size_t recv b_int b_ptr_void b_unsigned_long b_int
-sys/socket.h        function        size_t recvfrom b_int b_ptr_void b_unsigned_long b_int
-sys/syscall.h       function        int syscall b_int    
-unistd.h            function        int sysfs b_int b_unsigned_int b_int	
-
-
-unistd.h        function        size_t  confstr  b_int b_ptr_char b_unsigned_long
-unistd.h	function	int	fchdir	 b_fd
-unistd.h	function	int     getdomainname   b_ptr_char b_unsigned_long
-unistd.h	function	int     setdomainname	b_fname    b_unsigned_long
-unistd.h	function        long    sethostid   b_long
-unistd.h	function	int     gethostname     b_ptr_char b_unsigned_long
-unistd.h	function	int     sethostname	b_fname    b_unsigned_long
-unistd.h	function	pid_t   getsid	 b_pid
-unistd.h	function	pid_t   getpgid  b_pid 
-unistd.h	function	int     setpgid  b_pid b_pid
-unistd.h	function	int     lstat  b_fname b_ptr_stat
-unistd.h	function	int     modify_ldt  b_int b_ptr_void b_unsigned_long
-#unistd.h	function	int     getresgid  b_gid_ptr b_gid_ptr b_gid_ptr
-unistd.h	function	int     profil   b_ptr_unsigned_int  b_unsigned_long b_unsigned_long b_unsigned_int
-
-
-# grp.h            function       struct group getgrnam b_fname
-
-
-sys/io.h        function        int     iopl  b_int
-sys/socket.h    function        int     listen  b_int b_int
-sys/time.h      function        int     getpriority   b_int b_int
-sys/resource.h  function 	int     setpriority   b_int b_int b_int 
-sys/prctl.h     function 	int     prctl b_int b_unsigned_long b_unsigned_long b_unsigned_long b_unsigned_long
-
-
-
-#files:
-unistd.h	function	int	access	b_fname	b_int_amode
-unistd.h	function	int	chdir	b_fname
-sys/stat.h	function	int	chmod	b_fname	b_mode_t
-sys/types.h	function	int	chown	b_fname	b_id	b_id
-unistd.h	function	int	close	b_fd
-fcntl.h	function	int	creat	b_fname	b_mode_t
-unistd.h	function	int	dup	b_fd
-unistd.h	function	int	dup2	b_fd	b_fd
-sys/stat.h	function	int	fchmod	b_fd	b_mode_t
-fcntl.h	function	int	fcntl	b_fd	b_int	b_int
-unistd.h	function	int	fdatasync	b_fd
-sys/stat.h	function	int	fstat	b_fd	b_ptr_stat
-unistd.h	function	int	fsync	b_fd
-unistd.h	function	int	ftruncate	b_fd	b_long
-unistd.h	function	char*	getcwd	b_ptr_char	b_int
-unistd.h	function	int	link	b_fname	b_fname
-unistd.h	function	off_t	lseek	b_fd	b_long	b_int_whence
-sys/stat.h	function	int	mkdir	b_fname	b_mode_t
-sys/stat.h	function	int	mkfifo	b_fname	b_mode_t
-fcntl.h	function	int	open	b_fname	b_oflag
-fcntl.h	function	int	open	b_fname	b_oflag	b_mode_t
-unistd.h	function	ssize_t	read	b_fd	b_ptr_buf	b_int
-unistd.h	function	int	rename	b_fname	b_fname
-unistd.h	function	int	rmdir	b_fname
-sys/stat.h	function	int	stat	b_fname	b_ptr_stat
-sys/stat.h	function	mode_t	umask	b_mode_t
-unistd.h	function	int	unlink	b_fname
-unistd.h	function	ssize_t	write	b_fd	b_ptr_char	b_int
-utime.h	function	int	utime	b_fname	b_ptr_utimbuf
-
-#dir:
-dirent.h	function	int	closedir	b_ptr_dir
-dirent.h	function	DIR*	opendir	b_fname
-dirent.h	function	dirent*	readdir	b_ptr_dir
-dirent.h	function	void	rewinddir	b_ptr_dir
-
-#processes:
-unistd.h	function	int	execl	b_fname	b_ptr_char
-unistd.h	function	int	execl	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execv	b_fname	b_ptr_ptr_char
-unistd.h	function	int	execve	b_fname	b_ptr_ptr_char	b_ptr_ptr_char
-unistd.h	function	int	execvp	b_fname	b_ptr_ptr_char
-#unistd.h	function	int	pipe	b_ptr_int       #pipe intentionally left off the list
-sys/wait.h	function	pid_t	wait	b_ptr_int
-sys/wait.h	function	pid_t	waitpid	b_pid	b_ptr_int	b_waitopt
-
-#pid:
-sys/types.h	function	int	getgroups	b_int	b_ptr_gid_t
-sys/types.h	function	int	setgid	b_pid
-sys/types.h	function	int	setpgid	b_pid	b_pid
-sys/types.h	function	int	setuid	b_pid
-
-#signals:
-unistd.h	function	int	alarm	b_int
-signal.h	int	kill	b_pid	b_int	# sends a SIGHUP to all procs in proc grp
-signal.h	function	int	sigaction	b_signal	b_ptr_sigaction	b_ptr_sigaction
-signal.h	function	int	sigaddset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigdelset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigemptyset	b_ptr_sigset_t
-signal.h	function	int	sigfillset	b_ptr_sigset_t
-signal.h	function	int	sigismember	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigpending	b_ptr_sigset_t
-signal.h	function	int	sigprocmask	b_sig_how	b_ptr_sigset_t	b_ptr_sigset_t
-#signal	int	sigqueue	b_pid	b_signal	b_ptr_char	# same reason as kill()
-signal.h	int	sigsuspend	b_ptr_sigset_t	#inflated restarts
-
-#termio: 
-termios.h	function	speed_t	cfgetispeed	b_ptr_termios
-termios.h	function	speed_t	cfgetospeed	b_ptr_termios
-termios.h	function	int	cfsetispeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	cfsetospeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	tcdrain	b_fd
-termios.h	function	int	tcflow	b_fd	b_int   # restart inflated
-termios.h	function	int	tcflush	b_fd	b_int_tc
-termios.h	function	int	tcgetattr	b_fd	b_ptr_termios
-termios.h	function	int	tcsendbreak	b_fd	b_int
-termios.h	function	int	tcsetattr	b_fd	b_int_tc	b_ptr_termios
-sys/types.h	function	pid_t	tcgetpgrp	b_fd
-#sys/types.h	function	int	tcsetpgrp	b_fd	b_pid  #suspend ttyoutput
-
-#jumps:
-setjmp.h	function	void	longjmp	b_jmp_buf	b_int
-setjmp.h	function	int	setjmp	b_jmp_buf
-setjmp.h	function	void	siglongjmp	b_jmp_buf	b_int
-setjmp.h	function	int	sigsetjmp	b_jmp_buf	b_int
-
-#misc:
-assert.h	function	void	assert	#inflate the abort percentages
-locale.h	function	char*	setlocale	b_int_category	b_ptr_char
-stdio.h	function	void	perror	b_ptr_char
-time.h	function	time_t	time	b_ptr_time_t
-sys/times.h	function	clock_t	times	b_ptr_tms
-stdio.h	function	char*	ctermid	b_ptr_char
-unistd.h	function	int	isatty	b_fd
-unistd.h	function	char*	ttyname	b_fd
-sys/utsname.h	function	int	uname	b_ptr_utsname
-unistd.h	function	int	fpathconf	b_fd	b_int_file_var
-unistd.h	function	int	pathconf	b_fname	b_int_file_var
-unistd.h	function	long	sysconf	b_int_sys_var
-stdlib.h	function	char*	getenv	b_ptr_char
-grp.h	function	group*	getgrgid	b_id
-grp.h	function	group*	getgrnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwuid	b_id
-sys/socket.h	function	int socketpair b_int b_int b_int b_ptr_int
-time.h function int stime b_ptr_time_t
-unistd.h	function	int symlink b_fname b_fname
-
-
-
-# Currently these tests are commented out in order to debug them
-#timers:
-#time.h	function	int	clock_gettime	b_clockid	b_ptr_timespec
-#time.h	function	int	clock_settime	b_clockid	b_ptr_timespec
-#time.h	function	int	clock_getres	b_clockid	b_ptr_timespec
-#ZEROtime.h	function	clock_t	clock #ZERO calling arguments
-#time.h	function	double	difftime	b_time_t	b_time_t
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_int  
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_long  #ALPHA version
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_int   #LINUX/SUN version
-#time.h	function	int	timer_delete	b_timer
-#time.h	function	int	timer_settime	b_timer	b_timer	b_ptr_itimerspec	b_ptr_itimerspec
-#time.h	function	int	timer_gettime	b_timer		b_ptr_itimerspec
-#time.h	function	int	timer_getoverrun	b_timer
-#time.h	function	int	nanosleep	b_ptr_timespec	b_ptr_timespec
-
-#memory
-#munlockall no call arguments
-sys/mman.h	function	int 	mlockall	b_mcl_flag
-sys/mman.h	function	int	mlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	munlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	void*	mmap	b_ptr_void	b_unsigned_long	b_prot_flag	b_map_flag	b_fd	b_int
-#note mmap probably should be tested on shared memory w/ b_fd
-sys/mman.h	function	int	munmap	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	mprotect	b_ptr_void	b_unsigned_long	b_prot_flag
-sys/mman.h	function	int	msync	b_ptr_void	b_unsigned_long	b_ms_flag
-sys/mman.h	function	int	shm_open	b_fname	b_oflag	b_mode_t
-sys/mman.h	function	int 	shm_unlink	b_fname
-#note shm_* should probably also try names that start with /
-
-
-#sched:
-sched.h	function	int	sched_setparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_getparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_setscheduler	b_pid	b_sched_policy	b_ptr_sched_param
-sched.h	function	int	sched_getscheduler	b_pid
-#sched.h	function	int	sched_yield    #no calling arguments
-sched.h	function	int	sched_get_priority_max	b_sched_policy
-sched.h	function	int	sched_get_priority_min	b_sched_policy
-#sched.h	function	int	sched_rr_get_interval	b_pid	b_ptr_timespec
-
-#semaphore
-semaphore.h	function	int	sem_init	b_ptr_sem_t	b_int	b_unsigned_int
-semaphore.h	function	int	sem_destroy	b_ptr_sem_t
-semaphore.h	function	sem_t*	sem_open	b_fname	b_oflag
-semaphore.h	function	int	sem_close	b_ptr_sem_t
-semaphore.h	function	int	sem_unlink	b_fname
-semaphore.h	function	int	sem_wait	b_ptr_sem_t
-semaphore.h	function	int	sem_trywait	b_ptr_sem_t
-semaphore.h	function	int	sem_post	b_ptr_sem_t
-semaphore.h	function	int	sem_getvalue	b_ptr_sem_t	b_ptr_int
-
-#aio
-aio.h	function	int	aio_read	b_ptr_aiocb
-aio.h	function	int	aio_write	b_ptr_aiocb
-#aio.h   function        int     lio_listio      b_aio_mode      b_ptr_ptr_aiocb b_int   b_ptr_sigevent
-aio.h	function	int	aio_error	b_ptr_aiocb
-aio.h	function	ssize_t	aio_return	b_ptr_aiocb
-aio.h	function	int	aio_cancel	b_fd	b_ptr_aiocb
-aio.h	function	int	aio_suspend	b_ptr_ptr_aiocb	b_int	b_ptr_timespec
-aio.h	function	int	aio_fsync	b_oflag	b_ptr_aiocb
-
diff --git a/testcases/ballista/ballista/callTable.all.minusC b/testcases/ballista/ballista/callTable.all.minusC
deleted file mode 100644
index 312b5d4..0000000
--- a/testcases/ballista/ballista/callTable.all.minusC
+++ /dev/null
@@ -1,279 +0,0 @@
-# callTable.all: function definition file used by Ballista
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#------------------------------------------------------------------------
-#Calltable file
-#This file is ported to Digital UNIX 4.0
-#The file format is as follows
-#
-# include file name  callType  return type  function name  ballista type
-#
-# callType can be:
-# constructor   -   puts a new before method name ie: result = new widget;
-# function - normal function
-#------------------------------------------------------------------------
-
-syscall.h	function	int nfsservctl b_int b_ptr_void b_ptr_void 
-grp.h		function	int getgroups b_int b_ptr_gid_t
-grp.h		function	int setgroups b_unsigned_long b_ptr_gid_t
-unistd.h	function	int getdents b_unsigned_int b_ptr_void b_unsigned_int
-unistd.h	function	int bdflush b_int b_ptr_long
-unistd.h	function	int bdflush b_int b_long
-unistd.h	function	int exit b_int
-unistd.h	function	int mount b_ptr_buf b_ptr_buf b_ptr_buf
-unistd.h	function	int umount b_ptr_buf b_int
-unistd.h        function	int nice b_int
-unistd.h	function	int chroot b_ptr_buf
-unistd.h	function	int readlink b_ptr_buf b_ptr_char b_int
-unistd.h	function	int uselib b_ptr_char
-unistd.h	function	int swapon b_ptr_char b_int
-unistd.h	function	int swapoff b_ptr_char
-unistd.h	function	int reboot b_int b_int b_int b_ptr_void
-sys/mman.h	function	int mumap b_ptr_void b_unsigned_long
-unistd.h	function	int fchown b_int b_pid b_pid
-unistd.h	function	int fsync b_fd
-unistd.h	function	int sigreturn b_unsigned_long
-
-	
-
-unistd.h	function	int    getresgid  b_ptr_gid_t b_ptr_gid_t b_ptr_gid_t
-unistd.h        function        int    ioperm b_unsigned_long b_unsigned_long b_int
-unistd.h        function        int    ipc b_unsigned_int b_int b_int b_int b_ptr_void b_long
-sys/file.h      function        int     flock b_fd b_int
-sys/mman.h      function        void*    mremap b_ptr_void b_unsigned_long b_unsigned_long b_unsigned_long
-sys/socket.h        function       ssize_t send b_int b_ptr_void b_unsigned_long b_int
-
-# from LTP
-unistd.h        function        int     acct    b_fname
-unistd.h        function        int   setfsgid b_pid
-unistd.h        function        int   setfsuid b_pid
-unistd.h        function        int     brk     b_ptr_void
-#unistd.h       function        int     b_unsigned_int b_unsigned_long b_unsigned_long b_unsigned_int
-sys/socket.h        function        size_t recv b_int b_ptr_void b_unsigned_long b_int
-sys/socket.h        function        size_t recvfrom b_int b_ptr_void b_unsigned_long b_int
-sys/syscall.h       function        int syscall b_int    
-unistd.h            function        int sysfs b_int b_unsigned_int b_int	
-
-
-unistd.h        function        size_t  confstr  b_int b_ptr_char b_unsigned_long
-unistd.h	function	int	fchdir	 b_fd
-unistd.h	function	int     getdomainname   b_ptr_char b_unsigned_long
-unistd.h	function	int     setdomainname	b_fname    b_unsigned_long
-unistd.h	function        long    sethostid   b_long
-unistd.h	function	int     gethostname     b_ptr_char b_unsigned_long
-unistd.h	function	int     sethostname	b_fname    b_unsigned_long
-unistd.h	function	pid_t   getsid	 b_pid
-unistd.h	function	pid_t   getpgid  b_pid 
-unistd.h	function	int     setpgid  b_pid b_pid
-unistd.h	function	int     lstat  b_fname b_ptr_stat
-unistd.h	function	int     modify_ldt  b_int b_ptr_void b_unsigned_long
-#unistd.h	function	int     getresgid  b_gid_ptr b_gid_ptr b_gid_ptr
-unistd.h	function	int     profil   b_ptr_unsigned_int  b_unsigned_long b_unsigned_long b_unsigned_int
-
-
-# grp.h            function       struct group getgrnam b_fname
-
-
-sys/io.h        function        int     iopl  b_int
-sys/socket.h    function        int     listen  b_int b_int
-sys/time.h      function        int     getpriority   b_int b_int
-sys/resource.h  function 	int     setpriority   b_int b_int b_int 
-sys/prctl.h     function 	int     prctl b_int b_unsigned_long b_unsigned_long b_unsigned_long b_unsigned_long
-
-
-
-#files:
-unistd.h	function	int	access	b_fname	b_int_amode
-unistd.h	function	int	chdir	b_fname
-sys/stat.h	function	int	chmod	b_fname	b_mode_t
-sys/types.h	function	int	chown	b_fname	b_id	b_id
-unistd.h	function	int	close	b_fd
-fcntl.h	function	int	creat	b_fname	b_mode_t
-unistd.h	function	int	dup	b_fd
-unistd.h	function	int	dup2	b_fd	b_fd
-sys/stat.h	function	int	fchmod	b_fd	b_mode_t
-fcntl.h	function	int	fcntl	b_fd	b_int	b_int
-unistd.h	function	int	fdatasync	b_fd
-sys/stat.h	function	int	fstat	b_fd	b_ptr_stat
-unistd.h	function	int	fsync	b_fd
-unistd.h	function	int	ftruncate	b_fd	b_long
-unistd.h	function	char*	getcwd	b_ptr_char	b_int
-unistd.h	function	int	link	b_fname	b_fname
-unistd.h	function	off_t	lseek	b_fd	b_long	b_int_whence
-sys/stat.h	function	int	mkdir	b_fname	b_mode_t
-sys/stat.h	function	int	mkfifo	b_fname	b_mode_t
-fcntl.h	function	int	open	b_fname	b_oflag
-fcntl.h	function	int	open	b_fname	b_oflag	b_mode_t
-unistd.h	function	ssize_t	read	b_fd	b_ptr_buf	b_int
-unistd.h	function	int	rename	b_fname	b_fname
-unistd.h	function	int	rmdir	b_fname
-sys/stat.h	function	int	stat	b_fname	b_ptr_stat
-sys/stat.h	function	mode_t	umask	b_mode_t
-unistd.h	function	int	unlink	b_fname
-unistd.h	function	ssize_t	write	b_fd	b_ptr_char	b_int
-utime.h	function	int	utime	b_fname	b_ptr_utimbuf
-
-#dir:
-dirent.h	function	int	closedir	b_ptr_dir
-dirent.h	function	DIR*	opendir	b_fname
-dirent.h	function	dirent*	readdir	b_ptr_dir
-dirent.h	function	void	rewinddir	b_ptr_dir
-
-#processes:
-unistd.h	function	int	execl	b_fname	b_ptr_char
-unistd.h	function	int	execl	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execv	b_fname	b_ptr_ptr_char
-unistd.h	function	int	execve	b_fname	b_ptr_ptr_char	b_ptr_ptr_char
-unistd.h	function	int	execvp	b_fname	b_ptr_ptr_char
-#unistd.h	function	int	pipe	b_ptr_int       #pipe intentionally left off the list
-sys/wait.h	function	pid_t	wait	b_ptr_int
-sys/wait.h	function	pid_t	waitpid	b_pid	b_ptr_int	b_waitopt
-
-#pid:
-sys/types.h	function	int	getgroups	b_int	b_ptr_gid_t
-sys/types.h	function	int	setgid	b_pid
-sys/types.h	function	int	setpgid	b_pid	b_pid
-sys/types.h	function	int	setuid	b_pid
-
-#signals:
-unistd.h	function	int	alarm	b_int
-signal.h	int	kill	b_pid	b_int	# sends a SIGHUP to all procs in proc grp
-signal.h	function	int	sigaction	b_signal	b_ptr_sigaction	b_ptr_sigaction
-signal.h	function	int	sigaddset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigdelset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigemptyset	b_ptr_sigset_t
-signal.h	function	int	sigfillset	b_ptr_sigset_t
-signal.h	function	int	sigismember	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigpending	b_ptr_sigset_t
-signal.h	function	int	sigprocmask	b_sig_how	b_ptr_sigset_t	b_ptr_sigset_t
-#signal	int	sigqueue	b_pid	b_signal	b_ptr_char	# same reason as kill()
-signal.h	int	sigsuspend	b_ptr_sigset_t	#inflated restarts
-#sigwaitinfo and sigtimedwait comment out as correct operation would be counted as Restarts
-#uncomment to check for Catastrophics
-signal.h	function	int	sigtimedwait	b_ptr_sigset_t	b_ptr_siginfo_t	b_ptr_timespec
-signal.h	function	int	sigwaitinfo	b_ptr_sigset_t	b_ptr_siginfo_t
-
-#termio: 
-termios.h	function	speed_t	cfgetispeed	b_ptr_termios
-termios.h	function	speed_t	cfgetospeed	b_ptr_termios
-termios.h	function	int	cfsetispeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	cfsetospeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	tcdrain	b_fd
-termios.h	function	int	tcflow	b_fd	b_int   # restart inflated
-termios.h	function	int	tcflush	b_fd	b_int_tc
-termios.h	function	int	tcgetattr	b_fd	b_ptr_termios
-termios.h	function	int	tcsendbreak	b_fd	b_int
-termios.h	function	int	tcsetattr	b_fd	b_int_tc	b_ptr_termios
-sys/types.h	function	pid_t	tcgetpgrp	b_fd
-#sys/types.h	function	int	tcsetpgrp	b_fd	b_pid  #suspend ttyoutput
-
-#jumps:
-setjmp.h	function	void	longjmp	b_jmp_buf	b_int
-setjmp.h	function	int	setjmp	b_jmp_buf
-setjmp.h	function	void	siglongjmp	b_jmp_buf	b_int
-setjmp.h	function	int	sigsetjmp	b_jmp_buf	b_int
-
-#misc:
-assert.h	function	void	assert	#inflate the abort percentages
-locale.h	function	char*	setlocale	b_int_category	b_ptr_char
-stdio.h	function	void	perror	b_ptr_char
-time.h	function	time_t	time	b_ptr_time_t
-sys/times.h	function	clock_t	times	b_ptr_tms
-stdio.h	function	char*	ctermid	b_ptr_char
-unistd.h	function	int	isatty	b_fd
-unistd.h	function	char*	ttyname	b_fd
-sys/utsname.h	function	int	uname	b_ptr_utsname
-unistd.h	function	int	fpathconf	b_fd	b_int_file_var
-unistd.h	function	int	pathconf	b_fname	b_int_file_var
-unistd.h	function	long	sysconf	b_int_sys_var
-stdlib.h	function	char*	getenv	b_ptr_char
-grp.h	function	group*	getgrgid	b_id
-grp.h	function	group*	getgrnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwuid	b_id
-sys/socket.h	function	int socketpair b_int b_int b_int b_ptr_int
-time.h function int stime b_ptr_time_t
-unistd.h	function	int symlink b_fname b_fname
-
-
-
-
-#timers:
-time.h	function	int	clock_gettime	b_clockid	b_ptr_timespec
-time.h	function	int	clock_settime	b_clockid	b_ptr_timespec
-time.h	function	int	clock_getres	b_clockid	b_ptr_timespec
-#ZEROtime.h	function	clock_t	clock #ZERO calling arguments
-time.h	function	double	difftime	b_time_t	b_time_t
-time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_int  
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_long  #ALPHA version
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_int   #LINUX/SUN version
-time.h	function	int	timer_delete	b_timer
-time.h	function	int	timer_settime	b_timer	b_timer	b_ptr_itimerspec	b_ptr_itimerspec
-time.h	function	int	timer_gettime	b_timer		b_ptr_itimerspec
-time.h	function	int	timer_getoverrun	b_timer
-time.h	function	int	nanosleep	b_ptr_timespec	b_ptr_timespec
-
-#memory
-#munlockall no call arguments
-sys/mman.h	function	int 	mlockall	b_mcl_flag
-sys/mman.h	function	int	mlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	munlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	void*	mmap	b_ptr_void	b_unsigned_long	b_prot_flag	b_map_flag	b_fd	b_int
-#note mmap probably should be tested on shared memory w/ b_fd
-sys/mman.h	function	int	munmap	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	mprotect	b_ptr_void	b_unsigned_long	b_prot_flag
-sys/mman.h	function	int	msync	b_ptr_void	b_unsigned_long	b_ms_flag
-sys/mman.h	function	int	shm_open	b_fname	b_oflag	b_mode_t
-sys/mman.h	function	int 	shm_unlink	b_fname
-#note shm_* should probably also try names that start with /
-
-
-#sched:
-sched.h	function	int	sched_setparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_getparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_setscheduler	b_pid	b_sched_policy	b_ptr_sched_param
-sched.h	function	int	sched_getscheduler	b_pid
-#sched.h	function	int	sched_yield    #no calling arguments
-sched.h	function	int	sched_get_priority_max	b_sched_policy
-sched.h	function	int	sched_get_priority_min	b_sched_policy
-sched.h	function	int	sched_rr_get_interval	b_pid	b_ptr_timespec
-
-#semaphore
-semaphore.h	function	int	sem_init	b_ptr_sem_t	b_int	b_unsigned_int
-semaphore.h	function	int	sem_destroy	b_ptr_sem_t
-semaphore.h	function	sem_t*	sem_open	b_fname	b_oflag
-semaphore.h	function	int	sem_close	b_ptr_sem_t
-semaphore.h	function	int	sem_unlink	b_fname
-semaphore.h	function	int	sem_wait	b_ptr_sem_t
-semaphore.h	function	int	sem_trywait	b_ptr_sem_t
-semaphore.h	function	int	sem_post	b_ptr_sem_t
-semaphore.h	function	int	sem_getvalue	b_ptr_sem_t	b_ptr_int
-
-#aio
-aio.h	function	int	aio_read	b_ptr_aiocb
-aio.h	function	int	aio_write	b_ptr_aiocb
-#aio.h   function        int     lio_listio      b_aio_mode      b_ptr_ptr_aiocb b_int   b_ptr_sigevent
-aio.h	function	int	aio_error	b_ptr_aiocb
-aio.h	function	ssize_t	aio_return	b_ptr_aiocb
-aio.h	function	int	aio_cancel	b_fd	b_ptr_aiocb
-aio.h	function	int	aio_suspend	b_ptr_ptr_aiocb	b_int	b_ptr_timespec
-aio.h	function	int	aio_fsync	b_oflag	b_ptr_aiocb
-
diff --git a/testcases/ballista/ballista/callTableDUNIX.all b/testcases/ballista/ballista/callTableDUNIX.all
deleted file mode 100644
index f7f0a55..0000000
--- a/testcases/ballista/ballista/callTableDUNIX.all
+++ /dev/null
@@ -1,374 +0,0 @@
-# callTableDUNIX.all: function definition file used by Ballista - DUNIX
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#------------------------------------------------------------------------
-
-#Calltable file
-#This file is ported to Digital UNIX 4.0
-#The file format is as follows
-#
-# include file name  callType  return type  function name  ballista type
-#
-# callType can be:
-# constructor   -   puts a new before method name ie: result = new widget;
-# function - normal function
-#------------------------------------------------------------------------
-
-
-#files:
-unistd.h	function	int	access	b_fname	b_int_amode
-unistd.h	function	int	chdir	b_fname
-sys/stat.h	function	int	chmod	b_fname	b_mode_t
-sys/types.h	function	int	chown	b_fname	b_id	b_id
-unistd.h	function	int	close	b_fd
-fcntl.h	function	int	creat	b_fname	b_mode_t
-unistd.h	function	int	dup	b_fd
-unistd.h	function	int	dup2	b_fd	b_fd
-sys/stat.h	function	int	fchmod	b_fd	b_mode_t
-fcntl.h	function	int	fcntl	b_fd	b_int	b_int
-unistd.h	function	int	fdatasync	b_fd
-sys/stat.h	function	int	fstat	b_fd	b_ptr_stat
-unistd.h	function	int	fsync	b_fd
-unistd.h	function	int	ftruncate	b_fd	b_long
-unistd.h	function	char*	getcwd	b_ptr_char	b_int
-unistd.h	function	int	link	b_fname	b_fname
-unistd.h	function	off_t	lseek	b_fd	b_long	b_int_whence
-sys/stat.h	function	int	mkdir	b_fname	b_mode_t
-sys/stat.h	function	int	mkfifo	b_fname	b_mode_t
-fcntl.h	function	int	open	b_fname	b_oflag
-fcntl.h	function	int	open	b_fname	b_oflag	b_mode_t
-#unistd.h	function	ssize_t	read	b_fd	b_ptr_buf	b_int
-unistd.h	function	int	rename	b_fname	b_fname
-unistd.h	function	int	rmdir	b_fname
-sys/stat.h	function	int	stat	b_fname	b_ptr_stat
-sys/stat.h	function	mode_t	umask	b_mode_t
-unistd.h	function	int	unlink	b_fname
-unistd.h	function	ssize_t	write	b_fd	b_ptr_char	b_int
-utime.h	function	int	utime	b_fname	b_ptr_utimbuf
-
-#dir:
-dirent.h	function	int	closedir	b_ptr_dir
-dirent.h	function	DIR*	opendir	b_fname
-dirent.h	function	dirent*	readdir	b_ptr_dir
-dirent.h	function	void	rewinddir	b_ptr_dir
-
-#processes:
-unistd.h	function	int	execl	b_fname	b_ptr_char
-unistd.h	function	int	execl	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char
-unistd.h	function	int	execle	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char
-unistd.h	function	int	execlp	b_fname	b_ptr_char	b_ptr_char
-unistd.h	function	int	execv	b_fname	b_ptr_ptr_char
-unistd.h	function	int	execve	b_fname	b_ptr_ptr_char	b_ptr_ptr_char
-unistd.h	function	int	execvp	b_fname	b_ptr_ptr_char
-#unistd.h	function	int	pipe	b_ptr_int       #pipe intentionally left off the list
-sys/wait.h	function	pid_t	wait	b_ptr_int
-sys/wait.h	function	pid_t	waitpid	b_pid	b_ptr_int	b_waitopt
-
-#pid:
-sys/types.h	function	int	getgroups	b_int	b_ptr_gid_t
-sys/types.h	function	int	setgid	b_pid
-sys/types.h	function	int	setpgid	b_pid	b_pid
-sys/types.h	function	int	setuid	b_pid
-
-#signals:
-unistd.h	function	int	alarm	b_int
-#signal.h	int	kill	b_pid	b_int	# sends a SIGHUP to all procs in proc grp
-signal.h	function	int	sigaction	b_signal	b_ptr_sigaction	b_ptr_sigaction
-signal.h	function	int	sigaddset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigdelset	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigemptyset	b_ptr_sigset_t
-signal.h	function	int	sigfillset	b_ptr_sigset_t
-signal.h	function	int	sigismember	b_ptr_sigset_t	b_signal
-signal.h	function	int	sigpending	b_ptr_sigset_t
-signal.h	function	int	sigprocmask	b_sig_how	b_ptr_sigset_t	b_ptr_sigset_t
-#signal	int	sigqueue	b_pid	b_signal	b_ptr_char	# same reason as kill()
-#signal.h	int	sigsuspend	b_ptr_sigset_t	#inflated restarts
-#sigwaitinfo and sigtimedwait comment out as correct operation would be counted as Restarts
-#uncomment to check for Catastrophics
-#signal.h	function	int	sigtimedwait	b_ptr_sigset_t	b_ptr_siginfo_t	b_ptr_timespec
-#signal.h	function	int	sigwaitinfo	b_ptr_sigset_t	b_ptr_siginfo_t
-
-#termio:
-termios.h	function	speed_t	cfgetispeed	b_ptr_termios
-termios.h	function	speed_t	cfgetospeed	b_ptr_termios
-termios.h	function	int	cfsetispeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	cfsetospeed	b_ptr_termios	b_unsigned_int
-termios.h	function	int	tcdrain	b_fd
-#termios.h	function	int	tcflow	b_fd	b_int   # restart inflated
-termios.h	function	int	tcflush	b_fd	b_int_tc
-termios.h	function	int	tcgetattr	b_fd	b_ptr_termios
-termios.h	function	int	tcsendbreak	b_fd	b_int
-termios.h	function	int	tcsetattr	b_fd	b_int_tc	b_ptr_termios
-sys/types.h	function	pid_t	tcgetpgrp	b_fd
-#sys/types.h	function	int	tcsetpgrp	b_fd	b_pid  #suspend ttyoutput
-
-#jumps:
-setjmp.h	function	void	longjmp	b_jmp_buf	b_int
-setjmp.h	function	int	setjmp	b_jmp_buf
-setjmp.h	function	void	siglongjmp	b_jmp_buf	b_int
-setjmp.h	function	int	sigsetjmp	b_jmp_buf	b_int
-
-#misc:
-#assert.h	function	void	assert	#inflate the abort percentages
-locale.h	function	char*	setlocale	b_int_category	b_ptr_char
-stdio.h	function	void	perror	b_ptr_char
-time.h	function	time_t	time	b_ptr_time_t
-sys/times.h	function	clock_t	times	b_ptr_tms
-stdio.h	function	char*	ctermid	b_ptr_char
-unistd.h	function	int	isatty	b_fd
-unistd.h	function	char*	ttyname	b_fd
-sys/utsname.h	function	int	uname	b_ptr_utsname
-unistd.h	function	int	fpathconf	b_fd	b_int_file_var
-unistd.h	function	int	pathconf	b_fname	b_int_file_var
-unistd.h	function	long	sysconf	b_int_sys_var
-stdlib.h	function	char*	getenv	b_ptr_char
-grp.h	function	group*	getgrgid	b_id
-grp.h	function	group*	getgrnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwnam	b_ptr_char_id
-pwd.h	function	passwd*	getpwuid	b_id
-
-#stdio:
-stdio.h	function	void	clearerr	b_ptr_file
-stdio.h	function	int	fclose	b_ptr_file
-stdio.h	function	FILE*	fdopen	b_fd	b_ptr_char_mode
-stdio.h	function	int	feof	b_ptr_file
-stdio.h	function	int	ferror	b_ptr_file
-stdio.h	function	int	fflush	b_ptr_file
-stdio.h	function	int	fgetc	b_ptr_file
-stdio.h	function	char*	fgets	b_ptr_char	b_size	b_ptr_file
-stdio.h	function	int	fileno	b_ptr_file
-stdio.h	function	FILE*	fopen	b_fname	b_ptr_char_mode
-stdio.h	function	int	fprintf	b_ptr_file	b_ptr_char
-stdio.h	function	int	fprintf	b_ptr_file	b_ptr_char	b_int
-stdio.h	function	int	fprintf	b_ptr_file	b_ptr_char	b_ptr_char
-stdio.h	function	int	fputc	b_int	b_ptr_file
-#fputs is okay to test but your xterm window stops being updated so results and summary information is not shown
-#stdio.h	function	int	fputs	b_ptr_char	b_ptr_file
-stdio.h	function	int	fread	b_ptr_buf	b_unsigned_long	b_unsigned_long	b_ptr_file
-stdio.h	function	FILE*	freopen	b_fname	b_ptr_char_mode	b_ptr_file
-stdio.h	function	int	fscanf	b_ptr_file	b_ptr_char
-stdio.h	function	int	fscanf	b_ptr_file	b_ptr_char	b_ptr_buf
-stdio.h	function	int	fseek	b_ptr_file	b_long	b_int_whence
-stdio.h	function	long	ftell	b_ptr_file
-stdio.h	function	int	fwrite	b_ptr_char	b_unsigned_long	b_unsigned_long	b_ptr_file
-stdio.h	function	int	getc	b_ptr_file
-#unistd.h	function	char*	gets	b_ptr_char  //inflate the number of Restarts
-stdio.h	function	int	printf	b_ptr_char
-stdio.h	function	int	printf	b_ptr_char	b_int
-stdio.h	function	int	printf	b_ptr_char	b_ptr_char
-stdio.h	function	int	putchar	b_int
-stdio.h	function	int	putc	b_int	b_ptr_file
-stdio.h	function	int	puts	b_ptr_char
-stdio.h	function	int	remove	b_fname
-stdio.h	function	void	rewind	b_ptr_file
-#stdio.h	function	int	scanf	b_ptr_char  //inflate the number of Restarts
-#stdio.h	function	int	scanf	b_ptr_char	b_ptr_char
-stdio.h	function	void	setbuf	b_ptr_file	b_ptr_char
-stdio.h	function	int	sprintf	b_ptr_char	b_ptr_char
-stdio.h	function	int	sprintf	b_ptr_char	b_ptr_char	b_int
-stdio.h	function	int	sprintf	b_ptr_char	b_ptr_char	b_ptr_char
-stdio.h	function	int	sscanf	b_ptr_char	b_ptr_char
-stdio.h	function	int	sscanf	b_ptr_char	b_ptr_char	b_ptr_char
-stdio.h	function	int	ungetc	b_int	b_ptr_file
-stdio.h	function	char*	tmpnam	b_ptr_char
-
-#stdlib:
-stdlib.h	function	int	abs	b_int
-#stdlib.h	function	void	abort	#inflate the number of aborts
-#stdlib.h	function	void	atexit  #operation occurs later and could throw statistics
-#stdlib.h	function	void*	bsearch #intentionally commented out
-stdlib.h	function	void	srand	b_unsigned_int
-stdlib.h	function	double	atof	b_ptr_char
-stdlib.h	function	int	atoi	b_ptr_char
-stdlib.h	function	long	atol	b_ptr_char
-stdlib.h	function	void*	malloc	b_unsigned_long
-stdlib.h	function	void*	calloc	b_unsigned_long	b_unsigned_long
-stdlib.h	function	void*	realloc	b_ptr_buf	b_unsigned_long
-stdlib.h	function	void	free	b_ptr_buf
-
-#strings:
-string.h	function	char*	strcat	b_ptr_char	b_ptr_char
-string.h	function	char*	strchr	b_ptr_char	b_int
-string.h	function	int	strcmp	b_ptr_char	b_ptr_char
-string.h	function	char*	strcpy	b_ptr_char	b_ptr_char
-string.h	function	int	strcspn	b_ptr_char	b_ptr_char
-string.h	function	size_t	strlen	b_ptr_char
-string.h	function	char*	strncat	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	int	strncmp	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	char*	strncpy	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	char*	strpbrk	b_ptr_char	b_ptr_char
-string.h	function	char*	strrchr	b_ptr_char	b_int
-string.h	function	size_t	strspn	b_ptr_char	b_ptr_char
-string.h	function	char*	strstr	b_ptr_char	b_ptr_char
-string.h	function	char*	strtok	b_ptr_char	b_ptr_char
-
-#char:
-ctype.h	function	int	isalnum	b_int
-ctype.h	function	int	isalpha	b_int
-ctype.h	function	int	iscntrl	b_int
-ctype.h	function	int	isdigit	b_int
-ctype.h	function	int	isgraph	b_int
-ctype.h	function	int	islower	b_int
-ctype.h	function	int	isprint	b_int
-ctype.h	function	int	ispunct	b_int
-ctype.h	function	int	isspace	b_int
-ctype.h	function	int	isupper	b_int
-ctype.h	function	int	isxdigit	b_int
-ctype.h	function	int	tolower	b_int
-ctype.h	function	int	toupper	b_int
-
-#math:  add -lm in configHints.txt [DIGITAL]
-math.h	function	double	acos	b_double
-math.h	function	double	asin	b_double
-math.h	function	double	atan	b_double
-math.h	function	double	atan2	b_double	b_double
-math.h	function	double	ceil	b_double
-math.h	function	double	cos	b_double
-math.h	function	double	cosh	b_double
-math.h	function	double	exp	b_double
-math.h	function	double	fabs	b_double
-math.h	function	double	floor	b_double
-math.h	function	double	fmod	b_double	b_double
-math.h	function	double	frexp	b_double	b_ptr_int
-math.h	function	double	ldexp	b_double	b_int
-math.h	function	double	log	b_double
-math.h	function	double	log10	b_double
-math.h	function	double	modf	b_double	b_ptr_double
-math.h	function	double	pow	b_double	b_double
-math.h	function	double	sin	b_double
-math.h	function	double	sinh	b_double
-math.h	function	double	sqrt	b_double
-math.h	function	double	tan	b_double
-math.h	function	double	tanh	b_double
-
-#time:
-time.h	function	char*	asctime	b_ptr_tm
-time.h	function	char*	ctime	b_ptr_time_t
-time.h	function	tm*	gmtime	b_ptr_time_t
-time.h	function	tm*	localtime	b_ptr_time_t
-time.h	function	time_t	mktime	b_ptr_tm
-time.h	function	size_t	strftime	b_ptr_char	b_unsigned_long	b_ptr_char	b_ptr_tm
-
-#timers:
-time.h	function	int	clock_gettime	b_clockid	b_ptr_timespec
-time.h	function	int	clock_settime	b_clockid	b_ptr_timespec
-time.h	function	int	clock_getres	b_clockid	b_ptr_timespec
-#ZEROtime.h	function	clock_t	clock #ZERO calling arguments
-time.h	function	double	difftime	b_time_t	b_time_t
-time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_long  
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_long  #ALPHA version
-#time.h	function	int	timer_create	b_clockid	b_ptr_sigevent	b_ptr_int   #LINUX/SUN version
-time.h	function	int	timer_delete	b_timer
-time.h	function	int	timer_settime	b_timer	b_timer	b_ptr_itimerspec	b_ptr_itimerspec
-time.h	function	int	timer_gettime	b_timer		b_ptr_itimerspec
-time.h	function	int	timer_getoverrun	b_timer
-time.h	function	int	nanosleep	b_ptr_timespec	b_ptr_timespec
-
-#memory
-#munlockall no call arguments
-sys/mman.h	function	int 	mlockall	b_mcl_flag
-sys/mman.h	function	int	mlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	munlock	b_ptr_void	b_unsigned_long
-sys/mman.h	function	void*	mmap	b_ptr_void	b_unsigned_long	b_prot_flag	b_map_flag	b_fd	b_int
-#note mmap probably should be tested on shared memory w/ b_fd
-sys/mman.h	function	int	munmap	b_ptr_void	b_unsigned_long
-sys/mman.h	function	int	mprotect	b_ptr_void	b_unsigned_long	b_prot_flag
-sys/mman.h	function	int	msync	b_ptr_void	b_unsigned_long	b_ms_flag
-sys/mman.h	function	int	shm_open	b_fname	b_oflag	b_mode_t
-sys/mman.h	function	int 	shm_unlink	b_fname
-#note shm_* should probably also try names that start with /
-
-#mqueues:  (not supported on LINUX )
-mqueue.h	function	mqd_t	mq_open	b_fname	b_oflag
-mqueue.h	function	int	mq_close	b_mqd
-mqueue.h	function	int	mq_unlink	b_fname
-mqueue.h	function	int	mq_send	b_mqd	b_ptr_char	b_size	b_unsigned_int
-mqueue.h	function	ssize_t	mq_receive	b_mqd	b_ptr_char	b_unsigned_long	b_ptr_unsigned_int
-mqueue.h	function	int	mq_notify	b_mqd	b_ptr_sigevent
-mqueue.h	function	int	mq_setattr	b_mqd	b_mq_attr	b_mq_attr
-mqueue.h	function	int	mq_getattr	b_mqd	b_mq_attr
-
-#sched:
-sched.h	function	int	sched_setparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_getparam	b_pid	b_ptr_sched_param
-sched.h	function	int	sched_setscheduler	b_pid	b_sched_policy	b_ptr_sched_param
-sched.h	function	int	sched_getscheduler	b_pid
-#sched.h	function	int	sched_yield    #no calling arguments
-sched.h	function	int	sched_get_priority_max	b_sched_policy
-sched.h	function	int	sched_get_priority_min	b_sched_policy
-sched.h	function	int	sched_rr_get_interval	b_pid	b_ptr_timespec
-
-#semaphore
-semaphore.h	function	int	sem_init	b_ptr_sem_t	b_int	b_unsigned_int
-semaphore.h	function	int	sem_destroy	b_ptr_sem_t
-semaphore.h	function	sem_t*	sem_open	b_fname	b_oflag
-semaphore.h	function	int	sem_close	b_ptr_sem_t
-semaphore.h	function	int	sem_unlink	b_fname
-semaphore.h	function	int	sem_wait	b_ptr_sem_t
-semaphore.h	function	int	sem_trywait	b_ptr_sem_t
-semaphore.h	function	int	sem_post	b_ptr_sem_t
-semaphore.h	function	int	sem_getvalue	b_ptr_sem_t	b_ptr_int
-
-#aio
-aio.h	function	int	aio_read	b_ptr_aiocb
-aio.h	function	int	aio_write	b_ptr_aiocb
-#aio.h   function        int     lio_listio      b_aio_mode      b_ptr_ptr_aiocb b_int   b_ptr_sigevent
-aio.h	function	int	aio_error	b_ptr_aiocb
-aio.h	function	ssize_t	aio_return	b_ptr_aiocb
-aio.h	function	int	aio_cancel	b_fd	b_ptr_aiocb
-aio.h	function	int	aio_suspend	b_ptr_ptr_aiocb	b_int	b_ptr_timespec
-aio.h	function	int	aio_fsync	b_oflag	b_ptr_aiocb
-
-#additions
-#stdio.h	function	char*	cuserid	b_ptr_char  #check the b_ptr_char for array...
-
-#sun, alpha and linux
-stdlib.h	function	div_t	div	b_int	b_int 
-
-#stdlib.h	function	exit	b_int	#inflated robustness failure rates
-stdio.h	function	int	fgetpos	b_ptr_file	b_ptr_fpos_t  
-stdio.h	function	int	fsetpos	b_ptr_file	b_ptr_fpos_t
-
-# getchar intentionally omitted since it requires stdin
-stdlib.h	function	long	labs	b_long
-stdlib.h	function	ldiv_t	ldiv	b_long	b_long
-stdlib.h	function	int	mblen	b_ptr_char	b_unsigned_long
-stdlib.h	function	size_t	mbstowcs	b_ptr_wchar	b_ptr_char	b_unsigned_long	
-stdlib.h	function	int	mbtowc	b_ptr_wchar	b_ptr_char	b_unsigned_long
-# qsort intentionally left off the list
-# rand has zero parameters and therefore, intentionally left off the list
-string.h	function	void*	memchr	b_ptr_char	b_int	b_unsigned_long
-string.h	function	int	memcmp	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	void*	memcpy	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	void*	memmove	b_ptr_char	b_ptr_char	b_unsigned_long
-string.h	function	void*	memset	b_ptr_char	b_int	b_unsigned_long
-
-stdio.h	function	int	setvbuf	b_ptr_file	b_ptr_char	b_int_buffer_mode	b_unsigned_long
-# raise, signal, & system intentionally left off the list
-string.h	function	int	strcoll	b_ptr_char	b_ptr_char
-string.h	function	char*	strerror	b_int
-stdlib.h	function	double	strtod	b_ptr_char	b_ptr_ptr_char
-stdlib.h	function	long	strtol	b_ptr_char	b_ptr_ptr_char	b_int
-stdlib.h	function	ulong	strtoul	b_ptr_char	b_ptr_ptr_char	b_int
-string.h	function	size_t	strxfrm	b_ptr_char	b_ptr_char	b_unsigned_long
-
-# tmpfile not defined as zero parameters
-stdlib.h	function	size_t	wcstombs	b_ptr_char	b_ptr_wchar	b_unsigned_int
-stdlib.h	function	int	wctomb	b_ptr_char	b_wchar
-
-#vfprintf, vprintf, vsprintf omitted 
diff --git a/testcases/ballista/ballista/comp.txt b/testcases/ballista/ballista/comp.txt
deleted file mode 100644
index 7640a90..0000000
--- a/testcases/ballista/ballista/comp.txt
+++ /dev/null
@@ -1,328 +0,0 @@
-
-
-
-Function: access
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_int_amode.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccEyWuNk.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/cchhR0Km.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-g++ -w -O -DB_SELFHOST -lpthread -ldl -lnsl -rdynamic ballista.cpp match.o line.o hack.o ballistaRPC.o ballistaXDR.o selfHost.o ballistaUtil.o marshal.o testCaseIterator.o serverCommunication.o parseArguments.o ballistaError.o -o ballista
-selfHost.o(.text+0x78e): In function `Selfhost_test_manager::manage_test(char[255] (*) [33], long, char*, int, int*, char*, int, char*, int)':
-: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Warning: File `mut.out' has modification time 1.2e+07 s in the future
-g++  -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS -c executeTestCase.cpp
-In file included from executeTestCase.h:18,
-                 from executeTestCase.cpp:18:
-userIncludes.h:1:10: empty file name in #include
-make: *** [executeTestCase.o] Error 1
-
-makeBallista failed for access.  access will not be tested -- this function may not exist on your operating system.
-
-
-
-Function: chdir
-Datatype list: templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccv5YOqT.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/cc8xWl0F.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-g++ -w -O -DB_SELFHOST -lpthread -ldl -lnsl -rdynamic ballista.cpp match.o line.o hack.o ballistaRPC.o ballistaXDR.o selfHost.o ballistaUtil.o marshal.o testCaseIterator.o serverCommunication.o parseArguments.o ballistaError.o -o ballista
-selfHost.o(.text+0x78e): In function `Selfhost_test_manager::manage_test(char[255] (*) [33], long, char*, int, int*, char*, int, char*, int)':
-: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Warning: File `mut.out' has modification time 1.2e+07 s in the future
-g++  -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS -c executeTestCase.cpp
-In file included from executeTestCase.h:18,
-                 from executeTestCase.cpp:18:
-userIncludes.h:1:10: empty file name in #include
-make: *** [executeTestCase.o] Error 1
-
-makeBallista failed for chdir.  chdir will not be tested -- this function may not exist on your operating system.
-
-
-
-Function: chmod
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_mode_t.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/cc0J4vy6.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/cc51F5OJ.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-make: *** [hack.o] Interrupt
-
-
-makeBallista failed for chmod.  chmod will not be tested -- this function may not exist on your operating system.
-
-
-
-Function: chown
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_id.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-
-[4]+  Stopped                 perl ostest.pl
-gospurs1:~/balista/ballista # kill %4
-
-[4]+  Stopped                 perl ostest.pl
-gospurs1:~/balista/ballista # make: *** [callGen] Terminated
-
-[4]+  Terminated              perl ostest.pl
-gospurs1:~/balista/ballista # cp ostest.pl ostest.pl.mine
-gospurs1:~/balista/ballista # ls os*
-osLibs  ostest.pl  ostest.pl.mine  ostest.pl.version1  ostest.pl~
-gospurs1:~/balista/ballista # cp ostest.pl.version1 ostest.pl
-gospurs1:~/balista/ballista # perl ostest.pl
-
-About to remove all previous results files located in the outfiles directory.  If you wish to save these
-results, type "n," copy the results to another location, and restart this script.  Continue cleanup?y
-
-Cleaning up previous results...
-
-This package will limit individual function tests to 5,000 total test cases.  If this is acceptable,
-press Enter.  If you would like to test all possible cases (100%), type "100."   To test fewer
-cases, enter the desired percentage of test cases to run.  (Note test cases per function are still
-limited to a maximum of 5,000 per function even set at 100%.) 100
-Configuring for host platform: linux
-              target platform: linux
-make: Entering directory `/root/balista/ballista/compile'
-make: Warning: File `blexer' has modification time 1.2e+07 s in the future
-cp blexer ../blexer
-cp blexer ../templates/blexer
-cp bparser ../bparser
-cp bparser ../templates/bparser
-cp do_parse ../do_parse
-cp do_parse ../templates/do_parse
-chmod 700 ../templates/do_parse
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Leaving directory `/root/balista/ballista/compile'
-**************************************
-* Currently testing "access"
-* access passed
-**************************************
-
-Compling...
-
-[4]+  Stopped                 perl ostest.pl
-gospurs1:~/balista/ballista # kill %4
-
-[4]+  Stopped                 perl ostest.pl
-gospurs1:~/balista/ballista # emacs ostest.pl &
-[5] 3863
-[4]   Terminated              perl ostest.pl
-gospurs1:~/balista/ballista # perl ostest.pl
-
-About to remove all previous results files located in the outfiles directory.  If you wish to save these
-results, type "n," copy the results to another location, and restart this script.  Continue cleanup?y
-
-Cleaning up previous results...
-
-This package will limit individual function tests to 5,000 total test cases.  If this is acceptable,
-press Enter.  If you would like to test all possible cases (100%), type "100."   To test fewer
-cases, enter the desired percentage of test cases to run.  (Note test cases per function are still
-limited to a maximum of 5,000 per function even set at 100%.) 100
-Configuring for host platform: linux
-              target platform: linux
-make: Entering directory `/root/balista/ballista/compile'
-make: Warning: File `blexer' has modification time 1.2e+07 s in the future
-cp blexer ../blexer
-cp blexer ../templates/blexer
-cp bparser ../bparser
-cp bparser ../templates/bparser
-cp do_parse ../do_parse
-cp do_parse ../templates/do_parse
-chmod 700 ../templates/do_parse
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Leaving directory `/root/balista/ballista/compile'
-Function: access
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_int_amode.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccYbD9ZP.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccwHYQvo.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-g++ -w -O -DB_SELFHOST -lpthread -ldl -lnsl -rdynamic ballista.cpp match.o line.o hack.o ballistaRPC.o ballistaXDR.o selfHost.o ballistaUtil.o marshal.o testCaseIterator.o serverCommunication.o parseArguments.o ballistaError.o -o ballista
-selfHost.o(.text+0x78e): In function `Selfhost_test_manager::manage_test(char[255] (*) [33], long, char*, int, int*, char*, int, char*, int)':
-: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Warning: File `mut.out' has modification time 1.2e+07 s in the future
-g++  -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS -c executeTestCase.cpp
-make: warning:  Clock skew detected.  Your build may be incomplete.
-**************************************
-* Currently testing "access"
-* access passed
-**************************************
-
-Compling...
-Function: chdir
-Datatype list: templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccKU4Vua.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/cclS7n2R.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-g++ -w -O -DB_SELFHOST -lpthread -ldl -lnsl -rdynamic ballista.cpp match.o line.o hack.o ballistaRPC.o ballistaXDR.o selfHost.o ballistaUtil.o marshal.o testCaseIterator.o serverCommunication.o parseArguments.o ballistaError.o -o ballista
-selfHost.o(.text+0x78e): In function `Selfhost_test_manager::manage_test(char[255] (*) [33], long, char*, int, int*, char*, int, char*, int)':
-: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Warning: File `mut.out' has modification time 1.2e+07 s in the future
-g++  -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS -c executeTestCase.cpp
-make: warning:  Clock skew detected.  Your build may be incomplete.
-**************************************
-* Currently testing "chdir"
-* chdir passed
-**************************************
-
-Compling...
-Function: chmod
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_mode_t.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
-
-
-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future
-g++ -O callGen.cpp -o callGen
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccGfecMc.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O callGen_standAlone.cpp -o callGen_standAlone
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from callGen_standAlone.cpp:20:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-/tmp/ccBnfxUc.o(.text+0x1562): In function `__static_initialization_and_destruction_0(int, int)':
-: the use of `tempnam' is dangerous, better use `mkstemp'
-g++ -O genCodeCreator.cpp -o genCodeCreator
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from genCodeCreator.cpp:26:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -O replacer.cpp -o replacer
-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,
-                 from replacer.cpp:18:
-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
-g++ -w -O -DB_SELFHOST -c hack.cpp
-g++ -w -O -DB_SELFHOST -lpthread -ldl -lnsl -rdynamic ballista.cpp match.o line.o hack.o ballistaRPC.o ballistaXDR.o selfHost.o ballistaUtil.o marshal.o testCaseIterator.o serverCommunication.o parseArguments.o ballistaError.o -o ballista
-selfHost.o(.text+0x78e): In function `Selfhost_test_manager::manage_test(char[255] (*) [33], long, char*, int, int*, char*, int, char*, int)':
-: `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead
-make: warning:  Clock skew detected.  Your build may be incomplete.
-make: Warning: File `mut.out' has modification time 1.2e+07 s in the future
-g++  -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS -c executeTestCase.cpp
-make: warning:  Clock skew detected.  Your build may be incomplete.
-**************************************
-* Currently testing "chmod"
-* chmod passed
-**************************************
-
-Compling...
-Function: chown
-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_id.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o
-Compiler options:
diff --git a/testcases/ballista/ballista/compile/Makefile b/testcases/ballista/ballista/compile/Makefile
deleted file mode 100644
index ef43c00..0000000
--- a/testcases/ballista/ballista/compile/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# Makefile: Makefile for Ballista Datatype Template Compiler
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-dFLAGS=-g -DDEBUG
-FLAGS= -O -Wall
-PFLAGS= -p -g3
-
-CPPCOMP= ${CXX}
-
-#
-# The following is "boilerplate" to set up the standard compilation
-# commands:
-.SUFFIXES:
-.SUFFIXES: .cpp .c .cc .h .o
-.c.o:  ; ${CC} $(FLAGS) -c $*.c
-.cc.o:  ; $(CPPCOMP) $(FLAGS) -c $*.cc
-.cpp.o:  ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cpp
-.cxx.o:  ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cxx
-
-all: blexer bparser
-	cp blexer ../blexer
-	cp blexer ../templates/blexer
-	cp bparser ../bparser
-	cp bparser ../templates/bparser
-	cp do_parse ../do_parse
-	cp do_parse ../templates/do_parse
-	chmod 700 ../templates/do_parse
-
-blexer: jlist.o butil.o lex.yy.o blexer.o
-	${CC} $(FLAGS)  -o blexer jlist.o butil.o lex.yy.o blexer.o 
-
-bparser: bparser.o 
-	${CXX} $(FLAGS) -o bparser bparser.o butil.c
-
-jlist.o: jlist.c butil.h jlist.h
-
-butil.o: butil.c butil.h
-
-lex.yy.o: lex.yy.c
-
-lex.yy.c: ballista.l tokens.h
-	flex ballista.l
-
-blexer.o: blexer.c blexer.h jlist.h butil.h
-
-bparser.o: bparser.cpp tokens.h butil.h
-
-clean:
-	rm -f *.o
-	rm -f lex.yy.c
-	rm -f blexer
-	rm -f bparser
-	rm -f ../blexer ../bparser ../templates/blexer ../templates/bparser ../do_parse ../templates/do_parse
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/compile/ballista.l b/testcases/ballista/ballista/compile/ballista.l
deleted file mode 100644
index d5c4526..0000000
--- a/testcases/ballista/ballista/compile/ballista.l
+++ /dev/null
@@ -1,122 +0,0 @@
-%{
-  /* ballista.l : Ballista lexer - Compiler
-  Copyright (C) 1998-2001  Carnegie Mellon University
-
-  This program 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 Software Foundation; either version 2
-  of the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  */
-#include <stdio.h>
-#include "blexer.h"
-#include "butil.h"
-
-#include "tokens.h"
-
-int inCode = 0;  /* if zero, not in user c-code somewhere*/
-int lineNum = 0;
-int helpFlag =0;
-int dumpFlag =0;
-int commentState=0; /* track if we are in a comment */
-
-
-%}
-
-%%
-
-[\t ]+ {if (inCode!=0) return CODE_SP;}   /*ignore whitespace*/
-
-
-\n {lineNum++;commentState=0;if (inCode!=0) return CODE_NL;return EOL_ID;}
-
-name {if (inCode!=0) return CODE_ID;return NAME_ID;}
-parent {if (inCode!=0) return CODE_ID;return PARENT_ID;}
-includes {if (inCode!=0) return CODE_ID;return INCLUDES_ID;}
-global_defines {if (inCode!=0) return CODE_ID;return GLOBAL_DEFINES_ID;}
-dials {if (inCode!=0) return CODE_ID;return DIALS_ID;}
-enum_dial {if (inCode!=0) return CODE_ID;return ENUM_DIAL_ID;}
-int_dial {if (inCode!=0) return CODE_ID;return INT_DIAL_ID;}
-access {if (inCode!=0) return CODE_ID;return  ACCESS_ID;}
-commit {if (inCode!=0) return CODE_ID;return COMMIT_ID;}
-cleanup {if (inCode!=0) return CODE_ID;return CLEANUP_ID;}
-\/\/.* { commentState=1;}
-\[ {if (inCode!=0) return CODE_ID;return LEFT_BRACKET_ID;}
-\] {if (inCode!=0) return CODE_ID;return RIGHT_BRACKET_ID;}
-\{ {inCode++;if (inCode!=1) return CODE_ID;return  LEFT_BRACE_ID;}
-\} {
-    inCode --; 
-    if (inCode <0)
-      {
-	char s[50];
-	sprintf(s,"Error, mismatched } - line number %i",lineNum);
-	jerror(s);
-      }
-    if (inCode!=0) return CODE_ID;return RIGHT_BRACE_ID;
-   }
-: {if (inCode!=0) return CODE_ID;return COLON_ID;}
-; {if (inCode!=0) return CODE_ID;return SEMI_ID;}
-, {if (inCode!=0) return CODE_ID;return COMMA_ID;}
-[a-zA-Z0-9_*:\-\<\>]+ {
-  if (inCode!=0)
-    return CODE_ID;
-  else
-    {
-      symLook(yytext);
-      return VAR_ID;
-    }
-}
-. {if (inCode!=0) return CODE_ID;return CHAR_ID;}
-
-%%
-void parseCLine(int argc,char *argv[])
-{
-  int i;
-  for (i=2;i<=argc;i++)
-    {
-      if (!strcmp(argv[i-1],"-h")) helpFlag=1;
-      if (!strcmp(argv[i-1],"-dump")) dumpFlag=1;
-    }
-}
-
-int main(int argc,char *argv[])
-{
-  int i;
-
-  parseCLine(argc,argv);
-
-  if (helpFlag)
-  {
-    printf("Ballista Lexical Analyzer v0.1\n");
-    printf("options\n");
-    printf("-h       Print this message\n");
-    printf("-dump    Verbose output mode");
-  }
-
-  i=yylex();
-  while (i!=0)
-    {
-      if (dumpFlag) printf("(%i)%i: %s\n",inCode,i,yytext);
-      else if (i==VAR_ID || i==CODE_ID) printf("%i\t%s\n",i,yytext);
-      else printf("%i\n",i);
-      i=yylex();
-    }
-
-  if (dumpFlag)
-  {
-   printf("\nDumping Symbol Table\n");
-   dumpTable();
-  }
-
-  freeTable();
-  return 0;
-}
diff --git a/testcases/ballista/ballista/compile/bintDELETE.tpl b/testcases/ballista/ballista/compile/bintDELETE.tpl
deleted file mode 100644
index 541632a..0000000
--- a/testcases/ballista/ballista/compile/bintDELETE.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-name int bint;
-
-parent paramAccess;
-
-includes
-[
- {
-  #include "values.h"  //for digital unix
-  #include "bTypes.h"
- }
-]
-
-global_defines
-[
- {
-  #define filename "btestfile"
- }
-]
-
-dials
-[
-  enum_dial HVAL : ONE, ZERO, NEG1, MAX, MIN, TWO, FOUR, EIGHT, SIXTEEN, THIRTYTWO, SIXTYFOUR, SEVENTEEN, FIFTEEN, THIRTYTHREE, SIXTYFIVE, ONE27, ONE29, TWO55, TWO57, I65535, I65537, INEG64K;
-  int_dial  ANYINT;
-]
-
-access
-[
-  INEG64K
-    {
-       _theVariable=-65536;
-    }
-  I65537
-    {
-       _theVariable=65537;
-    }
-  I65535
-    {
-       _theVariable=65535;
-    }
-  TWO57
-    {
-       _theVariable=257;
-    }
-  TWO55
-    {
-       _theVariable=255;
-    }
-  ONE29
-    {
-       _theVariable=129;
-    }
-  ONE27
-    {
-       _theVariable=127;
-    }
-  ONE
-    {
-       _theVariable=1;
-    }
- ZERO
-    {
-       _theVariable=0;
-    }
- NEG1
-    {
-       _theVariable=-1;
-    }
- MAX
-    {
-       _theVariable=MAXINT;
-    }
- MIN
-    {
-       _theVariable=-MAXINT;
-    }
- TWO
-    {
-       _theVariable=2;
-    }
- FOUR
-    {
-       _theVariable=4;
-    }
- EIGHT
-    {
-       _theVariable=8;
-    }
- SIXTEEN
-    {
-       _theVariable=16;
-    }
- THIRTYTWO
-    {
-       _theVariable=32;
-    }
- SIXTYFOUR
-    {
-       _theVariable=64;
-    }
- SEVENTEEN
-    {
-       _theVariable=17;
-    }
- FIFTEEN
-    {
-       _theVariable=15;
-    }
- THIRTYTHREE
-    {
-       _theVariable=33;
-    }
- SIXTYFIVE
-    {
-       _theVariable=65;
-    }
-  ANYINT
-    {
-      _theVariable = _ANYINT_INT;
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/compile/blexer.c b/testcases/ballista/ballista/compile/blexer.c
deleted file mode 100644
index ca67759..0000000
--- a/testcases/ballista/ballista/compile/blexer.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* blexer.c : Ballista lexer - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-  
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-  
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-  
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "butil.h"
-#include "jlist.h"
-#include "blexer.h"
-
-struct jlist symTable;
-int init=0;
-
-int yywrap()
-{
-  return 1;
-}
-
-int myCompare(struct jelement *el1,struct jelement *el2)
-{
-  int i=0;
-  if (el1==NULL || el2==NULL)
-    jerror ("Error jlist compare function called with null ptr");
-
-#ifdef DEBUG
-  printf("Comparing %s and %s \n",((struct tableData *)el1->theData)->lexeme,((struct tableData*)el2->theData)->lexeme);
-#endif
-
-  i = strcmp(((struct tableData *)el1->theData)->lexeme,((struct tableData*)el2->theData)->lexeme);
-
-#ifdef DEBUG
-  printf ("strcmp returned %i\n",i);
-#endif
-
-  return i;
-
-}
-
-void myCopy(struct jelement *el1,struct jelement *el2)
-{
-  struct tableData *t1,*t2;
-  if (el1==NULL ||el2==NULL) 
-    jerror("Error, jlist copy function called with null ptr");
-  t1 = (struct tableData *) el1->theData;
-  t2 = (struct tableData *) el2->theData;
-  strcpy (t2->lexeme,t1->lexeme);
-  strcpy (t2->owner,t1->owner);  
-}
-
-void initSym()
-{
-#ifdef DEBUG
-  printf ("Initializing list: symTable\n");
-#endif
-  init=1;
-  symTable.compare = &myCompare;
-  symTable.copydata = &myCopy;
-  symTable.sort_ascending = 1;
-  symTable.i_am_sorted = 1;
-  symTable.stay_sorted = 1;
-  symTable.circular = 0;
-  symTable.insert_mode = insert_in_order;
-  symTable.data_size = sizeof(struct tableData);
-  symTable.head = NULL;
-  symTable.tail = NULL;
-}
-
-struct tableData *symLook(char sym[255])
-{
-  struct jelement *el;
-  struct jelement *rel;
-  struct tableData *data;
-
-  data = malloc (sizeof(struct tableData));
-  
-  if (!init) initSym();
-  
-  el = (struct jelement *)malloc (sizeof(struct jelement));
-
-  strcpy (data->lexeme,sym);
-
-  el->theData = data;
-
-#ifdef DEBUG
-  printf("looking for %s \n",sym);
-#endif
-  
-  rel = find_element(&symTable,el);
-  
-  if (rel!=NULL) 
-    {
-#ifdef DEBUG
-      printf("found: %s",((struct tableData *)rel->theData)->lexeme);
-#endif
-      free(el);
-      free (data);
-      return (struct tableData *)rel->theData;
-    }
-  else
-    {
-#ifdef DEBUG
-      printf("Adding to symtable: %s\n",data->lexeme);
-      fflush (stdout);
-#endif
-      insert_element(&symTable,el);
-      return (struct tableData *)el->theData;
-    }
-}
-
-int printout(struct jelement *el)
-{
-  printf ("%s: %s\n",((struct tableData *)el->theData)->lexeme,((struct tableData *)el->theData)->owner);
-  return 1;
-}
-
-void dumpTable()
-{
-  do_action(&symTable,&printout,NULL);
-}
-
-void freeTable()
-{
-  destroy_list(&symTable);
-}
-
-
diff --git a/testcases/ballista/ballista/compile/blexer.h b/testcases/ballista/ballista/compile/blexer.h
deleted file mode 100644
index f3bbc38..0000000
--- a/testcases/ballista/ballista/compile/blexer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* blexer.h : Ballista lexer header - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef BLEXER_H
-#define BLEXER_H
-#include "butil.h"
-#include "jlist.h"
-#include <unistd.h>
-
-struct tableData
-{
-  char lexeme[255];
-  char owner[255]; 
-};
-
-struct tableData *symLook(char sym[255]);
-
-void dumpTable();
-void freeTable();
-#endif
diff --git a/testcases/ballista/ballista/compile/bparser.cpp b/testcases/ballista/ballista/compile/bparser.cpp
deleted file mode 100644
index dfa39f7..0000000
--- a/testcases/ballista/ballista/compile/bparser.cpp
+++ /dev/null
@@ -1,1521 +0,0 @@
-/* bparser.c : Ballista parser - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <ctype.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-//#include <vector>
-#include <vector>
-#include <unistd.h>
-#include "tokens.h"
-#include "butil.h"
-
-#define MYMAP map<int, translationEntry,less<int>>
-#define MAXLIST 10
-using std::endl;
-using std::cerr;
-using std::cout;
-using std::cin;
-using std::ios;
-using std::vector;
-using std::ofstream;
-using std::ostream;
-
-vector<int> parseStack;
-
-//quote character
-#define qt (char)34 
-
-
-int helpFlag=0;
-int dumpFlag=0;
-int lineNumber=1;
-int stackDump=0;
-int dumpActions=0;
-int dialCount=0;
-int dialSetting=0;
-int conditionNum=0;
-
-char lexeme[256];
-char dname[256];
-
-char *h1name=tempnam(NULL,"h1x");
-char *h2name=tempnam(NULL,"h2x");
-char *h3name=tempnam(NULL,"h3x");
-char *h4name=tempnam(NULL,"h4x");
-
-char *c1name=tempnam(NULL,"c1x");
-char *c2name=tempnam(NULL,"c2x");
-char *c3name=tempnam(NULL,"c3x");
-char *c4name=tempnam(NULL,"c4x");
-char *c5name=tempnam(NULL,"c5x");
-char *c6name=tempnam(NULL,"c6x");
-char *c7name=tempnam(NULL,"c7x");
-char *c8name=tempnam(NULL,"c8x");
-char *c9name=tempnam(NULL,"c9x");
-char *c10name=tempnam(NULL,"c10x");
-char *c11name=tempnam(NULL,"c11x");
-char *c12name=tempnam(NULL,"c12x");
-char *cfname=tempnam(NULL,"cfx");
-
-
-
-ofstream h1(h1name,ios::out); //name defines
-ofstream h2(h2name,ios::out); //includes and global defines
-ofstream h3(h3name,ios::out); //private member data
-ofstream h4(h4name,ios::out); //public access functions
-
-ofstream c1(c1name,ios::out);
-ofstream c2(c2name,ios::out);
-ofstream c3(c3name,ios::out);
-ofstream c4(c4name,ios::out);
-ofstream c5(c5name,ios::out);
-ofstream c6(c6name,ios::out);
-ofstream c7(c7name,ios::out);
-ofstream c8(c8name,ios::out);
-ofstream c9(c9name,ios::out);
-ofstream c10(c10name,ios::out);
-ofstream c11(c11name,ios::out);
-ofstream c12(c12name,ios::out);
-ofstream cf(cfname,ios::out);
-
-
-ofstream *codeOut;              //where code goes
-
-char obName[256];               //name of object
-char obNamebak[256];	   //backup for uppering of include control directives.
-
-void getTokenString(char *s,int i);
-
-struct translationEntry
-{
-  int num;
-  enum tokenid data[MAXLIST];
-};
-
-translationEntry tTable[NUM_NONTERMS][NUM_TOKENS];
-
-ostream& operator<<(ostream& s, translationEntry& t)
-{
-  int i;
-  for (i=0;i<t.num;i++)
-    s<<t.data[i]<<"/t";
-  if (i==0) s<<"No entries in translation table";
-  s<<endl;
-  return s;
-}
-
-void addEntry(translationEntry& e,int i)
-{
-  char s[30];
-  strcpy(s,"Translation table entry full");
-  if (e.num==MAXLIST)
-    jerror(s);
-  e.data[e.num]=(enum tokenid)i;
-  e.num++;
-}
-
-int isNonTerm(int i)
-{
-  int t=0;
-  if (i>=NONTERM_BASE && i<(NONTERM_BASE+NUM_NONTERMS)) t=1;
-  return t;
-}
-
-int isTerm(int i)
-{
-  int t=0;
-  if (i>=TOKEN_BASE && i<(TOKEN_BASE+NUM_TOKENS)) t=1;
-  return t;
-}
-
-int isAction(int i)
-{
-  int t=0;
-  if (i>=ACTION_BASE && i<(ACTION_BASE+NUM_ACTIONS)) t=1;
-  return t;
-}
-
-int doAction(int i)
-{
-  char s[255];
-  
-  if (dumpActions)
-    {
-      getTokenString(s,i);
-      cout<<"Performing action "<<s<<" lexeme = "<<lexeme<<endl;
-    }
-
-  switch(i)
-    {
-    case (NAME_DEFINES): //define the name in the .h file
-    	// don't lower case this any longer to support the SEI naming conventions
-      //lower(lexeme);
-      h1<<"#define CLASSNAME "<<lexeme<<endl;
-      h1<<"#define CLASS_STRING "<<(char)34<<lexeme<<(char)34<<"\n";
-      strcpy(obName,lexeme);
-      strcpy(obNamebak,lexeme);
-      break;
-    case (TYPE_DEFINES): //define the class type in the .h file
-      h1<<"#define CLASSTYPE "<<lexeme<<endl;
-      break;
-    case (HERITAGE_DEFINES): //define its parent class
-      h1<<"#define CLASSPARENT "<<lexeme<<endl;
-      break;
-    case (SET_H2): //Sets the default out stream for code to H2
-      codeOut=&h2;
-      break;
-    case (SET_NULL): //sets the default out stream to null
-      codeOut=NULL;
-      break;
-    case (OUTPUT_CODE): //outputs code to wherever CodeOut is set to
-      if (codeOut==NULL) 
-	//jerror("Internal Parse Rule error.  Code output file set to NULL");
-	cerr<<lexeme;
-      else
-	*codeOut<<lexeme;
-      break;
-    case (OUTPUT_CODE_SP): //outputs whitespace to wherever CodeOut is set to
-      if (codeOut==NULL) 
-	//jerror("Internal Parse Rule error.  Code output file set to NULL");
-	cerr<<" ";
-      else
-	*codeOut<<" ";
-      break;
-    case (OUTPUT_CODE_NL): //outputs newln to wherever CodeOut is set to
-      if (codeOut==NULL) 
-	//jerror("Internal Parse Rule error.  Code output file set to NULL");
-	cerr<<endl;
-      else
-	*codeOut<<endl;
-      break;
-    case (SET_H3):
-      codeOut = &h3;
-      break;
-    case (INC_DIAL):
-      dialCount++;
-      dialSetting=0;
-
-      //output The dial cases in paramName
-      c11<<endl<<"case "<<dialCount<<":"<<endl;
-
-      break;
-    case (OUTPUT_BPARAM):
-      upper(lexeme);
-      dialSetting++;  //another (or first) setting for current dial
-      
-      //generate switch statements in paramName method
-      if (dialSetting==1)
-	{
-	  c11<<" switch (position)"<<endl;
-	  c11<<"   {"<<endl;
-	}
-      c11<<"      case "<<dialSetting<<":"<<endl;
-      c11<<"         return "<<obName<<lexeme<<"();"<<endl;
-      c11<<"         break;"<<endl;
-
-
-      if(dialSetting==1 && dialCount==1) c5<<"   int dataPTR =0;"<<endl<<endl;
-
-      /*
-	if(dialSetting==1 && dialCount>1 && strcmp(dname,"done")) //output final else block 
-	{
-	c5<<"  else"<<endl;
-	c5<<"    {"<<endl;
-	c5<<"      cerr<<"<<qt<<"Error: Unknown setting for the "<<qt<<endl;
-	c5<<"          <<"<<qt<<dname<<qt<<endl;
-	c5<<"          <<"<<qt<<" dial of the data object "<<qt<<endl;
-	c5<<"          <<CLASS_STRING"<<endl; 
-	c5<<"          <<"<<qt<<". "<<qt<<"<<endl"<<endl; 
-	c5<<"          <<"<<qt<<"The offending string is : "<<qt<<endl;  
-	c5<<"          <<data[dataPTR]"<<endl; 
-	c5<<"          <<endl;"<<endl; 
-	c5<<"      exit(1);"<<endl; 
-	c5<<"    }"<<endl;
-	strcpy(dname,"done");
-	
-	}
-      */
-      if(dialSetting==1) c5<<endl<<"   dataPTR++;"<<endl;
-      else c5<<"   else ";
-
- 
-      c5<<"if (strcmp(data[dataPTR],_"<<obName<<lexeme<<")==0)"<<endl;
-      lower(lexeme);
-      c5<<"      "<<obName<<"_"<<lexeme<<" = 1;"<<endl;
-      upper(lexeme);
-	
-      h3<<"b_param _"<<obName<<lexeme<<";\n";   //declaration
-      //initialization in constructor
-      c1<<"strcpy(_"<<obName<<lexeme<<","<<qt<<obName<<"_"<<lexeme<<qt<<");\n";
-      h4<<"b_param *"<<obName<<lexeme<<"();\n"; //access function decl
-      
-      //create access function
-      c2<<"b_param *"<<obName<<"::"<<obName<<lexeme<<"()"<<endl;
-      c2<<"{"<<endl;
-      c2<<"   return &_"<<obName<<lexeme<<";"<<endl;
-      c2<<"}"<<endl<<endl;
-
-      lower(lexeme);
-      h3<<"int "<<obName<<"_"<<lexeme<<";\n";
-      c4<<obName<<"_"<<lexeme<<" = 0;\n";
-
-      break;
-    case (OUTPUT_DNUM):
-      h1<<"#define NUMBER_OF_DIALS "<<dialCount<<endl;
-      break;
-    case (OUTPUT_INTPARAM):
-      upper(lexeme);
-
-      //numItems method outputs
-      c10<<endl<<"   case "<<dialCount<<":"<<endl;
-      c10<<"      return 1;"<<endl;
-      c10<<"      break;"<<endl;
-
-      //output case statements for paramName
-      c11<<"      if (position==1)"<<endl;
-      c11<<"        return "<<obName<<"NO"<<lexeme<<"();"<<endl;
-      c11<<"      else "<<endl;
-      c11<<"          cerr<<"<<qt<<"Error, invalid position number passed to "<<qt<<endl;
-      c11<<"              <<CLASS_STRING<<"<<qt<<"::paramName\\n"<<qt<<endl;
-      c11<<"              <<"<<qt
-	  <<"Please check declaration files.  Dial number passed was"<<qt<<endl;
-      c11<<"              <<dialNumber<<"<<qt<<" position "
-	  <<qt<<"<<position<<"<<qt<<".\\n"<<qt<<";"<<endl;
-      c11<<"          exit(1);"<<endl;
-      c11<<"      break;"<<endl;
-
-      //create declarations in class definition
-      h3<<"b_param _"<<obName<<lexeme<<";\n";
-      h3<<"b_param _"<<obName<<"NO"<<lexeme<<";\n";
-      h3<<"int _"<<obName<<lexeme<<"_INT;\n";
-      h3<<"#define _"<<lexeme<<"_INT _"<<obName<<lexeme<<"_INT"<<endl;
-      //create initialization code in constructor
-      
-      c1<<"strcpy(_"<<obName<<"NO"<<lexeme<<","<<qt<<"INTDIAL_"<<obName<<"_NO"
-	<<lexeme<<qt<<");\n";
-      c1<<"strcpy(_"<<obName<<lexeme<<","<<qt<<"INTDIAL_"<<obName
-	<<"_"<<lexeme<<qt<<");\n";
-      c1<<"_"<<obName<<lexeme<<"_INT = 0;"<<endl;
-
-      //create declarations for access functions
-      h4<<"b_param *"<<obName<<lexeme<<"();\n";
-      h4<<"b_param *"<<obName<<"NO"<<lexeme<<"();\n";
-
-      //create access methods
-      c2<<"b_param *"<<obName<<"::"<<obName<<"NO"<<lexeme<<"()"<<endl;
-      c2<<"{"<<endl;
-      c2<<"   return &_"<<obName<<"NO"<<lexeme<<";"<<endl;
-      c2<<"}"<<endl<<endl;
-
-      c2<<"b_param *"<<obName<<"::"<<obName<<lexeme<<"()"<<endl;
-      c2<<"{"<<endl;
-      c2<<"   return &_"<<obName<<lexeme<<";"<<endl;
-      c2<<"}"<<endl<<endl;
-
-      //create access initializer...
-      if(dialSetting==1) c5<<"   int dataPTR =0;"<<endl<<endl;
-      c5<<endl;
-      c5<<"  dataPTR++;"<<endl;
-      c5<<"  if (strcmp(data[dataPTR],_"<<obName<<lexeme<<")==0)"<<endl;
-      c5<<"     sscanf(data[++dataPTR],"<<qt<<"%i"<<qt
-	<<",&_"<<obName<<lexeme<<"_INT);"<<endl;
-      c5<<"  else if (strcmp(data[dataPTR],_"
-	<<obName<<"NO"<<lexeme<<")!=0)"<<endl;
-      c5<<"    {"<<endl;
-      c5<<"      cerr<<"<<qt<<"Error: Unknown setting for the "<<qt<<endl;
-      c5<<"          <<"<<qt<<lexeme<<qt<<endl;
-      c5<<"          <<"<<qt<<" dial of the data object "<<qt<<endl;
-      c5<<"          <<CLASS_STRING"<<endl; 
-      c5<<"          <<"<<qt<<". "<<qt<<"<<endl"<<endl; 
-      c5<<"          <<"<<qt<<"The offending string is : "<<qt<<endl;  
-      c5<<"          <<data[dataPTR]"<<endl; 
-      c5<<"          <<endl;"<<endl; 
-      c5<<"      exit(1);"<<endl; 
-      c5<<"    }"<<endl<<endl;;
-
-
-
-      lower(lexeme);
-
-      c4<<obName<<"_"<<lexeme<<" = 0;"<<endl;
-      h3<<"int "<<obName<<"_"<<lexeme<<";\n";
-
-     break;    
-    case (GET_DNAME):
-      strcpy(dname,lexeme);
-      upper(dname);
-      break;
-    case (FINISH_ENUM):
-      c5<<"  else"<<endl;
-      c5<<"    {"<<endl;
-      c5<<"      cerr<<"<<qt<<"Error: Unknown setting for the "<<qt<<endl;
-      c5<<"          <<"<<qt<<dname<<qt<<endl;
-      c5<<"          <<"<<qt<<" dial of the data object "<<qt<<endl;
-      c5<<"          <<CLASS_STRING"<<endl; 
-      c5<<"          <<"<<qt<<". "<<qt<<"<<endl"<<endl; 
-      c5<<"          <<"<<qt<<"The offending string is : "<<qt<<endl;  
-      c5<<"          <<data[dataPTR]"<<endl; 
-      c5<<"          <<endl;"<<endl; 
-      c5<<"      exit(1);"<<endl; 
-      c5<<"    }"<<endl;
-
-      //paramName method outputs
-      c11<<endl<<"      default:"<<endl;
-      c11<<"          cerr<<"<<qt<<"Error, invalid position number passed to "<<qt<<endl;
-      c11<<"              <<CLASS_STRING<<"<<qt<<"::paramName\\n"<<qt<<endl;
-      c11<<"              <<"<<qt
-	  <<"Please check declaration files.  Dial number passed was"<<qt<<endl;
-      c11<<"              <<dialNumber<<"<<qt<<" position "
-	  <<qt<<"<<position<<"<<qt<<".\\n"<<qt<<";"<<endl;
-      c11<<"          exit(1);"<<endl;
-      c11<<"   }"<<endl;
-      c11<<"   break;"<<endl;
-     
-      //numItems method outputs
-      c10<<endl<<"   case "<<dialCount<<":"<<endl;
-      c10<<"      return "<<dialSetting<<";"<<endl;
-      c10<<"      break;"<<endl;
-      break;
-    case (GENERATE_CONDITIONAL):
-      //output conditionals for action blocks
-      conditionNum++;
-      lower(lexeme);
-      
-      if (codeOut!=NULL)
-	{
-	  if (conditionNum==1) 
-	    *codeOut<<endl<<"if ("<<obName<<"_"<<lexeme<<"==1";
-	  else *codeOut<<" || "<<obName<<"_"<<lexeme<<"==1";
-	}
-      else
-	{
-	  if (conditionNum==1) cout<<endl<<"if ("<<obName<<"_"<<lexeme<<"==1";
-	  else cout<<" || "<<obName<<"_"<<lexeme<<"==1";
-	}
-
-      break;
-    case (CLOSE_CONDITIONAL):
-      if (codeOut!=NULL)
-	*codeOut<<")"<<endl<<"{"<<endl;
-      else
-	cout<<")"<<endl<<"{"<<endl;
-      break;
-    case (CLOSE_BLOCK):
-      if (codeOut!=NULL)
-	*codeOut<<endl<<"}"<<endl;
-      else
-	cout<<endl<<"}"<<endl;
-      break;
-    case (RESET_CNUM):
-      conditionNum=0;
-      break;
-    case (SET_C7):
-      codeOut = &c7;
-      break;
-    case (SET_C8):
-      codeOut = &c8;
-      break;
-    case (SET_C9):
-      codeOut = &c9;
-      break;
-    case (SET_C10):
-      codeOut = &c10;
-    case (SET_C12):
-      codeOut = &c12;
-      break;
-    default:  
-      sprintf(s,"Internal parse error - undefined action #%i",i);
-      jerror(s);
-   }
-  return 0;
-}
-
-void getTokenString(char *s,int i)
-{
-  switch(i)
-    {
-    case (DECLARATION): strcpy(s,"delaration");
-      break;
-    case (HERITAGE): strcpy(s,"heritage");
-      break;
-    case (INCLUDE_BLOCK): strcpy(s,"include_block");
-      break;
-    case (GLOBAL_DBLOCK): strcpy(s,"global_define_block");
-      break;
-    case (DIALSBLOCK): strcpy(s,"dials_block");
-      break;
-    case (ACCESSBLOCK): strcpy(s,"access_block");
-      break;
-    case (COMMITBLOCK): strcpy(s,"commit_block");
-      break;
-    case (CLEANUPBLOCK): strcpy(s,"cleanup_block");
-      break;
-    case (DIAL_LIST): strcpy(s,"dial_list");
-      break;
-    case (ENUM_DECL): strcpy(s,"enum_dial_decl.");
-      break;
-    case (INT_DECL): strcpy(s,"int_dial_decl.");
-      break;
-    case (BLOCK_LIST): strcpy(s,"blocklist");
-      break;
-    case (VARBLOCK): strcpy(s,"varblock");
-      break;
-    case (VAREST): strcpy(s,"varREST");
-      break;
-    case (CBLOCK): strcpy(s,"code_block");
-      break;
-    case (CODELIST): strcpy(s,"code_list");
-      break;
-    case (SET_LIST): strcpy(s,"set_list");
-      break;
-    case (SETREST): strcpy(s,"set*rest*");
-      break;
-
-    case (ACCESS_ID): strcpy(s,"access");
-      break;
-    case (CHAR_ID): strcpy(s,"*char*");
-      break;
-    case (CLEANUP_ID): strcpy(s,"cleanup");
-      break;
-    case (CODE_ID): strcpy(s,"*code*");
-      break;
-    case (CODE_SP): strcpy(s,"*code space*");
-      break;
-    case (CODE_NL): strcpy(s,"*code newline*");
-      break;
-    case (COLON_ID): strcpy(s,":");
-      break;
-    case (COMMA_ID): strcpy(s,",");
-      break;
-    case (COMMIT_ID): strcpy(s,"commit");
-      break;
-    case (DIALS_ID): strcpy(s,"dials");
-      break;
-    case (ENUM_DIAL_ID): strcpy(s,"enum_dial");
-      break;
-    case (EOL_ID): strcpy(s,"*eoln*");
-      break;
-    case (END): strcpy(s,"*end*");
-      break;
-    case (GLOBAL_DEFINES_ID): strcpy(s,"global_defines");
-      break;
-    case (INCLUDES_ID): strcpy(s,"includes");
-      break;
-    case (INT_DIAL_ID): strcpy(s,"int_dial");
-      break;
-    case (LEFT_BRACE_ID): strcpy(s,"{");
-      break;
-    case (LEFT_BRACKET_ID): strcpy(s,"[");
-      break;
-    case (NAME_ID): strcpy(s,"name");
-      break;
-    case (PARENT_ID): strcpy(s,"parent");
-      break;
-    case (RIGHT_BRACE_ID): strcpy(s,"}");
-      break;
-    case (RIGHT_BRACKET_ID): strcpy(s,"]");
-      break;
-    case (SEMI_ID): strcpy(s,";");
-      break;
-    case (STRING_ID): strcpy(s,"stringID");
-      break;
-    case (VAR_ID): strcpy(s,"var_ID");
-      break;
-    case (EPSILON): strcpy(s,"*epsilon*");
-      break;
-    case (SYNCH): strcpy(s,"*synch*");
-      break;
-
-    case (NAME_DEFINES): strcpy(s,"@name define action@");
-      break;
-    case (TYPE_DEFINES): strcpy(s,"@type define action@");
-      break;
-    case (HERITAGE_DEFINES): strcpy(s,"@heritage define action@");
-      break;
-    case (SET_H2): strcpy(s,"@set code output to file h2@");
-      break;
-    case (OUTPUT_CODE): strcpy(s,"@output code@");
-      break;
-    case (OUTPUT_CODE_SP): strcpy(s,"@output code sp@");
-      break;
-    case (OUTPUT_CODE_NL): strcpy(s,"@output code nl@");
-      break;
-    case (SET_NULL): strcpy(s,"@set code out to NULL@");
-      break;
-    case (SET_H3): strcpy(s,"@set code out to h3@");
-      break;
-    case (INC_DIAL): strcpy(s,"@increment dial#@");
-      break;
-    case (OUTPUT_BPARAM): strcpy(s,"@generate enum memberVars@");
-      break;
-    case (OUTPUT_DNUM): strcpy(s,"@output NUMBER_OF_DIALS@");
-      break;
-    case (OUTPUT_INTPARAM): strcpy(s,"@generate intDial vars@");
-      break;
-    case (GET_DNAME): strcpy(s,"@capture dial name@");
-      break;
-    case (FINISH_ENUM): strcpy(s,"@finish enum dial instance@");
-      break;
-    case (GENERATE_CONDITIONAL): strcpy(s,"@generate conditional@");
-      break;
-    case (CLOSE_CONDITIONAL): strcpy(s,"@close conditional@");
-      break;
-    case (CLOSE_BLOCK): strcpy(s,"@close block@");
-      break;
-    case (RESET_CNUM): strcpy(s,"@ reset conditional number@");
-      break;
-    case (SET_C7): strcpy(s,"@set code out to c7@");
-      break;
-    case (SET_C8): strcpy(s,"@set code out to c8@");
-      break;
-    case (SET_C9): strcpy(s,"@set code out to c9@");
-      break;
-    case (SET_C10): strcpy(s,"@set code out to c10@");
-      break;
-    case (SET_C12): strcpy(s,"@set code out to c12@");
-      break;
-
-    default: sprintf(s,"Error, unrecognized token %i",i);
-    }
-}
-
-void dumpEntry(translationEntry &e)
-  //Output the data in one entry to stdout
-{
-  char s[60];
-  for (int i=e.num-1;i>=0;i--)
-    {
-      getTokenString(s,e.data[i]);
-      cout<<s<<" ";
-    }
-}
-
-void dumpTable()
-{
-  char s[60];
-  char arrow[100];
-  for (int i=0;i<NUM_NONTERMS;i++)
-    for (int j=0;j<NUM_TOKENS;j++)
-      {
-	if (tTable[i][j].num!=0)
-	  {
-	    getTokenString(s,i+NONTERM_BASE);
-	    printf("%20s",s);
-	    getTokenString(s,j+TOKEN_BASE);
-	    sprintf(arrow," -- %s --> \t",s);
-	    printf("%25s",arrow);
-	    dumpEntry(tTable[i][j]);
-	    cout<<endl<<endl;
-	  }
-      }
-}
-/* initialize table with translation mappings staticly rather than
-   read in from file.  Its a bit more confusing and less modifiable
-   but its faster, and people can't muck with the file.
-*/
-
-void initTable()
-{
-  //Declaration NT
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],SEMI_ID);
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],VAR_ID);
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],NAME_DEFINES);
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],VAR_ID);
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],TYPE_DEFINES);
-  addEntry(tTable[DECLARATION-NONTERM_BASE][NAME_ID - TOKEN_BASE],NAME_ID);
-
-  addEntry(tTable[DECLARATION-NONTERM_BASE][PARENT_ID - TOKEN_BASE],SYNCH);
-
-  //Heritage NT
-
-  addEntry(tTable[HERITAGE-NONTERM_BASE][PARENT_ID - TOKEN_BASE],SEMI_ID);
-  addEntry(tTable[HERITAGE-NONTERM_BASE][PARENT_ID - TOKEN_BASE],VAR_ID);
-  addEntry(tTable[HERITAGE-NONTERM_BASE][PARENT_ID - TOKEN_BASE],
-	   HERITAGE_DEFINES);
-
-  addEntry(tTable[HERITAGE-NONTERM_BASE][PARENT_ID - TOKEN_BASE],PARENT_ID);
-
-  addEntry(tTable[HERITAGE-NONTERM_BASE][INCLUDES_ID - TOKEN_BASE],SYNCH);
-
-  //INCLULDE_BLOCK NT
-
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],RIGHT_BRACKET_ID);
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],SET_NULL);
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],CBLOCK);
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],SET_H2);
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],LEFT_BRACKET_ID);
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [INCLUDES_ID - TOKEN_BASE],INCLUDES_ID);
-
-  addEntry(tTable[INCLUDE_BLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID - TOKEN_BASE],SYNCH);
-
-  //GLOBAL_DBLOCK NT 
- 
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],RIGHT_BRACKET_ID);
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],SET_NULL);
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],CBLOCK);
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],SET_C12);
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],LEFT_BRACKET_ID);
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [GLOBAL_DEFINES_ID-TOKEN_BASE],GLOBAL_DEFINES_ID);
-  
-  addEntry(tTable[GLOBAL_DBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE],SYNCH);
-  
-  //DIALS_BLOCK
-  
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE],RIGHT_BRACKET_ID );
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE],OUTPUT_DNUM );
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE],DIAL_LIST);
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE],LEFT_BRACKET_ID );
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [DIALS_ID-TOKEN_BASE], DIALS_ID);
-  
-  addEntry(tTable[DIALSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE],SYNCH);
-  
-  //ACCESS BLOCK
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], RIGHT_BRACKET_ID);
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], SET_NULL);
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], BLOCK_LIST);
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], SET_C7);
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], LEFT_BRACKET_ID);
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [ACCESS_ID-TOKEN_BASE], ACCESS_ID);
-  
-  addEntry(tTable[ACCESSBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE], SYNCH);
-  
-  //COMMIT BLOCK
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],RIGHT_BRACKET_ID);
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],SET_NULL);
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],BLOCK_LIST);
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],SET_C8);
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],LEFT_BRACKET_ID);
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [COMMIT_ID-TOKEN_BASE],COMMIT_ID);
-  
-  addEntry(tTable[COMMITBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],SYNCH);
-  
-  //CLEANUP BLOCK
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],RIGHT_BRACKET_ID);
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],SET_NULL);
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],BLOCK_LIST);
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],SET_C9);
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],LEFT_BRACKET_ID);
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [CLEANUP_ID-TOKEN_BASE],CLEANUP_ID);
-  
-  addEntry(tTable[CLEANUPBLOCK-NONTERM_BASE]
-	   [END-TOKEN_BASE],SYNCH);
-  
-  //DIAL LIST
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE], DIAL_LIST);
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE], INT_DECL);
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE], INC_DIAL);
-  
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], DIAL_LIST);
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], ENUM_DECL);
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], INC_DIAL);
-  
-  addEntry(tTable[DIAL_LIST-NONTERM_BASE]
-	   [RIGHT_BRACKET_ID-TOKEN_BASE], EPSILON);
-  
-  //ENUM DIAL DECLARATIONS
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], SEMI_ID);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], FINISH_ENUM);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], SET_LIST);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], COLON_ID);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], VAR_ID);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], GET_DNAME);
-  addEntry(tTable[ENUM_DECL-NONTERM_BASE]
-	   [ENUM_DIAL_ID-TOKEN_BASE], ENUM_DIAL_ID);
-
-  //INTEGER DIAL DECLARATIONS
-  addEntry(tTable[INT_DECL-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE], SEMI_ID);
-  addEntry(tTable[INT_DECL-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE],VAR_ID );
-  addEntry(tTable[INT_DECL-NONTERM_BASE]
-  	   [INT_DIAL_ID-TOKEN_BASE],OUTPUT_INTPARAM );
-  addEntry(tTable[INT_DECL-NONTERM_BASE]
-	   [INT_DIAL_ID-TOKEN_BASE],INT_DIAL_ID );
-
-  //BLOCKLIST
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],BLOCK_LIST);
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],CBLOCK);
-
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],BLOCK_LIST);
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],VARBLOCK);
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],RESET_CNUM);
-
-  addEntry(tTable[BLOCK_LIST-NONTERM_BASE]
-	   [RIGHT_BRACKET_ID-TOKEN_BASE],EPSILON);
-
-  //VARBLOCK
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],CLOSE_BLOCK);
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],CBLOCK);
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],CLOSE_CONDITIONAL);
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],VAREST);
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],VAR_ID);
-  addEntry(tTable[VARBLOCK-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],GENERATE_CONDITIONAL);
-
-  //VAREST
-  addEntry(tTable[VAREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],VAREST);
-  addEntry(tTable[VAREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],VAR_ID);
-  addEntry(tTable[VAREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],GENERATE_CONDITIONAL);
-  addEntry(tTable[VAREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],COMMA_ID);
-
-  addEntry(tTable[VAREST-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],EPSILON);
-  
-  //CBLOCK
-  addEntry(tTable[CBLOCK-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],RIGHT_BRACE_ID);
-  addEntry(tTable[CBLOCK-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],CODELIST);
-  addEntry(tTable[CBLOCK-NONTERM_BASE]
-	   [LEFT_BRACE_ID-TOKEN_BASE],LEFT_BRACE_ID);
-
-  //CODELIST
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_ID-TOKEN_BASE],CODELIST);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_ID-TOKEN_BASE],CODE_ID);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_ID-TOKEN_BASE],OUTPUT_CODE);
-
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_NL-TOKEN_BASE],CODELIST);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_NL-TOKEN_BASE],CODE_NL);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_NL-TOKEN_BASE],OUTPUT_CODE_NL);
-
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_SP-TOKEN_BASE],CODELIST);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_SP-TOKEN_BASE],CODE_SP);
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [CODE_SP-TOKEN_BASE],OUTPUT_CODE_SP);
-
-  addEntry(tTable[CODELIST-NONTERM_BASE]
-	   [RIGHT_BRACE_ID-TOKEN_BASE],EPSILON);
-
-  //CODE_TYPE
-
-
-  //SET_LIST
-  addEntry(tTable[SET_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],SETREST);
-  addEntry(tTable[SET_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],VAR_ID);
-  addEntry(tTable[SET_LIST-NONTERM_BASE]
-	   [VAR_ID-TOKEN_BASE],OUTPUT_BPARAM);
-
-  //SETREST
-  addEntry(tTable[SETREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],SET_LIST);
-  addEntry(tTable[SETREST-NONTERM_BASE]
-	   [COMMA_ID-TOKEN_BASE],COMMA_ID);
-
-
-  addEntry(tTable[SETREST-NONTERM_BASE]
-	   [SEMI_ID-TOKEN_BASE],EPSILON);
-}
-
-void parseCLine(int argc,char *argv[])
-{
-  int i;
-  for (i=2;i<=argc;i++)
-    {
-      if (!strcmp(argv[i-1],"-h")) helpFlag=1;
-      if (!strcmp(argv[i-1],"-dump")) dumpFlag=1;
-      if (!strcmp(argv[i-1],"-s")) stackDump=1;
-      if (!strcmp(argv[i-1],"-a")) dumpActions=1;
-    }
-}
-
-void dumpStack()
-{
-  int l=1;
-  char s[60];
-  cout<<"Dumping parse stack...\n";
-  for (vector<int>::reverse_iterator i=parseStack.rbegin();
-       i!=parseStack.rend();
-       i++)
-    {
-      getTokenString(s,*i);
-      cout<<"Level "<<l++<<": "<<s<<endl;
-    }
-}
-
-int match(int token)
-  //returns 1 for match, 0 for NT conversion
-{
-  int i=parseStack.back();
-  char s[60];
-  char arrow[100];
-  //  int flag=1;
-  
-  if (token==EOL_ID) //end of line
-    {
-      lineNumber++;
-      if (stackDump)
-	cout<<"Eating end of line\n";
-      return 1;
-    }
-  if (isAction(i))
-    {
-      parseStack.pop_back();
-      doAction(i);
-      if (stackDump)
-	{
-	  getTokenString(s,i);
-	  cout<<"Popping "<<s<<" off the stack\n";
-	  dumpStack();
-	}
-      return 0;
-    }
-  else
-  if (isTerm(i)) //terminal symbol
-    {
-      if (i==token)  //match token
-	{
-	  parseStack.pop_back();
-	  if (stackDump)
-	    {
-	      getTokenString(s,i);
-	      cout<<"Popping "<<s<<" off the stack\n";
-	      dumpStack();
-	    }
-	  return 1;
-	}
-      else           //error
-	{
-	  i=parseStack.back();
-	  getTokenString(s,i);
-	  cout<<lineNumber<<" - Error: expected "<<s<<" found ";
-	  getTokenString(s,token);
-	  cout<<s<<endl;
-	  dumpStack();
-	  jerror("Error recovery mechanism not yet implemented");
-	}
-    }
-  else 
-    {
-      if (tTable[i-NONTERM_BASE][token-TOKEN_BASE].num==0)
-	{
-	  getTokenString(s,i);
-	  cout<<lineNumber<<" - Error expected declaration of type "<<s<<endl;
-	  dumpStack();
-	  jerror("Error recovery mechanism not yet implemented");
-	}
-      else
-	{
-	  parseStack.pop_back(); //get rid of nonterm
-	  translationEntry e=tTable[i-NONTERM_BASE][token-TOKEN_BASE];
-
-	  //Push new symbols onto the stack, except EPSILON transitions
-	  for (int ii=0;ii<e.num;ii++)
-	    if (e.data[ii]!=EPSILON) parseStack.push_back(e.data[ii]);
-
-	  if (stackDump)
-	    {
-	      cout<<"Transforming non-terminal symbol according to rule:";
-	      getTokenString(s,i);
-	      printf("%20s",s);
-	      getTokenString(s,token);
-	      sprintf(arrow," -- %s --> \t",s);
-	      printf("%25s",arrow);
-	      dumpEntry(e);
-	      cout<<endl;
-	      cout.flush();
-	    }
-	  return 0;
-	}
-    }
-  return -1; //should never reach this
-}
-
-void initStack()
-{
-  parseStack.push_back(END);
-  parseStack.push_back(CLEANUPBLOCK);
-  parseStack.push_back(COMMITBLOCK);
-  parseStack.push_back(ACCESSBLOCK);
-  parseStack.push_back(DIALSBLOCK);
-  parseStack.push_back(GLOBAL_DBLOCK);
-  parseStack.push_back(INCLUDE_BLOCK);
-  parseStack.push_back(HERITAGE);
-  parseStack.push_back(DECLARATION);
-}
-
-void buildH()
-{
-  char *b1=tempnam(NULL,NULL);
-  char s[255];
-  time_t t0=time(NULL);
-  if (t0!=(time_t)-1)
-    strftime(s,255,"%A, %B %d at %I:%M %p %Z",localtime(&t0));
-  else s[0]='\0';
-
-  h1.close();
-  h2.close();
-  h3.close();
-  h4.close();
-  
-  h1.open(b1,ios::out);
-
-  h1<<"/*"<<endl;
-  h1<<"   "<<obName<<".h";
-  h1<<"   Generated by the Ballista(tm) Project data object compiler"<<endl;
-  h1<<"   Copyright (C) 1998-2001  Carnegie Mellon University"<<endl<<endl;
-
-  h1<<"   This program is free software; you can redistribute it and/or"<<endl;
-  h1<<"   modify it under the terms of the GNU General Public License"<<endl;
-  h1<<"   as published by the Free Software Foundation; either version 2"<<endl;
-  h1<<"   of the License, or (at your option) any later version."<<endl<<endl;
-
-  h1<<"   This program is distributed in the hope that it will be useful,"<<endl;
-  h1<<"   but WITHOUT ANY WARRANTY; without even the implied warranty of"<<endl;
-  h1<<"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"<<endl;
-  h1<<"   GNU General Public License for more details."<<endl<<endl;
-
-  h1<<"   You should have received a copy of the GNU General Public License"<<endl;
-  h1<<"   along with this program; if not, write to the Free Software"<<endl;
-  h1<<"   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."<<endl<<endl;
-
-  h1<<"   File generated "<<s<<endl;
-  h1<<endl;
-  h1<<"TITLE"<<endl;
-  h1<<"   "<<obName<<".h"<<endl;
-  h1<<"*/"<<endl<<endl;
-  h1<<"//include control"<<endl;
-  upper(obNamebak);
-  h1<<"#ifndef "<<obNamebak<<"_H"<<endl;
-  h1<<"#define "<<obNamebak<<"_H"<<endl;
-  h1<<"#include <errno.h>"<<endl;
-  h1<<"#include <iostream>"<<endl;
-  h1<<"#include <stdio.h>"<<endl;
-  h1<<"#include <stdlib.h>"<<endl;
-  h1<<"#include <fstream>"<<endl;
-  h1<<"#include <string.h>"<<endl;
-  h1<<"#include <sys/types.h>"<<endl;
-  h1<<"#include <sys/stat.h>"<<endl;
-  h1<<"#include <unistd.h>"<<endl;
-  h1<<"#include "<<(char)34<<"bTypes.h"<<(char)34<<endl;
-  h1<<"using namespace std;"<<endl;
-  h1.close();
-
-  sprintf(s,"mv %s ./%s.h",b1,obName);
-  system(s);
-  sprintf(s,"cat %s>> ./%s.h",h2name,obName);
-  system(s);
-  sprintf(s,"cat %s>> ./%s.h",h1name,obName);
-  system(s);
-  sprintf(s,"rm %s",h2name);
-  system(s);
-  sprintf(s,"rm %s",h1name);
-  system(s);
-
-  b1=tempnam(NULL,NULL);
-  h1.open(b1,ios::out);
-  h1<<endl<<endl;
-  h1<<"class CLASSNAME:public CLASSPARENT"<<endl;
-  h1<<"{"<<endl;
-  h1<<"private:"<<endl;
-  h1<<"  //CLASS DIAL SETTING STRING VARIABLES"<<endl;
-  
-  h1<<"  b_param _"<<obName<<"TYPENAME;"<<endl;
-  h1.close();
-  
-  sprintf(s,"cat %s>> ./%s.h",b1,obName);
-  system(s);
-  sprintf(s,"rm %s",b1);
-  system(s);
-
-  sprintf(s,"cat %s>> ./%s.h",h3name,obName);
-  system(s);
-  sprintf(s,"rm %s",h3name);
-  system(s);
-
-  b1=tempnam(NULL,NULL);
-  h1.open(b1,ios::out);
-
-  h1<<"  //TYPE VARIABLE TO SAVE VALUE FOR DESTRUCTION"<<endl;
-  h1<<"  CLASSTYPE _theVariable;"<<endl;
-  h1<<endl;
-  h1<<" public:"<<endl;
-  h1<<"  //CLASS DIAL SETTING STRING ACCESS METHODS"<<endl;
-  h1.close();
-
-  sprintf(s,"cat %s>> ./%s.h",b1,obName);
-  system(s);
-  sprintf(s,"rm %s",b1);
-  system(s);
-
-  sprintf(s,"cat %s>> ./%s.h",h4name,obName);
-  system(s);
-  sprintf(s,"rm %s",h4name);
-  system(s);
- 
-  b1=tempnam(NULL,NULL);
-  h1.open(b1,ios::out);
-  h1<<"  //CLASS CONSTRUCTOR"<<endl;
-  h1<<"  CLASSNAME();"<<endl;
-  h1<<endl;
-  h1<<"public:"<<endl;
-  h1<<"  //Mandatory Methods"<<endl;
-  h1<<"  b_param *typeName();           //returns the type of parameter"<<endl;
-  h1<<"  virtual void *access(b_param data[]);"<<endl;
-  h1<<"  virtual int commit(b_param tname);"<<endl;
-  h1<<"  virtual int cleanup(b_param tname);"<<endl;
-  h1<<"  "<<endl;
-  h1<<"  virtual int numDials(b_param tname);"<<endl;
-  h1<<"  virtual int numItems(b_param tname,int dialNumber);"<<endl;
-  h1<<"  virtual b_param *paramName(b_param tname,int dialNumber, int position);"<<endl;
-  h1<<endl; 
-  h1<<"  virtual int distanceFromBase();"<<endl;
-  h1<<"  virtual void typeList(b_param list[],int num);"<<endl;
-  h1<<"  "<<endl;
-  h1<<"};"<<endl;
-  h1<<endl;
-  h1<<endl;
-  h1<<endl;
-  h1<<"#endif      //CLASSNAME_H"<<endl;
-
-  h1.close();
-
-  sprintf(s,"cat %s>> ./%s.h",b1,obName);
-  system(s);
-  sprintf(s,"rm %s",b1);
-  system(s);
-  unlink(h1name);
-
-  unlink(h2name);
-
-  unlink(h3name);
-
-  unlink(h4name);
-
-}
-
-void buildCPP()
-{
-  char s[255];
-  time_t t0=time(NULL);
-  if (t0!=(time_t)-1)
-    strftime(s,255,"%A, %B %d at %I:%M %p %Z",localtime(&t0));
-  else s[0]='\0';
-
-  c1.close();
-  c2.close();
-  c3.close();
-  c4.close();
-  c5.close();
-  c6.close();
-  c7.close();
-  c8.close();
-  c9.close();
-  c10.close();
-  c11.close();
-  c12.close();
-  
-  cf<<"/*"<<endl;
-  cf<<"   "<<obName<<".cpp";
-  cf<<"   Generated by the Ballista(tm) Project data object compiler"<<endl;
-  cf<<"   Copyright (C) 1998-2001  Carnegie Mellon University"<<endl<<endl;
-  
-  cf<<"   This program is free software; you can redistribute it and/or"<<endl;
-  cf<<"   modify it under the terms of the GNU General Public License"<<endl;   
-  cf<<"   as published by the Free Software Foundation; either version 2"<<endl;
-  cf<<"   of the License, or (at your option) any later version."<<endl<<endl;
-  
-  cf<<"   This program is distributed in the hope that it will be useful,"<<endl;
-  cf<<"   but WITHOUT ANY WARRANTY; without even the implied warranty of"<<endl;
-  cf<<"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"<<endl;
-  cf<<"   GNU General Public License for more details."<<endl<<endl;
-
-  cf<<"   You should have received a copy of the GNU General Public License"<<endl;
-  cf<<"   along with this program; if not, write to the Free Software"<<endl;
-  cf<<"   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA."<<endl<<endl;
-
-  cf<<"   File generated "<<s<<endl;
-  cf<<endl;
-  cf<<"TITLE"<<endl;
-  cf<<"   "<<obName<<".cpp"<<endl;
-  cf<<"*/"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl<<endl;
-  cf<<"#include <errno.h>"<<endl;
-  cf<<"#include <iostream>"<<endl;
-  cf<<"#include <stdio.h>"<<endl;
-  cf<<"#include <stdlib.h>"<<endl;
-  cf<<"#include <fstream>"<<endl;
-  cf<<"#include <string.h>"<<endl;
-  cf<<"#include <sys/types.h>"<<endl;
-  cf<<"#include <sys/stat.h>"<<endl;
-  cf<<"#include <unistd.h>"<<endl;
-  cf<<endl<<"#include "<<qt<<obName<<".h"<<qt<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl<<endl;
-  cf.close();
-
-  //start cpp file with header
-  sprintf(s,"cat %s >%s.cpp",cfname,obName);
-  system(s);
-  //start cpp file with header
-  sprintf(s,"cat %s >>%s.cpp",c12name,obName);
-  system(s);
-
-  cf.open(cfname,ios::out);
-  cf<<"//--------------------------------------------------------------------"
-    <<endl<<endl;
-  cf<<"CLASSNAME::CLASSNAME()"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  //DIAL DECLARATIONS HERE"<<endl;
-  cf<<""<<endl;
-  cf<<"  //generated"<<endl;
-  cf<<""<<endl;
-  cf<<"   strcpy(_"<<obName<<"TYPENAME,CLASS_STRING);"<<endl;
-  cf.close();
-
-  //add c1
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c1name,obName);
-  system(s);
-
-  cf.open(cfname,ios::out);
-  cf<<"}"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl;
-
-  cf.close();
-  //add c2
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c2name,obName);
-  system(s);
-
-  cf.open(cfname,ios::out);
-  //c2 is a block of methods, does not need closing brace
-  //  cf<<"}"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"//type name return method"<<endl;
-  cf<<""<<endl;
-  cf<<"b_param *CLASSNAME::typeName()"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  return &_"<<obName<<"TYPENAME;"<<endl;
-  cf<<"}"<<endl;
-  cf<<""<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"int CLASSNAME::distanceFromBase()"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  return CLASSPARENT::distanceFromBase() +1;"<<endl;
-  cf<<"}"<<endl;
-  cf<<""<<endl;
-  cf<<""<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"void CLASSNAME::typeList(b_param list[], int num)"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  strcpy(list[num],(char *) typeName());"<<endl;
-  cf<<"  CLASSPARENT::typeList(list,num+1);"<<endl;
-  cf<<"}"<<endl;
-  cf<<"//--------------------------------------------------------------------"<<endl;
-  cf<<"  void *CLASSNAME::access(b_param data[])"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (strcmp(data[0],(char *)typeName())!=0)"<<endl;
-  cf<<"    return CLASSPARENT::access(data);"<<endl;
-  cf<<""<<endl;
-  cf<<"  //ACCESS CODE"<<endl;
-  cf.close();
-
-  //add c4, c5, c7
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c4name,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c5name,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c7name,obName);
-  system(s);
-
-  cf.open(cfname,ios::out);
-  cf<<"   return &_theVariable;"<<endl;
-  cf<<"}"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl;
-  
-  cf<<"  int CLASSNAME::commit(b_param tname)"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (strcmp(tname,(char *)typeName())!=0)"<<endl;
-  cf<<"    return CLASSPARENT::commit(tname);"<<endl;
-  cf<<"  //COMMIT CODE HERE"<<endl;
-  cf<<"//generated"<<endl;
-  cf.close();
-
-  //add c8
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c8name,obName);
-  system(s);
-  cf.open(cfname,ios::out);
-  cf<<"   return 0;"<<endl;
-  cf<<"}"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl;
-
-  cf<<"  int CLASSNAME::cleanup(b_param tname)"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (strcmp(tname,(char *)typeName())!=0)"<<endl;
-  cf<<"    return CLASSPARENT::cleanup(tname);"<<endl;
-  cf<<"      "<<endl;
-  cf<<"  //CLEANUP CODE"<<endl;
-  cf<<"//generated"<<endl;
-  cf.close();
-
-  //add c9
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c9name,obName);
-  system(s);
-  cf.open(cfname,ios::out);
-  cf<<"   return 0;"<<endl;
-  cf<<"}"<<endl<<endl;
-  cf<<"//--------------------------------------------------------------------"
-    <<endl;
-  cf<<"int CLASSNAME::numDials(b_param tname)"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (!strcmp(tname,(char *)typeName()))"<<endl;
-  cf<<"    return NUMBER_OF_DIALS;"<<endl;
-  cf<<"  else return CLASSPARENT::numDials(tname);"<<endl;
-  cf<<"      "<<endl;
-  cf<<"}"<<endl;
-  cf<<""<<endl;
-  cf<<""<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"int CLASSNAME::numItems(b_param tname,int dialNumber)"<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (strcmp(tname,(char *)typeName())!=0)"<<endl;
-  cf<<"    return CLASSPARENT::numItems(tname,dialNumber);"<<endl;
-  cf<<"  switch (dialNumber)"<<endl;
-  cf<<"    {"<<endl;
-  cf<<"      //NUMITEMS SWITCH CASES HERE"<<endl;
-  cf<<"      //generated"<<endl;
-  
-  cf.close();
-
-  //add c10
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c10name,obName);
-  system(s);
-  cf.open(cfname,ios::out);
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf<<"      //end generated"<<endl;
-  cf<<""<<endl;
-  cf<<"    default:"<<endl;
-  cf<<"      cerr<<"<<qt<<"Error, invalid dial number passed to "<<qt<<endl;
-  cf<<"          <<CLASS_STRING<<"<<qt<<"::numItems\\n"<<qt<<endl;
-  cf<<"          <<"<<qt<<"Please check declaration files.  Dial number passed was "<<qt<<endl;
-  cf<<"          <<dialNumber<<endl;"<<endl;
-  cf<<"      exit(1);"<<endl;
-  cf<<"    }"<<endl;
-  cf<<"  return 0;"<<endl;
-  cf<<"}"<<endl<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-
-  cf<<"b_param *CLASSNAME::paramName(b_param tname,"<<endl;
-  cf<<"                                   int dialNumber,"<<endl; 
-  cf<<"                                   int position)"<<endl;
-  cf<<""<<endl;
-  cf<<"{"<<endl;
-  cf<<"  if (strcmp(tname,(char *)typeName())!=0)"<<endl;
-  cf<<"    return CLASSPARENT::paramName(tname,dialNumber,position);"<<endl;
-  cf<<"  "<<endl;
-  cf<<"  switch (dialNumber)"<<endl;
-  cf<<"    {"<<endl;
-  cf<<"      //PARAMNAME SWITCH CASES HERE"<<endl;
-  cf<<"      //generated"<<endl;
-
-  cf.close();
-
-  //add c11
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  sprintf(s,"cat %s >>%s.cpp",c11name,obName);
-  system(s);
-  cf.open(cfname,ios::out);
-  cf<<"    default:"<<endl;
-  cf<<"      cerr<<"<<qt<<"Error, invalid dial number passed to "<<qt<<endl;
-  cf<<"          <<CLASS_STRING<<"<<qt<<"::paramName\\n"<<qt<<endl;
-  cf<<"          <<"<<qt<<"Please check declaration files.  Dial number passed was "<<qt<<endl;
-  cf<<"          <<dialNumber<<endl;"<<endl;
-  cf<<"      exit(1);"<<endl;
-  cf<<""<<endl;
-  cf<<"    }"<<endl;
-  cf<<"  return NULL;"<<endl;
-  cf<<"}"<<endl;
-  cf<<""<<endl;
-  cf<<"//---------------------------------------------------------------------------"<<endl;
-  cf.close();
-
-  //add final
-  sprintf(s,"cat %s >>%s.cpp",cfname,obName);
-  system(s);
-  unlink(c1name);
-  unlink(c2name);
-  unlink(c3name);
-  unlink(c4name);
-  unlink(c5name);
-  unlink(c6name);
-  unlink(c7name);
-  unlink(c8name);
-  unlink(c9name);
-  unlink(c10name);
-  unlink(c11name);
-  unlink(c12name);
-  unlink(cfname);
-}
-
-int main(int argc,char *argv[])
-{
-  int cur;
-  int lcv=0;
-  char s[50];
-
-  initTable();
-  initStack();
-  parseCLine(argc,argv);
-  if (dumpFlag==1)
-    {
-      cout<<"Dumping translation table...\n";
-      dumpTable();
-      dumpStack();
-      exit(0);
-    }
-  if (helpFlag==1)
-    {
-      cout<<"Ballista parser pre-pre alpha\n"
-	  <<"options\n"
-	  <<"-h      Prints this message\n"
-	  <<"-dump   Dumps the parse table and exits\n"
-	  <<"-s      Provides diagnostic stack dumps\n"
-	  <<"-a      Verbose actions\n";
-      exit(0);
-      
-    }
-
-  cin>>s;
-  for (int ii=0;ii<(int)strlen(s);ii++)
-    if (!isdigit(s[ii]))
-      jerror("Error- invalid data in token stream");
-  if(!(strlen(s)>0))
-    jerror("Error - Empty token stream");
-  cur=atoi(s);
-  
-  while (!cin.eof())
-    {
-      if (cur==VAR_ID || cur==CODE_ID) cin>>lexeme;
-      lcv=0;
-      while (lcv==0) lcv=match(cur);
-
-      cin>>s;
-      for (int ii=0;ii<(int)strlen(s);ii++)
-	if (!isdigit(s[ii]))
-	  jerror("Error- invalid data in token stream");
-      if(!(strlen(s)>0) &&parseStack[0]!=END)
-	jerror("Error - Empty token stream");
-      cur=atoi(s);
-
-    }
-  if (parseStack.size()>1) //more than just the *END* token
-  	{	
-  		dumpStack();
-  		jerror("Error - Premature end of file.  Bailing out\n");
-  	}
-  buildH();
-  buildCPP();
-  return 0;
-}
diff --git a/testcases/ballista/ballista/compile/butil.c b/testcases/ballista/ballista/compile/butil.c
deleted file mode 100644
index 0bae1a1..0000000
--- a/testcases/ballista/ballista/compile/butil.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* butil.c : Ballista Utilities - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-void jerror(char error_text[])
-{
-	fprintf(stderr,"Ballista Parser run-time error...\n");
-	fprintf(stderr,"%s\n",error_text);
-	fprintf(stderr,"...now exiting to system...\n");
-	exit(1);
-}
-
-void upper(char *text)
-{
-
-  int i=0;
-  if (text==NULL) jerror("null string passed to upper");
-  for (i=0;i<(int)strlen(text);i++)
-    text[i] = (char)toupper(text[i]);
-}
-
-void lower(char *text)
-{
-  int i=0;
-  if (text==NULL) jerror("null string passed to lower");
-  for (i=0;i<(int)strlen(text);i++)
-    text[i] = (char)tolower(text[i]);
-}
diff --git a/testcases/ballista/ballista/compile/butil.h b/testcases/ballista/ballista/compile/butil.h
deleted file mode 100644
index f3dbd10..0000000
--- a/testcases/ballista/ballista/compile/butil.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* butil.h : Ballista utilities header file - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _NR_UTILS_H_
-#define _NR_UTILS_H_
-
-void jerror(char error_text[]);
-
-void upper(char *text);
-void lower(char *text);
-
-#endif /* _NR_UTILS_H_ */
diff --git a/testcases/ballista/ballista/compile/do_parse b/testcases/ballista/ballista/compile/do_parse
deleted file mode 100644
index bdc30cc..0000000
--- a/testcases/ballista/ballista/compile/do_parse
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/csh
-# do_parse: Ballista script that manages parsing the template files - Compiler
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-# OFFICIAL LOCATION .../ballista/compile.  Changes to other locations may be
-# overwritten.
-
-if ($#argv == 0) then
-    echo ""
-    echo usage: do_parse filename
-    echo ""
-    echo Where filename is the name of the template file to parse
-    echo ""
-    exit 1
-endif
-
-../compile/blexer <$1 | ../compile/bparser
-
-
diff --git a/testcases/ballista/ballista/compile/errorLog b/testcases/ballista/ballista/compile/errorLog
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/compile/errorLog
+++ /dev/null
diff --git a/testcases/ballista/ballista/compile/jlist.c b/testcases/ballista/ballista/compile/jlist.c
deleted file mode 100644
index 003a216..0000000
--- a/testcases/ballista/ballista/compile/jlist.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/* jlist.c : Ballista Linked List - Compiler
-   Copyright (C) 1995-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "jlist.h"
-#include "butil.h"
-
-struct jelement *jpop(struct jlist *theList)
-     /*	Pop removes the first element from theList and
-	returns a pointer to that element */
-{
-  struct jelement *temp1,*temp2;
-  
-  if (theList == NULL)														/* Check for a NULL list*/
-    jerror("Passed a NULL list into jpop");
-  
-  if (theList->number_of_elements == 0)	/*Check to see if we have anything!*/
-    return(NULL);
-  
-  temp1 = theList->head;
-  temp2 = temp1;										/* Save a pointer to the first value*/
-  temp2 = temp2->next;							/* Increment our list */
-  if (temp2!=NULL)
-    temp2->previous = NULL;					/* Point it to nothing */
-  theList->head = temp2;						/* store it back in our list structure*/
-  
-  if (temp2 == NULL)								/* If we get here it means that we poped out last*/
-    theList->tail = NULL;						/* element, so make sure our tail is NULL too*/
-  
-  temp1 ->next = NULL;							/* make sure we can't access anything once we return*/
-  
-  theList->number_of_elements --;		/* Decrement the element counter */
-  return(temp1);
-}
-
-void jpush(struct jlist *theList,struct jelement *theElement)
-     /* Push changes insert mode to stack_insert, inserts
-	the element, then changes mode back to original */
-{
-  if (theList == NULL)										/* Check for a NULL list*/
-    jerror("Passed a NULL list into jpush");
-  
-  if (theElement == NULL)									/* Test for a valid element to push*/
-    jerror("Tried to push a NULL pointer onto the list.");
-  
-  theList->i_am_sorted = 0;								/* We are no longer a sorted list */
-  theElement->previous = NULL;						/* make sure we are not pointing up anywhere */
-  theElement->next = theList->head;   		/* link to the last head*/
-  if (theList->number_of_elements == 0)		/* if this is the first item in the list */
-    theList->tail = theElement;     			/* make sure we also know it is the last element */
-  else																		/* If we are not the only element in the list*/
-    theList->head->previous = theElement;	/* point the old head up to us*/
-  theList->head = theElement;							/* Point the list head to it */
-  
-  theList->number_of_elements ++;					/* Increment the element counter */
-  /* Done */
-}
-
-void jenqueue(struct jlist *theList,struct jelement *theElement)
-     /* Enqueue inserts theelement to the end of the list */
-{
-  struct jelement *temp;
-  
-  if (theList == NULL)										/* Check for a NULL list*/
-    jerror("Passed a NULL list into jenqueue");
-  
-  if (theElement == NULL)									/* Test for a valid element to push*/
-    jerror("Tried to enqueue a NULL pointer onto the list.");
-  
-  theList->i_am_sorted = 0;								/* We are no longer a sorted list */
-  theElement->next = NULL;								/* Make sure we don't point down at anything*/
-  theElement->previous = theList->tail;		/*Link up to the tail*/
-  if (theList->number_of_elements == 0)		/* if this is the first item in the list */
-    theList->head = theElement;     			/* make sure we also know it is the first element */
-  else																		/* If we are not the only element in the list*/
-    {
-      temp = theList->tail;					
-      temp->next = theElement;						/* point the old tail down to us*/
-    }
-  theList->tail = theElement;							/* Point the list tail to it */
-  
-  theList->number_of_elements ++;					/* Increment the element counter */
-}
-
-struct jelement *jdequeue(struct jlist *theList)
-     /* Dequeue removes the first element from theList and returns
-	a pointer to it */
-{
-  if (theList == NULL)					/* Check for a NULL list*/
-    jerror("Passed a NULL list into jdequeue");
-  
-  return (jpop(theList));				/* This is the same as the POP operation */
-}
-
-void insert_element(struct jlist *theList,struct jelement *theElement)
-     /* insert_element inserts an element into the list using whatever
-	mode we are in */
-     /* note to myself -- the insert in order does not take into acount
-	starting with an unsorted list... */
-{
-  struct jelement *temp1,*temp2;
-  short vault;
-  int m;				/* this variable is a mutiplier for compare, which 
-					   causes us to sort/search in the desired direction */
-  
-  if (theList == NULL)														/* Check for a NULL list*/
-    jerror("Passed a NULL list into insert_element");
-  
-  if (theList->sort_ascending) m=1;					/* ascending/descending multiplier*/
-  else m=-1;
-  
-  switch (theList->insert_mode)							/* Insert in accordance with insert_mode*/
-    {
-    case (insert_in_order) :								/* Insert in Order */
-      if (theList->compare == NULL)					/* check for compare function */
-	jerror("Tried to insert an element in order prior to defineing compare function");
-      
-      vault = theList -> i_am_sorted;				/* save this in case we push or queue*/
-      /* because they will set this to 0 */
-      
-      if (theList->number_of_elements == 0)	/* As the first element it does not*/
-	jpush (theList,theElement);					/* Really matter how we put it in */
-      else
-	{
-	  temp1 = theList->head;
-	  while ((temp1 !=NULL)&&((theList->compare(theElement,temp1))*m==1))
-	    temp1 = temp1->next;						/* Keep rolling until we find the one after us*/
-	  if (temp1 == NULL)								/* We are adding to the end so que it*/
-	    jenqueue(theList,theElement);
-	  else if (temp1 == theList ->head)	/* We are adding to the front so push it*/
-	    jpush(theList,theElement);
-	  else															/* We are adding to the middle somewhere */
-	    {
-	      temp2 = temp1->previous;			/* Lets look at where we were just before this*/
-	      temp2->next = theElement;			/* Insert theElement into the forward chain*/
-	      temp1->previous = theElement;	/* Insert theElement into the backward chain*/
-	      theElement->previous = temp2; /* Aim us backwards */
-	      theElement->next = temp1;			/* Aim us forwards */
-	      theList->number_of_elements ++;		/* Increment the element counter */
-	    }
-	}
-      theList->i_am_sorted = vault;			/* restore in case we screwed i_am_sorted up*/
-      break;
-    case (stack_insert) :										/* Push it on */
-      jpush (theList,theElement);
-      break;
-    case (queue_insert) :										/* Queue it in */
-      jenqueue (theList,theElement);
-      break;
-    default:
-      jerror("Fatal Error: Failed to initialize insert_mode to known value");
-    }
-}
-
-struct jelement *find_element(struct jlist *theList,struct jelement *query)
-     /* this function returns a pointer to a record matching query if available
-	it will use a binary search algorithm if sorted, or brute force if not.
-	If it can't find the element it returns NULL*/
-     /* Note to myself -- Duh! -- you can't do a binary search on a dynamic list!!*/
-{
-	struct jelement *temp1;
-	int tflag=1;
-	int m;				/* this variable is a mutiplier for compare, which 
-									 causes us to sort/search in the desired direction */
-
-	if (theList == NULL)														/* Check for a NULL list*/
-		jerror("Passed a NULL list into find_element");
-
-	if (theList->compare == NULL)
-		jerror("Tried to find an element prior to defineing compare function");
-
-	if (theList->sort_ascending) m=1;
-	else m=-1;
-	if (theList->head == NULL) return(NULL);	/*Can't be in an empty list*/
-	temp1 = theList->head;										/* Need a temp variable */
-	if (theList->i_am_sorted)
-	  {
-	    tflag = theList->compare(query,temp1);
-	    /* we can just look until we are greater than temp*/
-	    while (((tflag*m==1) && temp1 !=NULL))
-	      {
-		temp1 = temp1->next;
-		if (temp1!=NULL)
-		  tflag = theList->compare(query,temp1);	
-		/* Keep rolling until we find it*/
-	      }
-	    if (tflag !=0) temp1 = NULL;
-	  }
-	else	 			     /* exhaustive search*/
-	  while (((theList->compare(query,temp1))*m!=0) && temp1 !=NULL)
-	    temp1 = temp1->next;      /* Keep rolling until we find it*/
-	return (temp1);
-}
-
-void delete_element(struct jlist *theList,struct jelement *trash)
-       /* this function removes the element pointed to by trash */
-       /* Note to myself -- add in code to ensure trash is in thelist*/
-{
-	struct jelement *temp1,*temp2;
-
-	/* Check for valid parameters */
-	if (trash == NULL)
-		jerror("Tried to delete a NULL pointer element");
-	if (theList->head == NULL)
-		jerror("Tried to delete from a NULL list");
-	if (theList->number_of_elements == NULL)
-		jerror("Tried to delete from a list with 0 elements but a non-null head pointer!");
-	
-	/* First we have to remove it from the list */
-	if (theList->head == trash)					/* its the head of the list, lets pop it off */
-	  trash = jpop(theList);						/* note if only 1 element it is also the tail */
-	else if (theList->tail == trash)		/* it is the tail*/
-	  {																	/* more that one elements must be in list */
-	    temp1 = trash->previous;				/* get the element before it */
-	    temp1->next = NULL;							/* terminate the list there */
-	    theList->tail = temp1;					/* point tail to it */
-	    theList->number_of_elements --;	/* Decrement the element counter */
-	  }
-	else																/* we are deleting from the middle somewhere*/
-	  {	
-	    temp1 = trash->previous;				/* get the element before it */
-	    temp2 = trash->next;						/* get the element after it */
-	    temp1->next = temp2;						/* establish forward link */
-	    temp2->previous = temp1;				/* establish backward link */
-	    theList->number_of_elements --;	/* Decrement the element counter */
-	  }
-	free(trash->theData);								/* release data memory*/
-	free(trash);												/* release element memory */
-      }
-
-struct jlist *sort_list(struct jlist *theList)
-     /* this function sorts the list either ascending or descending
-	depending on the value of sort_ascending
-	In fact, it is pretty inefficient, it uses insertion sort due
-	to the nature of the data structure.  I could have done a bubble sort,
-	but that isn't really any faster.  besides, we are not talking
-	about dealing with more than just a few thousand nodes here.*/
-{
-  struct jlist *templist = NULL;
-  struct jelement *myel = NULL;
-  struct jelement *tempel = NULL;
-
-  /*
-  struct mydata *datap = NULL;
-  
-  int j;
-  */
-
-  if (theList == NULL)														/* Check for a NULL list*/
-    jerror("Passed a NULL list into sort_list");
-  
-  if (theList->compare == NULL)
-    jerror("Tried to sort a list prior to defineing compare function");
-  if (theList->copydata == NULL)
-    jerror("Tried to sort a list prior to defineing copydata function");
-  
-  if (theList->i_am_sorted) return (theList);					/* it is already sorted, so return*/
-  
-  templist = malloc(sizeof(struct jlist));						/* Allocate space for a new list*/
-  if (templist == NULL) jerror("Error.  Could not allocate memory for base structure in SORT");
-  
-  templist->number_of_elements = 0;										/* Zero elements initially */
-  templist->sort_ascending = theList->sort_ascending;	/* Sort in the desired direction*/								
-  templist->i_am_sorted = 1;													/* empty therefore sorted*/
-  templist->stay_sorted = theList->stay_sorted;				/* save this value*/
-  templist->circular = theList->circular;							/* save this value as well */
-  templist->insert_mode = insert_in_order;						/* Cause we are sorting */
-	templist->compare = theList->compare;								/* Use the same compare function*/
-  templist->copydata = theList->copydata;							/* Use the same copydata function*/
-  
-  templist->head = NULL;															/* No head yet*/
-  templist->tail = NULL;															/* No tail yet*/
-  
-  tempel = theList->head;															/* Start adding at the head*/
-  while (tempel != NULL)															/* Iterate until done with theList */
-    {
-      myel = malloc(sizeof(struct jelement));					/* Allocate a new element */
-      if (myel == NULL)																/* Too little memory? */
-	jerror("Error.  Could not allocate memory for element structure in SORT");
-      
-      theList->copydata (tempel,myel);								/* copy in the data */
-      myel->next = NULL;															/* make sure we don't point yet*/
-      myel->previous = NULL;
-      insert_element(templist,myel);									/* insert the element */
-      tempel = tempel->next;													/* go to the next node */
-    }
-  templist -> insert_mode = theList -> insert_mode;		/* keep this the same */
-  destroy_list(theList);
-  return (templist);
-}
-
-void do_action(struct jlist *theList, 
-	       int (*func)(struct jelement *),
-	       int (*filter)(struct jelement *)
-	       )
-     /* this function performs an action (func) on each element which gets a 1
-	returned from (filter).  if filter = null then (func) is executed on
-	each element 
-	func declaration should be of type:
-	int func(struct jelement *theElement)
-	where the return value is 0 if the function may have messed up sorting, 1 otherwise
-	filter should be:
-	int filter(struct jelement *theElement)
-	returning 1 if pass, 0 if filtered
-	*/
-{
-  struct jelement *temp;
-  
-  if (theList == NULL)														/* Check for a NULL list*/
-    jerror("Passed a NULL list into do_action");
-  if (func == NULL)																/* Check for a NULL action procedure*/
-    jerror("Passed a NULL action procedure into do_action");
-  
-  temp = theList->head;
-  
-  if (filter == NULL)															/* if there is no filter proc*/
-    while (temp != NULL)
-      {
-	if (!func(temp))													/* do the function and check if we*/
-	  theList->i_am_sorted = 0;								/* messed up the sort order */
-	temp = temp->next;			
-      }
-  else
-    while (temp != NULL)
-      {
-	if (filter(temp))													/* did we pass through the filter?*/
-	  if (!func(temp))
-	    theList->i_am_sorted = 0;
-	temp = temp->next;
-      }
-  
-}
-
-int count_elements(struct jlist *theList)
-     /* this function returns the number of elements in the list */
-{
-  if (theList == NULL)														/* Check for a NULL list*/
-    jerror("Passed a NULL list into count_elements");
-  return (theList->number_of_elements);
-}
-
-struct jelement *next_in_list(struct jlist *theList,struct jelement *theElement)
-     /* this function returns a pointer to the next element in the list*/
-{	
-  struct jelement *temp;
-  
-  if (theList == NULL)												/* Check for a NULL list*/
-    jerror("Passed a NULL list into next_in_list");
-  if (theElement == NULL)											/* Check for a NULL element*/
-    jerror("Passed a NULL element into next_in_list");
-  
-  if (theList->head==NULL) return (NULL);			/* Does the list exist*/
-  if (theElement == NULL) return (NULL);			/* Does the element exist? */
-  temp = theElement->next;										/* Go to the next one */
-  if ((temp == NULL) && (theList->circular))	/* if we reached the end and are circular*/
-    temp = theList->head;											/* then go to the head */
-  return (temp);															/* return the value */
-}
-
-struct jelement *previous_in_list(struct jlist *theList,struct jelement *theElement)
-     /* this function returns a pointer to the previous element in the list*/
-{
-  struct jelement *temp;
-  
-  if (theList == NULL)												/* Check for a NULL list*/
-    jerror("Passed a NULL list into previous in list");
-  if (theElement == NULL)											/* Check for a NULL list*/
-    jerror("Passed a NULL element into previous in list");
-  
-  if (theList->head==NULL) return (NULL);			/* Does the list exist*/
-  if (theElement == NULL) return (NULL);			/* Does the element exist? */
-  temp = theElement->previous;								/* Go to the previous one */
-  if ((temp == NULL) && (theList->circular))	/* if we passed the top and are circular*/
-    temp = theList->tail;											/* then go to the tail */
-  return (temp);															/* return the value */
-}
-
-void destroy_list(struct jlist *theList)
-     /* this function frees all list memory and sets theList = NULL */
-{
-  struct jelement *temp;
-  
-  if (theList == NULL)												/* Check for a NULL list*/
-    jerror("Passed a NULL list into destrol_list");
-  
-  while (theList->number_of_elements >0)		/* while there are still items in the list*/
-    {
-      temp = theList->head;									/* point to the head */
-      delete_element(theList,temp);					/* and trash it */
-    }
-}
-
diff --git a/testcases/ballista/ballista/compile/jlist.h b/testcases/ballista/ballista/compile/jlist.h
deleted file mode 100644
index c589ca2..0000000
--- a/testcases/ballista/ballista/compile/jlist.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* jlist.h : Ballista Linked List Header
-   Copyright (C) 1995-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-/* Linked List Interface Module 
-   John Peter DeVale
-   
-   Abstract linked list module implementing a double linked list
-   and can operate as a circular or terminated list.
-
-   the data is a void casted pointer.
-
-   the list is sortable by built in sorting algorithms
-   
-   the list uses a variable compare and copydata function
-
-   the list can have a passed in function operate on every node
-   which passes a test by a passed in filtering function.  If the passed
-   in function is null, it operates on every node.
-
-   the list can be specified to be sorted on insert, or not.
-
-   the list can be specified to be circular or not
-
-*/
-#ifndef JLIST_H
-#define JLIST_H
-#define insert_in_order 1
-#define stack_insert 2
-#define queue_insert 3
-#ifndef NULL
-#define NULL 0
-#endif
-
-/* Data structure */
-
-struct jelement
-{
-  void            *theData;
-  struct jelement *next;
-  struct jelement *previous;
-};
-
-struct jlist
-{
-  long number_of_elements;		/* keep track of the number of elements in our list */
-  short sort_ascending;		/* if set to one it sorts ascending vice descending */
-
-  short i_am_sorted;			/* this variable is set to 1 if the list thinks
-    				it is sorted, or 0 if it thinks it is not */
-
-  short stay_sorted;			/* this is set to 1 if we want to sort the list
-				     if we realize it has somehow become unsorted
-				     like from using stack or queue mode operations
-				     If we are doing a search, and we know we are
-				     unsorted and this is set to 1 we will sort the
-				     list prior to searching and reset i_am_sorted
-				     otherwise we will execute a brute force search*/
-
-  short circular;		      	/* set to 1 if list is circular, 0 if not */
-
-  short insert_mode;			/* this controls the way the data is inserted into
-				     the list.  If insert_in_order it inserts the
-				     data in order according to the compare function
-				     if stack_insert it inserts the element onto 
-				     the head of the list.  if queue insert then
-				     it inserts the element on to the end of the 
-				     list*/
-
-  int   data_size;		      	/* the size of the data stored */
-
-  int (*compare)();		       	/* compare function takes two jelement pointers and
-	     			returns an int. 1 for param1>param2 0 for
-				param1 == param2 and -1 for param1 < param2 */
-  
-  void (*copydata)();			/* the copy data function copys the data from one data element 
-				     to another.  it copies param1 into param2.  param1 , param2 are
-				     pointers of type jelement, and must be already allocated
-				     the copydata procedure must allocate memory for the actual data */
-
-  struct jelement *head;		/* Head of the list */
-
-  struct jelement *tail;		/* Tail of the list*/
-};
-
-extern struct jelement *jpop(struct jlist *theList);
-	/* Pop removes the first element from theList and
-	returns a pointer to that element */
-
-extern void jpush(struct jlist *theList,struct jelement *theElement);
-	/* Push changes insert mode to stack_insert, inserts
-	the element, then changes mode back to original */
-
-extern void jenqueue(struct jlist *theList,struct jelement *theElement);
-	/* Enqueue inserts theelement to the end of the list */
-
-extern struct jelement *jdequeue(struct jlist *theList);
-	/* Dequeue removes the first element from theList and returns
-	a pointer to it */
-
-extern void insert_element(struct jlist *theList,struct jelement *theElement);
-	/* insert_element inserts an element into the list using whatever
-	mode we are in */
-
-extern struct jelement *find_element(struct jlist *theList,struct jelement *query);
-	/* this function returns a pointer to a record matching query if available
-	it will use a binary search algorithm if sorted, or brute force if not.
-	If it can't find the element it returns NULL*/
-
-extern void delete_element(struct jlist *theList,struct jelement *trash);
-	/* this function removes the element pointed to by trash */
-
-extern struct jlist *sort_list(struct jlist *theList);
-	/* this function sorts the list either ascending or descending
-	depending on the value of sort_ascending*/
-
-extern void do_action(struct jlist *theList, 
-				  int (*func)(struct jelement *),
-				  int (*filter)(struct jelement *)
-				  );
-	/* this function performs an action (func) on each element which gets a 1
-	returned from (filter).  if filter = null then (func) is executed on
-	each element 
-	func declaration should be of type:
-	int func(struct jelement *theElement)
-	where the return value is 0 if the function may have messed up sorting, 1 otherwise
-	filter should be:
-	int filter(struct jelement *theElement)
-	returning 1 if pass, 0 if filtered
-	*/
-
-extern int count_elements(struct jlist *theList);
-	/* this function returns the number of elements in the list */
-
-extern struct jelement *next_in_list(struct jlist *theList,struct jelement *theElement);
-	/* this function returns a pointer to the next element in the list*/
-
-extern struct jelement *previous_in_list(struct jlist *theList,struct jelement *theElement);
-	/* this function returns a pointer to the previous element in the list*/
-
-extern void destroy_list(struct jlist *theList);
-	/* this function frees all list memory and sets theList = NULL */
-
-#endif
diff --git a/testcases/ballista/ballista/compile/lex.yy.c b/testcases/ballista/ballista/compile/lex.yy.c
deleted file mode 100644
index 8be18ee..0000000
--- a/testcases/ballista/ballista/compile/lex.yy.c
+++ /dev/null
@@ -1,1748 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /cvsroot/ltp/ltp/testcases/ballista/ballista/compile/lex.yy.c,v 1.1 2004/10/18 17:46:07 mridge Exp $
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
-static yyconst short int yy_accept[91] =
-    {   0,
-        0,    0,   24,   22,    1,    2,   21,   20,   22,   18,
-       19,   14,   15,   21,   21,   21,   21,   21,   21,   21,
-       21,   16,   17,    1,   21,   13,   21,   21,   21,   21,
-       21,   21,   21,   21,   21,   13,   21,   21,   21,   21,
-       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-       21,   21,   21,   21,    3,   21,   21,   21,   21,    7,
-       21,   21,   21,   21,   21,   10,   21,   11,   21,   21,
-       21,   21,    4,   12,   21,   21,   21,   21,   21,   21,
-        5,    9,    8,   21,   21,   21,   21,   21,    6,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    1,    5,    4,    1,    6,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    7,    8,    4,
-        1,    4,    1,    1,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        9,    1,   10,    1,   11,    1,   12,   13,   14,   15,
-
-       16,   17,   18,    4,   19,    4,    4,   20,   21,   22,
-       23,   24,    4,   25,   26,   27,   28,    4,    4,    4,
-        4,    4,   29,    1,   30,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[31] =
-    {   0,
-        1,    1,    2,    3,    1,    1,    3,    1,    1,    1,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    1,    1
-    } ;
-
-static yyconst short int yy_base[93] =
-    {   0,
-        0,    0,   99,  100,   96,  100,    0,  100,   91,    0,
-      100,  100,  100,   82,   11,   76,   72,   73,   70,   79,
-       78,  100,  100,   87,    0,    0,   74,   71,   65,   73,
-       56,   60,   18,   61,   56,    0,   64,   67,   57,   57,
-       55,   62,   54,   62,   56,   55,   44,   47,   49,   41,
-       55,   53,   36,   48,    0,   40,   35,   32,   32,    0,
-       43,   37,   41,   36,   27,    0,   29,    0,   33,   40,
-       34,   37,    0,    0,   35,   29,   17,   22,   21,   24,
-        0,    0,    0,   22,   19,   15,   20,    9,    0,  100,
-       30,   45
-
-    } ;
-
-static yyconst short int yy_def[93] =
-    {   0,
-       90,    1,   90,   90,   90,   90,   91,   90,   90,   91,
-       90,   90,   90,   91,   91,   91,   91,   91,   91,   91,
-       91,   90,   90,   90,   91,   92,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   92,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,    0,
-       90,   90
-
-    } ;
-
-static yyconst short int yy_nxt[131] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-        7,   14,    7,   15,   16,   17,    7,   18,   19,    7,
-        7,   20,    7,   21,    7,    7,    7,    7,   22,   23,
-       28,   43,   25,   29,   89,   88,   87,   86,   85,   84,
-       83,   82,   81,   80,   44,   36,   79,   36,   78,   77,
-       76,   75,   74,   73,   72,   71,   70,   69,   68,   67,
-       66,   65,   64,   63,   62,   61,   60,   59,   58,   57,
-       56,   55,   54,   53,   52,   51,   50,   49,   48,   47,
-       46,   45,   42,   41,   40,   39,   38,   37,   24,   35,
-       34,   33,   32,   31,   30,   27,   26,   24,   90,    3,
-
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90
-    } ;
-
-static yyconst short int yy_chk[131] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-       15,   33,   91,   15,   88,   87,   86,   85,   84,   80,
-       79,   78,   77,   76,   33,   92,   75,   92,   72,   71,
-       70,   69,   67,   65,   64,   63,   62,   61,   59,   58,
-       57,   56,   54,   53,   52,   51,   50,   49,   48,   47,
-       46,   45,   44,   43,   42,   41,   40,   39,   38,   37,
-       35,   34,   32,   31,   30,   29,   28,   27,   24,   21,
-       20,   19,   18,   17,   16,   14,    9,    5,    3,   90,
-
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "ballista.l"
-#define INITIAL 0
-#line 2 "ballista.l"
-  /* ballista.l : Ballista lexer - Compiler
-  Copyright (C) 1998-2001  Carnegie Mellon University
-
-  This program 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 Software Foundation; either version 2
-  of the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-  */
-#include <stdio.h>
-#include "blexer.h"
-#include "butil.h"
-
-#include "tokens.h"
-
-int inCode = 0;  /* if zero, not in user c-code somewhere*/
-int lineNum = 0;
-int helpFlag =0;
-int dumpFlag =0;
-int commentState=0; /* track if we are in a comment */
-
-
-#line 451 "lex.yy.c"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 35 "ballista.l"
-
-
-#line 605 "lex.yy.c"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 91 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 100 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 37 "ballista.l"
-{if (inCode!=0) return CODE_SP;}   /*ignore whitespace*/
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 40 "ballista.l"
-{lineNum++;commentState=0;if (inCode!=0) return CODE_NL;return EOL_ID;}
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 42 "ballista.l"
-{if (inCode!=0) return CODE_ID;return NAME_ID;}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 43 "ballista.l"
-{if (inCode!=0) return CODE_ID;return PARENT_ID;}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 44 "ballista.l"
-{if (inCode!=0) return CODE_ID;return INCLUDES_ID;}
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 45 "ballista.l"
-{if (inCode!=0) return CODE_ID;return GLOBAL_DEFINES_ID;}
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 46 "ballista.l"
-{if (inCode!=0) return CODE_ID;return DIALS_ID;}
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 47 "ballista.l"
-{if (inCode!=0) return CODE_ID;return ENUM_DIAL_ID;}
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 48 "ballista.l"
-{if (inCode!=0) return CODE_ID;return INT_DIAL_ID;}
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 49 "ballista.l"
-{if (inCode!=0) return CODE_ID;return  ACCESS_ID;}
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 50 "ballista.l"
-{if (inCode!=0) return CODE_ID;return COMMIT_ID;}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 51 "ballista.l"
-{if (inCode!=0) return CODE_ID;return CLEANUP_ID;}
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 52 "ballista.l"
-{ commentState=1;}
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 53 "ballista.l"
-{if (inCode!=0) return CODE_ID;return LEFT_BRACKET_ID;}
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 54 "ballista.l"
-{if (inCode!=0) return CODE_ID;return RIGHT_BRACKET_ID;}
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 55 "ballista.l"
-{inCode++;if (inCode!=1) return CODE_ID;return  LEFT_BRACE_ID;}
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 56 "ballista.l"
-{
-    inCode --; 
-    if (inCode <0)
-      {
-	char s[50];
-	sprintf(s,"Error, mismatched } - line number %i",lineNum);
-	jerror(s);
-      }
-    if (inCode!=0) return CODE_ID;return RIGHT_BRACE_ID;
-   }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 66 "ballista.l"
-{if (inCode!=0) return CODE_ID;return COLON_ID;}
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 67 "ballista.l"
-{if (inCode!=0) return CODE_ID;return SEMI_ID;}
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 68 "ballista.l"
-{if (inCode!=0) return CODE_ID;return COMMA_ID;}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 69 "ballista.l"
-{
-  if (inCode!=0)
-    return CODE_ID;
-  else
-    {
-      symLook(yytext);
-      return VAR_ID;
-    }
-}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 78 "ballista.l"
-{if (inCode!=0) return CODE_ID;return CHAR_ID;}
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 80 "ballista.l"
-ECHO;
-	YY_BREAK
-#line 820 "lex.yy.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 91 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 91 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 90);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-#include<unistd.h>
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 80 "ballista.l"
-
-void parseCLine(int argc,char *argv[])
-{
-  int i;
-  for (i=2;i<=argc;i++)
-    {
-      if (!strcmp(argv[i-1],"-h")) helpFlag=1;
-      if (!strcmp(argv[i-1],"-dump")) dumpFlag=1;
-    }
-}
-
-int main(int argc,char *argv[])
-{
-  int i;
-
-  parseCLine(argc,argv);
-
-  if (helpFlag)
-  {
-    printf("Ballista Lexical Analyzer v0.1\n");
-    printf("options\n");
-    printf("-h       Print this message\n");
-    printf("-dump    Verbose output mode");
-  }
-
-  i=yylex();
-  while (i!=0)
-    {
-      if (dumpFlag) printf("(%i)%i: %s\n",inCode,i,yytext);
-      else if (i==VAR_ID || i==CODE_ID) printf("%i\t%s\n",i,yytext);
-      else printf("%i\n",i);
-      i=yylex();
-    }
-
-  if (dumpFlag)
-  {
-   printf("\nDumping Symbol Table\n");
-   dumpTable();
-  }
-
-  freeTable();
-  return 0;
-}
diff --git a/testcases/ballista/ballista/compile/tempname.c b/testcases/ballista/ballista/compile/tempname.c
deleted file mode 100644
index 674a2ea..0000000
--- a/testcases/ballista/ballista/compile/tempname.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* tempname.c : Ballista function to create a temporary name - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-char theDir[255];
-char thePre[255];
-int dir=0;
-int pre=0;
-
-void parseCLine(int argc,char *argv[])
-{
-  int i;
-  for (i=2;i<=argc;i++)
-    {
-      if (i==2)
-	{
-	  dir=1;
-	  strcpy(theDir,argv[i-1]);
-	}
-      if (i==3)
-	{
-	  pre=1;
-	  strcpy(thePre,argv[i-1]);
-	}
-
-    }
-}
-
-int main(int argc,char *argv[])
-{
-  char* ret;
-
-  theDir[0]='\0';
-  thePre[0]='\0';
-
-
-  ret=NULL;
-
-
-  parseCLine(argc,argv);
-  
-  if (!dir)
-    {
-
-      ret=tmpnam(NULL);
-      if (ret==NULL)
-	{
-	  printf("could not get temp filename\n");
-	  exit(1);
-	}
-      printf("%s\n",ret);
-      exit(0);
-    }
-  ret = tempnam(theDir,thePre);
-      if (ret==NULL)
-	{
-	  printf("could not get temp filename\n");
-	  exit(1);
-	}
-      printf("%s\n",ret);
-      exit(0);
-}
diff --git a/testcases/ballista/ballista/compile/tokens.h b/testcases/ballista/ballista/compile/tokens.h
deleted file mode 100644
index 2bdcb49..0000000
--- a/testcases/ballista/ballista/compile/tokens.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* tokens.h : Ballista header file - Compiler
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-/*
-#define NAME_ID 1001
-#define PARENT_ID 1002
-#define INCLUDES_ID 1003
-#define GLOBAL_DEFINES_ID 1004
-#define DIALS_ID 1005
-#define ENUM_DIAL_ID 1006
-#define INT_DIAL_ID 1007
-#define ACCESS_ID 1008
-#define STRING_ID 1009
-#define VAR_ID 1010
-#define CODE_ID 1011
-#define COMMIT_ID 1012
-#define CLEANUP_ID 1013
-#define LEFT_BRACE_ID 1014
-#define RIGHT_BRACE_ID 1015
-#define LEFT_BRACKET_ID 1016
-#define RIGHT_BRACKET_ID 1017
-#define EOL_ID 1018
-#define CHAR_ID 1019
-#define COLON_ID 1020
-#define COMMA_ID 1021
-#define SEMI_ID 1022
-*/
-/* no not change the first or last item */
-
-#define NUM_TOKENS 27
-#define TOKEN_BASE 1000
-enum tokenid{
-ACCESS_ID=TOKEN_BASE,
-CHAR_ID,
-CLEANUP_ID,
-CODE_ID,
-CODE_SP,
-CODE_NL,
-COLON_ID,
-COMMA_ID,
-COMMIT_ID,
-DIALS_ID,
-ENUM_DIAL_ID,
-EOL_ID,
-END,
-GLOBAL_DEFINES_ID,
-INCLUDES_ID,
-INT_DIAL_ID,
-LEFT_BRACE_ID,
-LEFT_BRACKET_ID,
-NAME_ID,
-PARENT_ID,
-RIGHT_BRACE_ID,
-RIGHT_BRACKET_ID,
-SEMI_ID,
-STRING_ID,
-VAR_ID,
-EPSILON,
-SYNCH
-};
-
-#define NUM_NONTERMS 18
-#define NONTERM_BASE 2000
-enum nonterms{
-DECLARATION=NONTERM_BASE,
-HERITAGE,
-INCLUDE_BLOCK,
-GLOBAL_DBLOCK,
-DIALSBLOCK,
-ACCESSBLOCK,
-COMMITBLOCK,
-CLEANUPBLOCK,
-DIAL_LIST,
-ENUM_DECL,
-INT_DECL,
-BLOCK_LIST,
-VARBLOCK,
-VAREST,
-CBLOCK,
-CODELIST,
-SET_LIST,
-SETREST
-};
-
-#define NUM_ACTIONS 24
-#define ACTION_BASE 3000
-enum actions{
-NAME_DEFINES=ACTION_BASE,
-TYPE_DEFINES,
-HERITAGE_DEFINES,
-SET_H2,
-SET_H3,
-OUTPUT_CODE,
-OUTPUT_CODE_SP,
-OUTPUT_CODE_NL,
-SET_NULL,
-INC_DIAL,
-OUTPUT_BPARAM,
-OUTPUT_DNUM,
-OUTPUT_INTPARAM,
-GET_DNAME,
-FINISH_ENUM,
-GENERATE_CONDITIONAL,
-CLOSE_CONDITIONAL,
-CLOSE_BLOCK,
-RESET_CNUM,
-SET_C7,
-SET_C8,
-SET_C9,
-SET_C10,
-SET_C12
-};
-
-void getTokenString(char *s,int i);
-
-int isNonTerm(int i);
-int isTerm(int i);
-
diff --git a/testcases/ballista/ballista/configHints.txt b/testcases/ballista/ballista/configHints.txt
deleted file mode 100644
index 21ef5af..0000000
--- a/testcases/ballista/ballista/configHints.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-# configHints.txt: configuration hints for ballista configure
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-#############################
-####                     ####
-####  HOST sections      ####
-####                     ####
-#############################
-
-##########
-# Settings for Solaris hosts
-##########
-<Begin host:solaris>
-
-          # The name of your C compiler.
-	  #
-	host-CC		   [CC = g++]
-
-          # Any flags that should be passed to the C compiler.
-          # NOTE - You should always include ${TARGET_DEF}, which allows
-          #  the host components to conditionally compile things, based on
-          #  the target being used.
-	  #
-	host-CFLAGS	   [CFLAGS = -DSUN ${TARGET_DEF}]
-
-          # Any libraries to include when compiling newgo.
-          # NOTE - This should also include any non-library flags needed to
-          #  support compiling a dynamicly linked executable.
-	  #
-	host-CLIBS	   [CLIBS = -ldl -lnsl -lposix4]
-
-<End host:solaris>
-
-##########
-# Settings for Linux hosts
-##########
-<Begin host:linux>
-	host-CC		   [CC = g++]
-	host-CFLAGS	   [CFLAGS = -w -O ${TARGET_DEF}]
-	host-CLIBS	   [CLIBS = -lpthread -ldl -lnsl -rdynamic]
-<End host:linux>
-
-
-##########
-# Settings for Digital UNIX hosts
-##########
-<Begin host:osf1>
-	host-CC		   [CC = cxx]
-	host-CFLAGS	   [CFLAGS = -w -O0 ${TARGET_DEF}]
-	host-CLIBS	   [CLIBS =  -lc]
-<End host:osf1>
-
-##########
-# Settings for DEFAULT hosts
-##########
-<Begin host:default>
-
-          # The name of your C compiler.
-          #
-        host-CC            [CC = g++]
-
-          # Any flags that should be passed to the C compiler.
-          # NOTE - You should always include ${TARGET_DEF}, which allows
-          #  the host components to conditionally compile things, based on
-          #  the target being used.
-          #
-        host-CFLAGS        [CFLAGS = ${TARGET_DEF}]
-
-          # Any libraries to include when compiling newgo.
-          # NOTE - This should also include any non-library flags needed to
-          #  support compiling a dynamicly linked executable.
-          #
-        host-CLIBS         [CLIBS = -ldl -lnsl -lposix4]
-
-<End host:default>
-
-
-###############################
-####                       ####
-####  TARGET sections      ####
-####                       ####
-###############################
-
-##########
-# Settings for VxWorks targets
-##########
-<Begin target:vxworks>
-
-          # The file (without extension) that defines the Test Manager
-	  #  to use.
-	  #
-	host-TEST_MAN_FILE [TEST_MAN_FILE = vxworks]
-
-	  # The C preprocessor macro to define to allow code to be
-	  #  conditionally compiled, based on the target being used.
-	  #
-	TARGET_DEF	   [TARGET_DEF    = -DB_VXWORKS]
-
-	  # The name of your C compiler.
-	  #
-	target-CC	   [CC = cc68k]
-
-	  # Flags to pass to your C compiler.
-	  #
-	target-CFLAGS	   [CFLAGS = ${TARGET_DEF} -fno-builtin -nostdinc \
-				-I${WINDBASE}/target/h/ \
-				-DCPU=MC68060 -DB_VXWORKS -w
-			   ]
-
-        target-LDFLAGS [LDFLAGS = -r]
-
-          # Any miscellaneous variables that need to be set in order
-	  #  to get the C compiler to work properly.
-	  #
-	  # NOTE - You can set many variables in MISC_VARS, each on
-	  #  a seperate line.  Use backslashes at the end of the line
-	  #  only when you want a value for a variable that you cannot
-	  #  fit on a single line.
-	  #
-	target-MISC_VARS   [WINDBASE=/opt/wind
-			     WIND_HOST_TYPE=sun4-solaris2
-			     LD=ld68k
-			     NM=nm68k
-			     GCC_EXEC_PREFIX = \
-			     ${WINDBASE}/host/${WIND_HOST_TYPE}/lib/gcc-lib/
-			   ]
-
-          # The C compiler for Digital UNIX (cxx) does not recognize
-	  #  the -o flag when generating shared object files.  On all
-	  #  platforms except OSF1, set this to "-o mut.o" to indicate
-	  #  the output file when compiling the mut.  On OSF1, leave this
-	  #  empty, and make sure to have "mv a.out mut.out" in the
-	  #  munch phase.  
-	  #
-	target-MUT_O       [MUT_O = -o mut.o]
-
-          # Some platforms require a seperate munching phase after
-	  #  code has been compiled.  Set MUNCH to whatever needs to be
-	  #  done in the munching phase.
-	  #
-	  # NOTE - Even if your target platform does not need a seperate
-	  #  munching phase, this command should at least move
-	  #  mut.o to mut.out
-	  #
-	  # NOTE - If your target platform needs a munching phase, it
-	  #  will probably involve several commands.  Each of these
-	  #  commands should be seperated by a semicolon (in traditional
-	  #  shell style), and you can split the value of MUNCH across
-	  #  several lines with backslashes.
-	  #
-	target-MUNCH       [MUNCH = ${NM} mut.o | munch > __mut.c ;\
-			    ${CC} -traditional ${CFLAGS} -c __mut.c ;\
-			    ${LD} -r -o mut.out __mut.o mut.o ;\
-			    rm mut.o __mut.c __mut.o
-			   ]
-
-	  # make(1) is invoked twice, in order to compile the code in
-	  #  the templates/ directory.  Unfortunately, macros are not
-	  #  automatically propogated when make(1) is invoked recursively.
-	  #  Use the RECURSIVE_FLAGS to pass any important macros
-	  #  when make(1) is invoked recursively.  This will always include
-	  #  CC and CFLAGS, and will proabably include anything set in
-	  #  MISC_VARS
-	  #
-	target-RECURSIVE_FLAGS
-			   [RECURSIVE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}" \
-			    GCC_EXEC_PREFIX="${GCC_EXEC_PREFIX}" \
-			    WINDBASE="${WINDBASE}"
-			   ]
-
-<End target:vxworks>
-
-##########
-# Settings for Solaris targets
-##########
-<Begin target:solaris>
-	host-TEST_MAN_FILE [TEST_MAN_FILE = selfHost]
-	TARGET_DEF	   [TARGET_DEF    = -DB_SELFHOST]
-
-	target-CC	   [CC = g++]
-	target-CFLAGS	   [CFLAGS = -w -O ${BFLAGS} -DSUN ${TARGET_DEF} \
-				   -D__EXTENSIONS__ -D_XPG4_2 -DB_HANDLE_EXCEPTIONS]
-
-	  #Note the use of ${BFLAGS} first appearing here.
-	  #This is an environmental variable set by the perl script
-	  #downloaded from the ballista web page.  Any compiler 
-	  #directives or libraries specified will
-	  #be set into this environmental variable, and compiled
-	  #with the test case code.
-	  #
-	  #You should include this if you will be using the web page
-	  #GUI front end to ballista
-
-        target-LDFLAGS     [LDFLAGS = ${BFLAGS} -Xlinker -r -lm]
-	target-MISC_VARS   []
-	target-MUT_O       [MUT_O = -o mut.o]
-	target-MUNCH       [MUNCH = mv mut.o mut.out]
-	target-RECURSIVE_FLAGS
-			   [RECURSIVE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"]
-<End target:solaris>
-
-##########
-# Settings for Linux targets
-##########
-<Begin target:linux>
-	host-TEST_MAN_FILE [TEST_MAN_FILE = selfHost]
-	TARGET_DEF	   [TARGET_DEF    = -DB_SELFHOST]
-
-	target-CC	   [CC = g++]
-	target-CFLAGS	   [CFLAGS = ${BFLAGS} -DPOSIX_NO_REALTIME -w -O -fPIC -DB_HANDLE_EXCEPTIONS]
-        target-LDFLAGS     [LDFLAGS = -shared ${BFLAGS} -lm -lrt]
-	target-MISC_VARS   []
-	target-MUT_O       [MUT_O = -o mut.o]
-	target-MUNCH       [MUNCH = mv mut.o mut.out]
-	target-RECURSIVE_FLAGS
-			   [RECURSIVE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"]
-<End target:linux>
-
-
-##########
-# Settings for Digital UNIX targets
-##########
-<Begin target:osf1>
-	host-TEST_MAN_FILE [TEST_MAN_FILE = selfHost]
-	TARGET_DEF	   [TARGET_DEF    = -DB_SELFHOST]
-
-	target-CC	   [CC = cxx]
-	target-CFLAGS	   [CFLAGS = -w -O ${BFLAGS} -DB_HANDLE_EXCEPTIONS]
-        target-LDFLAGS     [LDFLAGS = -shared ${BFLAGS} -lm -lrt -laio_raw]
-	target-MISC_VARS   []
-	target-MUT_O       []
-	target-MUNCH       [MUNCH = mv -f a.out mut.out]
-	target-RECURSIVE_FLAGS
-			   [RECURSIVE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"]
-
-<End target:osf1>
-
-########## 
-# Settings for DEFAULT targets
-##########
-<Begin target:default>
-        host-TEST_MAN_FILE [TEST_MAN_FILE = selfHost]
-        TARGET_DEF         [TARGET_DEF    = -DB_SELFHOST]
-          
-        target-CC          [CC = g++]
-        target-CFLAGS      [CFLAGS = -w -O ${BFLAGS} ${TARGET_DEF} \
-                                   -D__EXTENSIONS__ -DB_HANDLE_EXCEPTIONS]
-             
-          #Note the use of ${BFLAGS} first appearing here.
-          #This is an environmental variable set by the perl script   
-          #downloaded from the ballista web page.  Any compiler 
-          #directives or libraries specified will   
-          #be set into this environmental variable, and compiled
-          #with the test case code.
-          # 
-          #You should include this if you will be using the web page 
-          #GUI front end to ballista
-
-        target-LDFLAGS     [LDFLAGS = ${BFLAGS} -Xlinker -r -lm]
-        target-MISC_VARS   []
-        target-MUT_O       [MUT_O = -o mut.o]
-        target-MUNCH       [MUNCH = mv mut.o mut.out]
-        target-RECURSIVE_FLAGS
-                           [RECURSIVE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"] 
-<End target:default>
-
-
-
diff --git a/testcases/ballista/ballista/configure b/testcases/ballista/ballista/configure
deleted file mode 100755
index 5fac6c1..0000000
--- a/testcases/ballista/ballista/configure
+++ /dev/null
@@ -1,284 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-########################
-# configure: creates Makefiles that are configured for user's platform(s)
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# Copyright (c) 1998 Carnegie Mellon University.
-# All rights reserved.
-#
-# This software is made available for academic and research purposes
-# only.  No commercial license is hereby granted.  Copying and other
-# reproduction is authorized only for research, education, and other
-# non-commercial purposes.  No warranties, either expressed or implied,
-# are made regarding the operation, use, or results of the software.
-#
-########################
-#
-# File:         configure
-#
-# Usage:        configure [-h host-platform] [-t target-platform] \
-#                         [-c config file]
-#
-#
-# Description:  create Makefiles that are configured for the user's
-#                choice of host and target platforms
-#
-########################
-#
-# Entry Conditions:
-#               the files configHints.txt, MakefileTarget.dist and
-#                MakefileHost.dist are present
-#
-########################
-
-########################
-#
-# The logic of this file is broken up into three major phases.
-#  First, we read in and parse the configuration file.
-#  Second, we figure out which platforms we ar configuring for.
-#  Finally, we create the Makefiles based on the above information.
-#
-# The different phases have different concerns, and therefore different
-#  variables.  Each phase is seperated from the others by comment blocks
-#  followed by declarations of the variables that are important to that
-#  section.  Note that some of the variables from earlier sections carry
-#  over into latter sections.
-#
-########################
-
-use strict;
-
-# check on command line arguments
-use Getopt::Std;
-use vars qw($opt_t $opt_h $opt_c);
-unless(getopts('t:h:c:') && !@ARGV) {
-    my $name;
-    ($name = $0) =~ s|.*/||;
-    $!=1;
-    die "usage: $name [-h host-platform] [-t target-platform] ".
-	"[-c config file]\n";
-}
-
-
-#############################
-# Parse the configuration file
-#############################
-my %config_setting;    # a hash of hashes holding the info from the
-                       #  config file.  Given the input:
-                       #
-                       # <Begin host:solaris>
-                       #   host-CC     [CC = g++]
-                       #   host-CFLAGS [CFLAGS = -DSUN -ldl -lnsl]
-                       # <End host:solaris>
-                       #
-                       # <Begin target:vxworks>
-                       #   host-TARGET_DEF [TARGET_DEF = B_VXWORKS]
-                       #   target-CC       [CC = cc68k]
-                       #
-                       # The form of the hash is:
-                       #
-                       # %config_setting = (
-                       #    'host:solaris' => {
-                       #        'host-CC' => 'CC = g++',
-                       #        'host-CFLAGS' => 'CFLAGS = -DSUN -ldl -lnsl',
-                       #                      },
-                       #    'target:vxworks' => {
-                       #        'host-TARGET_DEF' => 'TARGET_DEF = B_VXWORKS',
-                       #        'target-CC' => 'CC = cc68k',
-                       #                        }
-                       #                   );
-
-my $current_platform;  # keeps track of the platform declared in a <Begin>
-                       #  tag while we are processing the config file.
-                       #  Will be empty when we are not inside a
-                       #  platform block
-
-my $config;            # a scalar to hold the entire contents of the
-                       #  config file
-
-# figure out what config file to use, and read it in
-$opt_c = 'configHints.txt' unless $opt_c;
-open(CONFIG, $opt_c) || die "Can't open config file $opt_c: $!";
-do {
-    local $/ = undef;
-    $config = <CONFIG>;
-};
-close CONFIG;
-
-# parse the config file in a loop
-#  each pass through this loop should pull a chunk off of the beginning
-#  of $config, and possibly put a corresponding entry into %config_setting.
-#  If we fall all the way through, the last case will complain that we didn't
-#  recognize something
- CONFIG:
-    while ($config) {
-	# skip whitespace
-	$config =~ s/^\s+//s && next CONFIG;
-	# skip comments
-	$config =~ s/^#.*\n// && next CONFIG;
-	
-	# recognize beginning of a platform block
-	$config =~ s/^<\s*begin\s+((host|target):(\w+))\s*>//si &&
-	    do {
-		$current_platform = $1;
-		next CONFIG;
-	    };
-	    
-	# recognize ending of a platform block
-	$config =~ s/^<\s*end\s+(\S+)\s*>//si &&
-	    do {
-		unless ($1 == $current_platform) {
-		    warn "warning: platform block was opened as " .
-			"$current_platform, but closed as $1\n";
-		}
-		
-		$current_platform = '';
-		next CONFIG;
-	    };
-
-	# recognize a variable setting
-	#  NOTE - we are using the /x modifier to try to make this regex a
-	#   little more readable
-	$config =~ s/^(
-	            (\S+)      # non-whitespace
-                    \s+        # whitespace
-                    \[         # opening bracket
-                      ([^\]]*) # some number of non-closing bracket characters
-                    \]         # closing bracket
-			)//sx  
-	    && do {
-		unless ($current_platform) {
-		    warn "warning: Found text that looks like a variable ".
-			"setting outside of\n\ta platform block\n".
-			    "the offending string was:\n$1\n";
-		    next CONFIG;
-		}
-		
-		$config_setting{$current_platform}->{$2} = $3;
-		next CONFIG;
-	    };
-
-	# fall through
-	#  if we get here, none of the above regexen matched, so
-	#  we have no idea what they may have meant
-	$config =~ s/(.+)//s;
-	warn "warning: Found unrecognized text; " .
-	    "The offending string was:\n$1\n";
-	next CONFIG;
-	
-    }
-
-#############################
-# Determine host and target platforms
-#############################
-
-# hashes to map the strings returned from uname(1) and arch(1) to our
-#  mnemonic platform names
-my %uname2platform = (
-		      'SunOS' => 'solaris',
-		      'Linux' => 'linux',
-		      'OSF1'  => 'osf1',
-		      );
-my %arch2platform = (
-		     'sun4' => 'solaris',
-		     'i686' => 'linux',
-		     );
-
-# determine the host platform
-#  NOTE - we are setting up this block so that we can use next to jump
-#  into the continue block that checks to make sure we have a valid platform
-HOST : 
-{
-    # command line setting has priority
-    $opt_h && next HOST;
-
-    # NOTE - substr is used to lop off the newline from the command
-    #  we can't use chomp() because that would modify the read-only string
-
-    $opt_h = $uname2platform{substr `uname`, 0, -1};
-    $opt_h && next HOST;
-
-    $opt_h = $arch2platform{substr `arch`, 0, -1};
-    $opt_h && next HOST;
-
-#    $!=1;
-#    die "Can't determine host platform.  Specify with -h\n";
-     exec './configure -h default';
-} continue {
-    unless ($config_setting{"host:$opt_h"}) {
-	$!=1;
-	die "host platform determined to be $opt_h,\n".
-	    "but no configuration options are available for that platform\n";
-    }
-}
-
-# determine the target platform
-#  NOTE - this is structured the same as the HOST block above
-TARGET :
-{
-    # command line setting has priority
-    $opt_t && next TARGET;
-
-    # if target platform not specified, default it to the host platform
-    $opt_t = $opt_h;
-} continue {
-    unless ($config_setting{"target:$opt_t"}) {
-	$!=1;
-	die "target platform determined to be $opt_t,\n".
-	    "but no configuration options are available for that platform\n";
-    }
-}
-
-# show what platforms we are configuring for, mainly as a sanity check for
-#  the benefit of the user
-print "Configuring for host platform: $opt_h\n";
-print "              target platform: $opt_t\n";
-
-#############################
-# Create the Makefiles
-#############################
-
-# create a hash containing only the settings from the platforms we are
-#  interested in.  NOTE - the syntax %{ hash-ref } will take the hash-ref
-#  and flatten into it a list which can then be assigned to the new hash
-my %active_config_setting = (
-			     %{$config_setting{"host:$opt_h"}},
-			     %{$config_setting{"target:$opt_t"}}
-			     );
-# build a regex that will match any of the keys of keys from the above hash
-#  so that we can replace the keywords when we find them in the files
-my $regex =
-    '@(' .
-    join('|', keys %active_config_setting) .
-    ')@';
-
-# the files that we actually want to create
-my @makefiles = qw(MakefileHost MakefileTarget);
-foreach my $file (@makefiles) {
-    open(INPUT , "<$file.dist") || die "Can't open file $file.dist";
-    open(OUTPUT, ">$file"     ) || die "Can't open file $file";
-
-    while (<INPUT>) {
-	s/$regex/$active_config_setting{$1}/g;
-	print OUTPUT;
-    }
-}
diff --git a/testcases/ballista/ballista/consolidate.pl b/testcases/ballista/ballista/consolidate.pl
deleted file mode 100644
index b4835b3..0000000
--- a/testcases/ballista/ballista/consolidate.pl
+++ /dev/null
@@ -1,574 +0,0 @@
-# consolidate.pl: consolidates results from os test suite into tgz file
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#------------------------------------------------------------------------
-#
-#Description: consolidates the results from the os test suite (ostest.pl) into
-#             a tarred and gzipped file.  User questioned as script progresses.
-#
-#   Existing Files: callTable.all, os_results.txt, os_results.html, configHints.txt, faillog, ostest_version.txt 
-#   Created Files: catastrophic.txt, sysInfo.txt, configInfo.txt, tplInfo.txt, compileInfo.txt
-#                  userInfo.txt
-#   Directories: ./templates, ./consolidate, ./outfiles                
-#
-#Outputs: A single tar(red), gzip(ped) and uuencoded file named consolidate.tar.gz.uu is created.  
-#          
-#         Additionally files listed under "Created Files" are created.
-#
-
-# ** Maintain updated version number and release date **
-$version_num = "1.0.0";
-$release_date = "May 30, 2001";
-$path = "consolidate";
-
-# Header Information
-print "Thank you for choosing to report your Ballista OS Robustness test results.\n";
-print "If you choose to cancel the reporting you may do so by entering <Ctrl-C> at any time.\n";
-print "\nThe results are actually sent (by you) in a separate step\n\n";
-
-
-# Check for existing results files and query about deletion. 
-if (-d $path)
-{  
-  print "It appears that you have previously consolidated your results.  If you wish to save the\n";
-  print "prior consolidation then type \"NO\", copy the consolidate subdirectory to another location, \n";
-  print "and restart the script.  Otherwise your prior consolidation will be deleted \n";
-  print "Continue consolidation?  <Yes/No>\n";
-
-  if(<STDIN> =~ /^no/i)
-  {
-    exit(1);
-  }
-  else
-  {
-    print "\nCleaning up previous consolidation...\n";
-    opendir(CON_DIR,$path);
-
-    while (defined($file = readdir(CON_DIR)))
-    {
-      $outfile = "$path/$file";
-      chomp($outfile);
-
-      if (($file != ".")&&($file != ".."))
-      { 
-        if ($os !~ "OSF1")
-        {
-          unlink($outfile) || die "Cannot remove $path\$file: $!";
-        }   
-        else
-        {
-          system("rm $outfile");
-        }
-      }
-    }
-    closedir(CON_DIR); 
-    system("rm -rf $path");
-  }
-}
-
-if (! (-d $path))
-{
-  mkdir($path, 0777) || die "Cannot make $path directory: $!\n";
-}
-
-###################################
-# Process Catastrophic Functions
-
-open(CATFILE,">$path/catastrophic.txt") || die "Cannot open $path/catastrophic.txt.  Consolidation halted prematurely\n $!"; 
-
-open(CALLTABLEIN,"<callTable.all")|| die "Cannot read the file named callTable.all.  The consolidate script should be run in the same ballista directory ostest.pl was run.$!\n";
-$count = 0;
-while(<CALLTABLEIN>)
-{
-  if ($_ =~ /^#CAT/i)
-  {
-    $count= $count +1;
-    print CATFILE "$_";
-  }
-}
-
-if ($count == 0)
-{
-  print "Did you encounter any catastrophic errors when executing the test suite? \n";
-  print "(Did the system crash when running the test suite?)  <Yes/No>\n";
-
-  if(<STDIN> =~ /^YES/i)
-  {
-    print CATFILE "#%#START USER COMMENTS#%#\n";
-    print "Please list the functions that produced catastrophic errors.  (Enter a single \n";
-    print "period (\".\") on a line to indicate the end of the function list.)\n";
-
-    #gather input and append it to catastrophic.txt
-    $finished = 0;
-    while($finished < 99)
-    {
-      $userinput = <STDIN>;
-      if ($userinput =~ /^.$/)
-      {
-        $finished = 999;
-      }
-      else
-      {
-        print CATFILE "$userinput";
-        $finished++;
-      }  
-    }
-    if ($finished == 99)
-    {
-      print "Input halted after 99 lines.\n";
-    }
-  }
-  else
-  {
-    print CATFILE "No catastrophic robustness failures reported\n";
-  }
-}
-else
-{
-  close(CATFILE);
-  open(CATFILE, "<$path/catastrophic.txt")|| die "Cannot open $path/catastrophic.txt.  Consolidation halted prematurely\n $!";
-  print "Based on callTable.all the following functions appear to produce catastrophic errors:\n";
-  #output the contents of catastrophic.txt
-  while (<CATFILE>)
-  {
-    print "$_";
-  }
-  close(CATFILE);
-  open(CATFILE,">>$path/catastrophic.txt")|| die "Cannot open $path/catastrophic.txt.  Consolidation halted prematurely\n $!";
-
-  print "\nAre there additional functions that produced catastrophics or comments about the above functions \n";
-  print "you wish to add. <Yes/No>\n";
-
-  if(<STDIN> =~ /^YES/i)
-  {
-    print CATFILE "#%#START USER COMMENTS#%#\n";
-
-    print "Please report any additional functions producing catastrophic errors or \n";
-    print "add comments about the above catastrophic errors.  (Enter a single \n";
-    print "period (\".\") on a line to indicate the end of the function list.)\n";
-
-    #gather input and append it to catastrophic.txt
-    $finished = 0;
-    while($finished < 99)
-    {
-      $userinput = <STDIN>;
-      if ($userinput =~ /^.$/)
-      {
-        $finished = 999;
-      }
-      else
-      {
-        print CATFILE "$userinput";
-        $finished++;
-      }
-    }
-    if ($finished == 99)
-    {
-      print "Input halted after 99 lines.\n";
-    }
-  }
-}  
- 
-close(CATFILE);
-
-#################################
-# Process System Information
-
-if ((system("uname -rsvm > $path/sysInfo.txt"))/256 == 1)
-{
-  print "\nProblems encountered trying to gather system information.  Command uname -rsvm returned unsuccessfully\n";
-  print "Please report the following system information:\n";
-  print " - operating system under test (e.g. Linux)\n";
-  print " - operating system release (e.g. 2.2.16-22smp)\n";
-  print " - operating system version (e.g. \#1 SMP Tue Aug 22 16:39:21 EDT 2000)\n";
-  print " - machine (hardware) type (e.g. i686)\n\n";
-  $nothing = 1;
-}
-else
-{
-  $nothing = 0;
-  open(SYSFILE, "<$path/sysInfo.txt")|| die "Cannot open $path/sysInfo.txt.  Consolidation halted prematurely\n $!";
-  print "\nThe following system information has been recorded:\n";
-
-  #output the contents of sysInfo.txt
-  while (<SYSFILE>)
-  {
-    print "$_";
-  }
-  close(SYSFILE);
-}
-
-open(SYSFILE,">>$path/sysInfo.txt")|| die "Cannot open $path/sysInfo.txt.  Consolidation halted prematurely\n $!";
-
-print "\nIs there additional system or machine information you wish to record? <Yes/No>\n";
-       
-if(<STDIN> =~ /^YES/i)
-{
-  print SYSFILE "#%#START USER COMMENTS#%#\n";
-   
-  print "Please report any additional system or machine information. \n";
-  print "(Enter a single period (\".\") on a line to indicate the end of the information.)\n";
-     
-  #gather input and append it to sysInfo.txt
-  $finished = 0;
-  while($finished < 99)
-  {
-    $userinput = <STDIN>;
-    if ($userinput =~ /^.$/)
-    {
-      $finished = 999;
-    }
-    else
-    {
-      print SYSFILE "$userinput";
-      $finished++;
-    }
-  }
-  if ($finished == 99)
-  {
-    print "Input halted after 99 lines.\n";
-  }
-}
-else
-{
-  if ($nothing == 1)
-  {
-    print SYSFILE "No system information recorded\n";
-  }
-}
-
-close(SYSFILE);
-
-############################
-# Configuration Information
-
-open(CONFIGFILE,">>$path/configInfo.txt")|| die "Cannot open $path/configInfo.txt.  Consolidation halted prematurely\n $!";
-
-print "\nAre there any changes you made to the system configuration that are likely to \n";
-print "affect the results?  <Yes/No> \n";
-if(<STDIN> =~ /^YES/i)
-{
-  print CONFIGFILE "#%#START USER COMMENTS#%#\n";
-  
-  print "Please enter additional system configuration information. \n";
-  print "(Enter a single period (\".\") on a line to indicate the end of the information.)\n";
-  
-  #gather input and append it to configInfo.txt
-  $finished = 0;
-  while($finished < 99)
-  { 
-    $userinput = <STDIN>;
-    if ($userinput =~ /^.$/)
-    {
-      $finished = 999;
-    }
-    else
-    {
-      print CONFIGFILE "$userinput";
-      $finished++;
-    }
-  }   
-  if ($finished == 99)
-  {
-    print "Input halted after 99 lines.\n";
-  }
-}
-else
-{
-  print CONFIGFILE "No system configuration information recorded\n";
-}
-
-close(CONFIGFILE);
-
-################################################################
-# Compiler Version - Determine the compiler used and then query
-
-# Determine user's operating system
-$os_string = `uname`;
-chomp($os_string);
-
-# copy any os specific templates over the standard templates
-if ($os_string eq Linux)
-{
-  $os_name = linux;
-}
-elsif ($os_string eq SunOS)
-{
-  $os_name = solaris;
-}
-elsif ($os_string eq OSF1)
-{
-  $os_name = osf1;
-}
-else
-{
-  $os_name = default;
-}
-
-$host_header = "<Begin host:";
-$host_cc = "host-CC";
-
-open (CONFIGFILE, "configHints.txt")|| die "Cannot open configHints.txt.  Consolidation halted prematurely\n $!";
-@configList = <CONFIGFILE>;
-
-@subsetList = grep /$host_header|$host_cc/, @configList;
-
-# os_spec_flag values:
-#   0  when the <Begin host:$os_name has not been encountered
-#   1  after the <Begin host:$os_name has been encountered but before $host_cc or another $host_header
-#   2  after the <Begin host:$os_name and the associated $host_cc have been encountered
-#   3  after the <Begin host:$os_name is followed by a $host_header without a $host_cc inbetween
-#
-# only 2 is a successful exit condition.  
-$os_spec_flag = 0;
-foreach $config_line (@subsetList)
-{
-  if ($os_spec_flag == 0)
-  {
-    if ($config_line =~ /^$host_header$os_name/)
-    {
-      $os_spec_flag = 1;
-    }
-  }
-  elsif ($os_spec_flag ==1)
-  {
-    if($config_line =~ /$host_cc/)
-    {
-      @bits = split(/\s+/, $config_line);
-      @compiler = split(/]/,$bits[4]);
-      $os_spec_flag = 2;
-    }
-
-    if($config_line =~ /^$host_header/)
-    { 
-      print "\nAn ERROR was encountered trying to determine the C++ compiler specified by configHints.txt\n";
-      print " No compiler specification listed after $host_header$os_name and before $config_line\n";
-      $os_spec_flag = 3;
-    }
-  }
-}
-
-if ($os_spec_flag ==1)
-{
-  print "\nAn ERROR was encountered trying to determine the C++ compiler specified by configHints.txt\n";
-  print " No compiler specification listed after $host_header$os_name\n";
-}
-
-if ($os_spec_flag == 0)
-{
-  print "\nAn ERROR was encountered trying to determine the C++ compiler specified by configHints.txt\n";
-  print "$host_header$os_name> is not listed\n";
-}
-$version_flag = 0;
- 
-if ($os_spec_flag == 2)
-{
-  open (SHELLSCRIPT, ">compiler_version") ||die "Cannot open file compiler_version";
-  print SHELLSCRIPT "#!/bin/csh\n";
-  if ($compiler[0] eq "cxx")
-  {
-    print SHELLSCRIPT "cxx -V >& $path/compileInfo.txt\n";
-  }
-  elsif ($compiler[0] eq "g++")
-  {
-    print SHELLSCRIPT "g++ -v >& $path/compileInfo.txt\n";
-  }
-  else
-  {
-    print "\nUnable to determine the version associated with the C++ compiler $compiler[0] specified in configHints.txt\n";
-    print "Please specify\n";
-    $version_flag = -1;
-  }
-  close SHELLSCRIPT;
-
-  @dummy_list = ('compiler_version');
-  chmod 0700, @dummy_list;
-
-  if (((system('compiler_version'))/256) == 1)
-  {
-    print "\nError encountered trying to determine compiler version for $compiler[0].  Please specify\n";
-    open (COMPILEFILE,">$path/compileInfo.txt") || die "Cannot open file $path/compileInfo.txt";
-    print COMPILEFILE "compiler = $compiler[0]\n";
-    close COMPILEFILE;
-    $version_flag = -1;
-  }
-  else
-  {
-    $version_flag = 1;
-    print "\nThe compiler version was determined to be:\n";
-    open (COMPILEFILE, "<$path/compileInfo.txt") || die "Cannot open file $path/compileInfo.txt";
-    while (<COMPILEFILE>)
-    {
-      print $_;
-    }
-    print "\nWould you like to add an additional compile information? <Yes/No>\n";
-    if(<STDIN> =~ /^YES/i)
-    {
-      $version_flag = 0;
-    }
-  }
-}
-
-if ($version_flag != 1)
-{
-  print "(Enter a single period (\".\") on a line to indicate the end of the compiler version information.)\n";
-  open (COMPILEFILE, ">>$path/compileInfo.txt") || die "Cannot open file $path/compileInfo.txt";
-        
-  print COMPILEFILE "#%#START USER COMMENTS#%#\n";
-  
-  #gather input and append it to compileInfo.txt
-  $finished = 0;
-  while($finished < 25)
-  {
-    $userinput = <STDIN>;
-    if ($userinput =~ /^.$/)
-    {
-      $finished = 999;   
-    }
-    else
-    {
-      print COMPILEFILE "$userinput";
-      $finished++;
-    }  
-  }
-  if ($finished == 25)
-  {
-    print "Input halted after 25 lines.\n";
-  }
-  close COMPILEFILE;
-}
-
-##############################
-# Template Question
-
-open(TPLFILE, ">>$path/tplInfo.txt")|| die "Cannot open $path/tplInfo.txt.  Consolidation halted prematurely\n $!";
-
-print "\nDid you make any changes to the ballista datatype template files?  (These files have the .tpl suffix) <Yes/No>\n";
-$tplinput = <STDIN>;
-
-if($tplinput =~ /^YES/i)
-{
-  print TPLFILE "Template files changed\n";
-}
-else
-{
-  print TPLFILE "No template file changes\n";
-}
-close TPLFILE;
-
-###################################
-# user information
-
-open(USERFILE,">>$path/userInfo.txt")|| die "Cannot open $path/userInfo.txt.  Consolidation halted prematurely\n $!";
-
-print "\nName of tester: \n";
-$userinput = <STDIN>;
-print USERFILE "Tester Name: $userinput";
-
-print "\nName of organization: \n";
-$userinput = <STDIN>;
-print USERFILE "Organization Name: $userinput";
-
-print "\nLocation: (please include country)\n";
-print "(Enter a single period (\".\") on a line to indicate the end of the information.)\n";
-print USERFILE "Address:\n";
-
-#gather input and append it to userInfo.txt
-$finished = 0;
-while($finished < 9)
-{
-  $userinput = <STDIN>;
-  if ($userinput =~ /^.$/)
-  {
-    $finished = 999;
-  }
-  else
-  {
-    print USERFILE "$userinput";
-    $finished++;
-  }
-}
-
-if ($finished == 9)
-{
-  print "Input halted after 9 lines.\n";
-}
- 
-print "\nThe next two pieces of information: email and phone number are for our internal use only.\n";
-print "\nThey will not be posted on the web nor distributed.  Email and phone number allow us to 
-contact you if we have questions about your results.\n";
-print "\nEmail Address: ";
-$userinput = <STDIN>;
-print USERFILE "Email Address: $userinput";
-
-print "\nPhone Number: ";
-$userinput = <STDIN>;   
-print USERFILE "Phone Number: $userinput";
-
-close USERFILE;
-
-###################################
-# tar gzip and uuencode the results
-
-
-if ((system("tar -cf consolidate.tar $path callTable.all outfiles/os_results.txt outfiles/os_results.html outfiles/faillog outfiles/ostest_version.txt configHints.txt"))/256 == 1)
-{
-  print "Error encountered trying to tar files.  Consolidation incomplete. \n";
-  exit(1);
-}
-
-# Add template files only if changed.
-if($tplinput =~ /^YES/i)
-{
-  if ((system("tar -uf consolidate.tar templates/*.tpl"))/256 == 1)
-  {
-    print "Error encountered trying to add templates to tar file.  Consolidation incomplete. \n";
-    exit(1);
-  }
-}
-
-#gzip
-if ((system("gzip -f consolidate.tar"))/256 == 1)
-{
-  print "Error encountered trying to gzip the tar file.  Consolidation incomplete. \n";
-  exit(1);
-}
-
-#add subject header to uuencode output file
-open (UUFILE, ">consolidate.tar.gz.uu") || die "Cannot open file consolidate.tar.gz.uu";
-print UUFILE 'Subject: Consolidated Results for Ballista OS Robustness Test Suite';
-print UUFILE "\n";
-close UUFILE;
-
-#uuencode 
-if ((system("uuencode consolidate.tar.gz consolidate.tar.gz >> consolidate.tar.gz.uu"))/256 ==1)
-{
-  print "Error encountered trying to uuencode the gzipped tar file.  Consolidation incomplete. \n";
-  exit(1);
-}
-print "\nYour results have been tarred, gzipped and uuencoded. \n\n";
-print "To actually send your results at the command line please type:\n";
-if ($os_name eq linux)
-{
-  print 'mail -s "Consolidated Results for Ballista OS Robustness Test Suite" ballista@ece.cmu.edu < consolidate.tar.gz.uu'; 
-}
-else
-{
-  print 'mail ballista@ece.cmu.edu < consolidate.tar.gz.uu';
-}
-print "\n\nThank you for consolidating your results.\n";
-
-
diff --git a/testcases/ballista/ballista/create_code.pl b/testcases/ballista/ballista/create_code.pl
deleted file mode 100755
index 76c1940..0000000
--- a/testcases/ballista/ballista/create_code.pl
+++ /dev/null
@@ -1,708 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-# create_code.pl: produces C++ code that reproduces a Ballista test case - bug reports
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-######################################################################################
-#This cgi is given the function name, the paramater names, the
-#specific paramater and the number of paramaters, and will generate
-#c++ code that will reproduce the code that callGen creates. Note: If
-#it takes a long time to generate the code with this cgi, check the
-#template file for the datatype and make sure all ] are by themselves
-#and flush left. It needs to know where to get the template files
-#from.
-
-# 9/14/98 added some include files, including userIncludes.h
-#         added type cast to assignment/creation of parameters
-#               for compatability with compilers more type-sensitive
-#               than g++
-# jdevale
-
-# 5/23/99 Fixed a Major Bug:
-#
-#         The createcode stuff would not insert all the code
-#         that applied to all dial settings for example if you had:
-#
-#         access
-#         [
-#            {
-#              code block A
-#            }
-#          DIAL1
-#            {
-#              code block 1
-#            }
-#            {
-#              code block B
-#            }
-#          DIAL2
-#            {
-#              code block 2
-#            }
-#          ]
-#
-#          Then neither block A or B would be included properly.
-#
-#          The fix was to essentially rewrite the getstuph function
-# 
-#          For each block (access, commit, cleanup) it now finds
-#          the opening [, and locates and classifies code blocks
-#          as being alone (not associated with a dial, and thus
-#          applying to all dials) or being with a dial.  Blocks
-#          associated with dials are included if specified in the
-#          dial list, or skipped (eaten) if not.
-#
-#
-#          Also replaced all ne, eq type string matching with // pattern
-#          matching tests to account for whitespace.
-
-# 6/15/99 Charles Shelton
-#
-# Changed create_code.cgi to a command line script create_code.pl
-# This code generates bug reports based on one set of test case parameters
-# and outputs to the screen.
-#
-# Had to modify main because you cannot load a main() function ontp the
-# VxWorks target.  Instead, the main function is renamed [function_name]_test
-#
-# usage: create_code.pl [function_name] [failure type] [number of parameters] \
-# [parameter 1 ballista datatype] [parameter 1 test case] ...
-
-
-# 7/16/99 Charles Shelton
-#
-# Rewrote major portions of create_code.cgi.  Added comments and eliminated
-# debugging statements to make code more readable and less cluttered.
-# I redid the template file parsing for parameters to eliminate the problems
-# with reading templates that are syntacticly correct but are not formatted
-# in a specific style.  Also solves problem of mistaking brackets in an array
-# indexing (e.g. int a[6];) for the end of a section block.  Some conventions
-# must be preserved, though, such as putting the beginning and ending brackets
-# and braces on lines by themselves. 
-#
-
-#CGI code for web interface that is no longer needed
-#
-#require 'cgi-lib.pl';
-#print PrintHeader();
-#$puter=$ENV{"REMOTE_HOST"};
-#@nvpairs=split(/;/, $ENV{'HTTP_COOKIE'});
-# foreach $pair (@nvpairs) {
-#         ($name, $value) = split(/=/, $pair);
-#         $cookie{$name} = $value;
-# }
-#$user=$cookie{user};
-#&ReadParse(*input);
-
-# Function name is first argument in list
-$function = @ARGV[0];
-
-# Failure type
-$failure = @ARGV[1];
-
-#print "// $failure failure\n";
-
-#For a new datatype follow these instructions:
-#put the template file into the directory called templates
-#put what the data type maps to in the following hash table
-%datatypes=(
-	   fptest => "fptemplate.tpl",
-	    fp => "fp.tpl",
-	    bint => "bint.tpl",
-#	    bbasicfloat => "basicfloat.tpl",
-            b_ptr_buf => "b_ptr_buf.tpl",
-	    bdouble => "bdouble.tpl",
-	    bstring => "bstring.tpl",
-	    bstr => "bstr.tpl",
-	    clockid => "clockid.tpl",
- 	    fname => "fname.tpl",
-	    ptr => "ptrgentemplate.tpl",
-	    size => "size.tpl",
-	    buf => "buf.tpl",
-	    timeout => "timeout.tpl",
-	    string => "string.tpl",
-	    dir => "dir.tpl",
-	    ptrint => "ptrInt.tpl",
-            aioc => "aioc.tpl",
-	    fd => "fd.tpl",
-	    pid => "pid.tpl",
-            sem => "sem.tpl",
-	    fmode => "fmode.tpl",
-            messageq => "messageq.tpl",
-	    mqattrptr => "mqattrptr.tpl",
-	    fopenflags => "fopenflags.tpl",
-	    schedparamptr => "schedparamptr.tpl",
-	    sigset => "sigset.tpl",
-	    time_t_ptr => "time_t_ptr.tpl",
-	    tm_ptr => "tm_ptr.tpl",
-	    ptrrandomaccess => "ptrrandomaccess.tpl",
-	    POINTER_GENERIC => "ptrgentemplate.tpl"
-	   );
-
-#print "<HEAD></HEAD><BODY><pre><xmp>\n";
-#exit(0);
-
-# We need the callTable to generate the code
-if(!(-e "./callTable")){
-    die("Couldn't find: ./callTable");
-}
-
-# Run callGen to generate the code fragment for the function call
-system("./callGen $function temp/functioncall.cpp callTable > temp/funny.txt");
-
-open(INFILE2,"<temp/functioncall.cpp")||die("Couldn't open the file!!");
-open(OUTFILE, ">temp/output.temp")||die("Couldn't open the file!!");
-
-print OUTFILE "\n\n";
-print OUTFILE '/* This code will work for most operating systems using g++ ';
-print OUTFILE 'You may have to add a couple #include lines, especially if ';
-print OUTFILE 'you are testing your own function */';
-print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include <iostream>\n";
-#print OUTFILE "#include <unistd.h>\n\n\n";
-
-print OUTFILE '/* Includes from user */';
-print OUTFILE "\n";
-print OUTFILE "#include \"userIncludes.h\"\n";
-
-@includes=split(/,/,$input{includes});
-foreach $incl (@includes) {
-    print OUTFILE "#include \"$incl\"\n";
-}
-
-# Put datatype names and dial settings for each parameter in two arrays
-
-$num_of_params=@ARGV[2];
-for ($i = 0; $i < $num_of_params; $i++) {
-    @sparam[$i] = @ARGV[2*$i + 3];
-    @sparams[$i] = @ARGV[2*$i+1 + 3];
-}
-
-# For each parameter parse it's template file to read code for
-# parameter setup and tear down
-
-for ($i = 0; $i < $num_of_params; $i++) {
-    #print "template = @sparam[$i].tpl\n";
-    open(INFILE,"<templates/@sparam[$i].tpl")||die("couldn't open the file!!!@sparam[$i].tpl");
-    while ($#modes > 0){
-	pop(@mode);
-    }
-    
-    @mode = split(/lNw/, @sparams[$i]);
-    &getstuph;
-    close(INFILE);
-}
-
-print OUTFILE "\n";
-print OUTFILE '/* Includes from paramaters */';
-print OUTFILE "\n";
-
-foreach $line (@includes) {
-    unless($line !~ "\<") {
-	print OUTFILE "$line\n";
-    }
-}
-print OUTFILE "\n";
-
-
-# Includes in callInclude.cpp from callTable entry for function
-$notdone = 1;
-while ($notdone) {
-    $Line = <INFILE2>;
-    unless ($Line !~ "#include") {
-	print OUTFILE $Line;
-    } else {
-	$notdone = 0;
-    }
-}
-
-print OUTFILE "\n";
-print OUTFILE '/*Global defines from the paramaters*/';
-print OUTFILE "\n";
-foreach $line (@global_defines) {
-    print OUTFILE  "$line\n";
-}
-
-
-#create the individual functions to set up the parameters
-
-print OUTFILE "\n";
-print OUTFILE  '/* These are the functions used to set up the environment */ ';
-print OUTFILE "\n";
-
-# Generate access functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    
-    $count = $i + 1;
-    print OUTFILE  "\n$realType param$count";
-    print OUTFILE  "access()\n{\n";
-    
-    print OUTFILE  "$realType _theVariable;\n";
-    
-    while ($access[$j] ne "-+THE_END+-"){
-	print OUTFILE  "$access[$j]\n";
-	$j++;
-    }
-
-    print OUTFILE  "\treturn _theVariable;\n}\n\n";
-    $j++;
-}
-
-
-print OUTFILE "\n";
-print OUTFILE  '/* These are the functions used to commit the environment*/ ';
-print OUTFILE "\n";
-
-# Generate commit functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $count = $i + 1;
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    print OUTFILE  "\nvoid param$count";
-    print OUTFILE  "commit($realType & _theVariable){\n";
-    
-    while ($commit[$j] ne "-+THE_END+-") {
-	print OUTFILE  "$commit[$j]\n";
-	$j++;
-    }
-
-    print OUTFILE  "\n}\n\n";
-    $j++;
-}
-
-
-print OUTFILE "\n";
-print OUTFILE  '/*These are the functions used to destroy the environment */ ';
-print OUTFILE "\n";
-
-# Generate cleanup functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $count = $i + 1;
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    print OUTFILE  "\nvoid param$count";
-    print OUTFILE  "cleanup($realType & _theVariable){\n";
-    
-    while ($cleanup[$j] ne "-+THE_END+-") {
-	print OUTFILE  "$cleanup[$j]\n";
-	$j++;
-    }
-    
-    print OUTFILE  "\n}\n\n";
-    $j++;
-}
-
-
-#print OUTFILE  "int ";
-#print OUTFILE  $function;
-#print OUTFILE  "_test(){\n";
-
-print OUTFILE "int main(){\n";
-
-print OUTFILE "#include \"userSetup.cpp\"\n";
-print OUTFILE $Line;
-
-#access phase
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while ($notdone) {
-	$Line = <INFILE2>;
-
-	if ($Line =~ "temp") {
-	    $Line =~ /=/;
-	    $begin = $`;
-
-	    # create casting code
-
-	    @ary = split(' ', $begin);
-
-	    $end = "= (@ary[0])param$j";
-	    $endend = "access();\n";
-
-	    print OUTFILE  "$begin$end$endend";
-	    $notdone = 0;
-	    $j++;
-	} 
-    }
-}
-
-#commit phase
-#print "Commit\n";
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while ($notdone) {
-	$Line = <INFILE2>;
-
-	if ($Line = ~'commit') {
-            # typecast parameter to avoid compiler errors
-
-            $k = $j - 1;
-            #$parma = "sparam$k";
-            $type = `grep @sparam[$k] dataTypes`;
-            ($fred, $realType) = split(/\s+/, $type);
-            chomp($realType);
-
-            print OUTFILE  "param$j";
-            print OUTFILE  "commit(($realType &) temp$j);\n";
-            $notdone = 0;
-            $j++;
-	} else {
-	    print OUTFILE  "$Line";
-	}
-    }
-}
-
-$notdone = 1;
-while ($notdone) {
-    $Line = <INFILE2>;
-    unless ($Line =~ '#include') {
-	print OUTFILE  $Line;
-    } else {
-	$notdone = 0;
-    }
-}
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while($notdone){
-	$Line = <INFILE2>;
-
-	if ($Line = ~'cleanup') {
-            # typecast parameter to avoid compiler errors
-
-            $k = $j - 1;
-            $parma = "sparam$k";
-            $type = `grep @sparam[$k] dataTypes`;
-            ($fred, $realType) = split(/\s+/, $type);
-            chomp($realType);
-
-            print OUTFILE  "param$j";
-            print OUTFILE  "cleanup(($realType &) temp$j);\n";
-            $notdone = 0;
-            $j++;
-	} else {
-	    print OUTFILE  "$Line";
-	}
-    }
-}
-
-print OUTFILE "#include \"userShutdown.cpp\"\n";
-
-close(INFILE2);
-close(INFILE);
-
-#print "$path2$puter";
-#system("rm -f $path2$puter");	
-
-print OUTFILE  "\nreturn 0;\n";
-print OUTFILE  "}\n";
-close OUTFILE;
-
-# Indent code so it looks readable and nice
-system("indent -l65 -fca -c25 -nbc -br -bad -bap -sob -fc1 -sc -ce -lp temp/output.temp -o temp/output.temp2");
-
-open(BLAH,"<temp/output.temp2");
-while(<BLAH>){
-    print $_;
-}
-
-# Clean up extra files
-#system("rm -f temp/output.temp");
-#system("rm -f temp/output.temp2");
-#system("rm -f temp/functioncall.cpp");
-#system("rm -f temp/funny.txt");
-#close CB;
-
-#print "\n</xmp></pre></BODY></HTML>\n";
-		       
-exit(0);
-
-
-# Subroutine getstuph reads the template file to get the appropriate setup
-# and teardown code for the particular function parameters
-
-sub getstuph {
-  @includes;
-  @global_defines;
-  @access;
-  @commit;
-  @cleanup;
-
-  # Get the includes;
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*includes.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  while ($Line !~ /.*\[.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_block = &get_block;
-
-  foreach $block_line (@temp_block) {
-      $add = 1;
-      foreach $tempLine (@includes) {
-	  if ($tempLine eq $block_line) {
-	      $add = 0;
-	  }
-      }
-      if ($add) {
-	  push(@includes, $block_line);
-      }
-  }
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*\].*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-
-  # Get the global_defines
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*global_defines.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  while ($Line !~ /.*\[.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_block = &get_block;
-
-  foreach $block_line (@temp_block) {
-      $add = 1;
-      foreach $tempLine (@global_defines) {
-	  if ($tempLine eq $block_line) {
-	      $add = 0;
-	  }
-      }
-      if ($add) {
-	  push(@global_defines, $block_line);
-      }
-  }
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*\].*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-
-  # Get the access
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*access.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_access = &get_section;
-  foreach $temp_line (@temp_access) {
-      push(@access, $temp_line);
-  }
-
-
-  # Get the commit
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*commit.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_commit = &get_section;
-  foreach $temp_line (@temp_commit) {
-      push(@commit, $temp_line);
-  }
-
-
-  # Get the cleanup
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*cleanup.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_cleanup = &get_section;
-  foreach $temp_line (@temp_cleanup) {
-      push(@cleanup, $temp_line);
-  }
-
-}
-
-
-# subroutine get_block will read one block of code between braces,
-# accounting for all inner blocks
-
-sub get_block {
-    my @block_array;
-    my $brace_count = 0;
-
-    # search for line with first open brace
-
-    while ($Line !~ /.*\{.*/) {
-     	$Line = <INFILE>;
-	chomp($Line);
-    }
-
-    # if there is code on the line after the brace, save it
-    # and push it onto the array
-
-    if ($Line =~ /\.*\{\s*\S+/) {
-	@temp_array = split '{', $Line;
-	shift @temp_array;
-	$Line = join '{', @temp_array;
-
-	# if there are other opening braces on the first line after
-	# the first one, count them too
-
-	$brace_count += @temp_array - 1;
-	push (@block_array, $Line);
-    }
-
-    $brace_count++;
-
-    # loop and read all input lines from input file until final
-    # ending brace is found for this block
-
-    while ($brace_count > 0) {
-	$Line = <INFILE>;
-	chomp($Line);
-
-	if ($Line =~ /.*\{.*/) {
-	    $brace_count++;
-	}
-
-	if ($Line =~ /.*\}.*/) {
-	    $brace_count--;
-	}
-
-	# NOTE: The final ending brace must be on a line by itself
-	# since it won't be put in the block_array
-
-	if ($brace_count > 0) {
-	    push (@block_array, $Line);
-	}
-    }
-
-    return @block_array;
-}
-
-
-# Subroutine get_section will read one section from the template file,
-# either the access, commit, or cleanup format.
-
-sub get_section {
-    my @section_array;
-    my @temp_block;
-
-    # Keep reading until the first open bracket is found, signaling the
-    # beginning of the block
-    # NOTE: the first open bracket must be on a line by itself and will not
-    # be put into the output array
-
-    while ($Line !~ /.*\[.*/) {
-	$Line = <INFILE>;
-	chomp($Line);
-    }
-
-    $notdone=1;
-
-    while ($notdone) {
-	$Line = <INFILE>;
-	chomp($Line);
-
-	if ($Line =~ /\s*\S+/) {
-
-	    if ($Line =~ /\s*\{\s*/) {
-		
-		# Get any code blocks not associated with a dial
-		
-		@temp_block = &get_block;
-		foreach $temp_line (@temp_block) {
-		    push(@section_array, $temp_line);
-		}
-	    } elsif ($Line =~ /\s*\]\s*/) {
-
-		# If closing bracket is found on a line by itself,
-		# that signals the end of the section
-		
-		$notdone = 0;
-	    } else {
-		
-		# If the line matches a dial setting we're looking for,
-		# get the code block associated with it
-		
-		$mode_match = 0;
-		foreach $Mode (@mode) {
-		    if ($Line =~ /\b$Mode\b/) {
-			$mode_match = 1;
-			@temp_block = &get_block;
-
-			foreach $temp_line (@temp_block) {
-			    push(@section_array, $temp_line);
-			}
-		    }
-		}
-
-		# read and throw away code for unwanted dial settings
-
-		if (!$mode_match) {
-		    &get_block;
-		}
-	    }
-	}
-    }
-
-    push(@section_array, "-+THE_END+-");
-    return @section_array;
-}
diff --git a/testcases/ballista/ballista/create_code_standAlone.pl b/testcases/ballista/ballista/create_code_standAlone.pl
deleted file mode 100755
index c6d7edb..0000000
--- a/testcases/ballista/ballista/create_code_standAlone.pl
+++ /dev/null
@@ -1,756 +0,0 @@
-#!/usr/bin/perl5
-# create_code_standAlone.pl: produces C++ code that reproduces a Ballista test case - bug reports - no server
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-######################################################################################
-
-#Created by David Guttendorf 07/98
-#This cgi is given the function name, the parameter names, the
-#specific parameter and the number of parameters, and will generate
-#c++ code that will reproduce the code that callGen creates. Note: If
-#it takes a long time to generate the code with this cgi, check the
-#template file for the datatype and make sure all ] are by themselves
-#and flush left. It needs to know where to get the template files
-#from.
-
-# 9/14/98 added some include files, including userIncludes.h
-#         added type cast to assignment/creation of parameters
-#               for compatability with compilers more type-sensitive
-#               than g++
-# jdevale
-
-# 5/23/99 Fixed a Major Bug:
-#
-#         The createcode stuff would not insert all the code
-#         that applied to all dial settings for example if you had:
-#
-#         access
-#         [
-#            {
-#              code block A
-#            }
-#          DIAL1
-#            {
-#              code block 1
-#            }
-#            {
-#              code block B
-#            }
-#          DIAL2
-#            {
-#              code block 2
-#            }
-#          ]
-#
-#          Then neither block A or B would be included properly.
-#
-#          The fix was to essentially rewrite the getstuph function
-# 
-#          For each block (access, commit, cleanup) it now finds
-#          the opening [, and locates and classifies code blocks
-#          as being alone (not associated with a dial, and thus
-#          applying to all dials) or being with a dial.  Blocks
-#          associated with dials are included if specified in the
-#          dial list, or skipped (eaten) if not.
-#
-#
-#          Also replaced all ne, eq type string matching with // pattern
-#          matching tests to account for whitespace.
-
-# 6/15/99 Charles Shelton
-#
-# Changed create_code.cgi to a command line script create_code.pl
-# This code generates bug reports based on one set of test case parameters
-# and outputs to the screen.
-#
-# Had to modify main because you cannot load a main() function ontp the
-# VxWorks target.  Instead, the main function is renamed [function_name]_test
-#
-# usage: create_code.pl [function_name] [failure type] [number of parameters] \
-# [parameter 1 ballista datatype] [parameter 1 test case] ...
-
-
-# 7/16/99 Charles Shelton
-#
-# Rewrote major portions of create_code.cgi.  Added comments and eliminated
-# debugging statements to make code more readable and less cluttered.
-# I redid the template file parsing for parameters to eliminate the problems
-# with reading templates that are syntacticly correct but are not formatted
-# in a specific style.  Also solves problem of mistaking brackets in an array
-# indexing (e.g. int a[6];) for the end of a section block.  Some conventions
-# must be preserved, though, such as putting the beginning and ending brackets
-# and braces on lines by themselves. 
-#
-
-#CGI code for web interface that is no longer needed
-#
-#require 'cgi-lib.pl';
-#print PrintHeader();
-#$puter=$ENV{"REMOTE_HOST"};
-#@nvpairs=split(/;/, $ENV{'HTTP_COOKIE'});
-# foreach $pair (@nvpairs) {
-#         ($name, $value) = split(/=/, $pair);
-#         $cookie{$name} = $value;
-# }
-#$user=$cookie{user};
-#&ReadParse(*input);
-
-# Function name is first argument in list
-$function = @ARGV[0];
-
-# Failure type
-$failure = @ARGV[1];
-
-#print "// $failure failure\n";
-
-#Create dataTypes file 
-open(DATATEMP, ">dataTypes");
-close(DATATEMP);
-if (system("./dataClimber -o dataTypes -i callTable.all $function") == 1)
-#if (system("cd ..; ./dataClimber -o outfiles/dataTypes -i callTable.all $function") == 1)
-{
-   print "ERROR creating dataTypes file!\n";
-} 
-
-#For a new datatype follow these instructions:
-#put the template file into the directory called templates
-#put what the data type maps to in the following hash table
-%datatypes=(
-	   fptest => "fptemplate.tpl",
-	    fp => "fp.tpl",
-	    bint => "bint.tpl",
-            b_short_int_common => "b_short_int_common.tpl",
-            b_ptr_buf => "b_ptr_buf.tpl",
-#	    bbasicfloat => "basicfloat.tpl",
-	    bdouble => "bdouble.tpl",
-	    bstring => "bstring.tpl",
-	    bstr => "bstr.tpl",
-	    clockid => "clockid.tpl",
- 	    fname => "fname.tpl",
-	    ptr => "ptrgentemplate.tpl",
-	    size => "size.tpl",
-	    buf => "buf.tpl",
-	    timeout => "timeout.tpl",
-	    string => "string.tpl",
-	    dir => "dir.tpl",
-	    ptrint => "ptrInt.tpl",
-            aioc => "aioc.tpl",
-	    fd => "fd.tpl",
-	    pid => "pid.tpl",
-            sem => "sem.tpl",
-	    fmode => "fmode.tpl",
-            messageq => "messageq.tpl",
-	    mqattrptr => "mqattrptr.tpl",
-	    fopenflags => "fopenflags.tpl",
-	    schedparamptr => "schedparamptr.tpl",
-	    sigset => "sigset.tpl",
-	    time_t_ptr => "time_t_ptr.tpl",
-	    tm_ptr => "tm_ptr.tpl",
-	    ptrrandomaccess => "ptrrandomaccess.tpl",
-	    POINTER_GENERIC => "ptrgentemplate.tpl"
-	   );
-
-#print "<HEAD></HEAD><BODY><pre><xmp>\n";
-#exit(0);
-
-# We need the callTable to generate the code
-if(!(-e "./callTable")){
-    die("Couldn't find: ./callTable");
-}
-
-# Run callGen to generate the code fragment for the function call
-system("./callGen_standAlone $function > temp/funny.txt");
-system("mv callInclude.cpp temp/functioncall.cpp");
-
-open(INFILE2,"<temp/functioncall.cpp")||die("Couldn't open the file temp/functioncall.cpp!!");
-open(OUTFILE, ">temp/output.temp")||die("Couldn't open the file!!");
-
-print OUTFILE "\n\n";
-print OUTFILE '/* This code will work for most operating systems using g++ ';
-print OUTFILE 'You may have to add a couple #include lines, especially if ';
-print OUTFILE 'you are testing your own function */';
-print OUTFILE "#include <stdio.h>\n#include <stdlib.h>\n#include <iostream>\n";
-#print OUTFILE "#include <unistd.h>\n\n\n";
-
-print OUTFILE '/* Includes from user */';
-print OUTFILE "\n";
-print OUTFILE "/* #include \"userIncludes.h\"\n */";
-
-@includes=split(/,/,$input{includes});
-foreach $incl (@includes) {
-    print OUTFILE "#include \"$incl\"\n";
-}
-
-# Put datatype names and dial settings for each parameter in two arrays
-
-$num_of_params=@ARGV[2];
-for ($i = 0; $i < $num_of_params; $i++) 
-{
-    @sparam[$i] = @ARGV[2*$i + 3];
-    @sparams[$i] = @ARGV[2*$i+1 + 3];
-}
-
-# For each parameter parse it's template file to read code for
-# parameter setup and tear down
-
-for ($i = 0; $i < $num_of_params; $i++) {
-    #print "template = @sparam[$i].tpl\n";
-    open(INFILE,"<../templates/@sparam[$i].tpl")||die("couldn't open the file!!!@sparam[$i].tpl");
-    while ($#modes > 0)
-    {
-	pop(@mode);
-    }
-    
-    @mode = split(/lNw/, @sparams[$i]);
-    &getstuph;
-    close(INFILE);
-}
-
-print OUTFILE "\n";
-print OUTFILE '/* Includes from parameters */';
-print OUTFILE "\n";
-
-foreach $line (@includes) 
-{
-    unless($line !~ "\<") 
-    {
-	print OUTFILE "$line\n";
-    }
-    else
-    {
-       #hack for Pan's templates
-       if ($line =~ "#define")   
-       {
-          print OUTFILE "$line\n";
-       }
-    }
-}
-print OUTFILE "\n";
-
-
-# Includes in callInclude.cpp from callTable entry for function
-$notdone = 1;
-while ($notdone) {
-    $Line = <INFILE2>;
-    unless ($Line !~ "#include") 
-    {
-	print OUTFILE $Line;
-    } 
-    else 
-    {
-	$notdone = 0;
-    }
-}
-
-print OUTFILE "\n";
-print OUTFILE '/*Global defines from the parameters*/';
-print OUTFILE "\n";
-foreach $line (@global_defines) 
-{
-    print OUTFILE  "$line\n";
-}
-
-
-#create the individual functions to set up the parameters
-
-print OUTFILE "\n";
-print OUTFILE  '/* These are the functions used to set up the environment */ ';
-print OUTFILE "\n";
-
-# Generate access functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    
-    $count = $i + 1;
-    print OUTFILE  "\n$realType param$count";
-    print OUTFILE  "access()\n{\n";
-    
-    print OUTFILE  "$realType _theVariable;\n";
-    
-    while ($access[$j] ne "-+THE_END+-"){
-	print OUTFILE  "$access[$j]\n";
-	$j++;
-    }
-
-    print OUTFILE  "\treturn _theVariable;\n}\n\n";
-    $j++;
-}
-
-
-print OUTFILE "\n";
-print OUTFILE  '/* These are the functions used to commit the environment*/ ';
-print OUTFILE "\n";
-
-# Generate commit functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $count = $i + 1;
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    print OUTFILE  "\nvoid param$count";
-    print OUTFILE  "commit($realType & _theVariable){\n";
-    
-    while ($commit[$j] ne "-+THE_END+-") {
-	print OUTFILE  "$commit[$j]\n";
-	$j++;
-    }
-
-    print OUTFILE  "\n}\n\n";
-    $j++;
-}
-
-
-print OUTFILE "\n";
-print OUTFILE  '/*These are the functions used to destroy the environment */ ';
-print OUTFILE "\n";
-
-# Generate cleanup functions
-$j = 0;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $count = $i + 1;
-
-    $type = `grep @sparam[$i] dataTypes`;
-    ($fred, $realType) = split(/\s+/, $type);
-    chomp($realType);
-    print OUTFILE  "\nvoid param$count";
-    print OUTFILE  "cleanup($realType & _theVariable){\n";
-    
-    while ($cleanup[$j] ne "-+THE_END+-") {
-	print OUTFILE  "$cleanup[$j]\n";
-	$j++;
-    }
-    
-    print OUTFILE  "\n}\n\n";
-    $j++;
-}
-
-
-#print OUTFILE  "int ";
-#print OUTFILE  $function;
-#print OUTFILE  "_test(){\n";
-
-print OUTFILE "int main(){\n";
-
-print OUTFILE "/* #include \"userSetup.cpp\" */\n";
-print OUTFILE $Line;
-
-#access phase
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while ($notdone) {
-	$Line = <INFILE2>;
-
-	if ($Line =~ "temp") {
-	    $Line =~ /=/;
-	    $begin = $`;
-
-	    # create casting code
-
-	    @ary = split(' ', $begin);
-
-	    $end = "= (@ary[0])param$j";
-	    $endend = "access();\n";
-
-	    print OUTFILE  "$begin$end$endend";
-	    $notdone = 0;
-	    $j++;
-	} 
-    }
-}
-
-#commit phase
-#print "Commit\n";
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while ($notdone) {
-	$Line = <INFILE2>;
-
-	if ($Line = ~'commit') {
-            # typecast parameter to avoid compiler errors
-
-            $k = $j - 1;
-            #$parma = "sparam$k";
-            $type = `grep @sparam[$k] dataTypes`;
-            ($fred, $realType) = split(/\s+/, $type);
-            chomp($realType);
-
-            print OUTFILE  "param$j";
-            print OUTFILE  "commit(($realType &) temp$j);\n";
-            $notdone = 0;
-            $j++;
-	} else {
-	    print OUTFILE  "$Line";
-	}
-    }
-}
-
-$notdone = 1;
-while ($notdone) {
-    $Line = <INFILE2>;
-    unless ($Line =~ 'cleanup') 
-    {
-	print OUTFILE  $Line;
-    } 
-    else 
-    {
-	$notdone = 0;
-    }
-}
-
-
-
-$j = 1;
-for ($i = 0; $i < $num_of_params; $i++) {
-    $notdone = 1;
-    while($notdone){
-	$Line = <INFILE2>;
-
-	if ($Line = ~'cleanup') {
-            # typecast parameter to avoid compiler errors
-
-            $k = $j - 1;
-            $parma = "sparam$k";
-            $type = `grep @sparam[$k] dataTypes`;
-            ($fred, $realType) = split(/\s+/, $type);
-            chomp($realType);
-
-            print OUTFILE  "param$j";
-            print OUTFILE  "cleanup(($realType &) temp$j);\n";
-            $notdone = 0;
-            $j++;
-	} else {
-	    print OUTFILE  "$Line";
-	}
-    }
-}
-
-print OUTFILE "/* #include \"userShutdown.cpp\"\n */";
-
-close(INFILE2);
-close(INFILE);
-
-#print "$path2$puter";
-#system("rm -f $path2$puter");	
-
-print OUTFILE  "\nreturn 0;\n";
-print OUTFILE  "}\n";
-close OUTFILE;
-
-# Indent code so it looks readable and nice
-system("indent -l65 -fca -c25 -nbc -br -bad -bap -sob -fc1 -sc -ce -lp temp/output.temp -o temp/output.temp2");
-
-open(BLAH,"<temp/output.temp2");
-while(<BLAH>){
-    print $_;
-}
-
-# Clean up extra files
-#system("rm -f temp/output.temp");
-#system("rm -f temp/output.temp2");
-#system("rm -f temp/functioncall.cpp");
-#system("rm -f temp/funny.txt");
-#close CB;
-
-#print "\n</xmp></pre></BODY></HTML>\n";
-		       
-exit(0);
-
-
-# Subroutine getstuph reads the template file to get the appropriate setup
-# and teardown code for the particular function parameters
-
-sub getstuph {
-  @includes;
-  @global_defines;
-  @access;
-  @commit;
-  @cleanup;
-
-  # Get the includes;
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*includes.*/) 
-  {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  while ($Line !~ /.*\[.*/) 
-  {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_block = &get_block;
-
-  foreach $block_line (@temp_block) {
-      $add = 1;
-      foreach $tempLine (@includes) 
-      {
-	  if ($tempLine eq $block_line) 
-          {
-	      $add = 0;
-	  }
-      }
-      if ($add) 
-      {
-	  push(@includes, $block_line);
-      }
-  }
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*\].*/) 
-  {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-
-  # Get the global_defines
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*global_defines.*/) 
-  {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  while ($Line !~ /.*\[.*/) 
-  {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_block = &get_block;
-
-  foreach $block_line (@temp_block) 
-  {
-      $add = 1;
-      foreach $tempLine (@global_defines) 
-      {
-	  if (($tempLine eq $block_line) and
-              ($tempLine !~ "{") and
-              ($tempLine !~ "}"))
-          {
-	      $add = 0;
-	  }
-      }
-      if ($add) 
-      {
-	  push(@global_defines, $block_line);
-      }
-  }
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*\].*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-
-  # Get the access
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*access.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_access = &get_section;
-  foreach $temp_line (@temp_access) {
-      push(@access, $temp_line);
-  }
-
-
-  # Get the commit
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*commit.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_commit = &get_section;
-  foreach $temp_line (@temp_commit) {
-      push(@commit, $temp_line);
-  }
-
-
-  # Get the cleanup
-
-  $Line = <INFILE>;
-  chomp($Line);
-  while ($Line !~ /.*cleanup.*/) {
-      $Line = <INFILE>;
-      chomp($Line);
-  }
-
-  @temp_cleanup = &get_section;
-  foreach $temp_line (@temp_cleanup) {
-      push(@cleanup, $temp_line);
-  }
-
-}
-
-
-# subroutine get_block will read one block of code between braces,
-# accounting for all inner blocks
-
-sub get_block {
-    my @block_array;
-    my $brace_count = 0;
-
-    # search for line with first open brace
-
-    while ($Line !~ /.*\{.*/) {
-     	$Line = <INFILE>;
-	chomp($Line);
-    }
-
-    # if there is code on the line after the brace, save it
-    # and push it onto the array
-
-    if ($Line =~ /\.*\{\s*\S+/) 
-    {
-	@temp_array = split '{', $Line;
-	shift @temp_array;
-	$Line = join '{', @temp_array;
-
-	# if there are other opening braces on the first line after
-	# the first one, count them too
-
-	$brace_count += @temp_array - 1;
-	push (@block_array, $Line);
-    }
-
-    $brace_count++;
-
-    # loop and read all input lines from input file until final
-    # ending brace is found for this block
-
-    while ($brace_count > 0) 
-    {
-	$Line = <INFILE>;
-	chomp($Line);
-
-	if ($Line =~ /.*\{.*/) 
-        {
-	    $brace_count++;
-	}
-
-	if ($Line =~ /.*\}.*/) 
-        {
-	    $brace_count--;
-	}
-        
-
-	# NOTE: The final ending brace must be on a line by itself
-	# since it won't be put in the block_array
-
-	if ($brace_count > 0) 
-        {
-	    push (@block_array, $Line);
-	}
-    }
-
-    return @block_array;
-}
-
-
-# Subroutine get_section will read one section from the template file,
-# either the access, commit, or cleanup format.
-
-sub get_section {
-    my @section_array;
-    my @temp_block;
-
-    # Keep reading until the first open bracket is found, signaling the
-    # beginning of the block
-    # NOTE: the first open bracket must be on a line by itself and will not
-    # be put into the output array
-
-    while ($Line !~ /.*\[.*/) {
-	$Line = <INFILE>;
-	chomp($Line);
-    }
-
-    $notdone=1;
-
-    while ($notdone) {
-	$Line = <INFILE>;
-	chomp($Line);
-
-	if ($Line =~ /\s*\S+/) {
-
-	    if ($Line =~ /\s*\{\s*/) {
-		
-		# Get any code blocks not associated with a dial
-		
-		@temp_block = &get_block;
-		foreach $temp_line (@temp_block) {
-		    push(@section_array, $temp_line);
-		}
-	    } elsif ($Line =~ /\s*\]\s*/) {
-
-		# If closing bracket is found on a line by itself,
-		# that signals the end of the section
-		
-		$notdone = 0;
-	    } else {
-		
-		# If the line matches a dial setting we're looking for,
-		# get the code block associated with it
-		
-		$mode_match = 0;
-		foreach $Mode (@mode) {
-		    if ($Line =~ /\b$Mode\b/) {
-			$mode_match = 1;
-			@temp_block = &get_block;
-
-			foreach $temp_line (@temp_block) {
-			    push(@section_array, $temp_line);
-			}
-		    }
-		}
-
-		# read and throw away code for unwanted dial settings
-
-		if (!$mode_match) {
-		    &get_block;
-		}
-	    }
-	}
-    }
-
-    push(@section_array, "-+THE_END+-");
-    return @section_array;
-}
diff --git a/testcases/ballista/ballista/dataClimber b/testcases/ballista/ballista/dataClimber
deleted file mode 100755
index 951ad84..0000000
--- a/testcases/ballista/ballista/dataClimber
+++ /dev/null
@@ -1,188 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-# dataClimber: extract the dataTypes required to Ballista test a function
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-########################
-#
-# File:		dataClimber
-#
-# Usage:        dataClimber [-d <directory> ] [-i <input_file>] 
-#                           [-o <output_file>] <mut>
-#
-#
-# Description:  Extract the list of dataType required from the function prototype 
-#               a given Mut
-#
-# Author:       Mark Hsu
-#
-#
-########################
-#
-# Entry Conditions:
-#              
-########################
-
-use strict;
-use Getopt::Std;
-use vars qw($opt_d $opt_i $opt_o);
-
-#determine the name by which we were invoked
-my $ARGV0 = $0;
-$ARGV0 =~ s/.*\///;
-
-# check usage
-# NOTE - getops will set $opt_d.
-#      - allows only for one arguments
-unless  (getopts('d:i:o:') &&  @ARGV == 1)   {
-	die "usage:  $ARGV0 [-d <directory> ] [-i <input_file>] [-o <output_file>] <mut>\n";
-}
-
-#if directory is not specified, assume templates is the base
-my $DIRECTORY = $opt_d || 'templates';
-my $IN_FILE = $opt_i || 'callTable';
-my $OUT_FILE = $opt_o || 'dataTypes';
-
-#set mut that we are working with
-my $MUT = $ARGV[0];
-
-##################################
-# Grab the MuT declaration from callTable and extract 
-# the dataType info.
-#################################
-my @dataType;	#array of dataTypes for the targetted MuT
-
-# grab declaration from callTable file
-open (CALLTABLE,"<$IN_FILE") || die "Can't open the file $IN_FILE: $!\n";
-my @list  =  grep /$MUT/o, <CALLTABLE>;
-close CALLTABLE;
-
-#make sure it was in the callTable file
-if (@list == 0) {
-  die "Error:  MuT declaration not found in '$IN_FILE'\n";
-}
-
-#make sure there was only one instance found
-my @declaration = grep /\b$MUT\b/, @list;
-my $count = @declaration;
-if ($count != 1) { 
-    die "Error: Found $count MuT declaration(s).\n";
-  }
-
-#pull datatypes off the declaration line and put in dataType array
-@dataType = ($declaration[0] =~ /$MUT\s+(.*)/);
-@dataType = split /\s+/, $dataType[0]; #split them apart by whitespace
-@dataType = grep {$_ !~ /\+/} @dataType; #remove + associated with phantom params
-
-##################################
-# Get data hierarchy for each dataType
-##################################
-my @dataHierAll; #array of all datatype's hierarchy and ctypes
-my %cTypes;      #hash of ballista types to c types
-my $top_parent = "paramAccess"; #top level datatype to not go beyond while searching
-
-foreach my $child (@dataType) {
-  my $parent;     #parent for the child dataType
-  my $cTypeChild; #c datatype for child
-  my %cycTest;    #hash used to determine cyclic relatonships
-
-  #look at the hierarchy of current child and put parent and c datatype in hash
-  while ($parent ne $top_parent) {
-    my $file = "$DIRECTORY/$child.tpl";
-    open (TPL, "<$file") || 
-	die "Cannot open the required template file: $file\n $!\n";
-
-    #reset these to undef for this round of searching
-    $parent = undef;
-    $cTypeChild = undef;
-    while (<TPL>){
-	#find child's c datatype
-	if(/^\s*name\s+(\S+)\s+$child\s*;/){
-	    $cTypeChild = $1;
-	}
-        #find child's parent
-	if(/^\s*parent\s+(\w+)\s*;/){
-	    $parent = $1;
-	}
-	#exit if we have both
-	if ($parent && $cTypeChild){
-	    last;
-	}
-    } #end while
-    close TPL;
-
-    #do some error checking
-    unless ($parent){
-        $! = 1; #set output to one
-	die "Error: Can't find a parent in $child.tpl.\n";
-    }
-    unless ($cTypeChild){
-        $! = 1;
-	die "Error: Can't find c datatype in $child.tpl.\n";
-    }    
-    if ($cycTest{$parent}) {
-	$! = 1;
-	die "Error: Cyclic relationship in hierarchy for $child";
-    }
-
-    $cTypes{$child} = $cTypeChild; #add datatype to hash
-    unshift @dataHierAll, $child;  #add child to list of completed types
-    $cycTest{$child} = 1;          #add child to cyc hash test
-    $child = $parent;              #move up one level
-  } #end while ($parent ne $top_parent)
-} #end foreach my $child (@dataType)
-
-######################################
-# Reduce the array of templates into minimal set
-#  and print the final result to standard i/o.
-######################################
-my $typeBuff;   #string buffer to hold types to put in file
-my %preventDup; #hash to prevent duplication of datatypes
-my $tmpfile = "${OUT_FILE}aa"; # temporary file to hold output
-
-foreach my $type (@dataHierAll) {
-  if (!$preventDup{$type}) {
-      $preventDup{$type} = 1;
-      $typeBuff .= "$type $cTypes{$type}\n";
-  }
-}
-
-while (-e $tmpfile) {
-    $tmpfile++;
-}
-
-open(FH,">$tmpfile") || die "Can't open the file $OUT_FILE: $!\n";
-print FH "#################################################\n";
-print FH "# The datatype hierachy is generated for the MuT \n";
-print FH "#   '$MUT' using the script '$ARGV0'.        \n";
-print FH "#################################################\n";
-print FH $typeBuff;
-close FH;
-
-# if the dataTypes file would not acutally change, we do not want to
-#  modify it, so that dependancies in the Makefiles will work correctly
-if (system("diff $OUT_FILE $tmpfile > /dev/null")) {
-    rename $tmpfile, $OUT_FILE;
-} else {
-    unlink $tmpfile;
-}
-
-exit(0);
diff --git a/testcases/ballista/ballista/dataTypes b/testcases/ballista/ballista/dataTypes
deleted file mode 100644
index b42dd10..0000000
--- a/testcases/ballista/ballista/dataTypes
+++ /dev/null
@@ -1,11 +0,0 @@
-#################################################
-# The datatype hierachy is generated for the MuT 
-#   'sigtimedwait' using the script 'dataClimber'.        
-#################################################
-b_ptr_void void*
-b_ptr_buf void*
-b_ptr_timespec structtimespecptr
-b_ptr_siginfo_t siginfo_t*
-b_ptr_int int*
-b_ptr_long long*
-b_ptr_sigset_t sigset_t*
diff --git a/testcases/ballista/ballista/do_parse b/testcases/ballista/ballista/do_parse
deleted file mode 100644
index bdc30cc..0000000
--- a/testcases/ballista/ballista/do_parse
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/csh
-# do_parse: Ballista script that manages parsing the template files - Compiler
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-# OFFICIAL LOCATION .../ballista/compile.  Changes to other locations may be
-# overwritten.
-
-if ($#argv == 0) then
-    echo ""
-    echo usage: do_parse filename
-    echo ""
-    echo Where filename is the name of the template file to parse
-    echo ""
-    exit 1
-endif
-
-../compile/blexer <$1 | ../compile/bparser
-
-
diff --git a/testcases/ballista/ballista/executeTestCase.cpp b/testcases/ballista/ballista/executeTestCase.cpp
deleted file mode 100644
index 2c975b9..0000000
--- a/testcases/ballista/ballista/executeTestCase.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// executeTestCase.cpp: executes the Ballista test case  
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "executeTestCase.h"
-#include <stdio.h>
-#include <iostream>
-#include <signal.h>
-#include "unmarshal.h"
-
-/* This prevents mangling of execute_test_case for dynamic loading */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void setup_catch_signal (int signal_number)
-{
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/kobeyTest.txt","a+")) == NULL)
-   {
-     cout << "CAUGHT SETUP SIGNAL" << endl;
-   }
-   fprintf(logFile, "caught setup HANDLE signal\n");
-   fclose(logFile);
-
-   //sleep(60);   
-   exit(99);
-}
-
-int execute_test_case (char *marshaled_parameters)
-{
-  char *se;
-  int ie;
-  errno=0;
-  void **ref[MAXP];      //dereferenced pointer for return
-  int unmarshal_return;  // return value of unmarshal()
-  struct sigaction setup_action;
-
-  MARSHAL_DATA_TYPE params; //dial parameter setting array
-  
-  unmarshal_return = unmarshal(params , marshaled_parameters);
-
-  if (unmarshal_return != 0) {
-    return unmarshal_return;
-  }
-
-//inlining variable instantiations
-int	rval;
-b_ptr_sigset_t param1;
-b_ptr_siginfo_t param2;
-b_ptr_timespec param3;
-b_ptr_timespec param4;
-
-  
-#ifdef     B_HANDLE_EXCEPTIONS
-  try{
-#endif //  B_HANDLE_EXCEPTIONS
-
-
-  //sigaction added to differentiate between setup robustness failures and 
-  //robustness failures related to the mut
-  sigemptyset(&setup_action.sa_mask);
-  setup_action.sa_handler = setup_catch_signal;  //setup_catch_signal is the signal handler
-  (void) sigaction (SIGINT, &setup_action, NULL);
-  (void) sigaction (SIGQUIT, &setup_action, NULL);
-  (void) sigaction (SIGTERM, &setup_action, NULL);
-  (void) sigaction (SIGABRT, &setup_action, NULL);
-  (void) sigaction (SIGBUS, &setup_action, NULL);
-  (void) sigaction (SIGSEGV, &setup_action, NULL);
-
-//inlining userSetup, callInclude, and userShutdown
-
-#ifdef     B_HANDLE_EXCEPTIONS
-  }
-  catch (char *se)
-    {
-      cerr<<"Exception String: "<<se<<endl;
-    }
-  catch (int ie)
-    {
-      cerr<<"Exception Integer: "<<ie<<endl;
-    }      
-  catch (...)
-    {
-      cerr<<"Caught unknown exception at lowest level.\n";
-    }
-#endif //  B_HANDLE_EXCEPTIONS
-
-  return (errno);
-
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/testcases/ballista/ballista/executeTestCase.fresh b/testcases/ballista/ballista/executeTestCase.fresh
deleted file mode 100644
index 7625c7e..0000000
--- a/testcases/ballista/ballista/executeTestCase.fresh
+++ /dev/null
@@ -1,108 +0,0 @@
-// executeTestCase.cpp: executes the Ballista test case  
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "executeTestCase.h"
-#include <stdio.h>
-#include <iostream>
-#include <signal.h>
-#include "unmarshal.h"
-
-/* This prevents mangling of execute_test_case for dynamic loading */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void setup_catch_signal (int signal_number)
-{
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/kobeyTest.txt","a+")) == NULL)
-   {
-     cout << "CAUGHT SETUP SIGNAL" << endl;
-   }
-   fprintf(logFile, "caught setup HANDLE signal\n");
-   fclose(logFile);
-
-   //sleep(60);   
-   exit(99);
-}
-
-int execute_test_case (char *marshaled_parameters)
-{
-  char *se;
-  int ie;
-  errno=0;
-  void **ref[MAXP];      //dereferenced pointer for return
-  int unmarshal_return;  // return value of unmarshal()
-  struct sigaction setup_action;
-
-  MARSHAL_DATA_TYPE params; //dial parameter setting array
-  
-  unmarshal_return = unmarshal(params , marshaled_parameters);
-
-  if (unmarshal_return != 0) {
-    return unmarshal_return;
-  }
-
-//placeVariables
-#include "vardefs.cpp"
-  
-#ifdef     B_HANDLE_EXCEPTIONS
-  try{
-#endif //  B_HANDLE_EXCEPTIONS
-
-
-  //sigaction added to differentiate between setup robustness failures and 
-  //robustness failures related to the mut
-  sigemptyset(&setup_action.sa_mask);
-  setup_action.sa_handler = setup_catch_signal;  //setup_catch_signal is the signal handler
-  (void) sigaction (SIGINT, &setup_action, NULL);
-  (void) sigaction (SIGQUIT, &setup_action, NULL);
-  (void) sigaction (SIGTERM, &setup_action, NULL);
-  (void) sigaction (SIGABRT, &setup_action, NULL);
-  (void) sigaction (SIGBUS, &setup_action, NULL);
-  (void) sigaction (SIGSEGV, &setup_action, NULL);
-
-//replacekey
-#include "userSetup.cpp"      //include any setup code the user provides
-#include "callInclude.cpp"    //include any 
-#include "userShutdown.cpp"
-
-#ifdef     B_HANDLE_EXCEPTIONS
-  }
-  catch (char *se)
-    {
-      cerr<<"Exception String: "<<se<<endl;
-    }
-  catch (int ie)
-    {
-      cerr<<"Exception Integer: "<<ie<<endl;
-    }      
-  catch (...)
-    {
-      cerr<<"Caught unknown exception at lowest level.\n";
-    }
-#endif //  B_HANDLE_EXCEPTIONS
-
-  return (errno);
-
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/testcases/ballista/ballista/executeTestCase.h b/testcases/ballista/ballista/executeTestCase.h
deleted file mode 100644
index 067ccf0..0000000
--- a/testcases/ballista/ballista/executeTestCase.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//executeTestCase.h: automatically generated header file - executes Ballista test
-// Copyright (C) 1998-2001  Carnegie Mellon University
- 
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
- 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
- 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-#include "userIncludes.h"
-#include "templates/b_ptr_void.h"
-#include "templates/b_ptr_buf.h"
-#include "templates/b_ptr_timespec.h"
-#include "templates/b_ptr_siginfo_t.h"
-#include "templates/b_ptr_int.h"
-#include "templates/b_ptr_long.h"
-#include "templates/b_ptr_sigset_t.h"
diff --git a/testcases/ballista/ballista/genCode.cpp b/testcases/ballista/ballista/genCode.cpp
deleted file mode 100644
index 7b527cf..0000000
--- a/testcases/ballista/ballista/genCode.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// genCode.cpp: generates the Ballista test execution code from various pieces  
-// Copyright (C) 1998-2001  Carnegie Mellon University
-// 
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-
-// From: John Peter DeVale <jdevale@ece.cmu.edu>
-// To: karner@andrew.cmu.edu
-// Message-ID: <Pine.OSF.4.02.9811090812520.3462-100000@skate.ece.cmu.edu>
-//
-// Replacer, which as you point out only inlines strings, is an artifact of
-// some wierd bug in cxx on digital unix.  As it turns out, cxx dies a
-// horrible screaming death if you try to inline code with #include
-// directives in the middle of a function.  The same thing compiles clean on
-// gcc.  It's odd.  So, I wrote replacer to actually shove the code into
-// place to work around the problem.
-
-int main()
-{
-  char buf[1024];
-  ifstream os;
-
-  while (!cin.eof())
-    {
-      cin.getline(buf,1024,'\n');
-      if (strcmp(buf,"//replacekey")==0)
-	{
-	  
-	  cout<<"//inlining userSetup, callInclude, and userShutdown\n";
-
-	  os.open("userSetup.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  os.open("callInclude.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  os.open("userShutdown.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-
-
-	  cin.getline(buf,1024,'\n');
-	  cin.getline(buf,1024,'\n');
-	  cin.getline(buf,1024,'\n');
-	}
-      else if (strcmp(buf,"//replacetoken")==0)
-	{
-	  
-	  cout<<"//inlining userCatches\n";
-
-	  os.open("userCatches.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  cin.getline(buf,1024,'\n');
-	}
-      else if (strcmp(buf,"//placeVariables")==0)
-	{
-	  
-	  cout<<"//inlining variable instantiations\n";
-
-	  os.open("vardefs.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  cin.getline(buf,1024,'\n');
-	}
-      else
-	cout<<buf<<endl;
-
-    }
-
-}
diff --git a/testcases/ballista/ballista/genCodeCreator.cpp b/testcases/ballista/ballista/genCodeCreator.cpp
deleted file mode 100644
index 0966de9..0000000
--- a/testcases/ballista/ballista/genCodeCreator.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// genCodeCreator.cpp: creates the script file contain the instructions to create the bug report code
-// Copyright (C) 1998-2001  Carnegie Mellon University
-// 
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-//-------------------------------------------------------------------------------------------
-// genCodeCreator:  The purpose of this program is to convert an outfile produced by running 
-//                  Ballista or the OSTest into a csh script file.  The csh script file will 
-//                  contain the instructions to generate stand-alone code to reproduce the 
-//                  Abort and Restart failures detected by Ballista.  This stand-alone code
-//                  is useful for bug reports.
-//-------------------------------------------------------------------------------------------
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ballista.h"
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-  if (argc < 5)
-  {
-    cout <<"Usage for genCodeCreator is: genCodeCreator <function Name> <input File Name>" 
-         <<" <number of parameters> <output File Name>" << endl;
-    cout <<"   where <input File Name> is the results file created by running ballista "
-         <<"or ostest" << endl;
-    cout <<"         <output File Name> is the file containing the .createCode commands" 
-         << endl;
-    return 1;
-  } 
-
-  
-  char buf[1024];
-  int fileExists = 0;
-  ifstream os;
-  ifstream instr(argv[2],ios::in);
-  ifstream tempStr(argv[4],ios::in|ios::in);
-
-  if (tempStr)
-  {
-    fileExists = 1;
-    tempStr.close();
-  }
-
-  ofstream outstr(argv[4],ios::out|ios::app);
-
-  char* paramType[MAXP];
-  char* paramValue[MAXP];
-
-  int numParam = atoi(argv[3]);
-
-  if (!fileExists)
-  {
-    outstr << "#!/bin/csh" << endl;
-    outstr << "cd .." << endl;
-  }
-
-  while (!instr.eof())
-  {
-    int count = 0;
-    
-    while ((count < (numParam)) && (!instr.eof()))
-    {
-      instr.ignore(9999,'#');
-      if (instr.eof())
-      {
-        return 0;
-      }
-      instr >> buf;
-
-      if ((strncmp(buf,"param:",6)) == 0)
-      {
-        // At this point buf should contain the #param:PARAMTYPE
-        paramType[count] = (char *)malloc(strlen(buf)*sizeof(char));
-        paramValue[count] = (char *)malloc(sizeof(char) * 1024);
-
-        if ((paramType[count] == NULL) || (paramValue[count] == NULL))
-        {       
-          outstr <<"# OUT OF MEMORY - INCOMPLETE" <<endl;
-          cout <<" ERROR: Ran out of memory running genCodeCreate" << endl;
-          return 1; 
-        }
-        strcpy(paramType[count], &(buf[6]));
-
-        char* temp;
-        int first = 1;       
-
-        // parse the paramValue - Note the paramValue is a series of Dial Settings 
-        // on the same line as #param:PARAMTYPE each preceed by the paramType_ and 
-        // separated by a tab.
-        instr.getline(buf,1024,'\n');
-        char* dialSetting = NULL;
-        char* endSetting = NULL;
-        char* bufPtr = buf;
-
-        while ((dialSetting = strstr(bufPtr,paramType[count])) != NULL)
-        {
-          if (!first)
-          {
-            temp = strcat(paramValue[count],"lNw");
-          }
-          else
-          {
-            strcpy(paramValue[count], "\0");
-            first = 0;
-          }
-
-          //move dialSetting to the start of the setting value
-          dialSetting = &(dialSetting[strlen(paramType[count]) + 1]);
-          
-          //determine the end of the setting value
-          endSetting = strstr(dialSetting,"\t");
-          *endSetting = '\0';
-          
-          temp = strcat(paramValue[count], dialSetting);
-          bufPtr = endSetting + 1;
-        }
-        count++;
-      }
-    }
-       
-    // Determine status of the test  - process only Abort and Restarts
-    int detStatus = 0;
-    char status[10];
-
-    while ( (!detStatus) && (!instr.eof()))
-    {
-      instr.getline(buf,1024,'\n');
-
-      //ignore fail bit being set when 1023+ chars read
-      if (instr.rdstate() == ios::failbit)
-      {
-        instr.clear();
-      }
-
-      if (strncmp(buf,"Done - ",7) == 0)
-      {
-        if (strstr(buf,"Abort") != NULL)
-        {
-          strcpy(status,"Abort");
-          detStatus = 1;
-        }
-        else if (strstr(buf,"Restart") != NULL)
-        {
-          strcpy(status,"Restart");
-          detStatus = 1;
-        }
-        else   //ignore Passes and Setup Failed
-        {
-          detStatus = 99;
-        }
-      }            
-               
-      if (detStatus == 1)
-      {
-        //output instruction to outstr
-        outstr<<"perl ./create_code_standAlone.pl " << argv[1] <<" " << status <<" "
-              << numParam <<" ";
-
-        for (int i = 0; i < numParam; i++)
-        {
-          outstr<<paramType[i] <<" "<<paramValue[i] <<" ";
-        }
-         
-        outstr<<" > "<< argv[1]<<"_bug_report/"<<argv[1];
-        for (int i = 0; i < numParam; i++)
-        {
-          outstr<<"_"<<paramType[i] <<paramValue[i];
-        }
-        outstr << ".cpp" << endl;
-      }
-    }
-  }
-  instr.close();
-  outstr.close();
-}
-
diff --git a/testcases/ballista/ballista/gpl.html b/testcases/ballista/ballista/gpl.html
deleted file mode 100644
index e53ba4c..0000000
--- a/testcases/ballista/ballista/gpl.html
+++ /dev/null
@@ -1,479 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
-<TITLE>GNU General Public License </TITLE>
-</HEAD>
-<p> 
-Ballista OS Robustness Test Suite is distributed under the GNU General Public License
-which means that its source code is freely-distributed and available to the general public.
-</p>
-
-<CENTER><H1>GNU General Public License</H1></CENTER>
-<Center>Version 2, June 1991</Center>
-
-<PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</PRE>
-
-
-
-<Center> <H2>Preamble</H2></Center>
-
-<P>
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-</P>
-<P>
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-</P>
-<P>
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-</P>
-<P>
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-</P>
-<P>
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-</P>
-<P>
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-</P>
-<P>
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-</P>
-<P>
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-</P>
-
-
-<Center><H2>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H2></Center>
-
-
-<P>
-
-<STRONG>0.</STRONG>
- This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-<P>
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-<P>
-
-<STRONG>1.</STRONG>
- You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-<P>
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-<P>
-
-<STRONG>2.</STRONG>
- You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-<P>
-
-<UL>
-
-<LI><STRONG>a)</STRONG>
-     You must cause the modified files to carry prominent notices
-     stating that you changed the files and the date of any change.
-
-<P>
-<LI><STRONG>b)</STRONG>
-     You must cause any work that you distribute or publish, that in
-     whole or in part contains or is derived from the Program or any
-     part thereof, to be licensed as a whole at no charge to all third
-     parties under the terms of this License.
-
-<P>
-<LI><STRONG>c)</STRONG>
-     If the modified program normally reads commands interactively
-     when run, you must cause it, when started running for such
-     interactive use in the most ordinary way, to print or display an
-     announcement including an appropriate copyright notice and a
-     notice that there is no warranty (or else, saying that you provide
-     a warranty) and that users may redistribute the program under
-     these conditions, and telling the user how to view a copy of this
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)
-</UL>
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-<P>
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-<P>
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-<P>
-
-<STRONG>3.</STRONG>
- You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-
-<!-- we use this doubled UL to get the sub-sections indented, -->
-<!-- while making the bullets as unobvious as possible. -->
-<UL>
-
-<LI><STRONG>a)</STRONG>
-     Accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software interchange; or,
-
-<P>
-<LI><STRONG>b)</STRONG>
-     Accompany it with a written offer, valid for at least three
-     years, to give any third party, for a charge no more than your
-     cost of physically performing source distribution, a complete
-     machine-readable copy of the corresponding source code, to be
-     distributed under the terms of Sections 1 and 2 above on a medium
-     customarily used for software interchange; or,
-
-<P>
-<LI><STRONG>c)</STRONG>
-     Accompany it with the information you received as to the offer
-     to distribute corresponding source code.  (This alternative is
-     allowed only for noncommercial distribution and only if you
-     received the program in object code or executable form with such
-     an offer, in accord with Subsection b above.)
-</UL>
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-<P>
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-<P>
-
-<STRONG>4.</STRONG>
- You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-<P>
-
-<STRONG>5.</STRONG>
- You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-<P>
-
-<STRONG>6.</STRONG>
- Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-<P>
-
-<STRONG>7.</STRONG>
- If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-<P>
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-<P>
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-<P>
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-<P>
-
-<STRONG>8.</STRONG>
- If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-<P>
-
-<STRONG>9.</STRONG>
- The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-<P>
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-<P>
-
-
-<STRONG>10.</STRONG>
- If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-
-<Center>
-<P><STRONG>NO WARRANTY</STRONG></P>
-</Center>
-<P>
-
-<STRONG>11.</STRONG>
- BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-<P>
-
-<STRONG>12.</STRONG>
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
-<center>
-<H2>END OF TERMS AND CONDITIONS</H2>
-</Center>
-
-<center>
-<H2>How to Apply These Terms to Your New Programs</H2>
-</center>
-
-<P>
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-</P>
-<P>
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-</P>
-
-<PRE>
-<VAR>one line to give the program's name and an idea of what it does.</VAR>
-Copyright (C) <VAR>yyyy</VAR>  <VAR>name of author</VAR>
-
-This program 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 Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-</PRE>
-
-<P>
-Also add information on how to contact you by electronic and paper mail.
-
-</P>
-<P>
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-</P>
-
-<PRE>
-Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c' 
-for details.
-</PRE>
-
-<P>
-The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than <SAMP>`show w'</SAMP> and
-<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever
-suits your program.
-
-</P>
-<P>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-</P>
-
-<PRE>
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written 
-by James Hacker.
-
-<VAR>signature of Ty Coon</VAR>, 1 April 1989
-Ty Coon, President of Vice
-</PRE>
-
-<P>
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-<HR>
-
-</BODY>
-</HTML>
-
diff --git a/testcases/ballista/ballista/gpl.txt b/testcases/ballista/ballista/gpl.txt
deleted file mode 100644
index 1bcc46f..0000000
--- a/testcases/ballista/ballista/gpl.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-
diff --git a/testcases/ballista/ballista/hack.cpp b/testcases/ballista/ballista/hack.cpp
deleted file mode 100644
index 0fef164..0000000
--- a/testcases/ballista/ballista/hack.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// hack.cpp : Ballista header file containing some constants.
-// Copyright (C) 1998-2001  Carnegie Mellon University
-// 
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <vector>
-#include "line.h"
-#define MAXP 16
-#define MAXD 32
-//vector<line > vec[MAXP];
diff --git a/testcases/ballista/ballista/htmlHeader.html b/testcases/ballista/ballista/htmlHeader.html
deleted file mode 100644
index 5fd9f72..0000000
--- a/testcases/ballista/ballista/htmlHeader.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!
-# os_results.html: Contains html version of the Ballista OS Robustness Test Suite results
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. >
-
-<HTML>
-<HEAD>
-<TITLE>Functions tested with Ballista OS Test</TITLE>
-</HEAD>
-
-<BODY TEXT="#FFFFDC" BGCOLOR="#666666" LINK="#FFFF00" VLINK="#0000FF"
- ALINK="#FF0000">
-<CENTER>
-<P><B><FONT FACE="verdana, arial, helvetica"><FONT SIZE="+1"> Functions tested
-with Ballista OS Test </FONT></FONT></B></P>
-</CENTER>
-
-<P><FONT FACE="verdana, arial, helvetica"> Listed below are the functions
-tested the last time Ballista OS Test was run. In addition to the basic result
-information, a link is provided for each function to a csh script. When
-executed, the csh script will generate C++ code that reproduces the robustness
-errors encountered for the selected function. One c++ file is created for each
-robustness error encountered.  </FONT></P>
-
-<P>There are two basic ways to use the script information</P>
-
-<OL>
-<LI> Find the test case you are interested in within the script and copy that
-single command to the command line </LI>
-
-<UL>
-<LI> The command should be performed after you are in the /outfiles directory. 
-</LI>
-<LI> The output will be placed in the directory and file specified at the end
-of the command. </LI>
-<LI> For example for the access function with parameters set to
-b_ptr_buf=BUF_LARGE and b_short_int_common=ZERO: (all on one line)
-<BLOCKQUOTE><FONT COLOR="AAD5D5"><FONT SIZE="-1"> .../ballista/outfiles&gt;
-<B><STRONG>./create_code_standAlone.pl access Abort 2 b_ptr_buf BUF_LARGE
-b_short_int_common ZERO &gt;
-access_bug_report/access.b_ptr_bufBUF_LARGE.b_short_int_commonZERO.cpp
-</STRONG></B></FONT></FONT></BLOCKQUOTE>
-</LI>
-</UL>
-
-
-<LI> The other option will be to run the entire script and create all the
-programs with a single command </LI>
-
-<UL>
-<LI> The script is already saved as a file. The file is stored as
-/outfiles/<I>functionName</I>_bug_report/genCode.</LI>
-<LI> Executing this script may create thousands of c++ files depending on the
-number of robustness errors detected. </LI>
-<LI> For example for the access function <BLOCKQUOTE><FONT COLOR="AAD5D5"><FONT
-SIZE="-1"> .../ballista/outfiles/access_bug_report&gt; <B>genCode</B>
-</FONT></FONT></BLOCKQUOTE>
-</LI>
-</UL>
-</OL>
-
-<HR>
-<TABLE WIDTH="90%" BORDER="1">
-<TR>
-<TH ALIGN="CENTER">FUNCTION</TH>
-<TH ALIGN="CENTER">PASS/FAIL STATS</TH>
-<TH ALIGN="CENTER">CONTAINS FAILURE(S)</TH>
-<TH ALIGN="CENTER"># TESTS</TH>
-<TH ALIGN="CENTER"># RESTARTS</TH>
-<TH ALIGN="CENTER"># ABORTS</TH>
-<TH ALIGN="CENTER"># SETUP FAILS</TH>
-</TR>
-
diff --git a/testcases/ballista/ballista/line.cpp b/testcases/ballista/ballista/line.cpp
deleted file mode 100644
index 7ed7264..0000000
--- a/testcases/ballista/ballista/line.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// line.cpp : Ballista test line
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <iostream>
-#include <stdlib.h>
-#include <fstream>
-#include <string.h>
-#include "line.h"
-
-using namespace std;
-
-line::line()
-{
-  p=NULL;
-}
-line::line(const char *name)
-{
-  p=new char[strlen(name)+1];
-  strcpy(p,name);
-}
-line::line(const line& rhs)
-{
-  p=new char[strlen(rhs.p)+1];
-  strcpy(p,rhs.p);
-}
-line::~line()
-{
-  if (p!=NULL) delete[] p;
-}
-int line::operator=(const line& rhs)
-{
-  if (p!=NULL) delete[] p;
-  p=new char[strlen(rhs.p)+1];
-  if (p==NULL) return 0;
-  strcpy(p,rhs.p);
-  return 1;
-}
-int line::operator=(const char *rhs)
-{
-  if (p!=NULL) delete[] p;
-  p=new char[strlen(rhs)+1];
-  if (p==NULL) return 0;
-  strcpy(p,rhs);
-  return 1;
-}
-
-void line::test()
-{
-  line l1("this");
-  line l2="a test";
-  line l3(l2);
-  l2 = " is ";
-  cout<<l1<<l2<<l3<<endl;
-}
-
-ostream& operator<< (ostream& os,line l)
-{
-  os<<l.p;
-  return os;
-}
diff --git a/testcases/ballista/ballista/line.h b/testcases/ballista/ballista/line.h
deleted file mode 100644
index 4c7064f..0000000
--- a/testcases/ballista/ballista/line.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// line.h : Ballista Test Line
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef _LINE_H_
-#define _LINE_H_
-
-#include <iostream>
-#include <fstream>
-
-using namespace std;
-
-class line
-{
-public:
-  char *p;
-  int operator=(const line& rhs);
-  int operator=(const char *rhs);
-  line(const line& rhs);
-  line (const char *name);
-  line();
-  ~line();
-  void test();
-};
-
-ostream& operator<< (ostream& os,line l);
-
-#endif // _LINE_H_
diff --git a/testcases/ballista/ballista/makeBallista b/testcases/ballista/ballista/makeBallista
deleted file mode 100755
index feb8b43..0000000
--- a/testcases/ballista/ballista/makeBallista
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/csh
-# makeBallista: makes the Ballista test for a specified function
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-if ( ! -e MakefileHost || ! -e MakefileTarget ) then
-    /bin/echo Missing either MakefileHost or MakefileTarget.
-    /bin/echo Please run configure.
-    exit 1
-endif
-
-if ( "$1" == '-c' ) then
-    shift
-    /bin/echo Cleaning up
-#    make -f MakefileHost clean >& /dev/null
-    make -f MakefileTarget clean >& /dev/null
-endif
-
-setenv FUNCTION $1
-setenv PERL5LIB `pwd`/perllib
-
-# print usage information when bad args are given
-if ( $#argv == 0 ) then
-    /bin/echo ""
-    /bin/echo usage: makeBallista \[-c\] callName
-    /bin/echo ""
-    /bin/echo Where callName is the name of the function to be tested 
-    /bin/echo The -c argument cleans up all old files before building
-    /bin/echo ""
-    exit 1
-endif
-
-# store mut name in file mut so we can determine what the last build built
-if ( $1 != `cat mut` ) then
-    echo $1 > mut
-endif
-
-/bin/echo Function: $FUNCTION
-
-# create dataTypes file
-./dataClimber $FUNCTION
-
-setenv OBLIST
-
-foreach A(`grep -v '#' dataTypes | awk '{print$1}'`)
-    setenv OBLIST "$OBLIST templates/$A.o"
-end
-
-/bin/echo Datatype list: $OBLIST
-
-setenv LLIST
-
-if (!(-e userLibs)) then
-    /bin/echo Warning: userLibs not found.  No user compiler flags used.
-else
-    foreach A(`grep -v "#" userLibs`)
-	setenv LLIST "$LLIST $A"
-    end
-endif
-
-#add the system OS libraries
-if (!(-e osLibs)) then
-    /bin/echo Warning: osLibs not found.  Link errors will most likely result.
-else
-    foreach A(`grep -v "#" osLibs`)
-	setenv LLIST "$LLIST $A"
-    end
-endif
-
-/bin/echo Compiler options: $LLIST
-
-/bin/echo
-/bin/echo
-
-# should bail if any of these fail...
-# make -f MakefileHost
-make -rf MakefileTarget
-
-
diff --git a/testcases/ballista/ballista/marshal.cpp b/testcases/ballista/ballista/marshal.cpp
deleted file mode 100644
index ea9e35b..0000000
--- a/testcases/ballista/ballista/marshal.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* marshal.cpp : Handles the marshalling of dials
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <assert.h>
-#include <stdio.h>	//testing only
-#include <stdlib.h>
-#include <string.h>
-
-#include "ballista.h"
-#include "marshal.h"
-
-/************************
- *
- * Function:        marshal
- * Description:     marshal dial settings into a string
- *
- * Function Inputs: string:  string to extract  marshalled dial settings,
- *                  data: two-dimensial array of dial settings=
- * Global Inputs:   - N.A.
- *
- * Return Values:   0 : success
- * Errors           -1 : exceeded the number of max dial settings error
- *                  -2 : exceeded the number of max parameters error
- * Global Outputs:  - N.A.
- * 
- * Pre-Conditions:  dial settings list is null-terminated,
- *                  string has sufficient space allocated 
- *
- * Post-Conditions: the string contains the marshalled data in the format specified 
- *                  by the design below.
- *
- * Design:          dial setting are marshalled by concatenating the strings
- *                  in the data[param_idx][dial_idx] array.  Individual dial
- *                  settings are separated by DIAL_MARKERS. A set of dial settings
- *                  for one parameter list is separated by DIAL_SETTING_MARKER.  Finally
- *                  the PARAMETER_LIST_MARKER marks the end of the parameter list.
- *                  
- *                 
- * Notes:           The number of dial settings per parameter list can vary.
- *                  The program must find Null string that terminates a list.
- *
- ************************/
-
-int marshal(const MARSHAL_DATA_TYPE data, char string[])
-{
-
-  int param_idx = 0; // index into Parameters
-  int dial_idx = 0;   // index into Dials
-
-
-  assert(data != NULL);
-  assert(string != NULL);
-
-  //Make sure that the string is null termintated first
-  string[0] = '\0';
-
-  // Check if at the end of the parameter lists, if first dial setting is null character
-  while ( data[param_idx][0][0]!= '\0' )
-  {    
-    // Abnormal exit if the index into the Parameters exceeded max
-    // Note:  The maximum X in data[X][.] is MAXP+1.
-    if (param_idx >= MAXP)
-      return -2;
-
-    // Reset control parameter for while loop
-    dial_idx=0;
-
-    while (data[param_idx][dial_idx][0] != '\0') 
-    {
-	// Abnormal exit if the index into the Dial Settings exceeded max
-	if (dial_idx >= MAXD)
-		return -1;
-
-	// Concat the individual dial setting to the end of string
-	strcat(string,data[param_idx][dial_idx] );
-	strcat(string, DIAL_MARKER);
-
-	// Point to the next dial setting
-	dial_idx++;	
-    }
-    // At end of a set of dial settings
-    strcat(string, DIAL_SETTINGS_MARKER); 
-
-    param_idx++;      
-  }
-  // Mark the end of the string signifying the end of the parameter list
-  strcat(string, PARAMETER_LIST_MARKER);
-
-  //Success:  Exit the program
-  return 0;
-}
-
-
diff --git a/testcases/ballista/ballista/marshal.h b/testcases/ballista/ballista/marshal.h
deleted file mode 100644
index 3e4cd61..0000000
--- a/testcases/ballista/ballista/marshal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* marshal.h: Handles the marshalling of dials
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _MARSHAL_H
-#define _MARSHAL_H
-
-#include "ballista.h"
-
-// Define the characters that terminates at end of each dial, dial settings, and parameter list
-#define DIAL_END ','
-#define DIAL_SETTINGS_END '@'
-#define PARAMETER_LIST_END '\0'
-
-// Define the constant string used to concatenate terminators to marshalled data string.
-const char DIAL_MARKER[2] = { DIAL_END, '\0' };
-const char DIAL_SETTINGS_MARKER[2] = { DIAL_SETTINGS_END, '\0'};
-const char PARAMETER_LIST_MARKER[2] = { PARAMETER_LIST_END, '\0'};
-
-int marshal(const MARSHAL_DATA_TYPE data, char *string);
-
-#endif // _MARSHAL_H
diff --git a/testcases/ballista/ballista/match.cpp b/testcases/ballista/ballista/match.cpp
deleted file mode 100644
index ce1e457..0000000
--- a/testcases/ballista/ballista/match.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/* match.cpp: Utility functions for matching file contents with regular expressions 
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <regex.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fstream>
-
-#include "match.h"
-
-using namespace std;
-
-/************************
- *
- * Function:        match_file
- * Description:     match the content of a file against an extended regular expression
- * Function Inputs: char *file_name,
- *		     char *reg_pattern
- *		     int* match 
- * Global Inputs: None  
- * Return Values: Return 0 if successful, else negative value if error found  
- * Global Outputs:  
- * Errors:          
- * Pre-Conditions:  
- * Post-Contidions:  *good_match = 1 if true, else 0.
- * Design:
- * Notes:           
- *
- ************************/
-int match_file(const char *file_name, char* reg_pattern, int* good_match)
-{
-  struct stat file_info;
-  char *file_buffer = NULL;
-  ifstream is;
-
-  // first get the size of the file
-  if(stat(file_name,&file_info) != 0) {
-    return -1;
-  }
-
-  // open the file
-  is.open(file_name);
-  if(is.bad()) {
-    return -2;
-  }
-
-  // next allocate memory, including 1 byte for the NULL terminator
-  file_buffer = (char *)malloc(file_info.st_size+1);
-  if(file_buffer == NULL) {
-    return -3;
-  }
-  
-  // read in the data
-  is.read(file_buffer,file_info.st_size);
-  if(is.bad()) {  
-    free(file_buffer);
-    return -4;
-  }
-  
-  // check if we actually read as many bytes as we wanted
-  if(is.gcount() != file_info.st_size) {
-    free(file_buffer);
-    return -5;
-  }
-  
-  // close the file
-  is.close();
-
-  // Ensure that the buffer is null terminated.
-  *(file_buffer + file_info.st_size) = '\0';
-
-  // Check the buffer against the regular expression 
-  // and store result into *good_match.
-  if (match(file_buffer,reg_pattern))
-  {
-    *good_match = 1;
-  }
-  else
-  {
-    *good_match = 0;
-  }
-
-  // free the memory after using it
-  free(file_buffer);
-  return 0;
-}
-
-
-/************************
- *
- * Function:        match
- * Description:     Match string against the extended regular expression in
- * 		     pattern, treating errors as no match.
- *
- * Function Inputs: char *string,
- *		     char *reg_pattern
- *		     
- * Global Inputs: None  
- * Return Values: Return 0 if match, else negative value   
- * Global Outputs:  
- * Errors:          
- * Pre-Conditions:  
- * Post-Contidions: 
- * Design:
- * Notes:           
- *
- ************************/
-int match(const char *string, char *pattern)
-{
-  int  status;
-  regex_t   re;
-  
-  if (regcomp(&re, pattern, REG_EXTENDED|REG_NOSUB) != 0) {
-    return(0);      /* report error */
-  }
-  status = regexec(&re, string, (size_t) 0, NULL, 0);
-  regfree(&re);
-  if (status != 0) {
-    return(0);      /* report error */
-  }
-
-  return(1);
-}
-
diff --git a/testcases/ballista/ballista/match.h b/testcases/ballista/ballista/match.h
deleted file mode 100644
index 9682a99..0000000
--- a/testcases/ballista/ballista/match.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* bparser.c : Ballista header file for match.cpp
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-/*
-** Function Protoype
-*/
-int match_file(const char *file_name, char* reg_pattern, int* good_match);
-int match(const char *string, char *pattern);
diff --git a/testcases/ballista/ballista/mut b/testcases/ballista/ballista/mut
deleted file mode 100644
index a9c55c9..0000000
--- a/testcases/ballista/ballista/mut
+++ /dev/null
@@ -1 +0,0 @@
-sigtimedwait
diff --git a/testcases/ballista/ballista/newcomp.txt b/testcases/ballista/ballista/newcomp.txt
deleted file mode 100644
index f8f2585..0000000
--- a/testcases/ballista/ballista/newcomp.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Script started on Wed Jul 28 10:48:42 2004
-gospurs1:~/balista/ballista # perl ostest.pl

-

-About to remove all previous results files located in the outfiles directory.  If you wish to save these 

-results, type "n," copy the results to another location, and restart this script.  Continue cleanup?y

-

-Cleaning up previous results...

-

-This package will limit individual function tests to 5,000 total test cases.  If this is acceptable, 

-press Enter.  If you would like to test all possible cases (100%), type "100."   To test fewer 

-cases, enter the desired percentage of test cases to run.  (Note test cases per function are still 

-limited to a maximum of 5,000 per function even set at 100%.) 100

-Configuring for host platform: linux

-              target platform: linux

-make: Entering directory `/root/balista/ballista/compile'

-make: Warning: File `blexer' has modification time 1.2e+07 s in the future

-cp blexer ../blexer

-cp blexer ../templates/blexer

-cp bparser ../bparser

-cp bparser ../templates/bparser

-cp do_parse ../do_parse

-cp do_parse ../templates/do_parse

-chmod 700 ../templates/do_parse

-make: warning:  Clock skew detected.  Your build may be incomplete.

-make: Leaving directory `/root/balista/ballista/compile'

-Function: access

-Datatype list: templates/b_short_int_common.o templates/b_short.o templates/b_int.o templates/b_int_amode.o templates/b_ptr_void.o templates/b_ptr_buf.o templates/b_ptr_char.o templates/b_fname.o

-Compiler options:

-

-

-make: Warning: File `callGen.cpp' has modification time 1.2e+07 s in the future

-g++ -O callGen.cpp -o callGen

-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,

-                 from callGen.cpp:20:

-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.

-/tmp/ccMRpa0u.o(.text+0x1536): In function `__static_initialization_and_destruction_0(int, int)':

-: the use of `tempnam' is dangerous, better use `mkstemp'

-g++ -O callGen_standAlone.cpp -o callGen_standAlone

-In file included from /usr/include/c++/3.3.3/backward/iostream.h:31,

-                 from callGen_standAlone.cpp:20:

-/usr/include/c++/3.3.3/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.

-

-[1]+  Stopped                 perl ostest.pl

-gospurs1:~/balista/ballista # kill %1

-

-[1]+  Stopped                 perl ostest.pl

-gospurs1:~/balista/ballista # make: *** [callGen_standAlone] Terminated

-

-[1]+  Terminated              perl ostest.pl

-gospurs1:~/balista/ballista # ps

-  PID TTY          TIME CMD

- 7239 pts/7    00:00:00 bash

- 7311 pts/7    00:00:00 ps

-gospurs1:~/balista/ballista # exit

-
-Script done on Wed Jul 28 10:49:23 2004
diff --git a/testcases/ballista/ballista/osLibs b/testcases/ballista/ballista/osLibs
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/osLibs
+++ /dev/null
diff --git a/testcases/ballista/ballista/ostest_new.pl b/testcases/ballista/ballista/ostest_new.pl
deleted file mode 100644
index a366a84..0000000
--- a/testcases/ballista/ballista/ostest_new.pl
+++ /dev/null
@@ -1,617 +0,0 @@
-# ostest.pl: perl script associated with Ballista OS Robustness Test Suite
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#------------------------------------------------------------------------
-#
-#Description: run all Ballista tests for the functions specified in callTable.all. 
-#
-#   Files: callTable.all, ballista client download
-#   Directories: ./outfiles/ and subdirectories               
-#
-#Outputs: all stored in /outfiles/: faillog, outfile.$function.@params, named after 
-#         each function name tested, os_results.txt.  
-#
-#         Additionally subdirectories under 
-#         /outfiles are created one per function.  These subdirectories have the 
-#         following naming convention <functionName>_bug_report.  Included in these 
-#         bug_report subdirectories is a script called genCode.  If executed genCode 
-#         will generate c++ code that reproduces the robustness failures detected.  
-#         (One cpp file per robustness failure)   
-#          
-#         A html file called outfiles/os_results.html can be used to navigate the 
-#         scripts.  
-#
-#Note: catastrophic failures (whose which crash or hang the entire machine) are not 
-#      automatically detected and therefore not available in the result files.
-#
-
-# ** Maintain updated version number and release date **
-$version_num = "1.0";
-$release_date = "May 3, 2001";
-
-# MB: separator text within results files -- used to search for next test results
-$results_separator = "----";
-chomp($results_separator);
-
-#find user's paths to necessary files:
-$env_path = $ENV{'PATH'};
-$ENV{'PATH'} .= ":.:";
-# removed because of problem on Linux systems:
-#$ENV{'PATH'} .= `pwd`;
-$ENV{'PATH'} .= ":/usr/include";
-$Path = $ENV{'PATH'};
-# find header files
-@Path = split(":", $Path);
-$found_headers = 0;
-foreach $Dir (@Path)
-{
-  opendir(DIR, $Dir);
-  @files = readdir(DIR);
-  closedir(DIR);
-  foreach $file (@files)
-  {
-    if ($file =~ /stdio\.h$/)
-    {
-      $found_headers = 1;
-      $ENV{'PATH'} .= ":";
-      $ENV{'PATH'} .= $Dir;
-    }
-  }
-}
-if ($found_headers != 1)
-{
-  print "\nCannot find directory containing header files \(\".h\" files\).  Please set your environment variable \n";
-  print "to contain the path to the correct directory. \(ex. set path=\(\$path = /usr/include\)\)\n";
-  exit(1);
-}
-
-# Determine user's operating system
-$os_string = `uname -rsv`;
-@OSID = split(/ /, $os_string);
-chomp($OSID[2]);
-$os = $OSID[0];
-$version = $OSID[1];
-$release = $OSID[2];
-
-# copy any os specific templates over the standard templates
-if ($os eq Linux)
-{
-  $os_name =  LINUX;
-}
-elsif ($os eq  SunOS)
-{
-  $os_name = SUN;
-}
-elsif ($os eq OSF1)
-{
-  $os_name = DUNIX;
-}
-
-opendir(TPL_PATH,  "templates");
-@tplOSfiles = grep(/$os_name/,readdir(TPL_PATH));
-
-foreach $tplfile(@tplOSfiles)
-{
-  ($tplname, $suffix) = split (/$os_name/,$tplfile);
-   
-  $cpy_string = "cp templates/$tplfile templates/$tplname$suffix";
-  #print  "COMMAND $cpy_string\n";
-  if(system($cpy_string) != 0)
-  {
-     printf ("\n Problems setting up OS specific templates.  Try to execute\n");
-     printf ("$cpy_string\n \n");
-  }
-} 
-
-closedir (TPL_PATH);
-
-# copy over callTable.all for platform specific callTables
-if ($os_name eq DUNIX)
-{
-  #  $cpy_string = "cp callTableDUNIX.all callTable.all";
-  $cpy_string = "cp callTable.some callTable.all";  
-  if(system($cpy_string) != 0)
-  {
-     printf ("\n Problems setting up OS specific callTable.  Trying to execute\n");
-     printf ("$cpy_string\n \n");
-  }
-}
-
-
-
-
-  print "\nCleaning up previous results...\n";
-  opendir(OUTFILES_PATH, $path);
-  @allfiles = grep(/^outfile\./, readdir(OUTFILES_PATH));
-  if ($os !~ "OSF1")
-  {
-    foreach $file (@allfiles)
-    {
-      $outfile = "$path/$file";
-      chomp($outfile);
-      unlink($outfile) || die "Cannot remove $file: $!";
-    }
-  }
-  else
-  {
-    foreach $file(@allfiles)
-    {
-      $outfile = "$path/$file";
-      chomp($outfile);
-      system("rm $outfile");
-    }
-  }
-  closedir(OUTFILES_PATH);
-  system("rm -r outfiles");
-
-
-#print "number of arguments $#ARGV \n";
-if($#ARGV < 0)
-{
-$user_percent=100;
-}
-else
-{
-
-    $user_percent=$ARGV[0];
-
-}
-
-print "$user_percent % \n";
-
-#exit;
-
-#print "\nThis package will limit individual function tests to 5,000 total test cases.  If this is acceptable, \n";
-#print "press Enter.  If you would like to test all possible cases \(100\%\), type \"100.\"   To test fewer \n";
-#print "cases, enter the desired percentage of test cases to run.  \(Note test cases per function are still \n";
-#print "limited to a maximum of 5,000 per function even set at 100\%.\ \n) ";
-#print " By default the value will be 100 %, and will timeout in 10 seconds \n";
-#print " If no percentage is entered \n";
-
-
-#my $timeout_value=10;
-
-# start
-#$SIG{ALRM} = sub { die "timeout" };
-
-# eval {
-
-# alarm( $timeout_value );
-
-# get the input
-#$user_percent = <STDIN>;
-
-#alarm( 0 );
-
-# };
-
-
-
-# if ( $@ ) 
-# {
-
-#     if ( $@ =~ /timeout/i ) 
-#     {
-#	 $user_percent=100;
-
-#     } 
-#     else 
-#     {
-#	 alarm( 0 );
-#	 die;
-#     }
-
-# }
-
-
-
-
-
-
-
-#print "$user_percent % \n";
-
-#    exit;
-
-if ($user_percent > 100)
-{
-  print "\nYou cannot run more than 100\% of the test cases.  Reseting to 5,000 test cases...";
-  $user_percent = 100;
-}
-
-
-  if (! (-d "outfiles"))
-  {
-    mkdir(outfiles, 0777) || die "Can't make outfiles directory: $!\n";
-    mkdir("outfiles/temp",0777) || die "Can't make outfiles/temp directory: $!\n";
-  }
-
-
-$path = "outfiles";
-$template_path = "templates";
-$logfile="outfiles/logfile.txt";
-
-open(CALLTABLEIN,"<callTable.all")||die "Can't read callTable.all\n";
-open(FAILFILE, ">$path/faillog")||die "Can't open faillog: $!\n";
-open(VERSIONFILE, ">$path/ostest_version.txt")||die "Can't open ostest_version.txt \n";
-print VERSIONFILE "$version_num\n";
-close VERSIONFILE;
-
-if ((system("./configure"))/256 == 1)
-{
-	print "Error running configure\n";
-	print FAILFILE "Error running configure\n";
-	exit(1);
-}
-if ((system("make -f MakefileHost"))/256 == 1)
-{
-        print "Error mak(e)ing Ballista MakefileHost\n";
-        print FAILFILE "Error mak(e)ing Ballista makefileHost\n";
-        exit(1);
-}
-
-if ((system("make -C compile"))/256 == 1)
-{
-        print "Error mak(e)ing Ballista datatype compiler\n";
-        print FAILFILE "Error mak(e)ing Ballista datatype compiler\n";
-        exit(1);
-}
-
-
-open LOGFILE,">$logfile" or die "Cannot open $outfile for write :$!";
-while(<CALLTABLEIN>)
-{
-  if (!($_ =~ "#")&&(!($_=~":"))&&($_ ne "\n")){#not comment, or empty, or title
-    open(CALLTABLEOUT,">callTable")||die "can not write to call table file: $!\n";;
-    print (CALLTABLEOUT $_);
-    close(CALLTABLEOUT);
-  ($inc, $identity, $rval, $function, @params)=split(/\s+/, $_);
-   open(INCLUDEFILE, ">userIncludes.h") || die "Can't open userIncludes.h: $!";
-   print INCLUDEFILE "#include <$inc>";
-   close(INCLUDEFILE);
-
-# if ((system("./makeBallista  $function")/256) != 0)
- if ((system("./makeBallista  $function > /dev/null 2>&1")/256) != 0)	# if makeBallista fails, don't try to run ballista!
-  {
-	print "\nmakeBallista failed for $function.  $function will not be tested -- this function may not exist on your operating system.";
-	print FAILFILE "makeBallista failed for $function.  $function will not be tested -- this function may not exist on your operating system.\n";
-  }
-  else
-  {
-
-# *** note ballista server information ignored
-      print LOGFILE "**************************************\n";
-      print LOGFILE "* Currently testing \"$function\"      \n";
-      print "**************************************\n";
-      print "* Currently testing \"$function\"      \n";
-
-    $exec_str = "./ballista ballista.ece.cmu.edu $function -t 5000000 -r ";
-    $num_tests = 1;
-    $test_percent = 0;
-    $param_str = "";
-    foreach $param(@params)
-    {
-      $num_tests *= `wc -l $template_path/$param.param`; 
-      $param_str .= "$template_path/$param.param ";
-    }
-# limit number of tests to 5,000 (can't just specify straight percent for all functions because may lose smaller tests)
-    if(($user_percent <= 100) && ($user_percent >0))
-    {
-      $test_percent = $user_percent;
-    }
-    else
-    {
-# ******** changed to 10 to test: change back to 1000!!!!
-      if ($num_tests >4000)
-      {
-        $test_percent = (4000/$num_tests)*100;
-      }
-      else
-      {
-        $test_percent = 100;
-      }
-    }
-
-    $exec_str_bkp = $exec_str;
-    $exec_str .= "$test_percent $param_str ";
-    $exec_str .= " |tee $path/outfile.$function";
-
-    foreach $param(@params)
-    {
-      $exec_str .= ".$param";
-    }
-  
-  
-#  print $exec_str;
-#run the test
-#  if ((system("$exec_str")/256) == 1)	# if ballista fails with fractional percents, round down
- # {
-#    $test_percent = int($test_percent);
-    if($test_percent < 0.001)	# in case round down to 0
-    {
-        print "\nThe test percentage was specified below 0.001.  Percentage changed to 0.001.\n";
-	$test_percent = 0.001;
-    }
-    else
-    {
-       $test_percent = 1.0 * $test_percent;
-    }
-    $exec_str = $exec_str_bkp;
-    $exec_str .= "$test_percent $param_str ";
-    $exec_str .= " > $path/outfile.$function";
-    $find_fail = "grep -i -q Fail ";
-    $output_filename ="";
-    $output_filename .= "outfile.$function"; 
-
-    $find_fail .= $path."/outfile.".$function; 
-
-    foreach $param(@params){
-      $exec_str .= ".$param"; 
-      $find_fail .= ".$param";  
-      $output_filename .= ".$param"; 
-    }
-
-
-      $out_filename{$function} = $output_filename;
-
- #   print "$find_fail \n\n";
- #  print "$function  $out_filename{$function}\n";
- #     print "$exec_str ";
-    if ((system("$exec_str")/256) == 1)
-    {
-      print "\nError running ballista.";
-      print FAILFILE "\nError running ballista.";
-      exit(1);
-    }
- # }	# does not appear to be working to test for fractional failure -- does not attempt to run ballista again upon failure
-
-#  $start_time = time;
-#  print "\nWaiting for TCP to reset (about 2 minutes)....\n";
-#  while(time < $start_time+120)
-#  {	# wait for 2 minutes to elapse to allow RPC to reset
-#  }
-
-      if ((system("$find_fail")/256) == 0)
-       {
-	  print LOGFILE "* $function has failed at least once  \n"; 
-	  print "* $function has failed at least once  \n";  
-          $status{$function} = "Yes";
-       }
-       else
-       { 
-	  print LOGFILE "* $function passed                    \n";
-	  print "* $function passed                    \n";  
-	  $status{$function} = "No";
-       }
-
-          print LOGFILE "**************************************\n\n";
-          print LOGFILE "Compling... \n";
-
-          print "**************************************\n\n";
-          print "Compling... \n";
-
-
-} # end if makeBallista
-
-
-#"./ballista ballista.ece.cmu.edu $function -r 100 $template_path/@params.param ");
-}#if
-}#while(<CALLTABLEIN>)
-
-
-
-close(CALLTABLEIN);
-close(FAILFILE);
-close LOGFILE;
-
-
-  #copy files necessary for create_code_standAlone to work to outfiles directory
-  if (( (system("cp create_code_standAlone.pl outfiles/."))/256 == 1) ||
-      ( (system("cp callTable.all outfiles/callTable"))/256 == 1) ||
-      ( (system("cp callGen_standAlone outfiles/."))/256 == 1))
-  {
-     print "ERROR copying files needed to create genCode - bug reports will be suspect\n";
-     print " trying to:\n cp create_code_standAlone.pl outfiles/. \ncp callTable.all outfiles/callTable\n cp callGen_standAlone outfiles/.\n";
-     die "Terminating Ballista OS Robustness Test Suite due to errors\n";
-  }
-
-# compute failure rates for each function and total failure rate
-
-open(SUMMARY, ">$path/os_results.txt") || die "Can't open os_results.txt: $!";
-($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time);
-$mon++;		# adjust for Perl's labelling of months as 0-11
-$year = $year + 1900;
-$date_stamp = "at $hour:$min:$sec on $mon/$mday/$year";
-printf(SUMMARY "\nBallista OS test, version %s released %s", $version_num, $release_date);
-#printf(SUMMARY "\nTHIS IS AN INCOMPLETE VERSION -- SOME FUNCTIONS WILL NOT BE TESTED BECAUSE THEY REQUIRE MORE TEST CASES THAN THE SERVER CAN CURRENTLY HANDLE");
-printf(SUMMARY "\nResults for: %s version %s release %s, completed %s", $os, $version, $release, $date_stamp);
-printf(SUMMARY "\n\n");
-
-#header information 
-system("cp htmlHeader.html $path/os_results.html");
-open(OUTHTML,">>$path/os_results.html") || die "Can't open os_results.html: $!";
-
-# derived from parse.cgi by David Guttendorf
-# modified to use Perl functions rather than spawn Unix functions, which could be precarious
-# to run this locally, want to use the files stored locally in outfiles/outfile.$function.@param_types
-# get all filenames beginning with "outfile."
-opendir(OUTFILES_PATH, $path) || die "Can't open directory $path: $!";
-@possiblefiles = grep(/^outfile\./, readdir(OUTFILES_PATH));
-closedir(OUTFILES_PATH);
-
-$failures = 0;
-$total_percent = 0;
-$total_abort_percent = 0;
-$total_restart_percent = 0;
-$total_setup = 0;
-$total_functions = 0;
-$setup_string = "Setup Failed";
-chomp($setup_string);
-
-foreach $file (@possiblefiles){
-        $outfile = "$path/$file";
-        chomp($outfile);
-        ($junk, $function, @param_types)=split(/\./,$file);    # find just the function name
-        
-        open(OUTFILE, "<$outfile") || die "Can't open $outfile: $!";
-        @file_lines = <OUTFILE>;
-        close(OUTFILE);
-        $tests_run = grep(/^$results_separator/, @file_lines);
-        if ($tests_run != 0)          # if no tests, may have timed out - don't record any data or attempt to divide by zero
-        {
-# create the directory and code necessary for generating bug reports
-               $genCodeDir = "outfiles/";
-               $genCodeDir .= $function;
-               $genCodeDir .= "_bug_report";
-               if (mkdir($genCodeDir, 0777) == 0)
-               {
-                  print "Multiple function calls using $genCodeDir directory\n";
-               }
-               $genCodeDir .= "/genCode";
-
-
-
-# the following are "+=" because a function may occur more than once in the callTable; this assumes the variables are initialized to zero!
-        	$abort_failures{$function} += grep(/Abort/, @file_lines);
-        	$restart_failures{$function} += grep(/Restart/, @file_lines);
-        	$setup_failures{$function} += grep(/$setup_string/, @file_lines);
-
-                if (($abort_failures{$function} > 0) || ($restart_failures{$function} > 0))
-                {
-                   $num_parameters = @param_types;
-                   if ((system("./genCodeCreator $function $outfile  $num_parameters $genCodeDir"))/256 == 1)
-                   {
-                      print "ERROR encountered creating genCode file for $function\n";
-                   }
-                   else
-                   {
-                      chmod 0700, $genCodeDir;
-                   }
-                }
-                else
-                {
-                   open(GENCODE,">$genCodeDir");
-                   print GENCODE "# No Abort or Restart Robustness Failures encountered\n";
-                   close(GENCODE);
-                }
-                $totaltests{$function} += $tests_run;
-                $totalruns{$function} =  $totaltests{$function} - $setup_failures{$function};
-        	$failures{$function} += $abort_failures{$function} + $restart_failures{$function};
-        	$passes{$function} += $totaltests{$function} - $failures{$function};
-
-                if (($totaltests{$function} == 0) ||($totalruns{$function} <=0))
-                {
-                  $fail_percent{$function} = 0;
-                  $restart_percent{$function} = 0;
-                  $abort_percent{$function} = 0;
-                }
-                else
-                {
-                  $fail_percent{$function} = ($failures{$function}*100/$totalruns{$function});
-                  $restart_percent{$function} = ($restart_failures{$function}*100/$totalruns{$function});
-                  $abort_percent{$function} = ($abort_failures{$function}*100/$totalruns{$function});
-                }
-
-# moved because functions with 2 different call signature counted incorrectly
-#               $total_alltests += $totaltests{$function};
-#                $total_setup += $setup_failures{$function};
-#                $total_percent += $fail_percent{$function};
-#                $total_abort_percent += $abort_percent{$function};
-#                $total_restart_percent += $restart_percent{$function};
-                $total_functions++;
-        }else
-        {
-        print FAILFILE "makeBallista failed for $function.  $function will not be tested -- this function may have timed out because of large test cases.\n";
-        }
-  }
-foreach $function(sort keys(%totaltests))
-{
-	write STDOUT;  
-	write SUMMARY; 
-        print OUTHTML "<TR>\n";
-        $tempStr = $function;
-        $pass_fail=$function;
-	$pass_fail  .= "  pass/fail stats";
-        $tempStr .= "_bug_report/genCode";
-        print OUTHTML "<TD ALIGN=\"LEFT\"><A HREF = \"$tempStr\">$function</A></TD>\n";
-        print OUTHTML "<TD ALIGN=\"LEFT\"><A HREF =\"$out_filename{$function}\">$pass_fail</A></TD>\n"; 
-        print OUTHTML "<TD ALIGN=\"RIGHT\">$status{$function}</TD>\n";
-	print OUTHTML "<TD ALIGN=\"RIGHT\">$totaltests{$function}</TD>\n";
-        print OUTHTML "<TD ALIGN=\"RIGHT\">$restart_failures{$function}</TD>\n";
-        print OUTHTML "<TD ALIGN=\"RIGHT\">$abort_failures{$function}</TD>\n";
-        print OUTHTML "<TD ALIGN=\"RIGHT\">$setup_failures{$function}</TD>\n";
-        print OUTHTML "</TD>\n";
-
-        $total_alltests += $totaltests{$function};
-        $total_setup += $setup_failures{$function};
-        $total_percent += $fail_percent{$function};
-        $total_abort_percent += $abort_percent{$function};
-        $total_restart_percent += $restart_percent{$function};
-}
-# compute simple average of individual functions' failure rates --
-#  non-existent POSIX functions do not produce results files, so do not skew percentages
-$overall_fail_rate = ($total_percent/($total_functions));  # if using as an int, add .5 for rounding?
-$overall_abort_rate = ($total_abort_percent/$total_functions);
-$overall_restart_rate = ($total_restart_percent/$total_functions);
-
-printf(SUMMARY "\n----------------------------------------------------------------------------------------------\n");
-printf(STDOUT "\n-----------------------------------------------------------------------------------------------\n");
-
-$function = "OVERALL FAILURE RATE:";
-$totaltests{$function} = $total_alltests - $total_setup;
-$setup_failures{$function} = $total_setup;
-$fail_percent{$function} = $overall_fail_rate;
-$restart_percent{$function} = $overall_restart_rate;
-$abort_percent{$function} = $overall_abort_rate;
-write SUMMARY;
-write STDOUT;
-
-printf(SUMMARY "\nTests which failed to properly setup are not included in the above percentages\n");
-printf(STDOUT "\nTests which failed to properly setup are not included in the above percentages\n");
-print OUTHTML "</TR></TABLE>\n";
-print OUTHTML "\n<p> Finish Date: $mon/$mday/$year";
-print OUTHTML "</BODY></HTML>\n";
-
-
-close(OUTHTML);
-close(SUMMARY);
-close(FAILFILE);
-print "Ballista OS Robustness Test Suite complete   ";
-
-##############
-# format for output results file:
-
-format SUMMARY_TOP =
-Function                    Num. tests   (#Setup Fail)  | Restart %    Abort %      Total %
---------                    ----------   -------------  | ---------   ---------    ---------
-.
-
-format SUMMARY =
-@<<<<<<<<<<<<<<<<<<<<<<    @##########   (@##########)  |@###.####   @###.####    @###.#### 
-$function                $totaltests{$function}  $setup_failures{$function}  $restart_percent{$function}  $abort_percent{$function}  $fail_percent{$function}
-.
-
-format STDOUT_TOP =
-Function                    Num. tests   (#Setup Fail)  |  Restart      Abort        Total
---------                    ----------   -------------  | ---------   ---------    ---------
-.
-
-format STDOUT =
-@<<<<<<<<<<<<<<<<<<<<<<    @##########   (@##########)  |@###.####%  @###.####%   @###.####%
-$function                $totaltests{$function}  $setup_failures{$function}  $restart_percent{$function}  $abort_percent{$function}  $fail_percent{$function}
-.
-
diff --git a/testcases/ballista/ballista/outfiles/faillog b/testcases/ballista/ballista/outfiles/faillog
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/outfiles/faillog
+++ /dev/null
diff --git a/testcases/ballista/ballista/outfiles/logfile.txt b/testcases/ballista/ballista/outfiles/logfile.txt
deleted file mode 100644
index 644cde4..0000000
--- a/testcases/ballista/ballista/outfiles/logfile.txt
+++ /dev/null
@@ -1,668 +0,0 @@
-**************************************
-* Currently testing "nfsservctl"      
-* nfsservctl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getgroups"      
-* getgroups passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setgroups"      
-* setgroups passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getdents"      
-* getdents passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "bdflush"      
-* bdflush passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "bdflush"      
-* bdflush passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "exit"      
-* exit passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "mount"      
-* mount passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "umount"      
-* umount passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "nice"      
-* nice passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "chroot"      
-* chroot passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "readlink"      
-* readlink passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "uselib"      
-* uselib passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "swapon"      
-* swapon passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "swapoff"      
-* swapoff passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "reboot"      
-* reboot passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "mumap"      
-* mumap passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fchown"      
-* fchown passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fsync"      
-* fsync passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigreturn"      
-* sigreturn passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getresgid"      
-* getresgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "ioperm"      
-* ioperm passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "ipc"      
-* ipc passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "flock"      
-* flock passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "mremap"      
-* mremap passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "send"      
-* send passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "acct"      
-* acct passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setfsgid"      
-* setfsgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setfsuid"      
-* setfsuid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "brk"      
-* brk passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "recv"      
-* recv passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "recvfrom"      
-* recvfrom passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "syscall"      
-* syscall passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sysfs"      
-* sysfs passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "confstr"      
-* confstr passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fchdir"      
-* fchdir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getdomainname"      
-* getdomainname passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setdomainname"      
-* setdomainname passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sethostid"      
-* sethostid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "gethostname"      
-* gethostname passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sethostname"      
-* sethostname passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getsid"      
-* getsid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getpgid"      
-* getpgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setpgid"      
-* setpgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "lstat"      
-* lstat passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "modify_ldt"      
-* modify_ldt passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "profil"      
-* profil passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "iopl"      
-* iopl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "listen"      
-* listen passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getpriority"      
-* getpriority passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setpriority"      
-* setpriority passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "prctl"      
-* prctl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "access"      
-* access passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "chdir"      
-* chdir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "chmod"      
-* chmod passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "chown"      
-* chown passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "close"      
-* close passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "creat"      
-* creat passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "dup"      
-* dup passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "dup2"      
-* dup2 passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fchmod"      
-* fchmod passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fcntl"      
-* fcntl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fdatasync"      
-* fdatasync passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fstat"      
-* fstat passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "fsync"      
-* fsync passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "ftruncate"      
-* ftruncate passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getcwd"      
-* getcwd passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "link"      
-* link passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "lseek"      
-* lseek passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "mkdir"      
-* mkdir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "mkfifo"      
-* mkfifo passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "open"      
-* open passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "open"      
-* open passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "read"      
-* read passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "rename"      
-* rename passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "rmdir"      
-* rmdir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "stat"      
-* stat passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "umask"      
-* umask passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "unlink"      
-* unlink passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "write"      
-* write passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "utime"      
-* utime passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "closedir"      
-* closedir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "opendir"      
-* opendir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "readdir"      
-* readdir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "rewinddir"      
-* rewinddir passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execl"      
-* execl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execl"      
-* execl passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execle"      
-* execle passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execle"      
-* execle passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execlp"      
-* execlp passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execlp"      
-* execlp passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execv"      
-* execv passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execve"      
-* execve passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "execvp"      
-* execvp passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "wait"      
-* wait passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "waitpid"      
-* waitpid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "getgroups"      
-* getgroups passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setgid"      
-* setgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setpgid"      
-* setpgid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "setuid"      
-* setuid passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "alarm"      
-* alarm passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigaction"      
-* sigaction passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigaddset"      
-* sigaddset passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigdelset"      
-* sigdelset passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigemptyset"      
-* sigemptyset passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigfillset"      
-* sigfillset passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigismember"      
-* sigismember passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigpending"      
-* sigpending passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigprocmask"      
-* sigprocmask passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigtimedwait"      
-* sigtimedwait passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "sigwaitinfo"      
-* sigwaitinfo passed                    
-**************************************
-
-Compling... 
-**************************************
-* Currently testing "cfgetispeed"      
diff --git a/testcases/ballista/ballista/outfiles/ostest_version.txt b/testcases/ballista/ballista/outfiles/ostest_version.txt
deleted file mode 100644
index d3827e7..0000000
--- a/testcases/ballista/ballista/outfiles/ostest_version.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/testcases/ballista/ballista/outfiles/outfile.access.b_fname.b_int_amode b/testcases/ballista/ballista/outfiles/outfile.access.b_fname.b_int_amode
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.access.b_fname.b_int_amode
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.acct.b_fname b/testcases/ballista/ballista/outfiles/outfile.acct.b_fname
deleted file mode 100644
index a5345d9..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.acct.b_fname
+++ /dev/null
@@ -1,1514 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~375 Combination #2 of 500----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~375 Combination #6 of 500----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~375 Combination #7 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~375 Combination #9 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~375 Combination #10 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~375 Combination #11 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~375 Combination #12 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~375 Combination #13 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~375 Combination #14 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~375 Combination #17 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~375 Combination #18 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~375 Combination #19 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~375 Combination #20 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~375 Combination #21 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~375 Combination #22 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~375 Combination #23 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~375 Combination #25 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~375 Combination #26 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~375 Combination #27 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~375 Combination #28 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~375 Combination #30 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~375 Combination #31 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~375 Combination #33 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~375 Combination #34 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~375 Combination #35 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~375 Combination #36 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~375 Combination #37 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~375 Combination #39 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~375 Combination #41 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~375 Combination #43 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~375 Combination #45 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~375 Combination #46 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~375 Combination #49 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~375 Combination #51 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~375 Combination #52 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~375 Combination #53 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~375 Combination #54 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~375 Combination #56 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~375 Combination #57 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~375 Combination #58 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~375 Combination #59 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~375 Combination #60 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~375 Combination #61 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~375 Combination #65 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~375 Combination #66 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~375 Combination #67 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 47 of ~375 Combination #69 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 48 of ~375 Combination #70 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 49 of ~375 Combination #71 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 50 of ~375 Combination #72 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 51 of ~375 Combination #73 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 52 of ~375 Combination #76 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 53 of ~375 Combination #77 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 54 of ~375 Combination #78 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 55 of ~375 Combination #79 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 56 of ~375 Combination #80 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 57 of ~375 Combination #81 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 58 of ~375 Combination #82 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 59 of ~375 Combination #83 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 60 of ~375 Combination #86 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 61 of ~375 Combination #87 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 62 of ~375 Combination #89 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 63 of ~375 Combination #90 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 64 of ~375 Combination #92 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 65 of ~375 Combination #93 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 66 of ~375 Combination #95 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 67 of ~375 Combination #97 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 68 of ~375 Combination #99 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 69 of ~375 Combination #101 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 70 of ~375 Combination #102 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 71 of ~375 Combination #105 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 72 of ~375 Combination #107 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 73 of ~375 Combination #108 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 74 of ~375 Combination #109 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 75 of ~375 Combination #110 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 76 of ~375 Combination #112 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 77 of ~375 Combination #113 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 78 of ~375 Combination #114 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 79 of ~375 Combination #115 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 80 of ~375 Combination #116 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 81 of ~375 Combination #117 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 82 of ~375 Combination #118 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 83 of ~375 Combination #119 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 84 of ~375 Combination #121 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 85 of ~375 Combination #122 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 86 of ~375 Combination #123 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 87 of ~375 Combination #127 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 88 of ~375 Combination #128 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 89 of ~375 Combination #129 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 90 of ~375 Combination #130 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 91 of ~375 Combination #131 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 92 of ~375 Combination #132 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 93 of ~375 Combination #133 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 94 of ~375 Combination #134 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 95 of ~375 Combination #135 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 96 of ~375 Combination #136 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 97 of ~375 Combination #137 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 98 of ~375 Combination #139 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 99 of ~375 Combination #140 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 100 of ~375 Combination #141 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 101 of ~375 Combination #143 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 102 of ~375 Combination #144 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 103 of ~375 Combination #145 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 104 of ~375 Combination #146 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 105 of ~375 Combination #148 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 106 of ~375 Combination #149 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 107 of ~375 Combination #151 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 108 of ~375 Combination #153 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 109 of ~375 Combination #154 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 110 of ~375 Combination #155 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 111 of ~375 Combination #156 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 112 of ~375 Combination #157 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 113 of ~375 Combination #158 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 114 of ~375 Combination #159 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 115 of ~375 Combination #161 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 116 of ~375 Combination #163 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 117 of ~375 Combination #164 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 118 of ~375 Combination #166 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 119 of ~375 Combination #168 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 120 of ~375 Combination #170 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 121 of ~375 Combination #172 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 122 of ~375 Combination #173 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 123 of ~375 Combination #175 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 124 of ~375 Combination #176 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 125 of ~375 Combination #177 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 126 of ~375 Combination #178 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 127 of ~375 Combination #181 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 128 of ~375 Combination #182 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 129 of ~375 Combination #183 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 130 of ~375 Combination #184 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 131 of ~375 Combination #185 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 132 of ~375 Combination #186 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 133 of ~375 Combination #187 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 134 of ~375 Combination #189 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 135 of ~375 Combination #191 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 136 of ~375 Combination #193 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 137 of ~375 Combination #194 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 138 of ~375 Combination #195 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 139 of ~375 Combination #196 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 140 of ~375 Combination #202 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 141 of ~375 Combination #205 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 142 of ~375 Combination #206 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 143 of ~375 Combination #207 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 144 of ~375 Combination #210 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 145 of ~375 Combination #211 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 146 of ~375 Combination #212 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 147 of ~375 Combination #213 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 148 of ~375 Combination #214 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 149 of ~375 Combination #215 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 150 of ~375 Combination #216 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 151 of ~375 Combination #217 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 152 of ~375 Combination #218 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 153 of ~375 Combination #219 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 154 of ~375 Combination #220 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 155 of ~375 Combination #221 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 156 of ~375 Combination #222 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 157 of ~375 Combination #223 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 158 of ~375 Combination #225 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 159 of ~375 Combination #226 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 160 of ~375 Combination #227 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 161 of ~375 Combination #228 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 162 of ~375 Combination #229 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 163 of ~375 Combination #230 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 164 of ~375 Combination #232 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 165 of ~375 Combination #233 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 166 of ~375 Combination #235 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 167 of ~375 Combination #236 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 168 of ~375 Combination #237 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 169 of ~375 Combination #238 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 170 of ~375 Combination #240 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 171 of ~375 Combination #241 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 172 of ~375 Combination #242 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 173 of ~375 Combination #243 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 174 of ~375 Combination #244 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 175 of ~375 Combination #245 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 176 of ~375 Combination #246 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 177 of ~375 Combination #247 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 178 of ~375 Combination #248 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 179 of ~375 Combination #249 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 180 of ~375 Combination #250 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 181 of ~375 Combination #251 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 182 of ~375 Combination #252 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 183 of ~375 Combination #253 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 184 of ~375 Combination #254 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 185 of ~375 Combination #255 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 186 of ~375 Combination #256 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 187 of ~375 Combination #257 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 188 of ~375 Combination #258 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 189 of ~375 Combination #259 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 190 of ~375 Combination #260 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 191 of ~375 Combination #262 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 192 of ~375 Combination #263 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 193 of ~375 Combination #264 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 194 of ~375 Combination #265 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 195 of ~375 Combination #266 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 196 of ~375 Combination #267 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 197 of ~375 Combination #269 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 198 of ~375 Combination #270 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 199 of ~375 Combination #271 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 200 of ~375 Combination #272 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 201 of ~375 Combination #273 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 202 of ~375 Combination #274 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 203 of ~375 Combination #275 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 204 of ~375 Combination #276 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 205 of ~375 Combination #278 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 206 of ~375 Combination #279 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 207 of ~375 Combination #280 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 208 of ~375 Combination #282 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 209 of ~375 Combination #284 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 210 of ~375 Combination #285 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 211 of ~375 Combination #286 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 212 of ~375 Combination #290 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 213 of ~375 Combination #291 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 214 of ~375 Combination #292 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 215 of ~375 Combination #293 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 216 of ~375 Combination #298 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 217 of ~375 Combination #300 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 218 of ~375 Combination #301 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 219 of ~375 Combination #305 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 220 of ~375 Combination #306 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 221 of ~375 Combination #307 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 222 of ~375 Combination #308 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 223 of ~375 Combination #310 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 224 of ~375 Combination #311 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 225 of ~375 Combination #313 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 226 of ~375 Combination #314 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 227 of ~375 Combination #315 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 228 of ~375 Combination #316 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 229 of ~375 Combination #317 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 230 of ~375 Combination #318 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 231 of ~375 Combination #319 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 232 of ~375 Combination #320 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 233 of ~375 Combination #322 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 234 of ~375 Combination #323 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 235 of ~375 Combination #324 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 236 of ~375 Combination #325 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 237 of ~375 Combination #326 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 238 of ~375 Combination #327 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 239 of ~375 Combination #328 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 240 of ~375 Combination #329 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 241 of ~375 Combination #332 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 242 of ~375 Combination #335 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 243 of ~375 Combination #336 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 244 of ~375 Combination #337 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 245 of ~375 Combination #338 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 246 of ~375 Combination #339 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 247 of ~375 Combination #340 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 248 of ~375 Combination #341 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 249 of ~375 Combination #342 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 250 of ~375 Combination #343 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 251 of ~375 Combination #344 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 252 of ~375 Combination #345 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 253 of ~375 Combination #346 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 254 of ~375 Combination #347 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 255 of ~375 Combination #348 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 256 of ~375 Combination #349 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 257 of ~375 Combination #351 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 258 of ~375 Combination #352 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 259 of ~375 Combination #353 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 260 of ~375 Combination #355 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 261 of ~375 Combination #356 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 262 of ~375 Combination #358 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 263 of ~375 Combination #359 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 264 of ~375 Combination #360 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 265 of ~375 Combination #361 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 266 of ~375 Combination #362 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 267 of ~375 Combination #364 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 268 of ~375 Combination #365 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 269 of ~375 Combination #366 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 270 of ~375 Combination #367 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 271 of ~375 Combination #368 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 272 of ~375 Combination #370 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 273 of ~375 Combination #372 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 274 of ~375 Combination #373 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 275 of ~375 Combination #374 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 276 of ~375 Combination #377 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 277 of ~375 Combination #378 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 278 of ~375 Combination #380 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 279 of ~375 Combination #381 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 280 of ~375 Combination #382 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 281 of ~375 Combination #384 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 282 of ~375 Combination #385 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 283 of ~375 Combination #386 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 284 of ~375 Combination #388 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 285 of ~375 Combination #389 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 286 of ~375 Combination #390 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 287 of ~375 Combination #391 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 288 of ~375 Combination #392 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 289 of ~375 Combination #394 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 290 of ~375 Combination #395 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 291 of ~375 Combination #396 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 292 of ~375 Combination #397 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 293 of ~375 Combination #399 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 294 of ~375 Combination #400 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 295 of ~375 Combination #401 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 296 of ~375 Combination #402 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 297 of ~375 Combination #403 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 298 of ~375 Combination #404 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 299 of ~375 Combination #405 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 300 of ~375 Combination #406 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 301 of ~375 Combination #407 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 302 of ~375 Combination #409 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 303 of ~375 Combination #410 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 304 of ~375 Combination #411 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 305 of ~375 Combination #412 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 306 of ~375 Combination #413 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 307 of ~375 Combination #414 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 308 of ~375 Combination #415 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 309 of ~375 Combination #417 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 310 of ~375 Combination #418 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 311 of ~375 Combination #420 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 312 of ~375 Combination #421 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 313 of ~375 Combination #422 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 314 of ~375 Combination #424 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 315 of ~375 Combination #425 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 316 of ~375 Combination #427 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 317 of ~375 Combination #429 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 318 of ~375 Combination #430 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 319 of ~375 Combination #431 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 320 of ~375 Combination #433 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 321 of ~375 Combination #435 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 322 of ~375 Combination #436 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 323 of ~375 Combination #437 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 324 of ~375 Combination #438 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 325 of ~375 Combination #439 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 326 of ~375 Combination #440 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 327 of ~375 Combination #442 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 328 of ~375 Combination #443 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 329 of ~375 Combination #444 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 330 of ~375 Combination #445 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 331 of ~375 Combination #446 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 332 of ~375 Combination #447 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 333 of ~375 Combination #448 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 334 of ~375 Combination #449 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 335 of ~375 Combination #450 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 336 of ~375 Combination #451 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 337 of ~375 Combination #452 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 338 of ~375 Combination #453 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 339 of ~375 Combination #454 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 340 of ~375 Combination #455 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 341 of ~375 Combination #456 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 342 of ~375 Combination #457 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 343 of ~375 Combination #458 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 344 of ~375 Combination #459 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 345 of ~375 Combination #461 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 346 of ~375 Combination #463 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 347 of ~375 Combination #464 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 348 of ~375 Combination #465 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 349 of ~375 Combination #466 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 350 of ~375 Combination #467 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 351 of ~375 Combination #469 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 352 of ~375 Combination #470 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 353 of ~375 Combination #471 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 354 of ~375 Combination #472 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 355 of ~375 Combination #473 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 356 of ~375 Combination #474 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 357 of ~375 Combination #476 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 358 of ~375 Combination #477 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 359 of ~375 Combination #478 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 360 of ~375 Combination #479 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 361 of ~375 Combination #480 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 362 of ~375 Combination #481 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 363 of ~375 Combination #482 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 364 of ~375 Combination #483 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 365 of ~375 Combination #484 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 366 of ~375 Combination #485 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 367 of ~375 Combination #486 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 368 of ~375 Combination #487 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 369 of ~375 Combination #488 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 370 of ~375 Combination #489 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 371 of ~375 Combination #491 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 372 of ~375 Combination #492 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 373 of ~375 Combination #493 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 374 of ~375 Combination #495 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 375 of ~375 Combination #496 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 376 of ~375 Combination #498 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 377 of ~375 Combination #499 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 378 of ~375 Combination #500 of 500----
diff --git a/testcases/ballista/ballista/outfiles/outfile.alarm.b_int b/testcases/ballista/ballista/outfiles/outfile.alarm.b_int
deleted file mode 100644
index 1525246..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.alarm.b_int
+++ /dev/null
@@ -1,70 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~18.75 Combination #2 of 25----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~18.75 Combination #6 of 25----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~18.75 Combination #7 of 25----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~18.75 Combination #9 of 25----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~18.75 Combination #10 of 25----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~18.75 Combination #11 of 25----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~18.75 Combination #12 of 25----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~18.75 Combination #13 of 25----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~18.75 Combination #14 of 25----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~18.75 Combination #17 of 25----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~18.75 Combination #18 of 25----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~18.75 Combination #19 of 25----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~18.75 Combination #20 of 25----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~18.75 Combination #21 of 25----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~18.75 Combination #22 of 25----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~18.75 Combination #23 of 25----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~18.75 Combination #25 of 25----
diff --git a/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_long b/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_ptr_long b/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_ptr_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.bdflush.b_int.b_ptr_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.brk.b_ptr_void b/testcases/ballista/ballista/outfiles/outfile.brk.b_ptr_void
deleted file mode 100644
index 69b93cc..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.brk.b_ptr_void
+++ /dev/null
@@ -1,14 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~5.25 Combination #2 of 7----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~5.25 Combination #6 of 7----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~5.25 Combination #7 of 7----
diff --git a/testcases/ballista/ballista/outfiles/outfile.cfgetispeed.b_ptr_termios b/testcases/ballista/ballista/outfiles/outfile.cfgetispeed.b_ptr_termios
deleted file mode 100644
index 8f6e802..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.cfgetispeed.b_ptr_termios
+++ /dev/null
@@ -1,1295 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 1 of ~4000 Combination #19 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 2 of ~4000 Combination #21 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 3 of ~4000 Combination #23 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 4 of ~4000 Combination #25 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 5 of ~4000 Combination #27 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 6 of ~4000 Combination #28 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 7 of ~4000 Combination #49 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 8 of ~4000 Combination #52 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 9 of ~4000 Combination #57 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 10 of ~4000 Combination #58 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 11 of ~4000 Combination #60 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 12 of ~4000 Combination #72 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 13 of ~4000 Combination #82 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 14 of ~4000 Combination #105 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 15 of ~4000 Combination #119 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 16 of ~4000 Combination #121 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 17 of ~4000 Combination #122 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 18 of ~4000 Combination #135 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 19 of ~4000 Combination #137 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 20 of ~4000 Combination #139 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 21 of ~4000 Combination #141 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 22 of ~4000 Combination #143 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 23 of ~4000 Combination #145 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 24 of ~4000 Combination #153 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 25 of ~4000 Combination #154 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 26 of ~4000 Combination #156 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 27 of ~4000 Combination #157 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 28 of ~4000 Combination #163 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 29 of ~4000 Combination #164 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 30 of ~4000 Combination #168 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 31 of ~4000 Combination #170 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 32 of ~4000 Combination #172 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 33 of ~4000 Combination #173 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 34 of ~4000 Combination #176 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 35 of ~4000 Combination #177 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 36 of ~4000 Combination #186 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 37 of ~4000 Combination #195 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 38 of ~4000 Combination #207 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 39 of ~4000 Combination #210 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 40 of ~4000 Combination #219 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 41 of ~4000 Combination #228 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 42 of ~4000 Combination #236 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 43 of ~4000 Combination #248 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 44 of ~4000 Combination #266 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 45 of ~4000 Combination #270 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 46 of ~4000 Combination #271 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 47 of ~4000 Combination #282 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 48 of ~4000 Combination #291 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 49 of ~4000 Combination #307 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 50 of ~4000 Combination #315 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 51 of ~4000 Combination #318 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 52 of ~4000 Combination #323 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 53 of ~4000 Combination #326 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 54 of ~4000 Combination #327 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 55 of ~4000 Combination #341 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 56 of ~4000 Combination #342 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 57 of ~4000 Combination #343 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 58 of ~4000 Combination #348 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 59 of ~4000 Combination #356 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 60 of ~4000 Combination #372 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 61 of ~4000 Combination #374 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 62 of ~4000 Combination #378 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 63 of ~4000 Combination #381 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 64 of ~4000 Combination #388 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 65 of ~4000 Combination #389 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 66 of ~4000 Combination #394 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 67 of ~4000 Combination #395 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 68 of ~4000 Combination #396 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 69 of ~4000 Combination #401 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 70 of ~4000 Combination #410 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 71 of ~4000 Combination #417 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 72 of ~4000 Combination #418 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 73 of ~4000 Combination #420 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 74 of ~4000 Combination #430 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 75 of ~4000 Combination #439 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 76 of ~4000 Combination #450 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 77 of ~4000 Combination #452 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_CLOCAL_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 78 of ~4000 Combination #466 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 79 of ~4000 Combination #477 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 80 of ~4000 Combination #478 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 81 of ~4000 Combination #479 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 82 of ~4000 Combination #485 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 83 of ~4000 Combination #486 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 84 of ~4000 Combination #491 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 85 of ~4000 Combination #499 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 86 of ~4000 Combination #534 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 87 of ~4000 Combination #544 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 88 of ~4000 Combination #546 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 89 of ~4000 Combination #551 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 90 of ~4000 Combination #554 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 91 of ~4000 Combination #559 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 92 of ~4000 Combination #563 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_NEGONE	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 93 of ~4000 Combination #571 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_NEGONE	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 94 of ~4000 Combination #572 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 95 of ~4000 Combination #616 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 96 of ~4000 Combination #623 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 97 of ~4000 Combination #627 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 98 of ~4000 Combination #629 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 99 of ~4000 Combination #635 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 100 of ~4000 Combination #641 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_IEXTEN_SET	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 101 of ~4000 Combination #650 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 102 of ~4000 Combination #657 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 103 of ~4000 Combination #660 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 104 of ~4000 Combination #661 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 105 of ~4000 Combination #664 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 106 of ~4000 Combination #665 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 107 of ~4000 Combination #666 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 108 of ~4000 Combination #670 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 109 of ~4000 Combination #672 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 110 of ~4000 Combination #681 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 111 of ~4000 Combination #687 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 112 of ~4000 Combination #696 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 113 of ~4000 Combination #708 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 114 of ~4000 Combination #709 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 115 of ~4000 Combination #710 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARODD_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 116 of ~4000 Combination #712 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_PARODD_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 117 of ~4000 Combination #714 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 118 of ~4000 Combination #717 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 119 of ~4000 Combination #722 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 120 of ~4000 Combination #734 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 121 of ~4000 Combination #751 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 122 of ~4000 Combination #761 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 123 of ~4000 Combination #771 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 124 of ~4000 Combination #772 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 125 of ~4000 Combination #773 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 126 of ~4000 Combination #780 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 127 of ~4000 Combination #784 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 128 of ~4000 Combination #785 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 129 of ~4000 Combination #789 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 130 of ~4000 Combination #792 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 131 of ~4000 Combination #796 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 132 of ~4000 Combination #801 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 133 of ~4000 Combination #804 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 134 of ~4000 Combination #808 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 135 of ~4000 Combination #811 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 136 of ~4000 Combination #814 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 137 of ~4000 Combination #824 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 138 of ~4000 Combination #825 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 139 of ~4000 Combination #827 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 140 of ~4000 Combination #829 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 141 of ~4000 Combination #838 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 142 of ~4000 Combination #839 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 143 of ~4000 Combination #844 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 144 of ~4000 Combination #847 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 145 of ~4000 Combination #849 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 146 of ~4000 Combination #851 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 147 of ~4000 Combination #857 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 148 of ~4000 Combination #858 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_MAXINT	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 149 of ~4000 Combination #860 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 150 of ~4000 Combination #862 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 151 of ~4000 Combination #876 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 152 of ~4000 Combination #890 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 153 of ~4000 Combination #893 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 154 of ~4000 Combination #894 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 155 of ~4000 Combination #902 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 156 of ~4000 Combination #904 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 157 of ~4000 Combination #915 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 158 of ~4000 Combination #926 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 159 of ~4000 Combination #932 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 160 of ~4000 Combination #934 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 161 of ~4000 Combination #935 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 162 of ~4000 Combination #940 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 163 of ~4000 Combination #944 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 164 of ~4000 Combination #952 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 165 of ~4000 Combination #964 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 166 of ~4000 Combination #970 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 167 of ~4000 Combination #973 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 168 of ~4000 Combination #979 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 169 of ~4000 Combination #980 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 170 of ~4000 Combination #983 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 171 of ~4000 Combination #996 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 172 of ~4000 Combination #1006 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 173 of ~4000 Combination #1018 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 174 of ~4000 Combination #1019 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 175 of ~4000 Combination #1025 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 176 of ~4000 Combination #1032 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 177 of ~4000 Combination #1034 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 178 of ~4000 Combination #1037 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 179 of ~4000 Combination #1039 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 180 of ~4000 Combination #1048 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 181 of ~4000 Combination #1049 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 182 of ~4000 Combination #1050 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 183 of ~4000 Combination #1053 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 184 of ~4000 Combination #1059 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_NEGONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 185 of ~4000 Combination #1069 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 186 of ~4000 Combination #1076 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 187 of ~4000 Combination #1082 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 188 of ~4000 Combination #1086 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 189 of ~4000 Combination #1092 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 190 of ~4000 Combination #1103 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 191 of ~4000 Combination #1107 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 192 of ~4000 Combination #1114 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 193 of ~4000 Combination #1117 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 194 of ~4000 Combination #1119 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 195 of ~4000 Combination #1121 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 196 of ~4000 Combination #1127 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 197 of ~4000 Combination #1130 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 198 of ~4000 Combination #1139 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 199 of ~4000 Combination #1151 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 200 of ~4000 Combination #1162 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 201 of ~4000 Combination #1168 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 202 of ~4000 Combination #1169 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 203 of ~4000 Combination #1174 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 204 of ~4000 Combination #1175 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 205 of ~4000 Combination #1176 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 206 of ~4000 Combination #1189 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 207 of ~4000 Combination #1216 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 208 of ~4000 Combination #1220 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 209 of ~4000 Combination #1226 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 210 of ~4000 Combination #1230 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 211 of ~4000 Combination #1235 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 212 of ~4000 Combination #1236 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 213 of ~4000 Combination #1243 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 214 of ~4000 Combination #1244 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 215 of ~4000 Combination #1255 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 216 of ~4000 Combination #1256 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 217 of ~4000 Combination #1262 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 218 of ~4000 Combination #1270 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 219 of ~4000 Combination #1271 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 220 of ~4000 Combination #1272 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 221 of ~4000 Combination #1274 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_ONE	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 222 of ~4000 Combination #1276 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 223 of ~4000 Combination #1285 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 224 of ~4000 Combination #1293 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 225 of ~4000 Combination #1294 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 226 of ~4000 Combination #1296 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 227 of ~4000 Combination #1297 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_NEGONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 228 of ~4000 Combination #1298 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 229 of ~4000 Combination #1303 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 230 of ~4000 Combination #1311 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 231 of ~4000 Combination #1312 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 232 of ~4000 Combination #1320 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 233 of ~4000 Combination #1325 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 234 of ~4000 Combination #1328 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 235 of ~4000 Combination #1329 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 236 of ~4000 Combination #1331 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 237 of ~4000 Combination #1333 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 238 of ~4000 Combination #1350 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 239 of ~4000 Combination #1353 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 240 of ~4000 Combination #1354 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 241 of ~4000 Combination #1356 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 242 of ~4000 Combination #1359 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 243 of ~4000 Combination #1360 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 244 of ~4000 Combination #1370 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 245 of ~4000 Combination #1375 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 246 of ~4000 Combination #1376 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 247 of ~4000 Combination #1389 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 248 of ~4000 Combination #1393 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 249 of ~4000 Combination #1397 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_MAXINT	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 250 of ~4000 Combination #1398 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 251 of ~4000 Combination #1401 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 252 of ~4000 Combination #1405 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 253 of ~4000 Combination #1416 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 254 of ~4000 Combination #1423 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 255 of ~4000 Combination #1433 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 256 of ~4000 Combination #1439 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 257 of ~4000 Combination #1449 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 258 of ~4000 Combination #1450 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 259 of ~4000 Combination #1461 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 260 of ~4000 Combination #1462 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 261 of ~4000 Combination #1463 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 262 of ~4000 Combination #1465 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 263 of ~4000 Combination #1466 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 264 of ~4000 Combination #1476 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 265 of ~4000 Combination #1479 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 266 of ~4000 Combination #1483 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_ZERO	b_ptr_termios_L_ZERO	b_ptr_termios_CC_UNSET	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 267 of ~4000 Combination #1487 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 268 of ~4000 Combination #1498 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 269 of ~4000 Combination #1499 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 270 of ~4000 Combination #1500 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 271 of ~4000 Combination #1523 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 272 of ~4000 Combination #1544 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 273 of ~4000 Combination #1545 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 274 of ~4000 Combination #1546 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 275 of ~4000 Combination #1559 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 276 of ~4000 Combination #1563 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 277 of ~4000 Combination #1564 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 278 of ~4000 Combination #1570 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 279 of ~4000 Combination #1572 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 280 of ~4000 Combination #1575 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 281 of ~4000 Combination #1583 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 282 of ~4000 Combination #1585 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_OPOST_SET	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 283 of ~4000 Combination #1586 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 284 of ~4000 Combination #1588 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 285 of ~4000 Combination #1592 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 286 of ~4000 Combination #1595 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_C_MAXINT	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 287 of ~4000 Combination #1604 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 288 of ~4000 Combination #1613 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_MAXINT	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 289 of ~4000 Combination #1620 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 290 of ~4000 Combination #1622 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 291 of ~4000 Combination #1623 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 292 of ~4000 Combination #1624 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 293 of ~4000 Combination #1626 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 294 of ~4000 Combination #1631 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 295 of ~4000 Combination #1639 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ZERO	b_ptr_termios_C_NEGONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 296 of ~4000 Combination #1640 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 297 of ~4000 Combination #1652 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 298 of ~4000 Combination #1663 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 299 of ~4000 Combination #1666 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ZERO	b_ptr_termios_C_ONE	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 300 of ~4000 Combination #1667 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 301 of ~4000 Combination #1673 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 302 of ~4000 Combination #1674 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 303 of ~4000 Combination #1677 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 304 of ~4000 Combination #1684 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_NEGONE	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 305 of ~4000 Combination #1686 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 306 of ~4000 Combination #1689 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_C_ZERO	b_ptr_termios_ECHOK_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 307 of ~4000 Combination #1693 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_OPOST_SET	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 308 of ~4000 Combination #1701 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 309 of ~4000 Combination #1707 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 310 of ~4000 Combination #1721 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 311 of ~4000 Combination #1722 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ZERO	b_ptr_termios_O_ONE	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 312 of ~4000 Combination #1724 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_CLOCAL_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 313 of ~4000 Combination #1726 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_NEGONE	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 314 of ~4000 Combination #1734 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_OPOST_SET	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 315 of ~4000 Combination #1735 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 316 of ~4000 Combination #1737 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_MAXINT	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 317 of ~4000 Combination #1738 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 318 of ~4000 Combination #1745 of 22070----
-#param:b_ptr_termios	b_ptr_termios_BRKINT_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARENB_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 319 of ~4000 Combination #1755 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_MAXINT	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 320 of ~4000 Combination #1771 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_MAXINT	b_ptr_termios_O_NEGONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 321 of ~4000 Combination #1775 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 322 of ~4000 Combination #1780 of 22070----
-#param:b_ptr_termios	b_ptr_termios_I_ONE	b_ptr_termios_O_ONE	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
-rval:
-Done - Pass	0
-------- 323 of ~4000 Combination #1783 of 22070----
-#param:b_ptr_termios	b_ptr_termios_PARMRK_SET	b_ptr_termios_O_ZERO	b_ptr_termios_PARODD_SET	b_ptr_termios_ICANON_SET	b_ptr_termios_CC_VKILL	b_ptr_termios_ZERO	
diff --git a/testcases/ballista/ballista/outfiles/outfile.chdir.b_fname b/testcases/ballista/ballista/outfiles/outfile.chdir.b_fname
deleted file mode 100644
index a5345d9..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.chdir.b_fname
+++ /dev/null
@@ -1,1514 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~375 Combination #2 of 500----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~375 Combination #6 of 500----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~375 Combination #7 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~375 Combination #9 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~375 Combination #10 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~375 Combination #11 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~375 Combination #12 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~375 Combination #13 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~375 Combination #14 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~375 Combination #17 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~375 Combination #18 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~375 Combination #19 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~375 Combination #20 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~375 Combination #21 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~375 Combination #22 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~375 Combination #23 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~375 Combination #25 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~375 Combination #26 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~375 Combination #27 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~375 Combination #28 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~375 Combination #30 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~375 Combination #31 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~375 Combination #33 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~375 Combination #34 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~375 Combination #35 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~375 Combination #36 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~375 Combination #37 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~375 Combination #39 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~375 Combination #41 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~375 Combination #43 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~375 Combination #45 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~375 Combination #46 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~375 Combination #49 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~375 Combination #51 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~375 Combination #52 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~375 Combination #53 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~375 Combination #54 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~375 Combination #56 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~375 Combination #57 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~375 Combination #58 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~375 Combination #59 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~375 Combination #60 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~375 Combination #61 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~375 Combination #65 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~375 Combination #66 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~375 Combination #67 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 47 of ~375 Combination #69 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 48 of ~375 Combination #70 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 49 of ~375 Combination #71 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 50 of ~375 Combination #72 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 51 of ~375 Combination #73 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 52 of ~375 Combination #76 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 53 of ~375 Combination #77 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 54 of ~375 Combination #78 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 55 of ~375 Combination #79 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 56 of ~375 Combination #80 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 57 of ~375 Combination #81 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 58 of ~375 Combination #82 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 59 of ~375 Combination #83 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 60 of ~375 Combination #86 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 61 of ~375 Combination #87 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 62 of ~375 Combination #89 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 63 of ~375 Combination #90 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 64 of ~375 Combination #92 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 65 of ~375 Combination #93 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 66 of ~375 Combination #95 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 67 of ~375 Combination #97 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 68 of ~375 Combination #99 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 69 of ~375 Combination #101 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 70 of ~375 Combination #102 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 71 of ~375 Combination #105 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 72 of ~375 Combination #107 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 73 of ~375 Combination #108 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 74 of ~375 Combination #109 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 75 of ~375 Combination #110 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 76 of ~375 Combination #112 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 77 of ~375 Combination #113 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 78 of ~375 Combination #114 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 79 of ~375 Combination #115 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 80 of ~375 Combination #116 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 81 of ~375 Combination #117 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 82 of ~375 Combination #118 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 83 of ~375 Combination #119 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 84 of ~375 Combination #121 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 85 of ~375 Combination #122 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 86 of ~375 Combination #123 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 87 of ~375 Combination #127 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 88 of ~375 Combination #128 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 89 of ~375 Combination #129 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 90 of ~375 Combination #130 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 91 of ~375 Combination #131 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 92 of ~375 Combination #132 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 93 of ~375 Combination #133 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 94 of ~375 Combination #134 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 95 of ~375 Combination #135 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 96 of ~375 Combination #136 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 97 of ~375 Combination #137 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 98 of ~375 Combination #139 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 99 of ~375 Combination #140 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 100 of ~375 Combination #141 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 101 of ~375 Combination #143 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 102 of ~375 Combination #144 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 103 of ~375 Combination #145 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 104 of ~375 Combination #146 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 105 of ~375 Combination #148 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 106 of ~375 Combination #149 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 107 of ~375 Combination #151 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 108 of ~375 Combination #153 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 109 of ~375 Combination #154 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 110 of ~375 Combination #155 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 111 of ~375 Combination #156 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 112 of ~375 Combination #157 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 113 of ~375 Combination #158 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 114 of ~375 Combination #159 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 115 of ~375 Combination #161 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 116 of ~375 Combination #163 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 117 of ~375 Combination #164 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 118 of ~375 Combination #166 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 119 of ~375 Combination #168 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 120 of ~375 Combination #170 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 121 of ~375 Combination #172 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 122 of ~375 Combination #173 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 123 of ~375 Combination #175 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 124 of ~375 Combination #176 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 125 of ~375 Combination #177 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 126 of ~375 Combination #178 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 127 of ~375 Combination #181 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 128 of ~375 Combination #182 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 129 of ~375 Combination #183 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 130 of ~375 Combination #184 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 131 of ~375 Combination #185 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 132 of ~375 Combination #186 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 133 of ~375 Combination #187 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 134 of ~375 Combination #189 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 135 of ~375 Combination #191 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 136 of ~375 Combination #193 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 137 of ~375 Combination #194 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 138 of ~375 Combination #195 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 139 of ~375 Combination #196 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 140 of ~375 Combination #202 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 141 of ~375 Combination #205 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 142 of ~375 Combination #206 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 143 of ~375 Combination #207 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 144 of ~375 Combination #210 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 145 of ~375 Combination #211 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 146 of ~375 Combination #212 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 147 of ~375 Combination #213 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 148 of ~375 Combination #214 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 149 of ~375 Combination #215 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 150 of ~375 Combination #216 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 151 of ~375 Combination #217 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 152 of ~375 Combination #218 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 153 of ~375 Combination #219 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 154 of ~375 Combination #220 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 155 of ~375 Combination #221 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 156 of ~375 Combination #222 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 157 of ~375 Combination #223 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 158 of ~375 Combination #225 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 159 of ~375 Combination #226 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 160 of ~375 Combination #227 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 161 of ~375 Combination #228 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 162 of ~375 Combination #229 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 163 of ~375 Combination #230 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 164 of ~375 Combination #232 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 165 of ~375 Combination #233 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 166 of ~375 Combination #235 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 167 of ~375 Combination #236 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 168 of ~375 Combination #237 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 169 of ~375 Combination #238 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 170 of ~375 Combination #240 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 171 of ~375 Combination #241 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 172 of ~375 Combination #242 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 173 of ~375 Combination #243 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 174 of ~375 Combination #244 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 175 of ~375 Combination #245 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 176 of ~375 Combination #246 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 177 of ~375 Combination #247 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 178 of ~375 Combination #248 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 179 of ~375 Combination #249 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 180 of ~375 Combination #250 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 181 of ~375 Combination #251 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 182 of ~375 Combination #252 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 183 of ~375 Combination #253 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 184 of ~375 Combination #254 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 185 of ~375 Combination #255 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 186 of ~375 Combination #256 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 187 of ~375 Combination #257 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 188 of ~375 Combination #258 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 189 of ~375 Combination #259 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 190 of ~375 Combination #260 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 191 of ~375 Combination #262 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 192 of ~375 Combination #263 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 193 of ~375 Combination #264 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 194 of ~375 Combination #265 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 195 of ~375 Combination #266 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 196 of ~375 Combination #267 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 197 of ~375 Combination #269 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 198 of ~375 Combination #270 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 199 of ~375 Combination #271 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 200 of ~375 Combination #272 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 201 of ~375 Combination #273 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 202 of ~375 Combination #274 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 203 of ~375 Combination #275 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 204 of ~375 Combination #276 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 205 of ~375 Combination #278 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 206 of ~375 Combination #279 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 207 of ~375 Combination #280 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 208 of ~375 Combination #282 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 209 of ~375 Combination #284 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 210 of ~375 Combination #285 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 211 of ~375 Combination #286 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 212 of ~375 Combination #290 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 213 of ~375 Combination #291 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 214 of ~375 Combination #292 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 215 of ~375 Combination #293 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 216 of ~375 Combination #298 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 217 of ~375 Combination #300 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 218 of ~375 Combination #301 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 219 of ~375 Combination #305 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 220 of ~375 Combination #306 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 221 of ~375 Combination #307 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 222 of ~375 Combination #308 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 223 of ~375 Combination #310 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 224 of ~375 Combination #311 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 225 of ~375 Combination #313 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 226 of ~375 Combination #314 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 227 of ~375 Combination #315 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 228 of ~375 Combination #316 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 229 of ~375 Combination #317 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 230 of ~375 Combination #318 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 231 of ~375 Combination #319 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 232 of ~375 Combination #320 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 233 of ~375 Combination #322 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 234 of ~375 Combination #323 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 235 of ~375 Combination #324 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 236 of ~375 Combination #325 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 237 of ~375 Combination #326 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 238 of ~375 Combination #327 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 239 of ~375 Combination #328 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 240 of ~375 Combination #329 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 241 of ~375 Combination #332 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 242 of ~375 Combination #335 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 243 of ~375 Combination #336 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 244 of ~375 Combination #337 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 245 of ~375 Combination #338 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 246 of ~375 Combination #339 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 247 of ~375 Combination #340 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 248 of ~375 Combination #341 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 249 of ~375 Combination #342 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 250 of ~375 Combination #343 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 251 of ~375 Combination #344 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 252 of ~375 Combination #345 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 253 of ~375 Combination #346 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 254 of ~375 Combination #347 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 255 of ~375 Combination #348 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 256 of ~375 Combination #349 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 257 of ~375 Combination #351 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 258 of ~375 Combination #352 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 259 of ~375 Combination #353 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 260 of ~375 Combination #355 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 261 of ~375 Combination #356 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 262 of ~375 Combination #358 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 263 of ~375 Combination #359 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 264 of ~375 Combination #360 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 265 of ~375 Combination #361 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 266 of ~375 Combination #362 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 267 of ~375 Combination #364 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 268 of ~375 Combination #365 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 269 of ~375 Combination #366 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 270 of ~375 Combination #367 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 271 of ~375 Combination #368 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 272 of ~375 Combination #370 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 273 of ~375 Combination #372 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 274 of ~375 Combination #373 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 275 of ~375 Combination #374 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 276 of ~375 Combination #377 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 277 of ~375 Combination #378 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 278 of ~375 Combination #380 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 279 of ~375 Combination #381 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 280 of ~375 Combination #382 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 281 of ~375 Combination #384 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 282 of ~375 Combination #385 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 283 of ~375 Combination #386 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 284 of ~375 Combination #388 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 285 of ~375 Combination #389 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 286 of ~375 Combination #390 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 287 of ~375 Combination #391 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 288 of ~375 Combination #392 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 289 of ~375 Combination #394 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 290 of ~375 Combination #395 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 291 of ~375 Combination #396 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 292 of ~375 Combination #397 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 293 of ~375 Combination #399 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 294 of ~375 Combination #400 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 295 of ~375 Combination #401 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 296 of ~375 Combination #402 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 297 of ~375 Combination #403 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 298 of ~375 Combination #404 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 299 of ~375 Combination #405 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 300 of ~375 Combination #406 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 301 of ~375 Combination #407 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 302 of ~375 Combination #409 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 303 of ~375 Combination #410 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 304 of ~375 Combination #411 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 305 of ~375 Combination #412 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 306 of ~375 Combination #413 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 307 of ~375 Combination #414 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 308 of ~375 Combination #415 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 309 of ~375 Combination #417 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 310 of ~375 Combination #418 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 311 of ~375 Combination #420 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 312 of ~375 Combination #421 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 313 of ~375 Combination #422 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 314 of ~375 Combination #424 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 315 of ~375 Combination #425 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 316 of ~375 Combination #427 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 317 of ~375 Combination #429 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 318 of ~375 Combination #430 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 319 of ~375 Combination #431 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 320 of ~375 Combination #433 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 321 of ~375 Combination #435 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 322 of ~375 Combination #436 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 323 of ~375 Combination #437 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 324 of ~375 Combination #438 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 325 of ~375 Combination #439 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 326 of ~375 Combination #440 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 327 of ~375 Combination #442 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 328 of ~375 Combination #443 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 329 of ~375 Combination #444 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 330 of ~375 Combination #445 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 331 of ~375 Combination #446 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 332 of ~375 Combination #447 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 333 of ~375 Combination #448 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 334 of ~375 Combination #449 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 335 of ~375 Combination #450 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 336 of ~375 Combination #451 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 337 of ~375 Combination #452 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 338 of ~375 Combination #453 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 339 of ~375 Combination #454 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 340 of ~375 Combination #455 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 341 of ~375 Combination #456 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 342 of ~375 Combination #457 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 343 of ~375 Combination #458 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 344 of ~375 Combination #459 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 345 of ~375 Combination #461 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 346 of ~375 Combination #463 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 347 of ~375 Combination #464 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 348 of ~375 Combination #465 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 349 of ~375 Combination #466 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 350 of ~375 Combination #467 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 351 of ~375 Combination #469 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 352 of ~375 Combination #470 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 353 of ~375 Combination #471 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 354 of ~375 Combination #472 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 355 of ~375 Combination #473 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 356 of ~375 Combination #474 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 357 of ~375 Combination #476 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 358 of ~375 Combination #477 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 359 of ~375 Combination #478 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 360 of ~375 Combination #479 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 361 of ~375 Combination #480 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 362 of ~375 Combination #481 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 363 of ~375 Combination #482 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 364 of ~375 Combination #483 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 365 of ~375 Combination #484 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 366 of ~375 Combination #485 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 367 of ~375 Combination #486 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 368 of ~375 Combination #487 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 369 of ~375 Combination #488 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 370 of ~375 Combination #489 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 371 of ~375 Combination #491 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 372 of ~375 Combination #492 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 373 of ~375 Combination #493 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 374 of ~375 Combination #495 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 375 of ~375 Combination #496 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 376 of ~375 Combination #498 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 377 of ~375 Combination #499 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 378 of ~375 Combination #500 of 500----
diff --git a/testcases/ballista/ballista/outfiles/outfile.chmod.b_fname.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.chmod.b_fname.b_mode_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.chmod.b_fname.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.chown.b_fname.b_id.b_id b/testcases/ballista/ballista/outfiles/outfile.chown.b_fname.b_id.b_id
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.chown.b_fname.b_id.b_id
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.chroot.b_ptr_buf b/testcases/ballista/ballista/outfiles/outfile.chroot.b_ptr_buf
deleted file mode 100644
index 7efbdb7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.chroot.b_ptr_buf
+++ /dev/null
@@ -1,54 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~15 Combination #2 of 20----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~15 Combination #6 of 20----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~15 Combination #7 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~15 Combination #9 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~15 Combination #10 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~15 Combination #11 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~15 Combination #12 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~15 Combination #13 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~15 Combination #14 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~15 Combination #17 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~15 Combination #18 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~15 Combination #19 of 20----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~15 Combination #20 of 20----
diff --git a/testcases/ballista/ballista/outfiles/outfile.close.b_fd b/testcases/ballista/ballista/outfiles/outfile.close.b_fd
deleted file mode 100644
index 58a0ad6..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.close.b_fd
+++ /dev/null
@@ -1,1778 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~450.75 Combination #2 of 601----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~450.75 Combination #6 of 601----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~450.75 Combination #7 of 601----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~450.75 Combination #9 of 601----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~450.75 Combination #10 of 601----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~450.75 Combination #11 of 601----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~450.75 Combination #12 of 601----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~450.75 Combination #13 of 601----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~450.75 Combination #14 of 601----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~450.75 Combination #17 of 601----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~450.75 Combination #18 of 601----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~450.75 Combination #19 of 601----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~450.75 Combination #20 of 601----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~450.75 Combination #21 of 601----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~450.75 Combination #22 of 601----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~450.75 Combination #23 of 601----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~450.75 Combination #25 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~450.75 Combination #26 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~450.75 Combination #27 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~450.75 Combination #28 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~450.75 Combination #30 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~450.75 Combination #31 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~450.75 Combination #33 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~450.75 Combination #34 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~450.75 Combination #35 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~450.75 Combination #36 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 27 of ~450.75 Combination #37 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 28 of ~450.75 Combination #39 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 29 of ~450.75 Combination #41 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 30 of ~450.75 Combination #43 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 31 of ~450.75 Combination #45 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 32 of ~450.75 Combination #46 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 33 of ~450.75 Combination #49 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 34 of ~450.75 Combination #51 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 35 of ~450.75 Combination #52 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 36 of ~450.75 Combination #53 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 37 of ~450.75 Combination #54 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 38 of ~450.75 Combination #56 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 39 of ~450.75 Combination #57 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 40 of ~450.75 Combination #58 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 41 of ~450.75 Combination #59 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 42 of ~450.75 Combination #60 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 43 of ~450.75 Combination #61 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 44 of ~450.75 Combination #65 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 45 of ~450.75 Combination #66 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 46 of ~450.75 Combination #67 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~450.75 Combination #69 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~450.75 Combination #70 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~450.75 Combination #71 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~450.75 Combination #72 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 51 of ~450.75 Combination #73 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 52 of ~450.75 Combination #76 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 53 of ~450.75 Combination #77 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 54 of ~450.75 Combination #78 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 55 of ~450.75 Combination #79 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 56 of ~450.75 Combination #80 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 57 of ~450.75 Combination #81 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 58 of ~450.75 Combination #82 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 59 of ~450.75 Combination #83 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 60 of ~450.75 Combination #86 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 61 of ~450.75 Combination #87 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 62 of ~450.75 Combination #89 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 63 of ~450.75 Combination #90 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 64 of ~450.75 Combination #92 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 65 of ~450.75 Combination #93 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 66 of ~450.75 Combination #95 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 67 of ~450.75 Combination #97 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 68 of ~450.75 Combination #99 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 69 of ~450.75 Combination #101 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 70 of ~450.75 Combination #102 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 71 of ~450.75 Combination #105 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 72 of ~450.75 Combination #107 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 73 of ~450.75 Combination #108 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 74 of ~450.75 Combination #109 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 75 of ~450.75 Combination #110 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 76 of ~450.75 Combination #112 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 77 of ~450.75 Combination #113 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 78 of ~450.75 Combination #114 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 79 of ~450.75 Combination #115 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 80 of ~450.75 Combination #116 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 81 of ~450.75 Combination #117 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 82 of ~450.75 Combination #118 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 83 of ~450.75 Combination #119 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 84 of ~450.75 Combination #121 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 85 of ~450.75 Combination #122 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 86 of ~450.75 Combination #123 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 87 of ~450.75 Combination #127 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 88 of ~450.75 Combination #128 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 89 of ~450.75 Combination #129 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 90 of ~450.75 Combination #130 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 91 of ~450.75 Combination #131 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 92 of ~450.75 Combination #132 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 93 of ~450.75 Combination #133 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 94 of ~450.75 Combination #134 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 95 of ~450.75 Combination #135 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 96 of ~450.75 Combination #136 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 97 of ~450.75 Combination #137 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 98 of ~450.75 Combination #139 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 99 of ~450.75 Combination #140 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 100 of ~450.75 Combination #141 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 101 of ~450.75 Combination #143 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 102 of ~450.75 Combination #144 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 103 of ~450.75 Combination #145 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 104 of ~450.75 Combination #146 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 105 of ~450.75 Combination #148 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 106 of ~450.75 Combination #149 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 107 of ~450.75 Combination #151 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 108 of ~450.75 Combination #153 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 109 of ~450.75 Combination #154 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 110 of ~450.75 Combination #155 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 111 of ~450.75 Combination #156 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 112 of ~450.75 Combination #157 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 113 of ~450.75 Combination #158 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 114 of ~450.75 Combination #159 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 115 of ~450.75 Combination #161 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 116 of ~450.75 Combination #163 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 117 of ~450.75 Combination #164 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 118 of ~450.75 Combination #166 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 119 of ~450.75 Combination #168 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 120 of ~450.75 Combination #170 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 121 of ~450.75 Combination #172 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 122 of ~450.75 Combination #173 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 123 of ~450.75 Combination #175 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 124 of ~450.75 Combination #176 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 125 of ~450.75 Combination #177 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 126 of ~450.75 Combination #178 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 127 of ~450.75 Combination #181 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 128 of ~450.75 Combination #182 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 129 of ~450.75 Combination #183 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 130 of ~450.75 Combination #184 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 131 of ~450.75 Combination #185 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 132 of ~450.75 Combination #186 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 133 of ~450.75 Combination #187 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 134 of ~450.75 Combination #189 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 135 of ~450.75 Combination #191 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 136 of ~450.75 Combination #193 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 137 of ~450.75 Combination #194 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 138 of ~450.75 Combination #195 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 139 of ~450.75 Combination #196 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 140 of ~450.75 Combination #202 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 141 of ~450.75 Combination #205 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 142 of ~450.75 Combination #206 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 143 of ~450.75 Combination #207 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 144 of ~450.75 Combination #210 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 145 of ~450.75 Combination #211 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 146 of ~450.75 Combination #212 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 147 of ~450.75 Combination #213 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 148 of ~450.75 Combination #214 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 149 of ~450.75 Combination #215 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 150 of ~450.75 Combination #216 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 151 of ~450.75 Combination #217 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 152 of ~450.75 Combination #218 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 153 of ~450.75 Combination #219 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 154 of ~450.75 Combination #220 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 155 of ~450.75 Combination #221 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 156 of ~450.75 Combination #222 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 157 of ~450.75 Combination #223 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 158 of ~450.75 Combination #225 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 159 of ~450.75 Combination #226 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 160 of ~450.75 Combination #227 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 161 of ~450.75 Combination #228 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 162 of ~450.75 Combination #229 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 163 of ~450.75 Combination #230 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 164 of ~450.75 Combination #232 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 165 of ~450.75 Combination #233 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 166 of ~450.75 Combination #235 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 167 of ~450.75 Combination #236 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 168 of ~450.75 Combination #237 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 169 of ~450.75 Combination #238 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 170 of ~450.75 Combination #240 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 171 of ~450.75 Combination #241 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 172 of ~450.75 Combination #242 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 173 of ~450.75 Combination #243 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 174 of ~450.75 Combination #244 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 175 of ~450.75 Combination #245 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 176 of ~450.75 Combination #246 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 177 of ~450.75 Combination #247 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 178 of ~450.75 Combination #248 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 179 of ~450.75 Combination #249 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 180 of ~450.75 Combination #250 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 181 of ~450.75 Combination #251 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 182 of ~450.75 Combination #252 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 183 of ~450.75 Combination #253 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 184 of ~450.75 Combination #254 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 185 of ~450.75 Combination #255 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 186 of ~450.75 Combination #256 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 187 of ~450.75 Combination #257 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 188 of ~450.75 Combination #258 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 189 of ~450.75 Combination #259 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 190 of ~450.75 Combination #260 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 191 of ~450.75 Combination #262 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 192 of ~450.75 Combination #263 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 193 of ~450.75 Combination #264 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 194 of ~450.75 Combination #265 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 195 of ~450.75 Combination #266 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 196 of ~450.75 Combination #267 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 197 of ~450.75 Combination #269 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 198 of ~450.75 Combination #270 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 199 of ~450.75 Combination #271 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 200 of ~450.75 Combination #272 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 201 of ~450.75 Combination #273 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 202 of ~450.75 Combination #274 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 203 of ~450.75 Combination #275 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 204 of ~450.75 Combination #276 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 205 of ~450.75 Combination #278 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 206 of ~450.75 Combination #279 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 207 of ~450.75 Combination #280 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 208 of ~450.75 Combination #282 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 209 of ~450.75 Combination #284 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 210 of ~450.75 Combination #285 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 211 of ~450.75 Combination #286 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 212 of ~450.75 Combination #290 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 213 of ~450.75 Combination #291 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 214 of ~450.75 Combination #292 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 215 of ~450.75 Combination #293 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 216 of ~450.75 Combination #298 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 217 of ~450.75 Combination #300 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 218 of ~450.75 Combination #301 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 219 of ~450.75 Combination #305 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 220 of ~450.75 Combination #306 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 221 of ~450.75 Combination #307 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 222 of ~450.75 Combination #308 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 223 of ~450.75 Combination #310 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 224 of ~450.75 Combination #311 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 225 of ~450.75 Combination #313 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 226 of ~450.75 Combination #314 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 227 of ~450.75 Combination #315 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 228 of ~450.75 Combination #316 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 229 of ~450.75 Combination #317 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 230 of ~450.75 Combination #318 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 231 of ~450.75 Combination #319 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 232 of ~450.75 Combination #320 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 233 of ~450.75 Combination #322 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 234 of ~450.75 Combination #323 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 235 of ~450.75 Combination #324 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 236 of ~450.75 Combination #325 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 237 of ~450.75 Combination #326 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 238 of ~450.75 Combination #327 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 239 of ~450.75 Combination #328 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 240 of ~450.75 Combination #329 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 241 of ~450.75 Combination #332 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 242 of ~450.75 Combination #335 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 243 of ~450.75 Combination #336 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 244 of ~450.75 Combination #337 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 245 of ~450.75 Combination #338 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 246 of ~450.75 Combination #339 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 247 of ~450.75 Combination #340 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 248 of ~450.75 Combination #341 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 249 of ~450.75 Combination #342 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 250 of ~450.75 Combination #343 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 251 of ~450.75 Combination #344 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 252 of ~450.75 Combination #345 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 253 of ~450.75 Combination #346 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 254 of ~450.75 Combination #347 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 255 of ~450.75 Combination #348 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 256 of ~450.75 Combination #349 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 257 of ~450.75 Combination #351 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 258 of ~450.75 Combination #352 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 259 of ~450.75 Combination #353 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 260 of ~450.75 Combination #355 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 261 of ~450.75 Combination #356 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 262 of ~450.75 Combination #358 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 263 of ~450.75 Combination #359 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 264 of ~450.75 Combination #360 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 265 of ~450.75 Combination #361 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 266 of ~450.75 Combination #362 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 267 of ~450.75 Combination #364 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 268 of ~450.75 Combination #365 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 269 of ~450.75 Combination #366 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 270 of ~450.75 Combination #367 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 271 of ~450.75 Combination #368 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 272 of ~450.75 Combination #370 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 273 of ~450.75 Combination #372 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 274 of ~450.75 Combination #373 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 275 of ~450.75 Combination #374 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 276 of ~450.75 Combination #377 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 277 of ~450.75 Combination #378 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 278 of ~450.75 Combination #380 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 279 of ~450.75 Combination #381 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 280 of ~450.75 Combination #382 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 281 of ~450.75 Combination #384 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 282 of ~450.75 Combination #385 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 283 of ~450.75 Combination #386 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 284 of ~450.75 Combination #388 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 285 of ~450.75 Combination #389 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 286 of ~450.75 Combination #390 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 287 of ~450.75 Combination #391 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 288 of ~450.75 Combination #392 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 289 of ~450.75 Combination #394 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 290 of ~450.75 Combination #395 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 291 of ~450.75 Combination #396 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 292 of ~450.75 Combination #397 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 293 of ~450.75 Combination #399 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 294 of ~450.75 Combination #400 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 295 of ~450.75 Combination #401 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 296 of ~450.75 Combination #402 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 297 of ~450.75 Combination #403 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 298 of ~450.75 Combination #404 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 299 of ~450.75 Combination #405 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 300 of ~450.75 Combination #406 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 301 of ~450.75 Combination #407 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 302 of ~450.75 Combination #409 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 303 of ~450.75 Combination #410 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 304 of ~450.75 Combination #411 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 305 of ~450.75 Combination #412 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 306 of ~450.75 Combination #413 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 307 of ~450.75 Combination #414 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 308 of ~450.75 Combination #415 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 309 of ~450.75 Combination #417 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 310 of ~450.75 Combination #418 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 311 of ~450.75 Combination #420 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 312 of ~450.75 Combination #421 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 313 of ~450.75 Combination #422 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 314 of ~450.75 Combination #424 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 315 of ~450.75 Combination #425 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 316 of ~450.75 Combination #427 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 317 of ~450.75 Combination #429 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 318 of ~450.75 Combination #430 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 319 of ~450.75 Combination #431 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 320 of ~450.75 Combination #433 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 321 of ~450.75 Combination #435 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 322 of ~450.75 Combination #436 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 323 of ~450.75 Combination #437 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 324 of ~450.75 Combination #438 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 325 of ~450.75 Combination #439 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 326 of ~450.75 Combination #440 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 327 of ~450.75 Combination #442 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 328 of ~450.75 Combination #443 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 329 of ~450.75 Combination #444 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 330 of ~450.75 Combination #445 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 331 of ~450.75 Combination #446 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 332 of ~450.75 Combination #447 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 333 of ~450.75 Combination #448 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 334 of ~450.75 Combination #449 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 335 of ~450.75 Combination #450 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 336 of ~450.75 Combination #451 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 337 of ~450.75 Combination #452 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 338 of ~450.75 Combination #453 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 339 of ~450.75 Combination #454 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 340 of ~450.75 Combination #455 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 341 of ~450.75 Combination #456 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 342 of ~450.75 Combination #457 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 343 of ~450.75 Combination #458 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 344 of ~450.75 Combination #459 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 345 of ~450.75 Combination #461 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 346 of ~450.75 Combination #463 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 347 of ~450.75 Combination #464 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 348 of ~450.75 Combination #465 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 349 of ~450.75 Combination #466 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 350 of ~450.75 Combination #467 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 351 of ~450.75 Combination #469 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 352 of ~450.75 Combination #470 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 353 of ~450.75 Combination #471 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 354 of ~450.75 Combination #472 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 355 of ~450.75 Combination #473 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 356 of ~450.75 Combination #474 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 357 of ~450.75 Combination #476 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 358 of ~450.75 Combination #477 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 359 of ~450.75 Combination #478 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 360 of ~450.75 Combination #479 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 361 of ~450.75 Combination #480 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 362 of ~450.75 Combination #481 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 363 of ~450.75 Combination #482 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 364 of ~450.75 Combination #483 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 365 of ~450.75 Combination #484 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 366 of ~450.75 Combination #485 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 367 of ~450.75 Combination #486 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 368 of ~450.75 Combination #487 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 369 of ~450.75 Combination #488 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 370 of ~450.75 Combination #489 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 371 of ~450.75 Combination #491 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 372 of ~450.75 Combination #492 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 373 of ~450.75 Combination #493 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 374 of ~450.75 Combination #495 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 375 of ~450.75 Combination #496 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 376 of ~450.75 Combination #498 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 377 of ~450.75 Combination #499 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 378 of ~450.75 Combination #500 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 379 of ~450.75 Combination #502 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 380 of ~450.75 Combination #504 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 381 of ~450.75 Combination #505 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 382 of ~450.75 Combination #506 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 383 of ~450.75 Combination #508 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 384 of ~450.75 Combination #509 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 385 of ~450.75 Combination #511 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 386 of ~450.75 Combination #513 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 387 of ~450.75 Combination #515 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 388 of ~450.75 Combination #516 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 389 of ~450.75 Combination #520 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 390 of ~450.75 Combination #521 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 391 of ~450.75 Combination #524 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 392 of ~450.75 Combination #526 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 393 of ~450.75 Combination #527 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 394 of ~450.75 Combination #531 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 395 of ~450.75 Combination #532 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 396 of ~450.75 Combination #533 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 397 of ~450.75 Combination #534 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 398 of ~450.75 Combination #538 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 399 of ~450.75 Combination #539 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 400 of ~450.75 Combination #540 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 401 of ~450.75 Combination #541 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 402 of ~450.75 Combination #542 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 403 of ~450.75 Combination #543 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 404 of ~450.75 Combination #544 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 405 of ~450.75 Combination #545 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 406 of ~450.75 Combination #546 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 407 of ~450.75 Combination #547 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 408 of ~450.75 Combination #548 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 409 of ~450.75 Combination #550 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 410 of ~450.75 Combination #551 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 411 of ~450.75 Combination #552 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 412 of ~450.75 Combination #553 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 413 of ~450.75 Combination #554 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 414 of ~450.75 Combination #556 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 415 of ~450.75 Combination #557 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 416 of ~450.75 Combination #558 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 417 of ~450.75 Combination #559 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 418 of ~450.75 Combination #560 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 419 of ~450.75 Combination #561 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 420 of ~450.75 Combination #562 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 421 of ~450.75 Combination #563 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 422 of ~450.75 Combination #564 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 423 of ~450.75 Combination #565 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 424 of ~450.75 Combination #567 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 425 of ~450.75 Combination #568 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 426 of ~450.75 Combination #569 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 427 of ~450.75 Combination #571 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 428 of ~450.75 Combination #572 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 429 of ~450.75 Combination #573 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 430 of ~450.75 Combination #574 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 431 of ~450.75 Combination #575 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 432 of ~450.75 Combination #576 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 433 of ~450.75 Combination #577 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 434 of ~450.75 Combination #579 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 435 of ~450.75 Combination #580 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 436 of ~450.75 Combination #581 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 437 of ~450.75 Combination #587 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 438 of ~450.75 Combination #588 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 439 of ~450.75 Combination #589 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 440 of ~450.75 Combination #590 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 441 of ~450.75 Combination #592 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 442 of ~450.75 Combination #595 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 443 of ~450.75 Combination #596 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 444 of ~450.75 Combination #600 of 601----
diff --git a/testcases/ballista/ballista/outfiles/outfile.closedir.b_ptr_dir b/testcases/ballista/ballista/outfiles/outfile.closedir.b_ptr_dir
deleted file mode 100644
index 9f02993..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.closedir.b_ptr_dir
+++ /dev/null
@@ -1,210 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~57 Combination #2 of 76----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~57 Combination #6 of 76----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~57 Combination #7 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~57 Combination #9 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~57 Combination #10 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~57 Combination #11 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~57 Combination #12 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~57 Combination #13 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~57 Combination #14 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~57 Combination #17 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~57 Combination #18 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~57 Combination #19 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~57 Combination #20 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~57 Combination #21 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~57 Combination #22 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~57 Combination #23 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~57 Combination #25 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~57 Combination #26 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~57 Combination #27 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~57 Combination #28 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~57 Combination #30 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~57 Combination #31 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~57 Combination #33 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~57 Combination #34 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~57 Combination #35 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~57 Combination #36 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~57 Combination #37 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~57 Combination #39 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~57 Combination #41 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~57 Combination #43 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~57 Combination #45 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~57 Combination #46 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~57 Combination #49 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~57 Combination #51 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~57 Combination #52 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~57 Combination #53 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~57 Combination #54 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~57 Combination #56 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~57 Combination #57 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~57 Combination #58 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~57 Combination #59 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~57 Combination #60 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~57 Combination #61 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~57 Combination #65 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~57 Combination #66 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~57 Combination #67 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~57 Combination #69 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_OPEN	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~57 Combination #70 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_REMOVED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~57 Combination #71 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~57 Combination #72 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 51 of ~57 Combination #73 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 52 of ~57 Combination #76 of 76----
diff --git a/testcases/ballista/ballista/outfiles/outfile.confstr.b_int.b_ptr_char.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.confstr.b_int.b_ptr_char.b_unsigned_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.confstr.b_int.b_ptr_char.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.creat.b_fname.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.creat.b_fname.b_mode_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.creat.b_fname.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.dup.b_fd b/testcases/ballista/ballista/outfiles/outfile.dup.b_fd
deleted file mode 100644
index 58a0ad6..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.dup.b_fd
+++ /dev/null
@@ -1,1778 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~450.75 Combination #2 of 601----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~450.75 Combination #6 of 601----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~450.75 Combination #7 of 601----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~450.75 Combination #9 of 601----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~450.75 Combination #10 of 601----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~450.75 Combination #11 of 601----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~450.75 Combination #12 of 601----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~450.75 Combination #13 of 601----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~450.75 Combination #14 of 601----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~450.75 Combination #17 of 601----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~450.75 Combination #18 of 601----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~450.75 Combination #19 of 601----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~450.75 Combination #20 of 601----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~450.75 Combination #21 of 601----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~450.75 Combination #22 of 601----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~450.75 Combination #23 of 601----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~450.75 Combination #25 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~450.75 Combination #26 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~450.75 Combination #27 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~450.75 Combination #28 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~450.75 Combination #30 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~450.75 Combination #31 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~450.75 Combination #33 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~450.75 Combination #34 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~450.75 Combination #35 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~450.75 Combination #36 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 27 of ~450.75 Combination #37 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 28 of ~450.75 Combination #39 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 29 of ~450.75 Combination #41 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 30 of ~450.75 Combination #43 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 31 of ~450.75 Combination #45 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 32 of ~450.75 Combination #46 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 33 of ~450.75 Combination #49 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 34 of ~450.75 Combination #51 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 35 of ~450.75 Combination #52 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 36 of ~450.75 Combination #53 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 37 of ~450.75 Combination #54 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 38 of ~450.75 Combination #56 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 39 of ~450.75 Combination #57 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 40 of ~450.75 Combination #58 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 41 of ~450.75 Combination #59 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 42 of ~450.75 Combination #60 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 43 of ~450.75 Combination #61 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 44 of ~450.75 Combination #65 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 45 of ~450.75 Combination #66 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 46 of ~450.75 Combination #67 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~450.75 Combination #69 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~450.75 Combination #70 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~450.75 Combination #71 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~450.75 Combination #72 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 51 of ~450.75 Combination #73 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 52 of ~450.75 Combination #76 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 53 of ~450.75 Combination #77 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 54 of ~450.75 Combination #78 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 55 of ~450.75 Combination #79 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 56 of ~450.75 Combination #80 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 57 of ~450.75 Combination #81 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 58 of ~450.75 Combination #82 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 59 of ~450.75 Combination #83 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 60 of ~450.75 Combination #86 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 61 of ~450.75 Combination #87 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 62 of ~450.75 Combination #89 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 63 of ~450.75 Combination #90 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 64 of ~450.75 Combination #92 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 65 of ~450.75 Combination #93 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 66 of ~450.75 Combination #95 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 67 of ~450.75 Combination #97 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 68 of ~450.75 Combination #99 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 69 of ~450.75 Combination #101 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 70 of ~450.75 Combination #102 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 71 of ~450.75 Combination #105 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 72 of ~450.75 Combination #107 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 73 of ~450.75 Combination #108 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 74 of ~450.75 Combination #109 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 75 of ~450.75 Combination #110 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 76 of ~450.75 Combination #112 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 77 of ~450.75 Combination #113 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 78 of ~450.75 Combination #114 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 79 of ~450.75 Combination #115 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 80 of ~450.75 Combination #116 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 81 of ~450.75 Combination #117 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 82 of ~450.75 Combination #118 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 83 of ~450.75 Combination #119 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 84 of ~450.75 Combination #121 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 85 of ~450.75 Combination #122 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 86 of ~450.75 Combination #123 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 87 of ~450.75 Combination #127 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 88 of ~450.75 Combination #128 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 89 of ~450.75 Combination #129 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 90 of ~450.75 Combination #130 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 91 of ~450.75 Combination #131 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 92 of ~450.75 Combination #132 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 93 of ~450.75 Combination #133 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 94 of ~450.75 Combination #134 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 95 of ~450.75 Combination #135 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 96 of ~450.75 Combination #136 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 97 of ~450.75 Combination #137 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 98 of ~450.75 Combination #139 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 99 of ~450.75 Combination #140 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 100 of ~450.75 Combination #141 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 101 of ~450.75 Combination #143 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 102 of ~450.75 Combination #144 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 103 of ~450.75 Combination #145 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 104 of ~450.75 Combination #146 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 105 of ~450.75 Combination #148 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 106 of ~450.75 Combination #149 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 107 of ~450.75 Combination #151 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 108 of ~450.75 Combination #153 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 109 of ~450.75 Combination #154 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 110 of ~450.75 Combination #155 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 111 of ~450.75 Combination #156 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 112 of ~450.75 Combination #157 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 113 of ~450.75 Combination #158 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 114 of ~450.75 Combination #159 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 115 of ~450.75 Combination #161 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 116 of ~450.75 Combination #163 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 117 of ~450.75 Combination #164 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 118 of ~450.75 Combination #166 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 119 of ~450.75 Combination #168 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 120 of ~450.75 Combination #170 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 121 of ~450.75 Combination #172 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 122 of ~450.75 Combination #173 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 123 of ~450.75 Combination #175 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 124 of ~450.75 Combination #176 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 125 of ~450.75 Combination #177 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 126 of ~450.75 Combination #178 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 127 of ~450.75 Combination #181 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 128 of ~450.75 Combination #182 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 129 of ~450.75 Combination #183 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 130 of ~450.75 Combination #184 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 131 of ~450.75 Combination #185 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 132 of ~450.75 Combination #186 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 133 of ~450.75 Combination #187 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 134 of ~450.75 Combination #189 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 135 of ~450.75 Combination #191 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 136 of ~450.75 Combination #193 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 137 of ~450.75 Combination #194 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 138 of ~450.75 Combination #195 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 139 of ~450.75 Combination #196 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 140 of ~450.75 Combination #202 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 141 of ~450.75 Combination #205 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 142 of ~450.75 Combination #206 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 143 of ~450.75 Combination #207 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 144 of ~450.75 Combination #210 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 145 of ~450.75 Combination #211 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 146 of ~450.75 Combination #212 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 147 of ~450.75 Combination #213 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 148 of ~450.75 Combination #214 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 149 of ~450.75 Combination #215 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 150 of ~450.75 Combination #216 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 151 of ~450.75 Combination #217 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 152 of ~450.75 Combination #218 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 153 of ~450.75 Combination #219 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 154 of ~450.75 Combination #220 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 155 of ~450.75 Combination #221 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 156 of ~450.75 Combination #222 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 157 of ~450.75 Combination #223 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 158 of ~450.75 Combination #225 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 159 of ~450.75 Combination #226 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 160 of ~450.75 Combination #227 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 161 of ~450.75 Combination #228 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 162 of ~450.75 Combination #229 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 163 of ~450.75 Combination #230 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 164 of ~450.75 Combination #232 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 165 of ~450.75 Combination #233 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 166 of ~450.75 Combination #235 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 167 of ~450.75 Combination #236 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 168 of ~450.75 Combination #237 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 169 of ~450.75 Combination #238 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 170 of ~450.75 Combination #240 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 171 of ~450.75 Combination #241 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 172 of ~450.75 Combination #242 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 173 of ~450.75 Combination #243 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 174 of ~450.75 Combination #244 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 175 of ~450.75 Combination #245 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 176 of ~450.75 Combination #246 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 177 of ~450.75 Combination #247 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 178 of ~450.75 Combination #248 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 179 of ~450.75 Combination #249 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 180 of ~450.75 Combination #250 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 181 of ~450.75 Combination #251 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 182 of ~450.75 Combination #252 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 183 of ~450.75 Combination #253 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 184 of ~450.75 Combination #254 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 185 of ~450.75 Combination #255 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 186 of ~450.75 Combination #256 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 187 of ~450.75 Combination #257 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 188 of ~450.75 Combination #258 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 189 of ~450.75 Combination #259 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 190 of ~450.75 Combination #260 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 191 of ~450.75 Combination #262 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 192 of ~450.75 Combination #263 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 193 of ~450.75 Combination #264 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 194 of ~450.75 Combination #265 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 195 of ~450.75 Combination #266 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 196 of ~450.75 Combination #267 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 197 of ~450.75 Combination #269 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 198 of ~450.75 Combination #270 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 199 of ~450.75 Combination #271 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 200 of ~450.75 Combination #272 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 201 of ~450.75 Combination #273 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 202 of ~450.75 Combination #274 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 203 of ~450.75 Combination #275 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 204 of ~450.75 Combination #276 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 205 of ~450.75 Combination #278 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 206 of ~450.75 Combination #279 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 207 of ~450.75 Combination #280 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 208 of ~450.75 Combination #282 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 209 of ~450.75 Combination #284 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 210 of ~450.75 Combination #285 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 211 of ~450.75 Combination #286 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 212 of ~450.75 Combination #290 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 213 of ~450.75 Combination #291 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 214 of ~450.75 Combination #292 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 215 of ~450.75 Combination #293 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 216 of ~450.75 Combination #298 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 217 of ~450.75 Combination #300 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 218 of ~450.75 Combination #301 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 219 of ~450.75 Combination #305 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 220 of ~450.75 Combination #306 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 221 of ~450.75 Combination #307 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 222 of ~450.75 Combination #308 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 223 of ~450.75 Combination #310 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 224 of ~450.75 Combination #311 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 225 of ~450.75 Combination #313 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 226 of ~450.75 Combination #314 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 227 of ~450.75 Combination #315 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 228 of ~450.75 Combination #316 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 229 of ~450.75 Combination #317 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 230 of ~450.75 Combination #318 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 231 of ~450.75 Combination #319 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 232 of ~450.75 Combination #320 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 233 of ~450.75 Combination #322 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 234 of ~450.75 Combination #323 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 235 of ~450.75 Combination #324 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 236 of ~450.75 Combination #325 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 237 of ~450.75 Combination #326 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 238 of ~450.75 Combination #327 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 239 of ~450.75 Combination #328 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 240 of ~450.75 Combination #329 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 241 of ~450.75 Combination #332 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 242 of ~450.75 Combination #335 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 243 of ~450.75 Combination #336 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 244 of ~450.75 Combination #337 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 245 of ~450.75 Combination #338 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 246 of ~450.75 Combination #339 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 247 of ~450.75 Combination #340 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 248 of ~450.75 Combination #341 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 249 of ~450.75 Combination #342 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 250 of ~450.75 Combination #343 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 251 of ~450.75 Combination #344 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 252 of ~450.75 Combination #345 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 253 of ~450.75 Combination #346 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 254 of ~450.75 Combination #347 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 255 of ~450.75 Combination #348 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 256 of ~450.75 Combination #349 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 257 of ~450.75 Combination #351 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 258 of ~450.75 Combination #352 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 259 of ~450.75 Combination #353 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 260 of ~450.75 Combination #355 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 261 of ~450.75 Combination #356 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 262 of ~450.75 Combination #358 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 263 of ~450.75 Combination #359 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 264 of ~450.75 Combination #360 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 265 of ~450.75 Combination #361 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 266 of ~450.75 Combination #362 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 267 of ~450.75 Combination #364 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 268 of ~450.75 Combination #365 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 269 of ~450.75 Combination #366 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 270 of ~450.75 Combination #367 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 271 of ~450.75 Combination #368 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 272 of ~450.75 Combination #370 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 273 of ~450.75 Combination #372 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 274 of ~450.75 Combination #373 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 275 of ~450.75 Combination #374 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 276 of ~450.75 Combination #377 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 277 of ~450.75 Combination #378 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 278 of ~450.75 Combination #380 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 279 of ~450.75 Combination #381 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 280 of ~450.75 Combination #382 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 281 of ~450.75 Combination #384 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 282 of ~450.75 Combination #385 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 283 of ~450.75 Combination #386 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 284 of ~450.75 Combination #388 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 285 of ~450.75 Combination #389 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 286 of ~450.75 Combination #390 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 287 of ~450.75 Combination #391 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 288 of ~450.75 Combination #392 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 289 of ~450.75 Combination #394 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 290 of ~450.75 Combination #395 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 291 of ~450.75 Combination #396 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 292 of ~450.75 Combination #397 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 293 of ~450.75 Combination #399 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 294 of ~450.75 Combination #400 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 295 of ~450.75 Combination #401 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 296 of ~450.75 Combination #402 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 297 of ~450.75 Combination #403 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 298 of ~450.75 Combination #404 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 299 of ~450.75 Combination #405 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 300 of ~450.75 Combination #406 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 301 of ~450.75 Combination #407 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 302 of ~450.75 Combination #409 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 303 of ~450.75 Combination #410 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 304 of ~450.75 Combination #411 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 305 of ~450.75 Combination #412 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 306 of ~450.75 Combination #413 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 307 of ~450.75 Combination #414 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 308 of ~450.75 Combination #415 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 309 of ~450.75 Combination #417 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 310 of ~450.75 Combination #418 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 311 of ~450.75 Combination #420 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 312 of ~450.75 Combination #421 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 313 of ~450.75 Combination #422 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 314 of ~450.75 Combination #424 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 315 of ~450.75 Combination #425 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 316 of ~450.75 Combination #427 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 317 of ~450.75 Combination #429 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 318 of ~450.75 Combination #430 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 319 of ~450.75 Combination #431 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 320 of ~450.75 Combination #433 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 321 of ~450.75 Combination #435 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 322 of ~450.75 Combination #436 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 323 of ~450.75 Combination #437 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 324 of ~450.75 Combination #438 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 325 of ~450.75 Combination #439 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 326 of ~450.75 Combination #440 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 327 of ~450.75 Combination #442 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 328 of ~450.75 Combination #443 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 329 of ~450.75 Combination #444 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 330 of ~450.75 Combination #445 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 331 of ~450.75 Combination #446 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 332 of ~450.75 Combination #447 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 333 of ~450.75 Combination #448 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 334 of ~450.75 Combination #449 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 335 of ~450.75 Combination #450 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 336 of ~450.75 Combination #451 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 337 of ~450.75 Combination #452 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 338 of ~450.75 Combination #453 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 339 of ~450.75 Combination #454 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 340 of ~450.75 Combination #455 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 341 of ~450.75 Combination #456 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 342 of ~450.75 Combination #457 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 343 of ~450.75 Combination #458 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 344 of ~450.75 Combination #459 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 345 of ~450.75 Combination #461 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 346 of ~450.75 Combination #463 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 347 of ~450.75 Combination #464 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 348 of ~450.75 Combination #465 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 349 of ~450.75 Combination #466 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 350 of ~450.75 Combination #467 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 351 of ~450.75 Combination #469 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 352 of ~450.75 Combination #470 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 353 of ~450.75 Combination #471 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 354 of ~450.75 Combination #472 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 355 of ~450.75 Combination #473 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 356 of ~450.75 Combination #474 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 357 of ~450.75 Combination #476 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 358 of ~450.75 Combination #477 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 359 of ~450.75 Combination #478 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 360 of ~450.75 Combination #479 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 361 of ~450.75 Combination #480 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 362 of ~450.75 Combination #481 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 363 of ~450.75 Combination #482 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 364 of ~450.75 Combination #483 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 365 of ~450.75 Combination #484 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 366 of ~450.75 Combination #485 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 367 of ~450.75 Combination #486 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 368 of ~450.75 Combination #487 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 369 of ~450.75 Combination #488 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 370 of ~450.75 Combination #489 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 371 of ~450.75 Combination #491 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 372 of ~450.75 Combination #492 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 373 of ~450.75 Combination #493 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 374 of ~450.75 Combination #495 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 375 of ~450.75 Combination #496 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 376 of ~450.75 Combination #498 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 377 of ~450.75 Combination #499 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 378 of ~450.75 Combination #500 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 379 of ~450.75 Combination #502 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 380 of ~450.75 Combination #504 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 381 of ~450.75 Combination #505 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 382 of ~450.75 Combination #506 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 383 of ~450.75 Combination #508 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 384 of ~450.75 Combination #509 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 385 of ~450.75 Combination #511 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 386 of ~450.75 Combination #513 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 387 of ~450.75 Combination #515 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 388 of ~450.75 Combination #516 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 389 of ~450.75 Combination #520 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 390 of ~450.75 Combination #521 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 391 of ~450.75 Combination #524 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 392 of ~450.75 Combination #526 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 393 of ~450.75 Combination #527 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 394 of ~450.75 Combination #531 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 395 of ~450.75 Combination #532 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 396 of ~450.75 Combination #533 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 397 of ~450.75 Combination #534 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 398 of ~450.75 Combination #538 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 399 of ~450.75 Combination #539 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 400 of ~450.75 Combination #540 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 401 of ~450.75 Combination #541 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 402 of ~450.75 Combination #542 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 403 of ~450.75 Combination #543 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 404 of ~450.75 Combination #544 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 405 of ~450.75 Combination #545 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 406 of ~450.75 Combination #546 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 407 of ~450.75 Combination #547 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 408 of ~450.75 Combination #548 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 409 of ~450.75 Combination #550 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 410 of ~450.75 Combination #551 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 411 of ~450.75 Combination #552 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 412 of ~450.75 Combination #553 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 413 of ~450.75 Combination #554 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 414 of ~450.75 Combination #556 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 415 of ~450.75 Combination #557 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 416 of ~450.75 Combination #558 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 417 of ~450.75 Combination #559 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 418 of ~450.75 Combination #560 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 419 of ~450.75 Combination #561 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 420 of ~450.75 Combination #562 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 421 of ~450.75 Combination #563 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 422 of ~450.75 Combination #564 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 423 of ~450.75 Combination #565 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 424 of ~450.75 Combination #567 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 425 of ~450.75 Combination #568 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 426 of ~450.75 Combination #569 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 427 of ~450.75 Combination #571 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 428 of ~450.75 Combination #572 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 429 of ~450.75 Combination #573 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 430 of ~450.75 Combination #574 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 431 of ~450.75 Combination #575 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 432 of ~450.75 Combination #576 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 433 of ~450.75 Combination #577 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 434 of ~450.75 Combination #579 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 435 of ~450.75 Combination #580 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 436 of ~450.75 Combination #581 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 437 of ~450.75 Combination #587 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 438 of ~450.75 Combination #588 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 439 of ~450.75 Combination #589 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 440 of ~450.75 Combination #590 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 441 of ~450.75 Combination #592 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 442 of ~450.75 Combination #595 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 443 of ~450.75 Combination #596 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 444 of ~450.75 Combination #600 of 601----
diff --git a/testcases/ballista/ballista/outfiles/outfile.dup2.b_fd.b_fd b/testcases/ballista/ballista/outfiles/outfile.dup2.b_fd.b_fd
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.dup2.b_fd.b_fd
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execl.b_fname.b_ptr_char.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execle.b_fname.b_ptr_char.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char.b_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execlp.b_fname.b_ptr_char.b_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execv.b_fname.b_ptr_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execv.b_fname.b_ptr_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execv.b_fname.b_ptr_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execve.b_fname.b_ptr_ptr_char.b_ptr_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execve.b_fname.b_ptr_ptr_char.b_ptr_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execve.b_fname.b_ptr_ptr_char.b_ptr_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.execvp.b_fname.b_ptr_ptr_char b/testcases/ballista/ballista/outfiles/outfile.execvp.b_fname.b_ptr_ptr_char
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.execvp.b_fname.b_ptr_ptr_char
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.exit.b_int b/testcases/ballista/ballista/outfiles/outfile.exit.b_int
deleted file mode 100644
index 1525246..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.exit.b_int
+++ /dev/null
@@ -1,70 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~18.75 Combination #2 of 25----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~18.75 Combination #6 of 25----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~18.75 Combination #7 of 25----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~18.75 Combination #9 of 25----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~18.75 Combination #10 of 25----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~18.75 Combination #11 of 25----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~18.75 Combination #12 of 25----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~18.75 Combination #13 of 25----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~18.75 Combination #14 of 25----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~18.75 Combination #17 of 25----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~18.75 Combination #18 of 25----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~18.75 Combination #19 of 25----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~18.75 Combination #20 of 25----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~18.75 Combination #21 of 25----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~18.75 Combination #22 of 25----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~18.75 Combination #23 of 25----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~18.75 Combination #25 of 25----
diff --git a/testcases/ballista/ballista/outfiles/outfile.fchdir.b_fd b/testcases/ballista/ballista/outfiles/outfile.fchdir.b_fd
deleted file mode 100644
index 58a0ad6..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fchdir.b_fd
+++ /dev/null
@@ -1,1778 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~450.75 Combination #2 of 601----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~450.75 Combination #6 of 601----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~450.75 Combination #7 of 601----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~450.75 Combination #9 of 601----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~450.75 Combination #10 of 601----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~450.75 Combination #11 of 601----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~450.75 Combination #12 of 601----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~450.75 Combination #13 of 601----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~450.75 Combination #14 of 601----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~450.75 Combination #17 of 601----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~450.75 Combination #18 of 601----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~450.75 Combination #19 of 601----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~450.75 Combination #20 of 601----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~450.75 Combination #21 of 601----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~450.75 Combination #22 of 601----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~450.75 Combination #23 of 601----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~450.75 Combination #25 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~450.75 Combination #26 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~450.75 Combination #27 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~450.75 Combination #28 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~450.75 Combination #30 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~450.75 Combination #31 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~450.75 Combination #33 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~450.75 Combination #34 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~450.75 Combination #35 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~450.75 Combination #36 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 27 of ~450.75 Combination #37 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 28 of ~450.75 Combination #39 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 29 of ~450.75 Combination #41 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 30 of ~450.75 Combination #43 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 31 of ~450.75 Combination #45 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 32 of ~450.75 Combination #46 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 33 of ~450.75 Combination #49 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 34 of ~450.75 Combination #51 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 35 of ~450.75 Combination #52 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 36 of ~450.75 Combination #53 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 37 of ~450.75 Combination #54 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 38 of ~450.75 Combination #56 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 39 of ~450.75 Combination #57 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 40 of ~450.75 Combination #58 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 41 of ~450.75 Combination #59 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 42 of ~450.75 Combination #60 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 43 of ~450.75 Combination #61 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 44 of ~450.75 Combination #65 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 45 of ~450.75 Combination #66 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 46 of ~450.75 Combination #67 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~450.75 Combination #69 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~450.75 Combination #70 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~450.75 Combination #71 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~450.75 Combination #72 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 51 of ~450.75 Combination #73 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 52 of ~450.75 Combination #76 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 53 of ~450.75 Combination #77 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 54 of ~450.75 Combination #78 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 55 of ~450.75 Combination #79 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 56 of ~450.75 Combination #80 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 57 of ~450.75 Combination #81 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 58 of ~450.75 Combination #82 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 59 of ~450.75 Combination #83 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 60 of ~450.75 Combination #86 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 61 of ~450.75 Combination #87 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 62 of ~450.75 Combination #89 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 63 of ~450.75 Combination #90 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 64 of ~450.75 Combination #92 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 65 of ~450.75 Combination #93 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 66 of ~450.75 Combination #95 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 67 of ~450.75 Combination #97 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 68 of ~450.75 Combination #99 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 69 of ~450.75 Combination #101 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 70 of ~450.75 Combination #102 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 71 of ~450.75 Combination #105 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 72 of ~450.75 Combination #107 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 73 of ~450.75 Combination #108 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 74 of ~450.75 Combination #109 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 75 of ~450.75 Combination #110 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 76 of ~450.75 Combination #112 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 77 of ~450.75 Combination #113 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 78 of ~450.75 Combination #114 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 79 of ~450.75 Combination #115 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 80 of ~450.75 Combination #116 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 81 of ~450.75 Combination #117 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 82 of ~450.75 Combination #118 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 83 of ~450.75 Combination #119 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 84 of ~450.75 Combination #121 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 85 of ~450.75 Combination #122 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 86 of ~450.75 Combination #123 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 87 of ~450.75 Combination #127 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 88 of ~450.75 Combination #128 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 89 of ~450.75 Combination #129 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 90 of ~450.75 Combination #130 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 91 of ~450.75 Combination #131 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 92 of ~450.75 Combination #132 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 93 of ~450.75 Combination #133 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 94 of ~450.75 Combination #134 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 95 of ~450.75 Combination #135 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 96 of ~450.75 Combination #136 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 97 of ~450.75 Combination #137 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 98 of ~450.75 Combination #139 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 99 of ~450.75 Combination #140 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 100 of ~450.75 Combination #141 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 101 of ~450.75 Combination #143 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 102 of ~450.75 Combination #144 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 103 of ~450.75 Combination #145 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 104 of ~450.75 Combination #146 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 105 of ~450.75 Combination #148 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 106 of ~450.75 Combination #149 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 107 of ~450.75 Combination #151 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 108 of ~450.75 Combination #153 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 109 of ~450.75 Combination #154 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 110 of ~450.75 Combination #155 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 111 of ~450.75 Combination #156 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 112 of ~450.75 Combination #157 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 113 of ~450.75 Combination #158 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 114 of ~450.75 Combination #159 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 115 of ~450.75 Combination #161 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 116 of ~450.75 Combination #163 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 117 of ~450.75 Combination #164 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 118 of ~450.75 Combination #166 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 119 of ~450.75 Combination #168 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 120 of ~450.75 Combination #170 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 121 of ~450.75 Combination #172 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 122 of ~450.75 Combination #173 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 123 of ~450.75 Combination #175 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 124 of ~450.75 Combination #176 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 125 of ~450.75 Combination #177 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 126 of ~450.75 Combination #178 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 127 of ~450.75 Combination #181 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 128 of ~450.75 Combination #182 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 129 of ~450.75 Combination #183 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 130 of ~450.75 Combination #184 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 131 of ~450.75 Combination #185 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 132 of ~450.75 Combination #186 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 133 of ~450.75 Combination #187 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 134 of ~450.75 Combination #189 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 135 of ~450.75 Combination #191 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 136 of ~450.75 Combination #193 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 137 of ~450.75 Combination #194 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 138 of ~450.75 Combination #195 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 139 of ~450.75 Combination #196 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 140 of ~450.75 Combination #202 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 141 of ~450.75 Combination #205 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 142 of ~450.75 Combination #206 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 143 of ~450.75 Combination #207 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 144 of ~450.75 Combination #210 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 145 of ~450.75 Combination #211 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 146 of ~450.75 Combination #212 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 147 of ~450.75 Combination #213 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 148 of ~450.75 Combination #214 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 149 of ~450.75 Combination #215 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 150 of ~450.75 Combination #216 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 151 of ~450.75 Combination #217 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 152 of ~450.75 Combination #218 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 153 of ~450.75 Combination #219 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 154 of ~450.75 Combination #220 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 155 of ~450.75 Combination #221 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 156 of ~450.75 Combination #222 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 157 of ~450.75 Combination #223 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 158 of ~450.75 Combination #225 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 159 of ~450.75 Combination #226 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 160 of ~450.75 Combination #227 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 161 of ~450.75 Combination #228 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 162 of ~450.75 Combination #229 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 163 of ~450.75 Combination #230 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 164 of ~450.75 Combination #232 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 165 of ~450.75 Combination #233 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 166 of ~450.75 Combination #235 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 167 of ~450.75 Combination #236 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 168 of ~450.75 Combination #237 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 169 of ~450.75 Combination #238 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 170 of ~450.75 Combination #240 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 171 of ~450.75 Combination #241 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 172 of ~450.75 Combination #242 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 173 of ~450.75 Combination #243 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 174 of ~450.75 Combination #244 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 175 of ~450.75 Combination #245 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 176 of ~450.75 Combination #246 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 177 of ~450.75 Combination #247 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 178 of ~450.75 Combination #248 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 179 of ~450.75 Combination #249 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 180 of ~450.75 Combination #250 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 181 of ~450.75 Combination #251 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 182 of ~450.75 Combination #252 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 183 of ~450.75 Combination #253 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 184 of ~450.75 Combination #254 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 185 of ~450.75 Combination #255 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 186 of ~450.75 Combination #256 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 187 of ~450.75 Combination #257 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 188 of ~450.75 Combination #258 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 189 of ~450.75 Combination #259 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 190 of ~450.75 Combination #260 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 191 of ~450.75 Combination #262 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 192 of ~450.75 Combination #263 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 193 of ~450.75 Combination #264 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 194 of ~450.75 Combination #265 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 195 of ~450.75 Combination #266 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 196 of ~450.75 Combination #267 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 197 of ~450.75 Combination #269 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 198 of ~450.75 Combination #270 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 199 of ~450.75 Combination #271 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 200 of ~450.75 Combination #272 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 201 of ~450.75 Combination #273 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 202 of ~450.75 Combination #274 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 203 of ~450.75 Combination #275 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 204 of ~450.75 Combination #276 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 205 of ~450.75 Combination #278 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 206 of ~450.75 Combination #279 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 207 of ~450.75 Combination #280 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 208 of ~450.75 Combination #282 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 209 of ~450.75 Combination #284 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 210 of ~450.75 Combination #285 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 211 of ~450.75 Combination #286 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 212 of ~450.75 Combination #290 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 213 of ~450.75 Combination #291 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 214 of ~450.75 Combination #292 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 215 of ~450.75 Combination #293 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 216 of ~450.75 Combination #298 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 217 of ~450.75 Combination #300 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 218 of ~450.75 Combination #301 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 219 of ~450.75 Combination #305 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 220 of ~450.75 Combination #306 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 221 of ~450.75 Combination #307 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 222 of ~450.75 Combination #308 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 223 of ~450.75 Combination #310 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 224 of ~450.75 Combination #311 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 225 of ~450.75 Combination #313 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 226 of ~450.75 Combination #314 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 227 of ~450.75 Combination #315 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 228 of ~450.75 Combination #316 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 229 of ~450.75 Combination #317 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 230 of ~450.75 Combination #318 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 231 of ~450.75 Combination #319 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 232 of ~450.75 Combination #320 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 233 of ~450.75 Combination #322 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 234 of ~450.75 Combination #323 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 235 of ~450.75 Combination #324 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 236 of ~450.75 Combination #325 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 237 of ~450.75 Combination #326 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 238 of ~450.75 Combination #327 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 239 of ~450.75 Combination #328 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 240 of ~450.75 Combination #329 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 241 of ~450.75 Combination #332 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 242 of ~450.75 Combination #335 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 243 of ~450.75 Combination #336 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 244 of ~450.75 Combination #337 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 245 of ~450.75 Combination #338 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 246 of ~450.75 Combination #339 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 247 of ~450.75 Combination #340 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 248 of ~450.75 Combination #341 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 249 of ~450.75 Combination #342 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 250 of ~450.75 Combination #343 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 251 of ~450.75 Combination #344 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 252 of ~450.75 Combination #345 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 253 of ~450.75 Combination #346 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 254 of ~450.75 Combination #347 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 255 of ~450.75 Combination #348 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 256 of ~450.75 Combination #349 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 257 of ~450.75 Combination #351 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 258 of ~450.75 Combination #352 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 259 of ~450.75 Combination #353 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 260 of ~450.75 Combination #355 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 261 of ~450.75 Combination #356 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 262 of ~450.75 Combination #358 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 263 of ~450.75 Combination #359 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 264 of ~450.75 Combination #360 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 265 of ~450.75 Combination #361 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 266 of ~450.75 Combination #362 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 267 of ~450.75 Combination #364 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 268 of ~450.75 Combination #365 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 269 of ~450.75 Combination #366 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 270 of ~450.75 Combination #367 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 271 of ~450.75 Combination #368 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 272 of ~450.75 Combination #370 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 273 of ~450.75 Combination #372 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 274 of ~450.75 Combination #373 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 275 of ~450.75 Combination #374 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 276 of ~450.75 Combination #377 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 277 of ~450.75 Combination #378 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 278 of ~450.75 Combination #380 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 279 of ~450.75 Combination #381 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 280 of ~450.75 Combination #382 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 281 of ~450.75 Combination #384 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 282 of ~450.75 Combination #385 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 283 of ~450.75 Combination #386 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 284 of ~450.75 Combination #388 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 285 of ~450.75 Combination #389 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 286 of ~450.75 Combination #390 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 287 of ~450.75 Combination #391 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 288 of ~450.75 Combination #392 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 289 of ~450.75 Combination #394 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 290 of ~450.75 Combination #395 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 291 of ~450.75 Combination #396 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 292 of ~450.75 Combination #397 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 293 of ~450.75 Combination #399 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 294 of ~450.75 Combination #400 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 295 of ~450.75 Combination #401 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 296 of ~450.75 Combination #402 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 297 of ~450.75 Combination #403 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 298 of ~450.75 Combination #404 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 299 of ~450.75 Combination #405 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 300 of ~450.75 Combination #406 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 301 of ~450.75 Combination #407 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 302 of ~450.75 Combination #409 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 303 of ~450.75 Combination #410 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 304 of ~450.75 Combination #411 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 305 of ~450.75 Combination #412 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 306 of ~450.75 Combination #413 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 307 of ~450.75 Combination #414 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 308 of ~450.75 Combination #415 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 309 of ~450.75 Combination #417 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 310 of ~450.75 Combination #418 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 311 of ~450.75 Combination #420 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 312 of ~450.75 Combination #421 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 313 of ~450.75 Combination #422 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 314 of ~450.75 Combination #424 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 315 of ~450.75 Combination #425 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 316 of ~450.75 Combination #427 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 317 of ~450.75 Combination #429 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 318 of ~450.75 Combination #430 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 319 of ~450.75 Combination #431 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 320 of ~450.75 Combination #433 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 321 of ~450.75 Combination #435 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 322 of ~450.75 Combination #436 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 323 of ~450.75 Combination #437 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 324 of ~450.75 Combination #438 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 325 of ~450.75 Combination #439 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 326 of ~450.75 Combination #440 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 327 of ~450.75 Combination #442 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 328 of ~450.75 Combination #443 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 329 of ~450.75 Combination #444 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 330 of ~450.75 Combination #445 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 331 of ~450.75 Combination #446 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 332 of ~450.75 Combination #447 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 333 of ~450.75 Combination #448 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 334 of ~450.75 Combination #449 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 335 of ~450.75 Combination #450 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 336 of ~450.75 Combination #451 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 337 of ~450.75 Combination #452 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 338 of ~450.75 Combination #453 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 339 of ~450.75 Combination #454 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 340 of ~450.75 Combination #455 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 341 of ~450.75 Combination #456 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 342 of ~450.75 Combination #457 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 343 of ~450.75 Combination #458 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 344 of ~450.75 Combination #459 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 345 of ~450.75 Combination #461 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 346 of ~450.75 Combination #463 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 347 of ~450.75 Combination #464 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 348 of ~450.75 Combination #465 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 349 of ~450.75 Combination #466 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 350 of ~450.75 Combination #467 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 351 of ~450.75 Combination #469 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 352 of ~450.75 Combination #470 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 353 of ~450.75 Combination #471 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 354 of ~450.75 Combination #472 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 355 of ~450.75 Combination #473 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 356 of ~450.75 Combination #474 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 357 of ~450.75 Combination #476 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 358 of ~450.75 Combination #477 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 359 of ~450.75 Combination #478 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 360 of ~450.75 Combination #479 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 361 of ~450.75 Combination #480 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 362 of ~450.75 Combination #481 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 363 of ~450.75 Combination #482 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 364 of ~450.75 Combination #483 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 365 of ~450.75 Combination #484 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 366 of ~450.75 Combination #485 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 367 of ~450.75 Combination #486 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 368 of ~450.75 Combination #487 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 369 of ~450.75 Combination #488 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 370 of ~450.75 Combination #489 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 371 of ~450.75 Combination #491 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 372 of ~450.75 Combination #492 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 373 of ~450.75 Combination #493 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 374 of ~450.75 Combination #495 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 375 of ~450.75 Combination #496 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 376 of ~450.75 Combination #498 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 377 of ~450.75 Combination #499 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 378 of ~450.75 Combination #500 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 379 of ~450.75 Combination #502 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 380 of ~450.75 Combination #504 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 381 of ~450.75 Combination #505 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 382 of ~450.75 Combination #506 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 383 of ~450.75 Combination #508 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 384 of ~450.75 Combination #509 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 385 of ~450.75 Combination #511 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 386 of ~450.75 Combination #513 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 387 of ~450.75 Combination #515 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 388 of ~450.75 Combination #516 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 389 of ~450.75 Combination #520 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 390 of ~450.75 Combination #521 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 391 of ~450.75 Combination #524 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 392 of ~450.75 Combination #526 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 393 of ~450.75 Combination #527 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 394 of ~450.75 Combination #531 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 395 of ~450.75 Combination #532 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 396 of ~450.75 Combination #533 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 397 of ~450.75 Combination #534 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 398 of ~450.75 Combination #538 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 399 of ~450.75 Combination #539 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 400 of ~450.75 Combination #540 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 401 of ~450.75 Combination #541 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 402 of ~450.75 Combination #542 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 403 of ~450.75 Combination #543 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 404 of ~450.75 Combination #544 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 405 of ~450.75 Combination #545 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 406 of ~450.75 Combination #546 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 407 of ~450.75 Combination #547 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 408 of ~450.75 Combination #548 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 409 of ~450.75 Combination #550 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 410 of ~450.75 Combination #551 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 411 of ~450.75 Combination #552 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 412 of ~450.75 Combination #553 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 413 of ~450.75 Combination #554 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 414 of ~450.75 Combination #556 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 415 of ~450.75 Combination #557 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 416 of ~450.75 Combination #558 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 417 of ~450.75 Combination #559 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 418 of ~450.75 Combination #560 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 419 of ~450.75 Combination #561 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 420 of ~450.75 Combination #562 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 421 of ~450.75 Combination #563 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 422 of ~450.75 Combination #564 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 423 of ~450.75 Combination #565 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 424 of ~450.75 Combination #567 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 425 of ~450.75 Combination #568 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 426 of ~450.75 Combination #569 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 427 of ~450.75 Combination #571 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 428 of ~450.75 Combination #572 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 429 of ~450.75 Combination #573 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 430 of ~450.75 Combination #574 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 431 of ~450.75 Combination #575 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 432 of ~450.75 Combination #576 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 433 of ~450.75 Combination #577 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 434 of ~450.75 Combination #579 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 435 of ~450.75 Combination #580 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 436 of ~450.75 Combination #581 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 437 of ~450.75 Combination #587 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 438 of ~450.75 Combination #588 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 439 of ~450.75 Combination #589 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 440 of ~450.75 Combination #590 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 441 of ~450.75 Combination #592 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 442 of ~450.75 Combination #595 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 443 of ~450.75 Combination #596 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 444 of ~450.75 Combination #600 of 601----
diff --git a/testcases/ballista/ballista/outfiles/outfile.fchmod.b_fd.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.fchmod.b_fd.b_mode_t
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fchmod.b_fd.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.fchown.b_int.b_pid.b_pid b/testcases/ballista/ballista/outfiles/outfile.fchown.b_int.b_pid.b_pid
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fchown.b_int.b_pid.b_pid
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.fcntl.b_fd.b_int.b_int b/testcases/ballista/ballista/outfiles/outfile.fcntl.b_fd.b_int.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fcntl.b_fd.b_int.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.fdatasync.b_fd b/testcases/ballista/ballista/outfiles/outfile.fdatasync.b_fd
deleted file mode 100644
index 58a0ad6..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fdatasync.b_fd
+++ /dev/null
@@ -1,1778 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~450.75 Combination #2 of 601----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~450.75 Combination #6 of 601----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~450.75 Combination #7 of 601----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~450.75 Combination #9 of 601----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~450.75 Combination #10 of 601----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~450.75 Combination #11 of 601----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~450.75 Combination #12 of 601----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~450.75 Combination #13 of 601----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~450.75 Combination #14 of 601----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~450.75 Combination #17 of 601----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~450.75 Combination #18 of 601----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~450.75 Combination #19 of 601----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~450.75 Combination #20 of 601----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~450.75 Combination #21 of 601----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~450.75 Combination #22 of 601----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~450.75 Combination #23 of 601----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~450.75 Combination #25 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~450.75 Combination #26 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~450.75 Combination #27 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~450.75 Combination #28 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~450.75 Combination #30 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~450.75 Combination #31 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~450.75 Combination #33 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~450.75 Combination #34 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~450.75 Combination #35 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~450.75 Combination #36 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 27 of ~450.75 Combination #37 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 28 of ~450.75 Combination #39 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 29 of ~450.75 Combination #41 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 30 of ~450.75 Combination #43 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 31 of ~450.75 Combination #45 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 32 of ~450.75 Combination #46 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 33 of ~450.75 Combination #49 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 34 of ~450.75 Combination #51 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 35 of ~450.75 Combination #52 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 36 of ~450.75 Combination #53 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 37 of ~450.75 Combination #54 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 38 of ~450.75 Combination #56 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 39 of ~450.75 Combination #57 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 40 of ~450.75 Combination #58 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 41 of ~450.75 Combination #59 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 42 of ~450.75 Combination #60 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 43 of ~450.75 Combination #61 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 44 of ~450.75 Combination #65 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 45 of ~450.75 Combination #66 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 46 of ~450.75 Combination #67 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~450.75 Combination #69 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~450.75 Combination #70 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~450.75 Combination #71 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~450.75 Combination #72 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 51 of ~450.75 Combination #73 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 52 of ~450.75 Combination #76 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 53 of ~450.75 Combination #77 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 54 of ~450.75 Combination #78 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 55 of ~450.75 Combination #79 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 56 of ~450.75 Combination #80 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 57 of ~450.75 Combination #81 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 58 of ~450.75 Combination #82 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 59 of ~450.75 Combination #83 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 60 of ~450.75 Combination #86 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 61 of ~450.75 Combination #87 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 62 of ~450.75 Combination #89 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 63 of ~450.75 Combination #90 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 64 of ~450.75 Combination #92 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 65 of ~450.75 Combination #93 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 66 of ~450.75 Combination #95 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 67 of ~450.75 Combination #97 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 68 of ~450.75 Combination #99 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 69 of ~450.75 Combination #101 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 70 of ~450.75 Combination #102 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 71 of ~450.75 Combination #105 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 72 of ~450.75 Combination #107 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 73 of ~450.75 Combination #108 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 74 of ~450.75 Combination #109 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 75 of ~450.75 Combination #110 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 76 of ~450.75 Combination #112 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 77 of ~450.75 Combination #113 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 78 of ~450.75 Combination #114 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 79 of ~450.75 Combination #115 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 80 of ~450.75 Combination #116 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 81 of ~450.75 Combination #117 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 82 of ~450.75 Combination #118 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 83 of ~450.75 Combination #119 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 84 of ~450.75 Combination #121 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 85 of ~450.75 Combination #122 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 86 of ~450.75 Combination #123 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 87 of ~450.75 Combination #127 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 88 of ~450.75 Combination #128 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 89 of ~450.75 Combination #129 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 90 of ~450.75 Combination #130 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 91 of ~450.75 Combination #131 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 92 of ~450.75 Combination #132 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 93 of ~450.75 Combination #133 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 94 of ~450.75 Combination #134 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 95 of ~450.75 Combination #135 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 96 of ~450.75 Combination #136 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 97 of ~450.75 Combination #137 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 98 of ~450.75 Combination #139 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 99 of ~450.75 Combination #140 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 100 of ~450.75 Combination #141 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 101 of ~450.75 Combination #143 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 102 of ~450.75 Combination #144 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 103 of ~450.75 Combination #145 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 104 of ~450.75 Combination #146 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 105 of ~450.75 Combination #148 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 106 of ~450.75 Combination #149 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 107 of ~450.75 Combination #151 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 108 of ~450.75 Combination #153 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 109 of ~450.75 Combination #154 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 110 of ~450.75 Combination #155 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 111 of ~450.75 Combination #156 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 112 of ~450.75 Combination #157 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 113 of ~450.75 Combination #158 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 114 of ~450.75 Combination #159 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 115 of ~450.75 Combination #161 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 116 of ~450.75 Combination #163 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 117 of ~450.75 Combination #164 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 118 of ~450.75 Combination #166 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 119 of ~450.75 Combination #168 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 120 of ~450.75 Combination #170 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 121 of ~450.75 Combination #172 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 122 of ~450.75 Combination #173 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 123 of ~450.75 Combination #175 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 124 of ~450.75 Combination #176 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 125 of ~450.75 Combination #177 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 126 of ~450.75 Combination #178 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 127 of ~450.75 Combination #181 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 128 of ~450.75 Combination #182 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 129 of ~450.75 Combination #183 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 130 of ~450.75 Combination #184 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 131 of ~450.75 Combination #185 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 132 of ~450.75 Combination #186 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 133 of ~450.75 Combination #187 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 134 of ~450.75 Combination #189 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 135 of ~450.75 Combination #191 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 136 of ~450.75 Combination #193 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 137 of ~450.75 Combination #194 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 138 of ~450.75 Combination #195 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 139 of ~450.75 Combination #196 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 140 of ~450.75 Combination #202 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 141 of ~450.75 Combination #205 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 142 of ~450.75 Combination #206 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 143 of ~450.75 Combination #207 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 144 of ~450.75 Combination #210 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 145 of ~450.75 Combination #211 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 146 of ~450.75 Combination #212 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 147 of ~450.75 Combination #213 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 148 of ~450.75 Combination #214 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 149 of ~450.75 Combination #215 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 150 of ~450.75 Combination #216 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 151 of ~450.75 Combination #217 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 152 of ~450.75 Combination #218 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 153 of ~450.75 Combination #219 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 154 of ~450.75 Combination #220 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 155 of ~450.75 Combination #221 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 156 of ~450.75 Combination #222 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 157 of ~450.75 Combination #223 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 158 of ~450.75 Combination #225 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 159 of ~450.75 Combination #226 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 160 of ~450.75 Combination #227 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 161 of ~450.75 Combination #228 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 162 of ~450.75 Combination #229 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 163 of ~450.75 Combination #230 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 164 of ~450.75 Combination #232 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 165 of ~450.75 Combination #233 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 166 of ~450.75 Combination #235 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 167 of ~450.75 Combination #236 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 168 of ~450.75 Combination #237 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 169 of ~450.75 Combination #238 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 170 of ~450.75 Combination #240 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 171 of ~450.75 Combination #241 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 172 of ~450.75 Combination #242 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 173 of ~450.75 Combination #243 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 174 of ~450.75 Combination #244 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 175 of ~450.75 Combination #245 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 176 of ~450.75 Combination #246 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 177 of ~450.75 Combination #247 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 178 of ~450.75 Combination #248 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 179 of ~450.75 Combination #249 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 180 of ~450.75 Combination #250 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 181 of ~450.75 Combination #251 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 182 of ~450.75 Combination #252 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 183 of ~450.75 Combination #253 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 184 of ~450.75 Combination #254 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 185 of ~450.75 Combination #255 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 186 of ~450.75 Combination #256 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 187 of ~450.75 Combination #257 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 188 of ~450.75 Combination #258 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 189 of ~450.75 Combination #259 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 190 of ~450.75 Combination #260 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 191 of ~450.75 Combination #262 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 192 of ~450.75 Combination #263 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 193 of ~450.75 Combination #264 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 194 of ~450.75 Combination #265 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 195 of ~450.75 Combination #266 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 196 of ~450.75 Combination #267 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 197 of ~450.75 Combination #269 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 198 of ~450.75 Combination #270 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 199 of ~450.75 Combination #271 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 200 of ~450.75 Combination #272 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 201 of ~450.75 Combination #273 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 202 of ~450.75 Combination #274 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 203 of ~450.75 Combination #275 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 204 of ~450.75 Combination #276 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 205 of ~450.75 Combination #278 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 206 of ~450.75 Combination #279 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 207 of ~450.75 Combination #280 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 208 of ~450.75 Combination #282 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 209 of ~450.75 Combination #284 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 210 of ~450.75 Combination #285 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 211 of ~450.75 Combination #286 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 212 of ~450.75 Combination #290 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 213 of ~450.75 Combination #291 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 214 of ~450.75 Combination #292 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 215 of ~450.75 Combination #293 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 216 of ~450.75 Combination #298 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 217 of ~450.75 Combination #300 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 218 of ~450.75 Combination #301 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 219 of ~450.75 Combination #305 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 220 of ~450.75 Combination #306 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 221 of ~450.75 Combination #307 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 222 of ~450.75 Combination #308 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 223 of ~450.75 Combination #310 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 224 of ~450.75 Combination #311 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 225 of ~450.75 Combination #313 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 226 of ~450.75 Combination #314 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 227 of ~450.75 Combination #315 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 228 of ~450.75 Combination #316 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 229 of ~450.75 Combination #317 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 230 of ~450.75 Combination #318 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 231 of ~450.75 Combination #319 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 232 of ~450.75 Combination #320 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 233 of ~450.75 Combination #322 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 234 of ~450.75 Combination #323 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 235 of ~450.75 Combination #324 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 236 of ~450.75 Combination #325 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 237 of ~450.75 Combination #326 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 238 of ~450.75 Combination #327 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 239 of ~450.75 Combination #328 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 240 of ~450.75 Combination #329 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 241 of ~450.75 Combination #332 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 242 of ~450.75 Combination #335 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 243 of ~450.75 Combination #336 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 244 of ~450.75 Combination #337 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 245 of ~450.75 Combination #338 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 246 of ~450.75 Combination #339 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 247 of ~450.75 Combination #340 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 248 of ~450.75 Combination #341 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 249 of ~450.75 Combination #342 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 250 of ~450.75 Combination #343 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 251 of ~450.75 Combination #344 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 252 of ~450.75 Combination #345 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 253 of ~450.75 Combination #346 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 254 of ~450.75 Combination #347 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 255 of ~450.75 Combination #348 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 256 of ~450.75 Combination #349 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 257 of ~450.75 Combination #351 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 258 of ~450.75 Combination #352 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 259 of ~450.75 Combination #353 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 260 of ~450.75 Combination #355 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 261 of ~450.75 Combination #356 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 262 of ~450.75 Combination #358 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 263 of ~450.75 Combination #359 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 264 of ~450.75 Combination #360 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 265 of ~450.75 Combination #361 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 266 of ~450.75 Combination #362 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 267 of ~450.75 Combination #364 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 268 of ~450.75 Combination #365 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 269 of ~450.75 Combination #366 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 270 of ~450.75 Combination #367 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 271 of ~450.75 Combination #368 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 272 of ~450.75 Combination #370 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 273 of ~450.75 Combination #372 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 274 of ~450.75 Combination #373 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 275 of ~450.75 Combination #374 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 276 of ~450.75 Combination #377 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 277 of ~450.75 Combination #378 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 278 of ~450.75 Combination #380 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 279 of ~450.75 Combination #381 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 280 of ~450.75 Combination #382 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 281 of ~450.75 Combination #384 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 282 of ~450.75 Combination #385 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 283 of ~450.75 Combination #386 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 284 of ~450.75 Combination #388 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 285 of ~450.75 Combination #389 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 286 of ~450.75 Combination #390 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 287 of ~450.75 Combination #391 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 288 of ~450.75 Combination #392 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 289 of ~450.75 Combination #394 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 290 of ~450.75 Combination #395 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 291 of ~450.75 Combination #396 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 292 of ~450.75 Combination #397 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 293 of ~450.75 Combination #399 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 294 of ~450.75 Combination #400 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 295 of ~450.75 Combination #401 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 296 of ~450.75 Combination #402 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 297 of ~450.75 Combination #403 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 298 of ~450.75 Combination #404 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 299 of ~450.75 Combination #405 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 300 of ~450.75 Combination #406 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 301 of ~450.75 Combination #407 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 302 of ~450.75 Combination #409 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 303 of ~450.75 Combination #410 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 304 of ~450.75 Combination #411 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 305 of ~450.75 Combination #412 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 306 of ~450.75 Combination #413 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 307 of ~450.75 Combination #414 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 308 of ~450.75 Combination #415 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 309 of ~450.75 Combination #417 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 310 of ~450.75 Combination #418 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 311 of ~450.75 Combination #420 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 312 of ~450.75 Combination #421 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 313 of ~450.75 Combination #422 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 314 of ~450.75 Combination #424 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 315 of ~450.75 Combination #425 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 316 of ~450.75 Combination #427 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 317 of ~450.75 Combination #429 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 318 of ~450.75 Combination #430 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 319 of ~450.75 Combination #431 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 320 of ~450.75 Combination #433 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 321 of ~450.75 Combination #435 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 322 of ~450.75 Combination #436 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 323 of ~450.75 Combination #437 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 324 of ~450.75 Combination #438 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 325 of ~450.75 Combination #439 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 326 of ~450.75 Combination #440 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 327 of ~450.75 Combination #442 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 328 of ~450.75 Combination #443 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 329 of ~450.75 Combination #444 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 330 of ~450.75 Combination #445 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 331 of ~450.75 Combination #446 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 332 of ~450.75 Combination #447 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 333 of ~450.75 Combination #448 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 334 of ~450.75 Combination #449 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 335 of ~450.75 Combination #450 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 336 of ~450.75 Combination #451 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 337 of ~450.75 Combination #452 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 338 of ~450.75 Combination #453 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 339 of ~450.75 Combination #454 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 340 of ~450.75 Combination #455 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 341 of ~450.75 Combination #456 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 342 of ~450.75 Combination #457 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 343 of ~450.75 Combination #458 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 344 of ~450.75 Combination #459 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 345 of ~450.75 Combination #461 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 346 of ~450.75 Combination #463 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 347 of ~450.75 Combination #464 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 348 of ~450.75 Combination #465 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 349 of ~450.75 Combination #466 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 350 of ~450.75 Combination #467 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 351 of ~450.75 Combination #469 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 352 of ~450.75 Combination #470 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 353 of ~450.75 Combination #471 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 354 of ~450.75 Combination #472 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 355 of ~450.75 Combination #473 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 356 of ~450.75 Combination #474 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 357 of ~450.75 Combination #476 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 358 of ~450.75 Combination #477 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 359 of ~450.75 Combination #478 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 360 of ~450.75 Combination #479 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 361 of ~450.75 Combination #480 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 362 of ~450.75 Combination #481 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 363 of ~450.75 Combination #482 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 364 of ~450.75 Combination #483 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 365 of ~450.75 Combination #484 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 366 of ~450.75 Combination #485 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 367 of ~450.75 Combination #486 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 368 of ~450.75 Combination #487 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 369 of ~450.75 Combination #488 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 370 of ~450.75 Combination #489 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 371 of ~450.75 Combination #491 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 372 of ~450.75 Combination #492 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 373 of ~450.75 Combination #493 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 374 of ~450.75 Combination #495 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 375 of ~450.75 Combination #496 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 376 of ~450.75 Combination #498 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 377 of ~450.75 Combination #499 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 378 of ~450.75 Combination #500 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 379 of ~450.75 Combination #502 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 380 of ~450.75 Combination #504 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 381 of ~450.75 Combination #505 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 382 of ~450.75 Combination #506 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 383 of ~450.75 Combination #508 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 384 of ~450.75 Combination #509 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 385 of ~450.75 Combination #511 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 386 of ~450.75 Combination #513 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 387 of ~450.75 Combination #515 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 388 of ~450.75 Combination #516 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 389 of ~450.75 Combination #520 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 390 of ~450.75 Combination #521 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 391 of ~450.75 Combination #524 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 392 of ~450.75 Combination #526 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 393 of ~450.75 Combination #527 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 394 of ~450.75 Combination #531 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 395 of ~450.75 Combination #532 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 396 of ~450.75 Combination #533 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 397 of ~450.75 Combination #534 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 398 of ~450.75 Combination #538 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 399 of ~450.75 Combination #539 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 400 of ~450.75 Combination #540 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 401 of ~450.75 Combination #541 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 402 of ~450.75 Combination #542 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 403 of ~450.75 Combination #543 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 404 of ~450.75 Combination #544 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 405 of ~450.75 Combination #545 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 406 of ~450.75 Combination #546 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 407 of ~450.75 Combination #547 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 408 of ~450.75 Combination #548 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 409 of ~450.75 Combination #550 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 410 of ~450.75 Combination #551 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 411 of ~450.75 Combination #552 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 412 of ~450.75 Combination #553 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 413 of ~450.75 Combination #554 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 414 of ~450.75 Combination #556 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 415 of ~450.75 Combination #557 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 416 of ~450.75 Combination #558 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 417 of ~450.75 Combination #559 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 418 of ~450.75 Combination #560 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 419 of ~450.75 Combination #561 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 420 of ~450.75 Combination #562 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 421 of ~450.75 Combination #563 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 422 of ~450.75 Combination #564 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 423 of ~450.75 Combination #565 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 424 of ~450.75 Combination #567 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 425 of ~450.75 Combination #568 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 426 of ~450.75 Combination #569 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 427 of ~450.75 Combination #571 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 428 of ~450.75 Combination #572 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 429 of ~450.75 Combination #573 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 430 of ~450.75 Combination #574 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 431 of ~450.75 Combination #575 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 432 of ~450.75 Combination #576 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 433 of ~450.75 Combination #577 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 434 of ~450.75 Combination #579 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 435 of ~450.75 Combination #580 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 436 of ~450.75 Combination #581 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 437 of ~450.75 Combination #587 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 438 of ~450.75 Combination #588 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 439 of ~450.75 Combination #589 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 440 of ~450.75 Combination #590 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 441 of ~450.75 Combination #592 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 442 of ~450.75 Combination #595 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 443 of ~450.75 Combination #596 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 444 of ~450.75 Combination #600 of 601----
diff --git a/testcases/ballista/ballista/outfiles/outfile.flock.b_fd.b_int b/testcases/ballista/ballista/outfiles/outfile.flock.b_fd.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.flock.b_fd.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.fstat.b_fd.b_ptr_stat b/testcases/ballista/ballista/outfiles/outfile.fstat.b_fd.b_ptr_stat
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fstat.b_fd.b_ptr_stat
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.fsync.b_fd b/testcases/ballista/ballista/outfiles/outfile.fsync.b_fd
deleted file mode 100644
index 58a0ad6..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.fsync.b_fd
+++ /dev/null
@@ -1,1778 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~450.75 Combination #2 of 601----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~450.75 Combination #6 of 601----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~450.75 Combination #7 of 601----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~450.75 Combination #9 of 601----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~450.75 Combination #10 of 601----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~450.75 Combination #11 of 601----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~450.75 Combination #12 of 601----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~450.75 Combination #13 of 601----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~450.75 Combination #14 of 601----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~450.75 Combination #17 of 601----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~450.75 Combination #18 of 601----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~450.75 Combination #19 of 601----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~450.75 Combination #20 of 601----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~450.75 Combination #21 of 601----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~450.75 Combination #22 of 601----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~450.75 Combination #23 of 601----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~450.75 Combination #25 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~450.75 Combination #26 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~450.75 Combination #27 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~450.75 Combination #28 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~450.75 Combination #30 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~450.75 Combination #31 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~450.75 Combination #33 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~450.75 Combination #34 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~450.75 Combination #35 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~450.75 Combination #36 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 27 of ~450.75 Combination #37 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 28 of ~450.75 Combination #39 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 29 of ~450.75 Combination #41 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 30 of ~450.75 Combination #43 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 31 of ~450.75 Combination #45 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 32 of ~450.75 Combination #46 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 33 of ~450.75 Combination #49 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 34 of ~450.75 Combination #51 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 35 of ~450.75 Combination #52 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 36 of ~450.75 Combination #53 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 37 of ~450.75 Combination #54 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 38 of ~450.75 Combination #56 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 39 of ~450.75 Combination #57 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 40 of ~450.75 Combination #58 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 41 of ~450.75 Combination #59 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 42 of ~450.75 Combination #60 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 43 of ~450.75 Combination #61 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 44 of ~450.75 Combination #65 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 45 of ~450.75 Combination #66 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 46 of ~450.75 Combination #67 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~450.75 Combination #69 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~450.75 Combination #70 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~450.75 Combination #71 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~450.75 Combination #72 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 51 of ~450.75 Combination #73 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 52 of ~450.75 Combination #76 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 53 of ~450.75 Combination #77 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 54 of ~450.75 Combination #78 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 55 of ~450.75 Combination #79 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 56 of ~450.75 Combination #80 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 57 of ~450.75 Combination #81 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 58 of ~450.75 Combination #82 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 59 of ~450.75 Combination #83 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 60 of ~450.75 Combination #86 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 61 of ~450.75 Combination #87 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 62 of ~450.75 Combination #89 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 63 of ~450.75 Combination #90 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 64 of ~450.75 Combination #92 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 65 of ~450.75 Combination #93 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 66 of ~450.75 Combination #95 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 67 of ~450.75 Combination #97 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 68 of ~450.75 Combination #99 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 69 of ~450.75 Combination #101 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 70 of ~450.75 Combination #102 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 71 of ~450.75 Combination #105 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 72 of ~450.75 Combination #107 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 73 of ~450.75 Combination #108 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 74 of ~450.75 Combination #109 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 75 of ~450.75 Combination #110 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 76 of ~450.75 Combination #112 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 77 of ~450.75 Combination #113 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 78 of ~450.75 Combination #114 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 79 of ~450.75 Combination #115 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 80 of ~450.75 Combination #116 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 81 of ~450.75 Combination #117 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 82 of ~450.75 Combination #118 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 83 of ~450.75 Combination #119 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 84 of ~450.75 Combination #121 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 85 of ~450.75 Combination #122 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 86 of ~450.75 Combination #123 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 87 of ~450.75 Combination #127 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 88 of ~450.75 Combination #128 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 89 of ~450.75 Combination #129 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 90 of ~450.75 Combination #130 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 91 of ~450.75 Combination #131 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 92 of ~450.75 Combination #132 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 93 of ~450.75 Combination #133 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 94 of ~450.75 Combination #134 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 95 of ~450.75 Combination #135 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 96 of ~450.75 Combination #136 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 97 of ~450.75 Combination #137 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 98 of ~450.75 Combination #139 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 99 of ~450.75 Combination #140 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 100 of ~450.75 Combination #141 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 101 of ~450.75 Combination #143 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 102 of ~450.75 Combination #144 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 103 of ~450.75 Combination #145 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 104 of ~450.75 Combination #146 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 105 of ~450.75 Combination #148 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 106 of ~450.75 Combination #149 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 107 of ~450.75 Combination #151 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 108 of ~450.75 Combination #153 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 109 of ~450.75 Combination #154 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 110 of ~450.75 Combination #155 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 111 of ~450.75 Combination #156 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 112 of ~450.75 Combination #157 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 113 of ~450.75 Combination #158 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 114 of ~450.75 Combination #159 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 115 of ~450.75 Combination #161 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 116 of ~450.75 Combination #163 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 117 of ~450.75 Combination #164 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 118 of ~450.75 Combination #166 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EMPTY	
-rval:
-Done - Pass	0
-------- 119 of ~450.75 Combination #168 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 120 of ~450.75 Combination #170 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 121 of ~450.75 Combination #172 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 122 of ~450.75 Combination #173 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 123 of ~450.75 Combination #175 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 124 of ~450.75 Combination #176 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 125 of ~450.75 Combination #177 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 126 of ~450.75 Combination #178 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 127 of ~450.75 Combination #181 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 128 of ~450.75 Combination #182 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 129 of ~450.75 Combination #183 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 130 of ~450.75 Combination #184 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 131 of ~450.75 Combination #185 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 132 of ~450.75 Combination #186 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 133 of ~450.75 Combination #187 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 134 of ~450.75 Combination #189 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 135 of ~450.75 Combination #191 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 136 of ~450.75 Combination #193 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 137 of ~450.75 Combination #194 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 138 of ~450.75 Combination #195 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 139 of ~450.75 Combination #196 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 140 of ~450.75 Combination #202 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 141 of ~450.75 Combination #205 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 142 of ~450.75 Combination #206 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 143 of ~450.75 Combination #207 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 144 of ~450.75 Combination #210 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 145 of ~450.75 Combination #211 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 146 of ~450.75 Combination #212 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 147 of ~450.75 Combination #213 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 148 of ~450.75 Combination #214 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 149 of ~450.75 Combination #215 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 150 of ~450.75 Combination #216 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 151 of ~450.75 Combination #217 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 152 of ~450.75 Combination #218 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 153 of ~450.75 Combination #219 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 154 of ~450.75 Combination #220 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 155 of ~450.75 Combination #221 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 156 of ~450.75 Combination #222 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 157 of ~450.75 Combination #223 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 158 of ~450.75 Combination #225 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 159 of ~450.75 Combination #226 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 160 of ~450.75 Combination #227 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 161 of ~450.75 Combination #228 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 162 of ~450.75 Combination #229 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 163 of ~450.75 Combination #230 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 164 of ~450.75 Combination #232 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 165 of ~450.75 Combination #233 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 166 of ~450.75 Combination #235 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 167 of ~450.75 Combination #236 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 168 of ~450.75 Combination #237 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 169 of ~450.75 Combination #238 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 170 of ~450.75 Combination #240 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 171 of ~450.75 Combination #241 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 172 of ~450.75 Combination #242 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 173 of ~450.75 Combination #243 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 174 of ~450.75 Combination #244 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 175 of ~450.75 Combination #245 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 176 of ~450.75 Combination #246 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 177 of ~450.75 Combination #247 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 178 of ~450.75 Combination #248 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 179 of ~450.75 Combination #249 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 180 of ~450.75 Combination #250 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 181 of ~450.75 Combination #251 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 182 of ~450.75 Combination #252 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 183 of ~450.75 Combination #253 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 184 of ~450.75 Combination #254 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 185 of ~450.75 Combination #255 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 186 of ~450.75 Combination #256 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 187 of ~450.75 Combination #257 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 188 of ~450.75 Combination #258 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 189 of ~450.75 Combination #259 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 190 of ~450.75 Combination #260 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 191 of ~450.75 Combination #262 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 192 of ~450.75 Combination #263 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 193 of ~450.75 Combination #264 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 194 of ~450.75 Combination #265 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 195 of ~450.75 Combination #266 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 196 of ~450.75 Combination #267 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 197 of ~450.75 Combination #269 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 198 of ~450.75 Combination #270 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 199 of ~450.75 Combination #271 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 200 of ~450.75 Combination #272 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 201 of ~450.75 Combination #273 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 202 of ~450.75 Combination #274 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 203 of ~450.75 Combination #275 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 204 of ~450.75 Combination #276 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 205 of ~450.75 Combination #278 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 206 of ~450.75 Combination #279 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 207 of ~450.75 Combination #280 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 208 of ~450.75 Combination #282 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 209 of ~450.75 Combination #284 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 210 of ~450.75 Combination #285 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 211 of ~450.75 Combination #286 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 212 of ~450.75 Combination #290 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 213 of ~450.75 Combination #291 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 214 of ~450.75 Combination #292 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 215 of ~450.75 Combination #293 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 216 of ~450.75 Combination #298 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 217 of ~450.75 Combination #300 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 218 of ~450.75 Combination #301 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 219 of ~450.75 Combination #305 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 220 of ~450.75 Combination #306 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 221 of ~450.75 Combination #307 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 222 of ~450.75 Combination #308 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 223 of ~450.75 Combination #310 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 224 of ~450.75 Combination #311 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_BEGINNING	
-rval:
-Done - Pass	0
-------- 225 of ~450.75 Combination #313 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 226 of ~450.75 Combination #314 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 227 of ~450.75 Combination #315 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 228 of ~450.75 Combination #316 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 229 of ~450.75 Combination #317 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 230 of ~450.75 Combination #318 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 231 of ~450.75 Combination #319 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 232 of ~450.75 Combination #320 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 233 of ~450.75 Combination #322 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 234 of ~450.75 Combination #323 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 235 of ~450.75 Combination #324 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 236 of ~450.75 Combination #325 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 237 of ~450.75 Combination #326 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 238 of ~450.75 Combination #327 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 239 of ~450.75 Combination #328 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 240 of ~450.75 Combination #329 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 241 of ~450.75 Combination #332 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 242 of ~450.75 Combination #335 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 243 of ~450.75 Combination #336 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 244 of ~450.75 Combination #337 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 245 of ~450.75 Combination #338 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 246 of ~450.75 Combination #339 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 247 of ~450.75 Combination #340 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 248 of ~450.75 Combination #341 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 249 of ~450.75 Combination #342 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 250 of ~450.75 Combination #343 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 251 of ~450.75 Combination #344 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 252 of ~450.75 Combination #345 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 253 of ~450.75 Combination #346 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 254 of ~450.75 Combination #347 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 255 of ~450.75 Combination #348 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 256 of ~450.75 Combination #349 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 257 of ~450.75 Combination #351 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 258 of ~450.75 Combination #352 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 259 of ~450.75 Combination #353 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 260 of ~450.75 Combination #355 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 261 of ~450.75 Combination #356 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 262 of ~450.75 Combination #358 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 263 of ~450.75 Combination #359 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 264 of ~450.75 Combination #360 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 265 of ~450.75 Combination #361 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 266 of ~450.75 Combination #362 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 267 of ~450.75 Combination #364 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 268 of ~450.75 Combination #365 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 269 of ~450.75 Combination #366 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 270 of ~450.75 Combination #367 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 271 of ~450.75 Combination #368 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 272 of ~450.75 Combination #370 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 273 of ~450.75 Combination #372 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 274 of ~450.75 Combination #373 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 275 of ~450.75 Combination #374 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 276 of ~450.75 Combination #377 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 277 of ~450.75 Combination #378 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 278 of ~450.75 Combination #380 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 279 of ~450.75 Combination #381 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 280 of ~450.75 Combination #382 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 281 of ~450.75 Combination #384 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 282 of ~450.75 Combination #385 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 283 of ~450.75 Combination #386 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 284 of ~450.75 Combination #388 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 285 of ~450.75 Combination #389 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 286 of ~450.75 Combination #390 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 287 of ~450.75 Combination #391 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 288 of ~450.75 Combination #392 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 289 of ~450.75 Combination #394 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 290 of ~450.75 Combination #395 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 291 of ~450.75 Combination #396 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 292 of ~450.75 Combination #397 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 293 of ~450.75 Combination #399 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 294 of ~450.75 Combination #400 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 295 of ~450.75 Combination #401 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 296 of ~450.75 Combination #402 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 297 of ~450.75 Combination #403 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 298 of ~450.75 Combination #404 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 299 of ~450.75 Combination #405 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 300 of ~450.75 Combination #406 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 301 of ~450.75 Combination #407 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 302 of ~450.75 Combination #409 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 303 of ~450.75 Combination #410 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 304 of ~450.75 Combination #411 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 305 of ~450.75 Combination #412 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 306 of ~450.75 Combination #413 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 307 of ~450.75 Combination #414 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 308 of ~450.75 Combination #415 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 309 of ~450.75 Combination #417 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 310 of ~450.75 Combination #418 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 311 of ~450.75 Combination #420 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 312 of ~450.75 Combination #421 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 313 of ~450.75 Combination #422 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 314 of ~450.75 Combination #424 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 315 of ~450.75 Combination #425 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 316 of ~450.75 Combination #427 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 317 of ~450.75 Combination #429 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 318 of ~450.75 Combination #430 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 319 of ~450.75 Combination #431 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 320 of ~450.75 Combination #433 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 321 of ~450.75 Combination #435 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 322 of ~450.75 Combination #436 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 323 of ~450.75 Combination #437 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 324 of ~450.75 Combination #438 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 325 of ~450.75 Combination #439 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 326 of ~450.75 Combination #440 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 327 of ~450.75 Combination #442 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 328 of ~450.75 Combination #443 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 329 of ~450.75 Combination #444 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 330 of ~450.75 Combination #445 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 331 of ~450.75 Combination #446 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 332 of ~450.75 Combination #447 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 333 of ~450.75 Combination #448 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 334 of ~450.75 Combination #449 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 335 of ~450.75 Combination #450 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 336 of ~450.75 Combination #451 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 337 of ~450.75 Combination #452 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 338 of ~450.75 Combination #453 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 339 of ~450.75 Combination #454 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 340 of ~450.75 Combination #455 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 341 of ~450.75 Combination #456 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_EOF	
-rval:
-Done - Pass	0
-------- 342 of ~450.75 Combination #457 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 343 of ~450.75 Combination #458 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 344 of ~450.75 Combination #459 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 345 of ~450.75 Combination #461 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 346 of ~450.75 Combination #463 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 347 of ~450.75 Combination #464 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 348 of ~450.75 Combination #465 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 349 of ~450.75 Combination #466 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 350 of ~450.75 Combination #467 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 351 of ~450.75 Combination #469 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 352 of ~450.75 Combination #470 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 353 of ~450.75 Combination #471 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 354 of ~450.75 Combination #472 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 355 of ~450.75 Combination #473 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 356 of ~450.75 Combination #474 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 357 of ~450.75 Combination #476 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 358 of ~450.75 Combination #477 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 359 of ~450.75 Combination #478 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 360 of ~450.75 Combination #479 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 361 of ~450.75 Combination #480 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 362 of ~450.75 Combination #481 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 363 of ~450.75 Combination #482 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 364 of ~450.75 Combination #483 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 365 of ~450.75 Combination #484 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 366 of ~450.75 Combination #485 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 367 of ~450.75 Combination #486 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 368 of ~450.75 Combination #487 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 369 of ~450.75 Combination #488 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 370 of ~450.75 Combination #489 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 371 of ~450.75 Combination #491 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 372 of ~450.75 Combination #492 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 373 of ~450.75 Combination #493 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 374 of ~450.75 Combination #495 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 375 of ~450.75 Combination #496 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 376 of ~450.75 Combination #498 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 377 of ~450.75 Combination #499 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 378 of ~450.75 Combination #500 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 379 of ~450.75 Combination #502 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 380 of ~450.75 Combination #504 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 381 of ~450.75 Combination #505 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 382 of ~450.75 Combination #506 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 383 of ~450.75 Combination #508 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 384 of ~450.75 Combination #509 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 385 of ~450.75 Combination #511 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 386 of ~450.75 Combination #513 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 387 of ~450.75 Combination #515 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 388 of ~450.75 Combination #516 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 389 of ~450.75 Combination #520 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 390 of ~450.75 Combination #521 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 391 of ~450.75 Combination #524 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 392 of ~450.75 Combination #526 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_CLOSED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 393 of ~450.75 Combination #527 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 394 of ~450.75 Combination #531 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 395 of ~450.75 Combination #532 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 396 of ~450.75 Combination #533 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 397 of ~450.75 Combination #534 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 398 of ~450.75 Combination #538 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 399 of ~450.75 Combination #539 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 400 of ~450.75 Combination #540 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 401 of ~450.75 Combination #541 of 601----
-#param:b_fd	b_fd_READ	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 402 of ~450.75 Combination #542 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 403 of ~450.75 Combination #543 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 404 of ~450.75 Combination #544 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 405 of ~450.75 Combination #545 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 406 of ~450.75 Combination #546 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_X_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 407 of ~450.75 Combination #547 of 601----
-#param:b_fd	b_fd_READ	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 408 of ~450.75 Combination #548 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 409 of ~450.75 Combination #550 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 410 of ~450.75 Combination #551 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 411 of ~450.75 Combination #552 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 412 of ~450.75 Combination #553 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 413 of ~450.75 Combination #554 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 414 of ~450.75 Combination #556 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 415 of ~450.75 Combination #557 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 416 of ~450.75 Combination #558 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 417 of ~450.75 Combination #559 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 418 of ~450.75 Combination #560 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 419 of ~450.75 Combination #561 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 420 of ~450.75 Combination #562 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 421 of ~450.75 Combination #563 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 422 of ~450.75 Combination #564 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_NONE	b_fd_DELETED	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 423 of ~450.75 Combination #565 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 424 of ~450.75 Combination #567 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 425 of ~450.75 Combination #568 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 426 of ~450.75 Combination #569 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 427 of ~450.75 Combination #571 of 601----
-#param:b_fd	b_fd_READ	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 428 of ~450.75 Combination #572 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 429 of ~450.75 Combination #573 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 430 of ~450.75 Combination #574 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 431 of ~450.75 Combination #575 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 432 of ~450.75 Combination #576 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_W_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 433 of ~450.75 Combination #577 of 601----
-#param:b_fd	b_fd_WRITE	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 434 of ~450.75 Combination #579 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 435 of ~450.75 Combination #580 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_X_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 436 of ~450.75 Combination #581 of 601----
-#param:b_fd	b_fd_READ_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 437 of ~450.75 Combination #587 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 438 of ~450.75 Combination #588 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_RWX_USER	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 439 of ~450.75 Combination #589 of 601----
-#param:b_fd	b_fd_READ	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 440 of ~450.75 Combination #590 of 601----
-#param:b_fd	b_fd_APPEND	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 441 of ~450.75 Combination #592 of 601----
-#param:b_fd	b_fd_APPEND_PLUS	b_fd_R_GRP	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 442 of ~450.75 Combination #595 of 601----
-#param:b_fd	b_fd_READ	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 443 of ~450.75 Combination #596 of 601----
-#param:b_fd	b_fd_WRITE_PLUS	b_fd_NONE	b_fd_NO_EXIST	b_fd_PAST_EOF	
-rval:
-Done - Pass	0
-------- 444 of ~450.75 Combination #600 of 601----
diff --git a/testcases/ballista/ballista/outfiles/outfile.ftruncate.b_fd.b_long b/testcases/ballista/ballista/outfiles/outfile.ftruncate.b_fd.b_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.ftruncate.b_fd.b_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getcwd.b_ptr_char.b_int b/testcases/ballista/ballista/outfiles/outfile.getcwd.b_ptr_char.b_int
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getcwd.b_ptr_char.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getdents.b_unsigned_int.b_ptr_void.b_unsigned_int b/testcases/ballista/ballista/outfiles/outfile.getdents.b_unsigned_int.b_ptr_void.b_unsigned_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getdents.b_unsigned_int.b_ptr_void.b_unsigned_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getdomainname.b_ptr_char.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.getdomainname.b_ptr_char.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getdomainname.b_ptr_char.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getgroups.b_int.b_ptr_gid_t b/testcases/ballista/ballista/outfiles/outfile.getgroups.b_int.b_ptr_gid_t
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getgroups.b_int.b_ptr_gid_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.gethostname.b_ptr_char.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.gethostname.b_ptr_char.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.gethostname.b_ptr_char.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getpgid.b_pid b/testcases/ballista/ballista/outfiles/outfile.getpgid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getpgid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.getpriority.b_int.b_int b/testcases/ballista/ballista/outfiles/outfile.getpriority.b_int.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getpriority.b_int.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getresgid.b_ptr_gid_t.b_ptr_gid_t.b_ptr_gid_t b/testcases/ballista/ballista/outfiles/outfile.getresgid.b_ptr_gid_t.b_ptr_gid_t.b_ptr_gid_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getresgid.b_ptr_gid_t.b_ptr_gid_t.b_ptr_gid_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.getsid.b_pid b/testcases/ballista/ballista/outfiles/outfile.getsid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.getsid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.ioperm.b_unsigned_long.b_unsigned_long.b_int b/testcases/ballista/ballista/outfiles/outfile.ioperm.b_unsigned_long.b_unsigned_long.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.ioperm.b_unsigned_long.b_unsigned_long.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.iopl.b_int b/testcases/ballista/ballista/outfiles/outfile.iopl.b_int
deleted file mode 100644
index 1525246..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.iopl.b_int
+++ /dev/null
@@ -1,70 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~18.75 Combination #2 of 25----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~18.75 Combination #6 of 25----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~18.75 Combination #7 of 25----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~18.75 Combination #9 of 25----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~18.75 Combination #10 of 25----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~18.75 Combination #11 of 25----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~18.75 Combination #12 of 25----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~18.75 Combination #13 of 25----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~18.75 Combination #14 of 25----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~18.75 Combination #17 of 25----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~18.75 Combination #18 of 25----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~18.75 Combination #19 of 25----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~18.75 Combination #20 of 25----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~18.75 Combination #21 of 25----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~18.75 Combination #22 of 25----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~18.75 Combination #23 of 25----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~18.75 Combination #25 of 25----
diff --git a/testcases/ballista/ballista/outfiles/outfile.ipc.b_unsigned_int.b_int.b_int.b_int.b_ptr_void.b_long b/testcases/ballista/ballista/outfiles/outfile.ipc.b_unsigned_int.b_int.b_int.b_int.b_ptr_void.b_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.ipc.b_unsigned_int.b_int.b_int.b_int.b_ptr_void.b_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.link.b_fname.b_fname b/testcases/ballista/ballista/outfiles/outfile.link.b_fname.b_fname
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.link.b_fname.b_fname
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.listen.b_int.b_int b/testcases/ballista/ballista/outfiles/outfile.listen.b_int.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.listen.b_int.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.lseek.b_fd.b_long.b_int_whence b/testcases/ballista/ballista/outfiles/outfile.lseek.b_fd.b_long.b_int_whence
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.lseek.b_fd.b_long.b_int_whence
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.lstat.b_fname.b_ptr_stat b/testcases/ballista/ballista/outfiles/outfile.lstat.b_fname.b_ptr_stat
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.lstat.b_fname.b_ptr_stat
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.mkdir.b_fname.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.mkdir.b_fname.b_mode_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.mkdir.b_fname.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.mkfifo.b_fname.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.mkfifo.b_fname.b_mode_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.mkfifo.b_fname.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.modify_ldt.b_int.b_ptr_void.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.modify_ldt.b_int.b_ptr_void.b_unsigned_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.modify_ldt.b_int.b_ptr_void.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.mount.b_ptr_buf.b_ptr_buf.b_ptr_buf b/testcases/ballista/ballista/outfiles/outfile.mount.b_ptr_buf.b_ptr_buf.b_ptr_buf
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.mount.b_ptr_buf.b_ptr_buf.b_ptr_buf
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.mremap.b_ptr_void.b_unsigned_long.b_unsigned_long.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.mremap.b_ptr_void.b_unsigned_long.b_unsigned_long.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.mremap.b_ptr_void.b_unsigned_long.b_unsigned_long.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.mumap.b_ptr_void.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.mumap.b_ptr_void.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.mumap.b_ptr_void.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.nfsservctl.b_int.b_ptr_void.b_ptr_void b/testcases/ballista/ballista/outfiles/outfile.nfsservctl.b_int.b_ptr_void.b_ptr_void
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.nfsservctl.b_int.b_ptr_void.b_ptr_void
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.nice.b_int b/testcases/ballista/ballista/outfiles/outfile.nice.b_int
deleted file mode 100644
index 1525246..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.nice.b_int
+++ /dev/null
@@ -1,70 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~18.75 Combination #2 of 25----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~18.75 Combination #6 of 25----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~18.75 Combination #7 of 25----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~18.75 Combination #9 of 25----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~18.75 Combination #10 of 25----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~18.75 Combination #11 of 25----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~18.75 Combination #12 of 25----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~18.75 Combination #13 of 25----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~18.75 Combination #14 of 25----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~18.75 Combination #17 of 25----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~18.75 Combination #18 of 25----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~18.75 Combination #19 of 25----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~18.75 Combination #20 of 25----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~18.75 Combination #21 of 25----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~18.75 Combination #22 of 25----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~18.75 Combination #23 of 25----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~18.75 Combination #25 of 25----
diff --git a/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag b/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag.b_mode_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.open.b_fname.b_oflag.b_mode_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.opendir.b_fname b/testcases/ballista/ballista/outfiles/outfile.opendir.b_fname
deleted file mode 100644
index a5345d9..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.opendir.b_fname
+++ /dev/null
@@ -1,1514 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~375 Combination #2 of 500----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~375 Combination #6 of 500----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~375 Combination #7 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~375 Combination #9 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~375 Combination #10 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~375 Combination #11 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~375 Combination #12 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~375 Combination #13 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~375 Combination #14 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~375 Combination #17 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~375 Combination #18 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~375 Combination #19 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~375 Combination #20 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~375 Combination #21 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~375 Combination #22 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~375 Combination #23 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~375 Combination #25 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~375 Combination #26 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~375 Combination #27 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~375 Combination #28 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~375 Combination #30 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~375 Combination #31 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~375 Combination #33 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~375 Combination #34 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~375 Combination #35 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~375 Combination #36 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~375 Combination #37 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~375 Combination #39 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~375 Combination #41 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~375 Combination #43 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~375 Combination #45 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~375 Combination #46 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~375 Combination #49 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~375 Combination #51 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~375 Combination #52 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~375 Combination #53 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~375 Combination #54 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~375 Combination #56 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~375 Combination #57 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~375 Combination #58 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~375 Combination #59 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~375 Combination #60 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~375 Combination #61 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~375 Combination #65 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~375 Combination #66 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~375 Combination #67 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 47 of ~375 Combination #69 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 48 of ~375 Combination #70 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 49 of ~375 Combination #71 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 50 of ~375 Combination #72 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 51 of ~375 Combination #73 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 52 of ~375 Combination #76 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 53 of ~375 Combination #77 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 54 of ~375 Combination #78 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 55 of ~375 Combination #79 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 56 of ~375 Combination #80 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 57 of ~375 Combination #81 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 58 of ~375 Combination #82 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 59 of ~375 Combination #83 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 60 of ~375 Combination #86 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 61 of ~375 Combination #87 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 62 of ~375 Combination #89 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 63 of ~375 Combination #90 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 64 of ~375 Combination #92 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 65 of ~375 Combination #93 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 66 of ~375 Combination #95 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 67 of ~375 Combination #97 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 68 of ~375 Combination #99 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 69 of ~375 Combination #101 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 70 of ~375 Combination #102 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 71 of ~375 Combination #105 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 72 of ~375 Combination #107 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 73 of ~375 Combination #108 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 74 of ~375 Combination #109 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 75 of ~375 Combination #110 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 76 of ~375 Combination #112 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 77 of ~375 Combination #113 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 78 of ~375 Combination #114 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 79 of ~375 Combination #115 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 80 of ~375 Combination #116 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 81 of ~375 Combination #117 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 82 of ~375 Combination #118 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 83 of ~375 Combination #119 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 84 of ~375 Combination #121 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 85 of ~375 Combination #122 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 86 of ~375 Combination #123 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 87 of ~375 Combination #127 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 88 of ~375 Combination #128 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 89 of ~375 Combination #129 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 90 of ~375 Combination #130 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 91 of ~375 Combination #131 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 92 of ~375 Combination #132 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 93 of ~375 Combination #133 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 94 of ~375 Combination #134 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 95 of ~375 Combination #135 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 96 of ~375 Combination #136 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 97 of ~375 Combination #137 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 98 of ~375 Combination #139 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 99 of ~375 Combination #140 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 100 of ~375 Combination #141 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 101 of ~375 Combination #143 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 102 of ~375 Combination #144 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 103 of ~375 Combination #145 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 104 of ~375 Combination #146 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 105 of ~375 Combination #148 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 106 of ~375 Combination #149 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 107 of ~375 Combination #151 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 108 of ~375 Combination #153 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 109 of ~375 Combination #154 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 110 of ~375 Combination #155 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 111 of ~375 Combination #156 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 112 of ~375 Combination #157 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 113 of ~375 Combination #158 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 114 of ~375 Combination #159 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 115 of ~375 Combination #161 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 116 of ~375 Combination #163 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 117 of ~375 Combination #164 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 118 of ~375 Combination #166 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 119 of ~375 Combination #168 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 120 of ~375 Combination #170 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 121 of ~375 Combination #172 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 122 of ~375 Combination #173 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 123 of ~375 Combination #175 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 124 of ~375 Combination #176 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 125 of ~375 Combination #177 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 126 of ~375 Combination #178 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 127 of ~375 Combination #181 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 128 of ~375 Combination #182 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 129 of ~375 Combination #183 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 130 of ~375 Combination #184 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 131 of ~375 Combination #185 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 132 of ~375 Combination #186 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 133 of ~375 Combination #187 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 134 of ~375 Combination #189 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 135 of ~375 Combination #191 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 136 of ~375 Combination #193 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 137 of ~375 Combination #194 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 138 of ~375 Combination #195 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 139 of ~375 Combination #196 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 140 of ~375 Combination #202 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 141 of ~375 Combination #205 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 142 of ~375 Combination #206 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 143 of ~375 Combination #207 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 144 of ~375 Combination #210 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 145 of ~375 Combination #211 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 146 of ~375 Combination #212 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 147 of ~375 Combination #213 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 148 of ~375 Combination #214 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 149 of ~375 Combination #215 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 150 of ~375 Combination #216 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 151 of ~375 Combination #217 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 152 of ~375 Combination #218 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 153 of ~375 Combination #219 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 154 of ~375 Combination #220 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 155 of ~375 Combination #221 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 156 of ~375 Combination #222 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 157 of ~375 Combination #223 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 158 of ~375 Combination #225 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 159 of ~375 Combination #226 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 160 of ~375 Combination #227 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 161 of ~375 Combination #228 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 162 of ~375 Combination #229 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 163 of ~375 Combination #230 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 164 of ~375 Combination #232 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 165 of ~375 Combination #233 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 166 of ~375 Combination #235 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 167 of ~375 Combination #236 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 168 of ~375 Combination #237 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 169 of ~375 Combination #238 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 170 of ~375 Combination #240 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 171 of ~375 Combination #241 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 172 of ~375 Combination #242 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 173 of ~375 Combination #243 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 174 of ~375 Combination #244 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 175 of ~375 Combination #245 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 176 of ~375 Combination #246 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 177 of ~375 Combination #247 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 178 of ~375 Combination #248 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 179 of ~375 Combination #249 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 180 of ~375 Combination #250 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 181 of ~375 Combination #251 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 182 of ~375 Combination #252 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 183 of ~375 Combination #253 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 184 of ~375 Combination #254 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 185 of ~375 Combination #255 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 186 of ~375 Combination #256 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 187 of ~375 Combination #257 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 188 of ~375 Combination #258 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 189 of ~375 Combination #259 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 190 of ~375 Combination #260 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 191 of ~375 Combination #262 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 192 of ~375 Combination #263 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 193 of ~375 Combination #264 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 194 of ~375 Combination #265 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 195 of ~375 Combination #266 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 196 of ~375 Combination #267 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 197 of ~375 Combination #269 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 198 of ~375 Combination #270 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 199 of ~375 Combination #271 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 200 of ~375 Combination #272 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 201 of ~375 Combination #273 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 202 of ~375 Combination #274 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 203 of ~375 Combination #275 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 204 of ~375 Combination #276 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 205 of ~375 Combination #278 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 206 of ~375 Combination #279 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 207 of ~375 Combination #280 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 208 of ~375 Combination #282 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 209 of ~375 Combination #284 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 210 of ~375 Combination #285 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 211 of ~375 Combination #286 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 212 of ~375 Combination #290 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 213 of ~375 Combination #291 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 214 of ~375 Combination #292 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 215 of ~375 Combination #293 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 216 of ~375 Combination #298 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 217 of ~375 Combination #300 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 218 of ~375 Combination #301 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 219 of ~375 Combination #305 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 220 of ~375 Combination #306 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 221 of ~375 Combination #307 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 222 of ~375 Combination #308 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 223 of ~375 Combination #310 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 224 of ~375 Combination #311 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 225 of ~375 Combination #313 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 226 of ~375 Combination #314 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 227 of ~375 Combination #315 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 228 of ~375 Combination #316 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 229 of ~375 Combination #317 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 230 of ~375 Combination #318 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 231 of ~375 Combination #319 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 232 of ~375 Combination #320 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 233 of ~375 Combination #322 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 234 of ~375 Combination #323 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 235 of ~375 Combination #324 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 236 of ~375 Combination #325 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 237 of ~375 Combination #326 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 238 of ~375 Combination #327 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 239 of ~375 Combination #328 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 240 of ~375 Combination #329 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 241 of ~375 Combination #332 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 242 of ~375 Combination #335 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 243 of ~375 Combination #336 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 244 of ~375 Combination #337 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 245 of ~375 Combination #338 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 246 of ~375 Combination #339 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 247 of ~375 Combination #340 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 248 of ~375 Combination #341 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 249 of ~375 Combination #342 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 250 of ~375 Combination #343 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 251 of ~375 Combination #344 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 252 of ~375 Combination #345 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 253 of ~375 Combination #346 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 254 of ~375 Combination #347 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 255 of ~375 Combination #348 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 256 of ~375 Combination #349 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 257 of ~375 Combination #351 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 258 of ~375 Combination #352 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 259 of ~375 Combination #353 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 260 of ~375 Combination #355 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 261 of ~375 Combination #356 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 262 of ~375 Combination #358 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 263 of ~375 Combination #359 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 264 of ~375 Combination #360 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 265 of ~375 Combination #361 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 266 of ~375 Combination #362 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 267 of ~375 Combination #364 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 268 of ~375 Combination #365 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 269 of ~375 Combination #366 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 270 of ~375 Combination #367 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 271 of ~375 Combination #368 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 272 of ~375 Combination #370 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 273 of ~375 Combination #372 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 274 of ~375 Combination #373 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 275 of ~375 Combination #374 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 276 of ~375 Combination #377 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 277 of ~375 Combination #378 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 278 of ~375 Combination #380 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 279 of ~375 Combination #381 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 280 of ~375 Combination #382 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 281 of ~375 Combination #384 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 282 of ~375 Combination #385 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 283 of ~375 Combination #386 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 284 of ~375 Combination #388 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 285 of ~375 Combination #389 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 286 of ~375 Combination #390 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 287 of ~375 Combination #391 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 288 of ~375 Combination #392 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 289 of ~375 Combination #394 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 290 of ~375 Combination #395 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 291 of ~375 Combination #396 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 292 of ~375 Combination #397 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 293 of ~375 Combination #399 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 294 of ~375 Combination #400 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 295 of ~375 Combination #401 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 296 of ~375 Combination #402 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 297 of ~375 Combination #403 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 298 of ~375 Combination #404 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 299 of ~375 Combination #405 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 300 of ~375 Combination #406 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 301 of ~375 Combination #407 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 302 of ~375 Combination #409 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 303 of ~375 Combination #410 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 304 of ~375 Combination #411 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 305 of ~375 Combination #412 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 306 of ~375 Combination #413 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 307 of ~375 Combination #414 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 308 of ~375 Combination #415 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 309 of ~375 Combination #417 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 310 of ~375 Combination #418 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 311 of ~375 Combination #420 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 312 of ~375 Combination #421 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 313 of ~375 Combination #422 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 314 of ~375 Combination #424 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 315 of ~375 Combination #425 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 316 of ~375 Combination #427 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 317 of ~375 Combination #429 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 318 of ~375 Combination #430 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 319 of ~375 Combination #431 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 320 of ~375 Combination #433 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 321 of ~375 Combination #435 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 322 of ~375 Combination #436 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 323 of ~375 Combination #437 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 324 of ~375 Combination #438 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 325 of ~375 Combination #439 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 326 of ~375 Combination #440 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 327 of ~375 Combination #442 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 328 of ~375 Combination #443 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 329 of ~375 Combination #444 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 330 of ~375 Combination #445 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 331 of ~375 Combination #446 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 332 of ~375 Combination #447 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 333 of ~375 Combination #448 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 334 of ~375 Combination #449 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 335 of ~375 Combination #450 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 336 of ~375 Combination #451 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 337 of ~375 Combination #452 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 338 of ~375 Combination #453 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 339 of ~375 Combination #454 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 340 of ~375 Combination #455 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 341 of ~375 Combination #456 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 342 of ~375 Combination #457 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 343 of ~375 Combination #458 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 344 of ~375 Combination #459 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 345 of ~375 Combination #461 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 346 of ~375 Combination #463 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 347 of ~375 Combination #464 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 348 of ~375 Combination #465 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 349 of ~375 Combination #466 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 350 of ~375 Combination #467 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 351 of ~375 Combination #469 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 352 of ~375 Combination #470 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 353 of ~375 Combination #471 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 354 of ~375 Combination #472 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 355 of ~375 Combination #473 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 356 of ~375 Combination #474 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 357 of ~375 Combination #476 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 358 of ~375 Combination #477 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 359 of ~375 Combination #478 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 360 of ~375 Combination #479 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 361 of ~375 Combination #480 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 362 of ~375 Combination #481 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 363 of ~375 Combination #482 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 364 of ~375 Combination #483 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 365 of ~375 Combination #484 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 366 of ~375 Combination #485 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 367 of ~375 Combination #486 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 368 of ~375 Combination #487 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 369 of ~375 Combination #488 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 370 of ~375 Combination #489 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 371 of ~375 Combination #491 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 372 of ~375 Combination #492 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 373 of ~375 Combination #493 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 374 of ~375 Combination #495 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 375 of ~375 Combination #496 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 376 of ~375 Combination #498 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 377 of ~375 Combination #499 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 378 of ~375 Combination #500 of 500----
diff --git a/testcases/ballista/ballista/outfiles/outfile.prctl.b_int.b_unsigned_long.b_unsigned_long.b_unsigned_long.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.prctl.b_int.b_unsigned_long.b_unsigned_long.b_unsigned_long.b_unsigned_long
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.prctl.b_int.b_unsigned_long.b_unsigned_long.b_unsigned_long.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.profil.b_ptr_unsigned_int.b_unsigned_long.b_unsigned_long.b_unsigned_int b/testcases/ballista/ballista/outfiles/outfile.profil.b_ptr_unsigned_int.b_unsigned_long.b_unsigned_long.b_unsigned_int
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.profil.b_ptr_unsigned_int.b_unsigned_long.b_unsigned_long.b_unsigned_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.read.b_fd.b_ptr_buf.b_int b/testcases/ballista/ballista/outfiles/outfile.read.b_fd.b_ptr_buf.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.read.b_fd.b_ptr_buf.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.readdir.b_ptr_dir b/testcases/ballista/ballista/outfiles/outfile.readdir.b_ptr_dir
deleted file mode 100644
index 9f02993..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.readdir.b_ptr_dir
+++ /dev/null
@@ -1,210 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~57 Combination #2 of 76----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~57 Combination #6 of 76----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~57 Combination #7 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~57 Combination #9 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~57 Combination #10 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~57 Combination #11 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~57 Combination #12 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~57 Combination #13 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~57 Combination #14 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~57 Combination #17 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~57 Combination #18 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~57 Combination #19 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~57 Combination #20 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~57 Combination #21 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~57 Combination #22 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~57 Combination #23 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~57 Combination #25 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~57 Combination #26 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~57 Combination #27 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~57 Combination #28 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~57 Combination #30 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~57 Combination #31 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~57 Combination #33 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~57 Combination #34 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~57 Combination #35 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~57 Combination #36 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~57 Combination #37 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~57 Combination #39 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~57 Combination #41 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~57 Combination #43 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~57 Combination #45 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~57 Combination #46 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~57 Combination #49 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~57 Combination #51 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~57 Combination #52 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~57 Combination #53 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~57 Combination #54 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~57 Combination #56 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~57 Combination #57 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~57 Combination #58 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~57 Combination #59 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~57 Combination #60 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~57 Combination #61 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~57 Combination #65 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~57 Combination #66 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~57 Combination #67 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~57 Combination #69 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_OPEN	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~57 Combination #70 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_REMOVED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~57 Combination #71 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~57 Combination #72 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 51 of ~57 Combination #73 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 52 of ~57 Combination #76 of 76----
diff --git a/testcases/ballista/ballista/outfiles/outfile.readlink.b_ptr_buf.b_ptr_char.b_int b/testcases/ballista/ballista/outfiles/outfile.readlink.b_ptr_buf.b_ptr_char.b_int
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.readlink.b_ptr_buf.b_ptr_char.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.reboot.b_int.b_int.b_int.b_ptr_void b/testcases/ballista/ballista/outfiles/outfile.reboot.b_int.b_int.b_int.b_ptr_void
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.reboot.b_int.b_int.b_int.b_ptr_void
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.recv.b_int.b_ptr_void.b_unsigned_long.b_int b/testcases/ballista/ballista/outfiles/outfile.recv.b_int.b_ptr_void.b_unsigned_long.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.recv.b_int.b_ptr_void.b_unsigned_long.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.recvfrom.b_int.b_ptr_void.b_unsigned_long.b_int b/testcases/ballista/ballista/outfiles/outfile.recvfrom.b_int.b_ptr_void.b_unsigned_long.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.recvfrom.b_int.b_ptr_void.b_unsigned_long.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.rename.b_fname.b_fname b/testcases/ballista/ballista/outfiles/outfile.rename.b_fname.b_fname
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.rename.b_fname.b_fname
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.rewinddir.b_ptr_dir b/testcases/ballista/ballista/outfiles/outfile.rewinddir.b_ptr_dir
deleted file mode 100644
index 9f02993..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.rewinddir.b_ptr_dir
+++ /dev/null
@@ -1,210 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~57 Combination #2 of 76----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~57 Combination #6 of 76----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~57 Combination #7 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~57 Combination #9 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~57 Combination #10 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~57 Combination #11 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~57 Combination #12 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~57 Combination #13 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~57 Combination #14 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~57 Combination #17 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~57 Combination #18 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~57 Combination #19 of 76----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~57 Combination #20 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~57 Combination #21 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~57 Combination #22 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~57 Combination #23 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~57 Combination #25 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~57 Combination #26 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~57 Combination #27 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~57 Combination #28 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~57 Combination #30 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~57 Combination #31 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~57 Combination #33 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~57 Combination #34 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~57 Combination #35 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~57 Combination #36 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~57 Combination #37 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~57 Combination #39 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~57 Combination #41 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~57 Combination #43 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~57 Combination #45 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~57 Combination #46 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~57 Combination #49 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~57 Combination #51 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~57 Combination #52 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~57 Combination #53 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~57 Combination #54 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~57 Combination #56 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~57 Combination #57 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~57 Combination #58 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~57 Combination #59 of 76----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~57 Combination #60 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~57 Combination #61 of 76----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~57 Combination #65 of 76----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~57 Combination #66 of 76----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~57 Combination #67 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 47 of ~57 Combination #69 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_OPEN	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 48 of ~57 Combination #70 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_REMOVED	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 49 of ~57 Combination #71 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_EMPTY	
-rval:
-Done - Pass	0
-------- 50 of ~57 Combination #72 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_CLOSED	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 51 of ~57 Combination #73 of 76----
-#param:b_ptr_dir	b_ptr_dir_DIR_MIDWAY	b_ptr_dir_WITH_FILES	
-rval:
-Done - Pass	0
-------- 52 of ~57 Combination #76 of 76----
diff --git a/testcases/ballista/ballista/outfiles/outfile.rmdir.b_fname b/testcases/ballista/ballista/outfiles/outfile.rmdir.b_fname
deleted file mode 100644
index a5345d9..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.rmdir.b_fname
+++ /dev/null
@@ -1,1514 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~375 Combination #2 of 500----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~375 Combination #6 of 500----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~375 Combination #7 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~375 Combination #9 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~375 Combination #10 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~375 Combination #11 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~375 Combination #12 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~375 Combination #13 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~375 Combination #14 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~375 Combination #17 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~375 Combination #18 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~375 Combination #19 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~375 Combination #20 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~375 Combination #21 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~375 Combination #22 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~375 Combination #23 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~375 Combination #25 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~375 Combination #26 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~375 Combination #27 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~375 Combination #28 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~375 Combination #30 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~375 Combination #31 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~375 Combination #33 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~375 Combination #34 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~375 Combination #35 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~375 Combination #36 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~375 Combination #37 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~375 Combination #39 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~375 Combination #41 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~375 Combination #43 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~375 Combination #45 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~375 Combination #46 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~375 Combination #49 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~375 Combination #51 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~375 Combination #52 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~375 Combination #53 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~375 Combination #54 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~375 Combination #56 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~375 Combination #57 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~375 Combination #58 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~375 Combination #59 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~375 Combination #60 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~375 Combination #61 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~375 Combination #65 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~375 Combination #66 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~375 Combination #67 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 47 of ~375 Combination #69 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 48 of ~375 Combination #70 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 49 of ~375 Combination #71 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 50 of ~375 Combination #72 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 51 of ~375 Combination #73 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 52 of ~375 Combination #76 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 53 of ~375 Combination #77 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 54 of ~375 Combination #78 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 55 of ~375 Combination #79 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 56 of ~375 Combination #80 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 57 of ~375 Combination #81 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 58 of ~375 Combination #82 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 59 of ~375 Combination #83 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 60 of ~375 Combination #86 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 61 of ~375 Combination #87 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 62 of ~375 Combination #89 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 63 of ~375 Combination #90 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 64 of ~375 Combination #92 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 65 of ~375 Combination #93 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 66 of ~375 Combination #95 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 67 of ~375 Combination #97 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 68 of ~375 Combination #99 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 69 of ~375 Combination #101 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 70 of ~375 Combination #102 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 71 of ~375 Combination #105 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 72 of ~375 Combination #107 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 73 of ~375 Combination #108 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 74 of ~375 Combination #109 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 75 of ~375 Combination #110 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 76 of ~375 Combination #112 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 77 of ~375 Combination #113 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 78 of ~375 Combination #114 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 79 of ~375 Combination #115 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 80 of ~375 Combination #116 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 81 of ~375 Combination #117 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 82 of ~375 Combination #118 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 83 of ~375 Combination #119 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 84 of ~375 Combination #121 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 85 of ~375 Combination #122 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 86 of ~375 Combination #123 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 87 of ~375 Combination #127 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 88 of ~375 Combination #128 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 89 of ~375 Combination #129 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 90 of ~375 Combination #130 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 91 of ~375 Combination #131 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 92 of ~375 Combination #132 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 93 of ~375 Combination #133 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 94 of ~375 Combination #134 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 95 of ~375 Combination #135 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 96 of ~375 Combination #136 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 97 of ~375 Combination #137 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 98 of ~375 Combination #139 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 99 of ~375 Combination #140 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 100 of ~375 Combination #141 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 101 of ~375 Combination #143 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 102 of ~375 Combination #144 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 103 of ~375 Combination #145 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 104 of ~375 Combination #146 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 105 of ~375 Combination #148 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 106 of ~375 Combination #149 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 107 of ~375 Combination #151 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 108 of ~375 Combination #153 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 109 of ~375 Combination #154 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 110 of ~375 Combination #155 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 111 of ~375 Combination #156 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 112 of ~375 Combination #157 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 113 of ~375 Combination #158 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 114 of ~375 Combination #159 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 115 of ~375 Combination #161 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 116 of ~375 Combination #163 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 117 of ~375 Combination #164 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 118 of ~375 Combination #166 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 119 of ~375 Combination #168 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 120 of ~375 Combination #170 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 121 of ~375 Combination #172 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 122 of ~375 Combination #173 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 123 of ~375 Combination #175 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 124 of ~375 Combination #176 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 125 of ~375 Combination #177 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 126 of ~375 Combination #178 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 127 of ~375 Combination #181 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 128 of ~375 Combination #182 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 129 of ~375 Combination #183 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 130 of ~375 Combination #184 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 131 of ~375 Combination #185 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 132 of ~375 Combination #186 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 133 of ~375 Combination #187 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 134 of ~375 Combination #189 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 135 of ~375 Combination #191 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 136 of ~375 Combination #193 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 137 of ~375 Combination #194 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 138 of ~375 Combination #195 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 139 of ~375 Combination #196 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 140 of ~375 Combination #202 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 141 of ~375 Combination #205 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 142 of ~375 Combination #206 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 143 of ~375 Combination #207 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 144 of ~375 Combination #210 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 145 of ~375 Combination #211 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 146 of ~375 Combination #212 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 147 of ~375 Combination #213 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 148 of ~375 Combination #214 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 149 of ~375 Combination #215 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 150 of ~375 Combination #216 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 151 of ~375 Combination #217 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 152 of ~375 Combination #218 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 153 of ~375 Combination #219 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 154 of ~375 Combination #220 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 155 of ~375 Combination #221 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 156 of ~375 Combination #222 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 157 of ~375 Combination #223 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 158 of ~375 Combination #225 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 159 of ~375 Combination #226 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 160 of ~375 Combination #227 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 161 of ~375 Combination #228 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 162 of ~375 Combination #229 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 163 of ~375 Combination #230 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 164 of ~375 Combination #232 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 165 of ~375 Combination #233 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 166 of ~375 Combination #235 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 167 of ~375 Combination #236 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 168 of ~375 Combination #237 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 169 of ~375 Combination #238 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 170 of ~375 Combination #240 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 171 of ~375 Combination #241 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 172 of ~375 Combination #242 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 173 of ~375 Combination #243 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 174 of ~375 Combination #244 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 175 of ~375 Combination #245 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 176 of ~375 Combination #246 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 177 of ~375 Combination #247 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 178 of ~375 Combination #248 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 179 of ~375 Combination #249 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 180 of ~375 Combination #250 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 181 of ~375 Combination #251 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 182 of ~375 Combination #252 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 183 of ~375 Combination #253 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 184 of ~375 Combination #254 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 185 of ~375 Combination #255 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 186 of ~375 Combination #256 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 187 of ~375 Combination #257 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 188 of ~375 Combination #258 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 189 of ~375 Combination #259 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 190 of ~375 Combination #260 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 191 of ~375 Combination #262 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 192 of ~375 Combination #263 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 193 of ~375 Combination #264 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 194 of ~375 Combination #265 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 195 of ~375 Combination #266 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 196 of ~375 Combination #267 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 197 of ~375 Combination #269 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 198 of ~375 Combination #270 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 199 of ~375 Combination #271 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 200 of ~375 Combination #272 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 201 of ~375 Combination #273 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 202 of ~375 Combination #274 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 203 of ~375 Combination #275 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 204 of ~375 Combination #276 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 205 of ~375 Combination #278 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 206 of ~375 Combination #279 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 207 of ~375 Combination #280 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 208 of ~375 Combination #282 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 209 of ~375 Combination #284 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 210 of ~375 Combination #285 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 211 of ~375 Combination #286 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 212 of ~375 Combination #290 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 213 of ~375 Combination #291 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 214 of ~375 Combination #292 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 215 of ~375 Combination #293 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 216 of ~375 Combination #298 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 217 of ~375 Combination #300 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 218 of ~375 Combination #301 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 219 of ~375 Combination #305 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 220 of ~375 Combination #306 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 221 of ~375 Combination #307 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 222 of ~375 Combination #308 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 223 of ~375 Combination #310 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 224 of ~375 Combination #311 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 225 of ~375 Combination #313 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 226 of ~375 Combination #314 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 227 of ~375 Combination #315 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 228 of ~375 Combination #316 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 229 of ~375 Combination #317 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 230 of ~375 Combination #318 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 231 of ~375 Combination #319 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 232 of ~375 Combination #320 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 233 of ~375 Combination #322 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 234 of ~375 Combination #323 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 235 of ~375 Combination #324 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 236 of ~375 Combination #325 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 237 of ~375 Combination #326 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 238 of ~375 Combination #327 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 239 of ~375 Combination #328 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 240 of ~375 Combination #329 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 241 of ~375 Combination #332 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 242 of ~375 Combination #335 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 243 of ~375 Combination #336 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 244 of ~375 Combination #337 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 245 of ~375 Combination #338 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 246 of ~375 Combination #339 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 247 of ~375 Combination #340 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 248 of ~375 Combination #341 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 249 of ~375 Combination #342 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 250 of ~375 Combination #343 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 251 of ~375 Combination #344 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 252 of ~375 Combination #345 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 253 of ~375 Combination #346 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 254 of ~375 Combination #347 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 255 of ~375 Combination #348 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 256 of ~375 Combination #349 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 257 of ~375 Combination #351 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 258 of ~375 Combination #352 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 259 of ~375 Combination #353 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 260 of ~375 Combination #355 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 261 of ~375 Combination #356 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 262 of ~375 Combination #358 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 263 of ~375 Combination #359 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 264 of ~375 Combination #360 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 265 of ~375 Combination #361 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 266 of ~375 Combination #362 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 267 of ~375 Combination #364 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 268 of ~375 Combination #365 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 269 of ~375 Combination #366 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 270 of ~375 Combination #367 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 271 of ~375 Combination #368 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 272 of ~375 Combination #370 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 273 of ~375 Combination #372 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 274 of ~375 Combination #373 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 275 of ~375 Combination #374 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 276 of ~375 Combination #377 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 277 of ~375 Combination #378 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 278 of ~375 Combination #380 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 279 of ~375 Combination #381 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 280 of ~375 Combination #382 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 281 of ~375 Combination #384 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 282 of ~375 Combination #385 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 283 of ~375 Combination #386 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 284 of ~375 Combination #388 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 285 of ~375 Combination #389 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 286 of ~375 Combination #390 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 287 of ~375 Combination #391 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 288 of ~375 Combination #392 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 289 of ~375 Combination #394 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 290 of ~375 Combination #395 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 291 of ~375 Combination #396 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 292 of ~375 Combination #397 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 293 of ~375 Combination #399 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 294 of ~375 Combination #400 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 295 of ~375 Combination #401 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 296 of ~375 Combination #402 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 297 of ~375 Combination #403 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 298 of ~375 Combination #404 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 299 of ~375 Combination #405 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 300 of ~375 Combination #406 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 301 of ~375 Combination #407 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 302 of ~375 Combination #409 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 303 of ~375 Combination #410 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 304 of ~375 Combination #411 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 305 of ~375 Combination #412 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 306 of ~375 Combination #413 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 307 of ~375 Combination #414 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 308 of ~375 Combination #415 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 309 of ~375 Combination #417 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 310 of ~375 Combination #418 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 311 of ~375 Combination #420 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 312 of ~375 Combination #421 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 313 of ~375 Combination #422 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 314 of ~375 Combination #424 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 315 of ~375 Combination #425 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 316 of ~375 Combination #427 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 317 of ~375 Combination #429 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 318 of ~375 Combination #430 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 319 of ~375 Combination #431 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 320 of ~375 Combination #433 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 321 of ~375 Combination #435 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 322 of ~375 Combination #436 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 323 of ~375 Combination #437 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 324 of ~375 Combination #438 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 325 of ~375 Combination #439 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 326 of ~375 Combination #440 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 327 of ~375 Combination #442 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 328 of ~375 Combination #443 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 329 of ~375 Combination #444 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 330 of ~375 Combination #445 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 331 of ~375 Combination #446 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 332 of ~375 Combination #447 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 333 of ~375 Combination #448 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 334 of ~375 Combination #449 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 335 of ~375 Combination #450 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 336 of ~375 Combination #451 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 337 of ~375 Combination #452 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 338 of ~375 Combination #453 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 339 of ~375 Combination #454 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 340 of ~375 Combination #455 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 341 of ~375 Combination #456 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 342 of ~375 Combination #457 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 343 of ~375 Combination #458 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 344 of ~375 Combination #459 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 345 of ~375 Combination #461 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 346 of ~375 Combination #463 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 347 of ~375 Combination #464 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 348 of ~375 Combination #465 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 349 of ~375 Combination #466 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 350 of ~375 Combination #467 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 351 of ~375 Combination #469 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 352 of ~375 Combination #470 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 353 of ~375 Combination #471 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 354 of ~375 Combination #472 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 355 of ~375 Combination #473 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 356 of ~375 Combination #474 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 357 of ~375 Combination #476 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 358 of ~375 Combination #477 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 359 of ~375 Combination #478 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 360 of ~375 Combination #479 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 361 of ~375 Combination #480 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 362 of ~375 Combination #481 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 363 of ~375 Combination #482 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 364 of ~375 Combination #483 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 365 of ~375 Combination #484 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 366 of ~375 Combination #485 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 367 of ~375 Combination #486 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 368 of ~375 Combination #487 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 369 of ~375 Combination #488 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 370 of ~375 Combination #489 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 371 of ~375 Combination #491 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 372 of ~375 Combination #492 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 373 of ~375 Combination #493 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 374 of ~375 Combination #495 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 375 of ~375 Combination #496 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 376 of ~375 Combination #498 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 377 of ~375 Combination #499 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 378 of ~375 Combination #500 of 500----
diff --git a/testcases/ballista/ballista/outfiles/outfile.send.b_int.b_ptr_void.b_unsigned_long.b_int b/testcases/ballista/ballista/outfiles/outfile.send.b_int.b_ptr_void.b_unsigned_long.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.send.b_int.b_ptr_void.b_unsigned_long.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.setdomainname.b_fname.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.setdomainname.b_fname.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setdomainname.b_fname.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.setfsgid.b_pid b/testcases/ballista/ballista/outfiles/outfile.setfsgid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setfsgid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.setfsuid.b_pid b/testcases/ballista/ballista/outfiles/outfile.setfsuid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setfsuid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.setgid.b_pid b/testcases/ballista/ballista/outfiles/outfile.setgid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setgid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.setgroups.b_unsigned_long.b_ptr_gid_t b/testcases/ballista/ballista/outfiles/outfile.setgroups.b_unsigned_long.b_ptr_gid_t
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setgroups.b_unsigned_long.b_ptr_gid_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sethostid.b_long b/testcases/ballista/ballista/outfiles/outfile.sethostid.b_long
deleted file mode 100644
index 73a223f..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sethostid.b_long
+++ /dev/null
@@ -1,78 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~20.25 Combination #2 of 27----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~20.25 Combination #6 of 27----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~20.25 Combination #7 of 27----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~20.25 Combination #9 of 27----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~20.25 Combination #10 of 27----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~20.25 Combination #11 of 27----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~20.25 Combination #12 of 27----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~20.25 Combination #13 of 27----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~20.25 Combination #14 of 27----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~20.25 Combination #17 of 27----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~20.25 Combination #18 of 27----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~20.25 Combination #19 of 27----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~20.25 Combination #20 of 27----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~20.25 Combination #21 of 27----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~20.25 Combination #22 of 27----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~20.25 Combination #23 of 27----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~20.25 Combination #25 of 27----
-#param:b_long	b_long_MAXLONG	
-rval:
-Done - Pass	0
-------- 18 of ~20.25 Combination #26 of 27----
-#param:b_long	b_long_NEG_MAXLONG	
-rval:
-Done - Pass	0
-------- 19 of ~20.25 Combination #27 of 27----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sethostname.b_fname.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.sethostname.b_fname.b_unsigned_long
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sethostname.b_fname.b_unsigned_long
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.setpgid.b_pid.b_pid b/testcases/ballista/ballista/outfiles/outfile.setpgid.b_pid.b_pid
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setpgid.b_pid.b_pid
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.setpriority.b_int.b_int.b_int b/testcases/ballista/ballista/outfiles/outfile.setpriority.b_int.b_int.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setpriority.b_int.b_int.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.setuid.b_pid b/testcases/ballista/ballista/outfiles/outfile.setuid.b_pid
deleted file mode 100644
index 4995a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.setuid.b_pid
+++ /dev/null
@@ -1,82 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~21.75 Combination #2 of 29----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~21.75 Combination #6 of 29----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~21.75 Combination #7 of 29----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~21.75 Combination #9 of 29----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~21.75 Combination #10 of 29----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~21.75 Combination #11 of 29----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~21.75 Combination #12 of 29----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~21.75 Combination #13 of 29----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~21.75 Combination #14 of 29----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~21.75 Combination #17 of 29----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~21.75 Combination #18 of 29----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~21.75 Combination #19 of 29----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~21.75 Combination #20 of 29----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~21.75 Combination #21 of 29----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~21.75 Combination #22 of 29----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~21.75 Combination #23 of 29----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~21.75 Combination #25 of 29----
-#param:b_pid	b_pid_PID_SELF	
-rval:
-Done - Pass	0
-------- 18 of ~21.75 Combination #26 of 29----
-#param:b_pid	b_pid_PID_CHILD	
-rval:
-Done - Pass	0
-------- 19 of ~21.75 Combination #27 of 29----
-#param:b_pid	b_pid_PID_65535	
-rval:
-Done - Pass	0
-------- 20 of ~21.75 Combination #28 of 29----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigaction.b_signal.b_ptr_sigaction.b_ptr_sigaction b/testcases/ballista/ballista/outfiles/outfile.sigaction.b_signal.b_ptr_sigaction.b_ptr_sigaction
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigaction.b_signal.b_ptr_sigaction.b_ptr_sigaction
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigaddset.b_ptr_sigset_t.b_signal b/testcases/ballista/ballista/outfiles/outfile.sigaddset.b_ptr_sigset_t.b_signal
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigaddset.b_ptr_sigset_t.b_signal
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigdelset.b_ptr_sigset_t.b_signal b/testcases/ballista/ballista/outfiles/outfile.sigdelset.b_ptr_sigset_t.b_signal
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigdelset.b_ptr_sigset_t.b_signal
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigemptyset.b_ptr_sigset_t b/testcases/ballista/ballista/outfiles/outfile.sigemptyset.b_ptr_sigset_t
deleted file mode 100644
index 4b204aa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigemptyset.b_ptr_sigset_t
+++ /dev/null
@@ -1,46 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~13.5 Combination #2 of 18----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~13.5 Combination #6 of 18----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~13.5 Combination #7 of 18----
-#param:b_ptr_int	b_ptr_int_ONE	
-rval:
-Done - Pass	0
-------- 4 of ~13.5 Combination #9 of 18----
-#param:b_ptr_int	b_ptr_int_MININT	
-rval:
-Done - Pass	0
-------- 5 of ~13.5 Combination #10 of 18----
-#param:b_ptr_int	b_ptr_int_NEG_ONE	
-rval:
-Done - Pass	0
-------- 6 of ~13.5 Combination #11 of 18----
-#param:b_ptr_long	b_ptr_long_MAXLONG	
-rval:
-Done - Pass	0
-------- 7 of ~13.5 Combination #12 of 18----
-#param:b_ptr_long	b_ptr_long_NEG_MAXLONG	
-rval:
-Done - Pass	0
-------- 8 of ~13.5 Combination #13 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_EMPTY	
-rval:
-Done - Pass	0
-------- 9 of ~13.5 Combination #14 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_SIGSEGV	
-rval:
-Done - Pass	0
-------- 10 of ~13.5 Combination #17 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_GARBAGE	
-rval:
-Done - Pass	0
-------- 11 of ~13.5 Combination #18 of 18----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigfillset.b_ptr_sigset_t b/testcases/ballista/ballista/outfiles/outfile.sigfillset.b_ptr_sigset_t
deleted file mode 100644
index 4b204aa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigfillset.b_ptr_sigset_t
+++ /dev/null
@@ -1,46 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~13.5 Combination #2 of 18----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~13.5 Combination #6 of 18----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~13.5 Combination #7 of 18----
-#param:b_ptr_int	b_ptr_int_ONE	
-rval:
-Done - Pass	0
-------- 4 of ~13.5 Combination #9 of 18----
-#param:b_ptr_int	b_ptr_int_MININT	
-rval:
-Done - Pass	0
-------- 5 of ~13.5 Combination #10 of 18----
-#param:b_ptr_int	b_ptr_int_NEG_ONE	
-rval:
-Done - Pass	0
-------- 6 of ~13.5 Combination #11 of 18----
-#param:b_ptr_long	b_ptr_long_MAXLONG	
-rval:
-Done - Pass	0
-------- 7 of ~13.5 Combination #12 of 18----
-#param:b_ptr_long	b_ptr_long_NEG_MAXLONG	
-rval:
-Done - Pass	0
-------- 8 of ~13.5 Combination #13 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_EMPTY	
-rval:
-Done - Pass	0
-------- 9 of ~13.5 Combination #14 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_SIGSEGV	
-rval:
-Done - Pass	0
-------- 10 of ~13.5 Combination #17 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_GARBAGE	
-rval:
-Done - Pass	0
-------- 11 of ~13.5 Combination #18 of 18----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigismember.b_ptr_sigset_t.b_signal b/testcases/ballista/ballista/outfiles/outfile.sigismember.b_ptr_sigset_t.b_signal
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigismember.b_ptr_sigset_t.b_signal
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigpending.b_ptr_sigset_t b/testcases/ballista/ballista/outfiles/outfile.sigpending.b_ptr_sigset_t
deleted file mode 100644
index 4b204aa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigpending.b_ptr_sigset_t
+++ /dev/null
@@ -1,46 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~13.5 Combination #2 of 18----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~13.5 Combination #6 of 18----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~13.5 Combination #7 of 18----
-#param:b_ptr_int	b_ptr_int_ONE	
-rval:
-Done - Pass	0
-------- 4 of ~13.5 Combination #9 of 18----
-#param:b_ptr_int	b_ptr_int_MININT	
-rval:
-Done - Pass	0
-------- 5 of ~13.5 Combination #10 of 18----
-#param:b_ptr_int	b_ptr_int_NEG_ONE	
-rval:
-Done - Pass	0
-------- 6 of ~13.5 Combination #11 of 18----
-#param:b_ptr_long	b_ptr_long_MAXLONG	
-rval:
-Done - Pass	0
-------- 7 of ~13.5 Combination #12 of 18----
-#param:b_ptr_long	b_ptr_long_NEG_MAXLONG	
-rval:
-Done - Pass	0
-------- 8 of ~13.5 Combination #13 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_EMPTY	
-rval:
-Done - Pass	0
-------- 9 of ~13.5 Combination #14 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_SIGSEGV	
-rval:
-Done - Pass	0
-------- 10 of ~13.5 Combination #17 of 18----
-#param:b_ptr_sigset_t	b_ptr_sigset_t_SIGSET_GARBAGE	
-rval:
-Done - Pass	0
-------- 11 of ~13.5 Combination #18 of 18----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigprocmask.b_sig_how.b_ptr_sigset_t.b_ptr_sigset_t b/testcases/ballista/ballista/outfiles/outfile.sigprocmask.b_sig_how.b_ptr_sigset_t.b_ptr_sigset_t
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigprocmask.b_sig_how.b_ptr_sigset_t.b_ptr_sigset_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigreturn.b_unsigned_long b/testcases/ballista/ballista/outfiles/outfile.sigreturn.b_unsigned_long
deleted file mode 100644
index 7963a06..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigreturn.b_unsigned_long
+++ /dev/null
@@ -1,66 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~17.25 Combination #2 of 23----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~17.25 Combination #6 of 23----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~17.25 Combination #7 of 23----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~17.25 Combination #9 of 23----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~17.25 Combination #10 of 23----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~17.25 Combination #11 of 23----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~17.25 Combination #12 of 23----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~17.25 Combination #13 of 23----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~17.25 Combination #14 of 23----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~17.25 Combination #17 of 23----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~17.25 Combination #18 of 23----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~17.25 Combination #19 of 23----
-#param:b_unsigned_short	b_unsigned_short_MAXSHORTPLUS1	
-rval:
-Done - Pass	0
-------- 13 of ~17.25 Combination #20 of 23----
-#param:b_unsigned_short	b_unsigned_short_MAXUSHORT	
-rval:
-Done - Pass	0
-------- 14 of ~17.25 Combination #21 of 23----
-#param:b_unsigned_int	b_unsigned_int_MAXUINT	
-rval:
-Done - Pass	0
-------- 15 of ~17.25 Combination #22 of 23----
-#param:b_unsigned_long	b_unsigned_long_MAXULONG	
-rval:
-Done - Pass	0
-------- 16 of ~17.25 Combination #23 of 23----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigtimedwait.b_ptr_sigset_t.b_ptr_siginfo_t.b_ptr_timespec b/testcases/ballista/ballista/outfiles/outfile.sigtimedwait.b_ptr_sigset_t.b_ptr_siginfo_t.b_ptr_timespec
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigtimedwait.b_ptr_sigset_t.b_ptr_siginfo_t.b_ptr_timespec
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.sigwaitinfo.b_ptr_sigset_t.b_ptr_siginfo_t b/testcases/ballista/ballista/outfiles/outfile.sigwaitinfo.b_ptr_sigset_t.b_ptr_siginfo_t
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sigwaitinfo.b_ptr_sigset_t.b_ptr_siginfo_t
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.stat.b_fname.b_ptr_stat b/testcases/ballista/ballista/outfiles/outfile.stat.b_fname.b_ptr_stat
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.stat.b_fname.b_ptr_stat
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.swapoff.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.swapoff.b_ptr_char
deleted file mode 100644
index d713b1d..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.swapoff.b_ptr_char
+++ /dev/null
@@ -1,186 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~51 Combination #2 of 68----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~51 Combination #6 of 68----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~51 Combination #7 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~51 Combination #9 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~51 Combination #10 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~51 Combination #11 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~51 Combination #12 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~51 Combination #13 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~51 Combination #14 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~51 Combination #17 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~51 Combination #18 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~51 Combination #19 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~51 Combination #20 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~51 Combination #21 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~51 Combination #22 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~51 Combination #23 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~51 Combination #25 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~51 Combination #26 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~51 Combination #27 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~51 Combination #28 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~51 Combination #30 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~51 Combination #31 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~51 Combination #33 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~51 Combination #34 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~51 Combination #35 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~51 Combination #36 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~51 Combination #37 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~51 Combination #39 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~51 Combination #41 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~51 Combination #43 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~51 Combination #45 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~51 Combination #46 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~51 Combination #49 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~51 Combination #51 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~51 Combination #52 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~51 Combination #53 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~51 Combination #54 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~51 Combination #56 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~51 Combination #57 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~51 Combination #58 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~51 Combination #59 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~51 Combination #60 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~51 Combination #61 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~51 Combination #65 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~51 Combination #66 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~51 Combination #67 of 68----
diff --git a/testcases/ballista/ballista/outfiles/outfile.swapon.b_ptr_char.b_int b/testcases/ballista/ballista/outfiles/outfile.swapon.b_ptr_char.b_int
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.swapon.b_ptr_char.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.syscall.b_int b/testcases/ballista/ballista/outfiles/outfile.syscall.b_int
deleted file mode 100644
index 1525246..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.syscall.b_int
+++ /dev/null
@@ -1,70 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~18.75 Combination #2 of 25----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~18.75 Combination #6 of 25----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~18.75 Combination #7 of 25----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~18.75 Combination #9 of 25----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~18.75 Combination #10 of 25----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~18.75 Combination #11 of 25----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~18.75 Combination #12 of 25----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~18.75 Combination #13 of 25----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~18.75 Combination #14 of 25----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~18.75 Combination #17 of 25----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~18.75 Combination #18 of 25----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~18.75 Combination #19 of 25----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~18.75 Combination #20 of 25----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~18.75 Combination #21 of 25----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~18.75 Combination #22 of 25----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~18.75 Combination #23 of 25----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~18.75 Combination #25 of 25----
diff --git a/testcases/ballista/ballista/outfiles/outfile.sysfs.b_int.b_unsigned_int.b_int b/testcases/ballista/ballista/outfiles/outfile.sysfs.b_int.b_unsigned_int.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.sysfs.b_int.b_unsigned_int.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.umask.b_mode_t b/testcases/ballista/ballista/outfiles/outfile.umask.b_mode_t
deleted file mode 100644
index 3b736e0..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.umask.b_mode_t
+++ /dev/null
@@ -1,1010 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
-rval:
-Done - Pass	0
-------- 1 of ~258.75 Combination #2 of 345----
-#param:b_short_int_common	b_short_int_common_SEVENTEEN	
-rval:
-Done - Pass	0
-------- 2 of ~258.75 Combination #6 of 345----
-#param:b_short_int_common	b_short_int_common_SC_PAGE	
-rval:
-Done - Pass	0
-------- 3 of ~258.75 Combination #7 of 345----
-#param:b_short_int_common	b_short_int_common_SIXTYFIVE	
-rval:
-Done - Pass	0
-------- 4 of ~258.75 Combination #9 of 345----
-#param:b_short_int_common	b_short_int_common_ONE27	
-rval:
-Done - Pass	0
-------- 5 of ~258.75 Combination #10 of 345----
-#param:b_short_int_common	b_short_int_common_ONE29	
-rval:
-Done - Pass	0
-------- 6 of ~258.75 Combination #11 of 345----
-#param:b_short_int_common	b_short_int_common_TWO55	
-rval:
-Done - Pass	0
-------- 7 of ~258.75 Combination #12 of 345----
-#param:b_short_int_common	b_short_int_common_TWO56	
-rval:
-Done - Pass	0
-------- 8 of ~258.75 Combination #13 of 345----
-#param:b_short_int_common	b_short_int_common_TWO57	
-rval:
-Done - Pass	0
-------- 9 of ~258.75 Combination #14 of 345----
-#param:b_short_int_common	b_short_int_common_I8193	
-rval:
-Done - Pass	0
-------- 10 of ~258.75 Combination #17 of 345----
-#param:b_short_int_common	b_short_int_common_I16383	
-rval:
-Done - Pass	0
-------- 11 of ~258.75 Combination #18 of 345----
-#param:b_short_int_common	b_short_int_common_MAXSHORT	
-rval:
-Done - Pass	0
-------- 12 of ~258.75 Combination #19 of 345----
-#param:b_short	b_short_NEG_ONE	
-rval:
-Done - Pass	0
-------- 13 of ~258.75 Combination #20 of 345----
-#param:b_short	b_short_NEG_SIXTYFOUR	
-rval:
-Done - Pass	0
-------- 14 of ~258.75 Combination #21 of 345----
-#param:b_short	b_short_NEG_MAXSHORT	
-rval:
-Done - Pass	0
-------- 15 of ~258.75 Combination #22 of 345----
-#param:b_int	b_int_MAXINT	
-rval:
-Done - Pass	0
-------- 16 of ~258.75 Combination #23 of 345----
-#param:b_int	b_int_A	
-rval:
-Done - Pass	0
-------- 17 of ~258.75 Combination #25 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 18 of ~258.75 Combination #26 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 19 of ~258.75 Combination #27 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 20 of ~258.75 Combination #28 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 21 of ~258.75 Combination #30 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 22 of ~258.75 Combination #31 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 23 of ~258.75 Combination #33 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 24 of ~258.75 Combination #34 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 25 of ~258.75 Combination #35 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 26 of ~258.75 Combination #36 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 27 of ~258.75 Combination #37 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 28 of ~258.75 Combination #39 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 29 of ~258.75 Combination #41 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 30 of ~258.75 Combination #43 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 31 of ~258.75 Combination #45 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 32 of ~258.75 Combination #46 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 33 of ~258.75 Combination #49 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 34 of ~258.75 Combination #51 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 35 of ~258.75 Combination #52 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 36 of ~258.75 Combination #53 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 37 of ~258.75 Combination #54 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 38 of ~258.75 Combination #56 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 39 of ~258.75 Combination #57 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 40 of ~258.75 Combination #58 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 41 of ~258.75 Combination #59 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 42 of ~258.75 Combination #60 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 43 of ~258.75 Combination #61 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 44 of ~258.75 Combination #65 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 45 of ~258.75 Combination #66 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 46 of ~258.75 Combination #67 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 47 of ~258.75 Combination #69 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 48 of ~258.75 Combination #70 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 49 of ~258.75 Combination #71 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 50 of ~258.75 Combination #72 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 51 of ~258.75 Combination #73 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 52 of ~258.75 Combination #76 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 53 of ~258.75 Combination #77 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 54 of ~258.75 Combination #78 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 55 of ~258.75 Combination #79 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 56 of ~258.75 Combination #80 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 57 of ~258.75 Combination #81 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 58 of ~258.75 Combination #82 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 59 of ~258.75 Combination #83 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 60 of ~258.75 Combination #86 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 61 of ~258.75 Combination #87 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 62 of ~258.75 Combination #89 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 63 of ~258.75 Combination #90 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 64 of ~258.75 Combination #92 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 65 of ~258.75 Combination #93 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 66 of ~258.75 Combination #95 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 67 of ~258.75 Combination #97 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 68 of ~258.75 Combination #99 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 69 of ~258.75 Combination #101 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 70 of ~258.75 Combination #102 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 71 of ~258.75 Combination #105 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 72 of ~258.75 Combination #107 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 73 of ~258.75 Combination #108 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 74 of ~258.75 Combination #109 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 75 of ~258.75 Combination #110 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 76 of ~258.75 Combination #112 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 77 of ~258.75 Combination #113 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 78 of ~258.75 Combination #114 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 79 of ~258.75 Combination #115 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 80 of ~258.75 Combination #116 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 81 of ~258.75 Combination #117 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 82 of ~258.75 Combination #118 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 83 of ~258.75 Combination #119 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 84 of ~258.75 Combination #121 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 85 of ~258.75 Combination #122 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 86 of ~258.75 Combination #123 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 87 of ~258.75 Combination #127 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 88 of ~258.75 Combination #128 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 89 of ~258.75 Combination #129 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 90 of ~258.75 Combination #130 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 91 of ~258.75 Combination #131 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 92 of ~258.75 Combination #132 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 93 of ~258.75 Combination #133 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 94 of ~258.75 Combination #134 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 95 of ~258.75 Combination #135 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 96 of ~258.75 Combination #136 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 97 of ~258.75 Combination #137 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 98 of ~258.75 Combination #139 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 99 of ~258.75 Combination #140 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 100 of ~258.75 Combination #141 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 101 of ~258.75 Combination #143 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 102 of ~258.75 Combination #144 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 103 of ~258.75 Combination #145 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 104 of ~258.75 Combination #146 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 105 of ~258.75 Combination #148 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 106 of ~258.75 Combination #149 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 107 of ~258.75 Combination #151 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 108 of ~258.75 Combination #153 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 109 of ~258.75 Combination #154 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 110 of ~258.75 Combination #155 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 111 of ~258.75 Combination #156 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 112 of ~258.75 Combination #157 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 113 of ~258.75 Combination #158 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 114 of ~258.75 Combination #159 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 115 of ~258.75 Combination #161 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 116 of ~258.75 Combination #163 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 117 of ~258.75 Combination #164 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 118 of ~258.75 Combination #166 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 119 of ~258.75 Combination #168 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 120 of ~258.75 Combination #170 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 121 of ~258.75 Combination #172 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 122 of ~258.75 Combination #173 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 123 of ~258.75 Combination #175 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 124 of ~258.75 Combination #176 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 125 of ~258.75 Combination #177 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 126 of ~258.75 Combination #178 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 127 of ~258.75 Combination #181 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 128 of ~258.75 Combination #182 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 129 of ~258.75 Combination #183 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 130 of ~258.75 Combination #184 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_SET	
-rval:
-Done - Pass	0
-------- 131 of ~258.75 Combination #185 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 132 of ~258.75 Combination #186 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 133 of ~258.75 Combination #187 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 134 of ~258.75 Combination #189 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 135 of ~258.75 Combination #191 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 136 of ~258.75 Combination #193 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 137 of ~258.75 Combination #194 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 138 of ~258.75 Combination #195 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 139 of ~258.75 Combination #196 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 140 of ~258.75 Combination #202 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 141 of ~258.75 Combination #205 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 142 of ~258.75 Combination #206 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 143 of ~258.75 Combination #207 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 144 of ~258.75 Combination #210 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 145 of ~258.75 Combination #211 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 146 of ~258.75 Combination #212 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 147 of ~258.75 Combination #213 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 148 of ~258.75 Combination #214 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 149 of ~258.75 Combination #215 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 150 of ~258.75 Combination #216 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 151 of ~258.75 Combination #217 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 152 of ~258.75 Combination #218 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 153 of ~258.75 Combination #219 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 154 of ~258.75 Combination #220 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 155 of ~258.75 Combination #221 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 156 of ~258.75 Combination #222 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 157 of ~258.75 Combination #223 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 158 of ~258.75 Combination #225 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 159 of ~258.75 Combination #226 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 160 of ~258.75 Combination #227 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 161 of ~258.75 Combination #228 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 162 of ~258.75 Combination #229 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 163 of ~258.75 Combination #230 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 164 of ~258.75 Combination #232 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 165 of ~258.75 Combination #233 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 166 of ~258.75 Combination #235 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 167 of ~258.75 Combination #236 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 168 of ~258.75 Combination #237 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 169 of ~258.75 Combination #238 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 170 of ~258.75 Combination #240 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 171 of ~258.75 Combination #241 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 172 of ~258.75 Combination #242 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 173 of ~258.75 Combination #243 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 174 of ~258.75 Combination #244 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 175 of ~258.75 Combination #245 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 176 of ~258.75 Combination #246 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 177 of ~258.75 Combination #247 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 178 of ~258.75 Combination #248 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 179 of ~258.75 Combination #249 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 180 of ~258.75 Combination #250 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 181 of ~258.75 Combination #251 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 182 of ~258.75 Combination #252 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 183 of ~258.75 Combination #253 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 184 of ~258.75 Combination #254 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 185 of ~258.75 Combination #255 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 186 of ~258.75 Combination #256 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 187 of ~258.75 Combination #257 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 188 of ~258.75 Combination #258 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 189 of ~258.75 Combination #259 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 190 of ~258.75 Combination #260 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 191 of ~258.75 Combination #262 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 192 of ~258.75 Combination #263 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 193 of ~258.75 Combination #264 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_SET	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 194 of ~258.75 Combination #265 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 195 of ~258.75 Combination #266 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 196 of ~258.75 Combination #267 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 197 of ~258.75 Combination #269 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 198 of ~258.75 Combination #270 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 199 of ~258.75 Combination #271 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 200 of ~258.75 Combination #272 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 201 of ~258.75 Combination #273 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 202 of ~258.75 Combination #274 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 203 of ~258.75 Combination #275 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 204 of ~258.75 Combination #276 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 205 of ~258.75 Combination #278 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 206 of ~258.75 Combination #279 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 207 of ~258.75 Combination #280 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 208 of ~258.75 Combination #282 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 209 of ~258.75 Combination #284 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_READ	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 210 of ~258.75 Combination #285 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 211 of ~258.75 Combination #286 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 212 of ~258.75 Combination #290 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 213 of ~258.75 Combination #291 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 214 of ~258.75 Combination #292 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 215 of ~258.75 Combination #293 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 216 of ~258.75 Combination #298 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 217 of ~258.75 Combination #300 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 218 of ~258.75 Combination #301 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_WRITE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 219 of ~258.75 Combination #305 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 220 of ~258.75 Combination #306 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 221 of ~258.75 Combination #307 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 222 of ~258.75 Combination #308 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_READ	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 223 of ~258.75 Combination #310 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 224 of ~258.75 Combination #311 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 225 of ~258.75 Combination #313 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 226 of ~258.75 Combination #314 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 227 of ~258.75 Combination #315 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 228 of ~258.75 Combination #316 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 229 of ~258.75 Combination #317 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 230 of ~258.75 Combination #318 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 231 of ~258.75 Combination #319 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 232 of ~258.75 Combination #320 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 233 of ~258.75 Combination #322 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 234 of ~258.75 Combination #323 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 235 of ~258.75 Combination #324 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_EXEC	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 236 of ~258.75 Combination #325 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 237 of ~258.75 Combination #326 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 238 of ~258.75 Combination #327 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 239 of ~258.75 Combination #328 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_READ	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 240 of ~258.75 Combination #329 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 241 of ~258.75 Combination #332 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_WRITE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 242 of ~258.75 Combination #335 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 243 of ~258.75 Combination #336 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 244 of ~258.75 Combination #337 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 245 of ~258.75 Combination #338 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 246 of ~258.75 Combination #339 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_EXEC	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 247 of ~258.75 Combination #340 of 345----
-#param:b_mode_t	b_mode_t_U_READ	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 248 of ~258.75 Combination #341 of 345----
-#param:b_mode_t	b_mode_t_U_WRITE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 249 of ~258.75 Combination #342 of 345----
-#param:b_mode_t	b_mode_t_U_EXEC	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 250 of ~258.75 Combination #343 of 345----
-#param:b_mode_t	b_mode_t_U_RWX	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 251 of ~258.75 Combination #344 of 345----
-#param:b_mode_t	b_mode_t_U_NONE	b_mode_t_G_NONE	b_mode_t_O_NONE	b_mode_t_UID_CLEAR	b_mode_t_GID_CLEAR	
-rval:
-Done - Pass	0
-------- 252 of ~258.75 Combination #345 of 345----
diff --git a/testcases/ballista/ballista/outfiles/outfile.umount.b_ptr_buf.b_int b/testcases/ballista/ballista/outfiles/outfile.umount.b_ptr_buf.b_int
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.umount.b_ptr_buf.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.unlink.b_fname b/testcases/ballista/ballista/outfiles/outfile.unlink.b_fname
deleted file mode 100644
index a5345d9..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.unlink.b_fname
+++ /dev/null
@@ -1,1514 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~375 Combination #2 of 500----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~375 Combination #6 of 500----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~375 Combination #7 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~375 Combination #9 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~375 Combination #10 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~375 Combination #11 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~375 Combination #12 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~375 Combination #13 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~375 Combination #14 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~375 Combination #17 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~375 Combination #18 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~375 Combination #19 of 500----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~375 Combination #20 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~375 Combination #21 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~375 Combination #22 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~375 Combination #23 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~375 Combination #25 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~375 Combination #26 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~375 Combination #27 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~375 Combination #28 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~375 Combination #30 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~375 Combination #31 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~375 Combination #33 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~375 Combination #34 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~375 Combination #35 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~375 Combination #36 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~375 Combination #37 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~375 Combination #39 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~375 Combination #41 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~375 Combination #43 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~375 Combination #45 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~375 Combination #46 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~375 Combination #49 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~375 Combination #51 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~375 Combination #52 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~375 Combination #53 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~375 Combination #54 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~375 Combination #56 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~375 Combination #57 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~375 Combination #58 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~375 Combination #59 of 500----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~375 Combination #60 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~375 Combination #61 of 500----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~375 Combination #65 of 500----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~375 Combination #66 of 500----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~375 Combination #67 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 47 of ~375 Combination #69 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 48 of ~375 Combination #70 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 49 of ~375 Combination #71 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 50 of ~375 Combination #72 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 51 of ~375 Combination #73 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 52 of ~375 Combination #76 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 53 of ~375 Combination #77 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 54 of ~375 Combination #78 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 55 of ~375 Combination #79 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 56 of ~375 Combination #80 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 57 of ~375 Combination #81 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 58 of ~375 Combination #82 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 59 of ~375 Combination #83 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 60 of ~375 Combination #86 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 61 of ~375 Combination #87 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 62 of ~375 Combination #89 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 63 of ~375 Combination #90 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 64 of ~375 Combination #92 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 65 of ~375 Combination #93 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 66 of ~375 Combination #95 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 67 of ~375 Combination #97 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 68 of ~375 Combination #99 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 69 of ~375 Combination #101 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 70 of ~375 Combination #102 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 71 of ~375 Combination #105 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 72 of ~375 Combination #107 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 73 of ~375 Combination #108 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 74 of ~375 Combination #109 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 75 of ~375 Combination #110 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 76 of ~375 Combination #112 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 77 of ~375 Combination #113 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 78 of ~375 Combination #114 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 79 of ~375 Combination #115 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 80 of ~375 Combination #116 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 81 of ~375 Combination #117 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 82 of ~375 Combination #118 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 83 of ~375 Combination #119 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 84 of ~375 Combination #121 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 85 of ~375 Combination #122 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 86 of ~375 Combination #123 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 87 of ~375 Combination #127 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 88 of ~375 Combination #128 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 89 of ~375 Combination #129 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 90 of ~375 Combination #130 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 91 of ~375 Combination #131 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 92 of ~375 Combination #132 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 93 of ~375 Combination #133 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 94 of ~375 Combination #134 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 95 of ~375 Combination #135 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 96 of ~375 Combination #136 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 97 of ~375 Combination #137 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 98 of ~375 Combination #139 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LOCAL	
-rval:
-Done - Pass	0
-------- 99 of ~375 Combination #140 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 100 of ~375 Combination #141 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 101 of ~375 Combination #143 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 102 of ~375 Combination #144 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 103 of ~375 Combination #145 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 104 of ~375 Combination #146 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 105 of ~375 Combination #148 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 106 of ~375 Combination #149 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 107 of ~375 Combination #151 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 108 of ~375 Combination #153 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 109 of ~375 Combination #154 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 110 of ~375 Combination #155 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 111 of ~375 Combination #156 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 112 of ~375 Combination #157 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 113 of ~375 Combination #158 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 114 of ~375 Combination #159 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 115 of ~375 Combination #161 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 116 of ~375 Combination #163 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 117 of ~375 Combination #164 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 118 of ~375 Combination #166 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 119 of ~375 Combination #168 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 120 of ~375 Combination #170 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 121 of ~375 Combination #172 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 122 of ~375 Combination #173 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 123 of ~375 Combination #175 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 124 of ~375 Combination #176 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 125 of ~375 Combination #177 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 126 of ~375 Combination #178 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 127 of ~375 Combination #181 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 128 of ~375 Combination #182 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 129 of ~375 Combination #183 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 130 of ~375 Combination #184 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 131 of ~375 Combination #185 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 132 of ~375 Combination #186 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 133 of ~375 Combination #187 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 134 of ~375 Combination #189 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 135 of ~375 Combination #191 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 136 of ~375 Combination #193 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 137 of ~375 Combination #194 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 138 of ~375 Combination #195 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 139 of ~375 Combination #196 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 140 of ~375 Combination #202 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 141 of ~375 Combination #205 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 142 of ~375 Combination #206 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 143 of ~375 Combination #207 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 144 of ~375 Combination #210 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 145 of ~375 Combination #211 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_TMP	
-rval:
-Done - Pass	0
-------- 146 of ~375 Combination #212 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 147 of ~375 Combination #213 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 148 of ~375 Combination #214 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 149 of ~375 Combination #215 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 150 of ~375 Combination #216 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 151 of ~375 Combination #217 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 152 of ~375 Combination #218 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 153 of ~375 Combination #219 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 154 of ~375 Combination #220 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 155 of ~375 Combination #221 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 156 of ~375 Combination #222 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 157 of ~375 Combination #223 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 158 of ~375 Combination #225 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 159 of ~375 Combination #226 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 160 of ~375 Combination #227 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 161 of ~375 Combination #228 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 162 of ~375 Combination #229 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 163 of ~375 Combination #230 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 164 of ~375 Combination #232 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 165 of ~375 Combination #233 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 166 of ~375 Combination #235 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 167 of ~375 Combination #236 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 168 of ~375 Combination #237 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 169 of ~375 Combination #238 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 170 of ~375 Combination #240 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 171 of ~375 Combination #241 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 172 of ~375 Combination #242 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 173 of ~375 Combination #243 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 174 of ~375 Combination #244 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 175 of ~375 Combination #245 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 176 of ~375 Combination #246 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 177 of ~375 Combination #247 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 178 of ~375 Combination #248 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 179 of ~375 Combination #249 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 180 of ~375 Combination #250 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 181 of ~375 Combination #251 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 182 of ~375 Combination #252 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 183 of ~375 Combination #253 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 184 of ~375 Combination #254 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 185 of ~375 Combination #255 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 186 of ~375 Combination #256 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 187 of ~375 Combination #257 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 188 of ~375 Combination #258 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 189 of ~375 Combination #259 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 190 of ~375 Combination #260 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 191 of ~375 Combination #262 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 192 of ~375 Combination #263 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 193 of ~375 Combination #264 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 194 of ~375 Combination #265 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 195 of ~375 Combination #266 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 196 of ~375 Combination #267 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 197 of ~375 Combination #269 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 198 of ~375 Combination #270 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 199 of ~375 Combination #271 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 200 of ~375 Combination #272 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 201 of ~375 Combination #273 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 202 of ~375 Combination #274 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 203 of ~375 Combination #275 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 204 of ~375 Combination #276 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 205 of ~375 Combination #278 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 206 of ~375 Combination #279 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 207 of ~375 Combination #280 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 208 of ~375 Combination #282 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_EMBEDDED_SPACE	
-rval:
-Done - Pass	0
-------- 209 of ~375 Combination #284 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 210 of ~375 Combination #285 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 211 of ~375 Combination #286 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 212 of ~375 Combination #290 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 213 of ~375 Combination #291 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 214 of ~375 Combination #292 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 215 of ~375 Combination #293 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 216 of ~375 Combination #298 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 217 of ~375 Combination #300 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 218 of ~375 Combination #301 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 219 of ~375 Combination #305 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 220 of ~375 Combination #306 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 221 of ~375 Combination #307 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 222 of ~375 Combination #308 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 223 of ~375 Combination #310 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 224 of ~375 Combination #311 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 225 of ~375 Combination #313 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 226 of ~375 Combination #314 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 227 of ~375 Combination #315 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 228 of ~375 Combination #316 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 229 of ~375 Combination #317 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 230 of ~375 Combination #318 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 231 of ~375 Combination #319 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 232 of ~375 Combination #320 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 233 of ~375 Combination #322 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 234 of ~375 Combination #323 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 235 of ~375 Combination #324 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 236 of ~375 Combination #325 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 237 of ~375 Combination #326 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 238 of ~375 Combination #327 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 239 of ~375 Combination #328 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 240 of ~375 Combination #329 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 241 of ~375 Combination #332 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 242 of ~375 Combination #335 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 243 of ~375 Combination #336 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 244 of ~375 Combination #337 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 245 of ~375 Combination #338 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 246 of ~375 Combination #339 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 247 of ~375 Combination #340 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 248 of ~375 Combination #341 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 249 of ~375 Combination #342 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 250 of ~375 Combination #343 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 251 of ~375 Combination #344 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 252 of ~375 Combination #345 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 253 of ~375 Combination #346 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 254 of ~375 Combination #347 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 255 of ~375 Combination #348 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 256 of ~375 Combination #349 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 257 of ~375 Combination #351 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 258 of ~375 Combination #352 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 259 of ~375 Combination #353 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 260 of ~375 Combination #355 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_LONG	
-rval:
-Done - Pass	0
-------- 261 of ~375 Combination #356 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 262 of ~375 Combination #358 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 263 of ~375 Combination #359 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 264 of ~375 Combination #360 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 265 of ~375 Combination #361 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 266 of ~375 Combination #362 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 267 of ~375 Combination #364 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 268 of ~375 Combination #365 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 269 of ~375 Combination #366 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 270 of ~375 Combination #367 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 271 of ~375 Combination #368 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 272 of ~375 Combination #370 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 273 of ~375 Combination #372 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 274 of ~375 Combination #373 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 275 of ~375 Combination #374 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 276 of ~375 Combination #377 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 277 of ~375 Combination #378 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 278 of ~375 Combination #380 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 279 of ~375 Combination #381 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 280 of ~375 Combination #382 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 281 of ~375 Combination #384 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 282 of ~375 Combination #385 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 283 of ~375 Combination #386 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 284 of ~375 Combination #388 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 285 of ~375 Combination #389 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 286 of ~375 Combination #390 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 287 of ~375 Combination #391 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 288 of ~375 Combination #392 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 289 of ~375 Combination #394 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 290 of ~375 Combination #395 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 291 of ~375 Combination #396 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 292 of ~375 Combination #397 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 293 of ~375 Combination #399 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 294 of ~375 Combination #400 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 295 of ~375 Combination #401 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 296 of ~375 Combination #402 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 297 of ~375 Combination #403 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 298 of ~375 Combination #404 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 299 of ~375 Combination #405 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 300 of ~375 Combination #406 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 301 of ~375 Combination #407 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 302 of ~375 Combination #409 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 303 of ~375 Combination #410 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 304 of ~375 Combination #411 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 305 of ~375 Combination #412 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 306 of ~375 Combination #413 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 307 of ~375 Combination #414 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 308 of ~375 Combination #415 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 309 of ~375 Combination #417 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 310 of ~375 Combination #418 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 311 of ~375 Combination #420 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 312 of ~375 Combination #421 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 313 of ~375 Combination #422 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 314 of ~375 Combination #424 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 315 of ~375 Combination #425 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_SPECIAL_CHAR	
-rval:
-Done - Pass	0
-------- 316 of ~375 Combination #427 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 317 of ~375 Combination #429 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 318 of ~375 Combination #430 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 319 of ~375 Combination #431 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 320 of ~375 Combination #433 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 321 of ~375 Combination #435 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 322 of ~375 Combination #436 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 323 of ~375 Combination #437 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 324 of ~375 Combination #438 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 325 of ~375 Combination #439 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 326 of ~375 Combination #440 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 327 of ~375 Combination #442 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 328 of ~375 Combination #443 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 329 of ~375 Combination #444 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 330 of ~375 Combination #445 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 331 of ~375 Combination #446 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 332 of ~375 Combination #447 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 333 of ~375 Combination #448 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 334 of ~375 Combination #449 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 335 of ~375 Combination #450 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 336 of ~375 Combination #451 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 337 of ~375 Combination #452 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 338 of ~375 Combination #453 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 339 of ~375 Combination #454 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 340 of ~375 Combination #455 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 341 of ~375 Combination #456 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 342 of ~375 Combination #457 of 500----
-#param:b_fname	b_fname_NONE	b_fname_CLOSED	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 343 of ~375 Combination #458 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 344 of ~375 Combination #459 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 345 of ~375 Combination #461 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 346 of ~375 Combination #463 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 347 of ~375 Combination #464 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 348 of ~375 Combination #465 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 349 of ~375 Combination #466 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 350 of ~375 Combination #467 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 351 of ~375 Combination #469 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_FILE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 352 of ~375 Combination #470 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 353 of ~375 Combination #471 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 354 of ~375 Combination #472 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 355 of ~375 Combination #473 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 356 of ~375 Combination #474 of 500----
-#param:b_fname	b_fname_NONE	b_fname_NOT_EXIST_DIR	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 357 of ~375 Combination #476 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 358 of ~375 Combination #477 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 359 of ~375 Combination #478 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 360 of ~375 Combination #479 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 361 of ~375 Combination #480 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 362 of ~375 Combination #481 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_WRITE	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 363 of ~375 Combination #482 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 364 of ~375 Combination #483 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 365 of ~375 Combination #484 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 366 of ~375 Combination #485 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 367 of ~375 Combination #486 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 368 of ~375 Combination #487 of 500----
-#param:b_fname	b_fname_NONE	b_fname_OPEN_READ	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 369 of ~375 Combination #488 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 370 of ~375 Combination #489 of 500----
-#param:b_fname	b_fname_X_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 371 of ~375 Combination #491 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 372 of ~375 Combination #492 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_CLOSED	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 373 of ~375 Combination #493 of 500----
-#param:b_fname	b_fname_R_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 374 of ~375 Combination #495 of 500----
-#param:b_fname	b_fname_W_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 375 of ~375 Combination #496 of 500----
-#param:b_fname	b_fname_RWX_USER	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 376 of ~375 Combination #498 of 500----
-#param:b_fname	b_fname_R_GRP	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 377 of ~375 Combination #499 of 500----
-#param:b_fname	b_fname_NONE	b_fname_LINK	b_fname_NON_EMPTY	b_fname_DIR	
-rval:
-Done - Pass	0
-------- 378 of ~375 Combination #500 of 500----
diff --git a/testcases/ballista/ballista/outfiles/outfile.uselib.b_ptr_char b/testcases/ballista/ballista/outfiles/outfile.uselib.b_ptr_char
deleted file mode 100644
index d713b1d..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.uselib.b_ptr_char
+++ /dev/null
@@ -1,186 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~51 Combination #2 of 68----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~51 Combination #6 of 68----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~51 Combination #7 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_MED	
-rval:
-Done - Pass	0
-------- 4 of ~51 Combination #9 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_LARGE	
-rval:
-Done - Pass	0
-------- 5 of ~51 Combination #10 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_XLARGE	
-rval:
-Done - Pass	0
-------- 6 of ~51 Combination #11 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_HUGE	
-rval:
-Done - Pass	0
-------- 7 of ~51 Combination #12 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUFMAX	
-rval:
-Done - Pass	0
-------- 8 of ~51 Combination #13 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_64K	
-rval:
-Done - Pass	0
-------- 9 of ~51 Combination #14 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_ODD	
-rval:
-Done - Pass	0
-------- 10 of ~51 Combination #17 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_FREED	
-rval:
-Done - Pass	0
-------- 11 of ~51 Combination #18 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_CODE	
-rval:
-Done - Pass	0
-------- 12 of ~51 Combination #19 of 68----
-#param:b_ptr_buf	b_ptr_buf_BUF_LOW	
-rval:
-Done - Pass	0
-------- 13 of ~51 Combination #20 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 14 of ~51 Combination #21 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 15 of ~51 Combination #22 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 16 of ~51 Combination #23 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 17 of ~51 Combination #25 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 18 of ~51 Combination #26 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 19 of ~51 Combination #27 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 20 of ~51 Combination #28 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 21 of ~51 Combination #30 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NASTY	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 22 of ~51 Combination #31 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 23 of ~51 Combination #33 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 24 of ~51 Combination #34 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 25 of ~51 Combination #35 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_EMPTY	
-rval:
-Done - Pass	0
-------- 26 of ~51 Combination #36 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 27 of ~51 Combination #37 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_CHAR	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 28 of ~51 Combination #39 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 29 of ~51 Combination #41 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 30 of ~51 Combination #43 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 31 of ~51 Combination #45 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NASTY	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 32 of ~51 Combination #46 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 33 of ~51 Combination #49 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 34 of ~51 Combination #51 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_ESC	b_ptr_char_SOME	
-rval:
-Done - Pass	0
-------- 35 of ~51 Combination #52 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 36 of ~51 Combination #53 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 37 of ~51 Combination #54 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_CHAR	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 38 of ~51 Combination #56 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 39 of ~51 Combination #57 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 40 of ~51 Combination #58 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 41 of ~51 Combination #59 of 68----
-#param:b_ptr_char	b_ptr_char_S8K	b_ptr_char_NUM	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 42 of ~51 Combination #60 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_NASTY	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 43 of ~51 Combination #61 of 68----
-#param:b_ptr_char	b_ptr_char_S1	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 44 of ~51 Combination #65 of 68----
-#param:b_ptr_char	b_ptr_char_S4	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 45 of ~51 Combination #66 of 68----
-#param:b_ptr_char	b_ptr_char_S16	b_ptr_char_ESC	b_ptr_char_FULL	
-rval:
-Done - Pass	0
-------- 46 of ~51 Combination #67 of 68----
diff --git a/testcases/ballista/ballista/outfiles/outfile.utime.b_fname.b_ptr_utimbuf b/testcases/ballista/ballista/outfiles/outfile.utime.b_fname.b_ptr_utimbuf
deleted file mode 100644
index d733cfa..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.utime.b_fname.b_ptr_utimbuf
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.wait.b_ptr_int b/testcases/ballista/ballista/outfiles/outfile.wait.b_ptr_int
deleted file mode 100644
index edfa53f..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.wait.b_ptr_int
+++ /dev/null
@@ -1,26 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_ptr_void	b_ptr_void_NEGONE	
-rval:
-Done - Pass	0
-------- 1 of ~8.25 Combination #2 of 11----
-#param:b_ptr_void	b_ptr_void_CONST	
-rval:
-Done - Pass	0
-------- 2 of ~8.25 Combination #6 of 11----
-#param:b_ptr_void	b_ptr_void_FREED	
-rval:
-Done - Pass	0
-------- 3 of ~8.25 Combination #7 of 11----
-#param:b_ptr_int	b_ptr_int_ONE	
-rval:
-Done - Pass	0
-------- 4 of ~8.25 Combination #9 of 11----
-#param:b_ptr_int	b_ptr_int_MININT	
-rval:
-Done - Pass	0
-------- 5 of ~8.25 Combination #10 of 11----
-#param:b_ptr_int	b_ptr_int_NEG_ONE	
-rval:
-Done - Pass	0
-------- 6 of ~8.25 Combination #11 of 11----
diff --git a/testcases/ballista/ballista/outfiles/outfile.waitpid.b_pid.b_ptr_int.b_waitopt b/testcases/ballista/ballista/outfiles/outfile.waitpid.b_pid.b_ptr_int.b_waitopt
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.waitpid.b_pid.b_ptr_int.b_waitopt
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/outfiles/outfile.write.b_fd.b_ptr_char.b_int b/testcases/ballista/ballista/outfiles/outfile.write.b_fd.b_ptr_char.b_int
deleted file mode 100644
index 697f1c7..0000000
--- a/testcases/ballista/ballista/outfiles/outfile.write.b_fd.b_ptr_char.b_int
+++ /dev/null
@@ -1,3 +0,0 @@
-Start random sample - ~ 75% of space.
-Timeout set to 5000000
-#param:b_short_int_common	b_short_int_common_ONE	
diff --git a/testcases/ballista/ballista/paramGen b/testcases/ballista/ballista/paramGen
deleted file mode 100755
index 8c86fda..0000000
--- a/testcases/ballista/ballista/paramGen
+++ /dev/null
@@ -1,198 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-use 5;
-
-# paramGen: Ballista script to generate .param files from .tpl files
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-########################
-# Usage:        paramGen <.tpl filename> ...
-#
-########################
-#
-# Entry Conditions:
-#               .param files are already generated for each parent of
-#                the .tpl files that appear on the command line
-#
-########################
-
-# must use 5.004 so that m//gc does not reset pos()
-use 5.004;
-use strict;
-
-# complain if no arguments are given
-unless (@ARGV) {
-    die "usage: paramGen <.tpl filename> ...\n";
-}
-
-# process each .tpl file on the command line
-foreach my $infile (@ARGV) {
-
-    my $outfile;          # output filename
-    my $datatype;         # name of the datatype being processed
-    my $input;            # contents of the input file
-    my $parent;           # parent of the datatype
-    my $dials_section;    # the dials section from the template
-    my @dials;            # the individual dials and their values (see below)
-    my @output;           # lines to be output
-    my $dial_count;       # number of dials of the datatype
-
-    # The structure of @dials:
-    #  For the dials section
-    #   enum_dial DIAL_ONE : FOO, BAR, BAZ;
-    #   int_dial  DIAL_TWO;
-    #   enum_dial DIAL_THREE : ZAPF, DING, DONG;
-    #   
-    #  The @dials array would be structured as:
-    #   @dials = [
-    #              ['FOO', 'BAR', 'BAZ],
-    #              ['NODIAL_TWO'],
-    #              ['ZAPF', 'DING', 'DONG']
-    #            ]
-
-    # open the .tpl file for input
-    open(IN, "<$infile") || die "Can't open $infile: $!";
-
-    # open the .param file for output
-    $outfile = $infile;
-    $outfile =~ s/\.tpl/.param/ || die "Bad input filename $infile\n";
-    open(OUT, ">$outfile") || die "Can't open $outfile: $!";
-
-    # determine the name of the datatype
-    $datatype = $infile;
-    $datatype =~ s|.*/||;
-    $datatype =~ s/\.tpl$//;
-
-    # read the entire file into $input
-    undef $/;
-    $input = <IN>;
-    $/ = 1;
-
-    # find the parent line
-    if ($input =~ m/^parent (\w+)/ms) {
-	$parent = $1;
-    } else {
-	die "File $infile does not contain a parent line";
-    }
-    
-
-    # copy the parent .param file into the beginning of this .param
-    #  file by matching everything before and after the current
-    #  datatype name
-    $outfile =~ m/(.*)$datatype(.*)/;
-    $parent = "$1$parent$2";
-    open(PARENT, "<$parent") || die "Can't open $parent for $infile: $!";
-    print OUT <PARENT>;
-    close PARENT;
-    
-
-    # find the dials section for further processing
-    ($dials_section) = $input =~ m/^dials\s\[(.*?)\]/sm;
-    unless (length $dials_section) {
-	die "File $infile does not contain a dials section";
-    }
-
-    # find each individual dial
-    while ($dials_section =~ m/^\s*(\w+)_dial\s*(\w+)/smg) {
-	
-	my $dial_type = $1;
-	my $dial_name = $2;
-
-	# complain about any type of dial we can't handle
-	if ($dial_type !~ m/^(enum|int)$/) {
-	    die "Unknown dial type in $infile: $dial_type\n";
-	}
-
-	# find the settings for the current dial
-	my ($settings) = $dials_section =~ m/\G\s*:(.*?);/sgc;
-	
-	# get rid of any optional whitespace seperating the settings
-	$settings =~ s/\s//gs;
-
-	# smash case on the setting name, to match the convention
-	#  used by the datatype compiler
-	$settings = uc $settings;
-
-	# an int_dial does not have any settings, so we force a single
-	#  setting into its list, so that we have something to enumerate
-	#  over later
-	if ($dial_type eq 'int') {
-	    $settings = "NO${dial_name}";
-	}
-
-	unless (length $settings) {
-	    die "Dial $dial_name does not contain any settings in $infile";
-	}
-	
-	# push the settings onto the dials list
-	push @dials, [split m/,/, $settings];
-	
-	# prepend the datatype name to the name of each setting
-	foreach (@{$dials[-1]}) {
-	    $_ = "${datatype}_$_";
-	}
-
-	# an int_dial needs INTDIAL_ prepended, for sanity's sake
-	if ($dial_type eq 'int') {
-	    $dials[-1]->[0] = "INTDIAL_" . $dials[-1]->[0];
-	}
-    }
-
-    # the output format should be:
-    #     <datatype>  <num>  <setting> ...
-    #  where num is the number of settings
-    #
-    # we take the *first* set of settings, and prepend the datatype name
-    #  and setting count, then take successive cross products to build up
-    #  the total dials settings
-    
-    $dial_count = @dials;
-    
-    @output = @{shift @dials} if @dials;
-
-    foreach (@output) {
-	$_ = join("\t", $datatype, $dial_count, $_);
-    }
-
-    while (@dials) {
-	@output = crossProduct(shift @dials, \@output);
-    }
-    
-    # now that the cross product is completed, simply dump it all to output
-    foreach (@output) {
-	print OUT "$_\t\n";
-    }
-    
-}
-
-# calculate the cross product of two arrays
-sub crossProduct {
-    my $a1 = shift;
-    my $a2 = shift;
-
-    my @b;
-
-    foreach my $i1 (@$a1) {
-	foreach my $i2 (@$a2) {
-	    push @b, "$i2\t$i1";
-	}
-    }
-
-    return @b;
-}
diff --git a/testcases/ballista/ballista/parseArguments.cpp b/testcases/ballista/ballista/parseArguments.cpp
deleted file mode 100644
index 1ec2aab..0000000
--- a/testcases/ballista/ballista/parseArguments.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-/* parseArguments.cpp: class for parsing through command line options
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <iostream>
-#include <ctype.h>
-#include <assert.h>
-#include "parseArguments.h"
-#include "ballistaUtil.h"
-
-using namespace std;
-
-/************************
- *
- * Function: Parse_arguments
- * Description: constructor
- * Function Inputs:
- * Global Inputs:
- * Return Values:
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions: number_of_arguments=0
- * Design:
- * Notes:
- *
- ************************/
-Parse_arguments::Parse_arguments()
-{
-  number_of_arguments=0;
-}
-
-/************************
- *
- * Function: init_and_find_index
- * Description: This method initializes the internal representation of the 
-                command line options and returns to the index into argv 
-		for the item right after the options
-		
- * Function Inputs: first_index - this is the first index into argv 
-                                  where the options may be found
-                    argc - number of argments on command line
-                    argv - command line arguments
- * Global Inputs:
- * Return Values:  index into argv of the first non option argument.  
-                   This is always >= first index
- * Global Outputs:
- * Errors: If too many arguments are specified, or if an argument was not 
-           specified for an option then the program will exit()
- * Pre-Conditions: number_of_arguments=0
- * Post-Contidions: the arguments are copied into the internal representation.
- * Design: loop through the arguments until one does not start with a hyphen.
-           For each argument, read in the name and its value. 
-	   Check that each option has a value.  
-	   Store these data in the data array.
- * Notes: All options must be stored in pairs, there will be a 
-          -argument_name and argument_value
- *
- ************************/
-int Parse_arguments::init_and_find_index(int first_index, int argc, 
-				    const char * const *argv)
-{
-  int i;
-  int j = 0;
-
-  assert(argv != NULL);
-
-  number_of_arguments=0;
-  i = first_index;
-
-  while(i < argc && argv[i][0] == '-') {
-    if(number_of_arguments == MAXIMUM_NUMBER_OF_ARGUMENTS) {
-      cerr << "Error: Too many command line options." << endl;
-      exit(1);
-    }
-
-    if(i + 1 == argc) {
-      cerr << "Error: " << argv[i];
-      cerr << " flag was used with invalid argument." << endl;
-      exit(1);
-    }
-
-    // determine if multiple copies of the same argument exist
-    j = 0; 
-    while(j < number_of_arguments) {
-      if(!strcasecmp(argv[i]+1,data[j].name)) {
-        cerr << "Error: " << argv[i];
-        cerr << " flag is repeated." << endl;
-        exit(1);
-      }
-      j++;
-    }
-
-    safe_strncpy(data[number_of_arguments].name,
-		 argv[i]+1,MAXIMUM_ARGUMENT_NAME_LENGTH);
-    safe_strncpy(data[number_of_arguments].argument,
-		 argv[i+1],MAXIMUM_ARGUMENT_LENGTH);
-    i += 2;
-    number_of_arguments++;
-  }
-  return i;
-}
-
-/************************
- *
- * Function: get_argument
- * Description:  get a command line argument
- * Function Inputs: argument_name - the argument that you want to find 
-                                    without the hyphen
-                    return_buffer - storage for the argument text
-		    max_return_buffer - maximum size of return buffer
- * Global Inputs:
- * Return Values:  BOOL_TRUE if the argument existed, BOOL_FALSE if not
- * Global Outputs:
- * Errors:
- * Pre-Conditions:  
- * Post-Contidions: return_buffer will contain the argument text if it existed
- * Design: look through all entries for argument, return it if found
- * Notes: The lookup is not case sensitive.
-          if the argument is not found, then nothing will be copied into 
-	  the return_buffer.
- *
- ************************/
-BOOL_TYPE Parse_arguments::get_argument(const char *argument_name, 
-					char *return_buffer,
-					int max_return_buffer)
-{
-  int i;
-
-  assert(argument_name != NULL);
-  assert(return_buffer != NULL);
-
-  for(i=0;i<number_of_arguments;i++) {
-    if(!strcasecmp(argument_name,data[i].name)) {
-      safe_strncpy(return_buffer,data[i].argument,max_return_buffer);
-      return BOOL_TRUE;
-    }
-  }
-  return BOOL_FALSE;
-}
-
-/************************
- *
- * Function: get_and_validate_integer
- * Description: get a command line argument that is supposed to be an 
- *              integer and validate that it is in a certain range.  
- *      	If it is not specified, then return a default value.
- * Function Inputs: return_value - the integer argument is copied here
- *                  argument_name - the name of the argument you want to
- *		                    find without the hyphen.
- *		    default_value - value to be copied into return_value
- *                                  if the argument was not found
- *                  min_range - minimum range for the value
- *                  max_range - maximum range for the value
- * Global Inputs:
- * Return Values: BOOL_TRUE if the argument was found, BOOL_FALSE otherwise
- * Global Outputs:
- * Errors: if a value was specified outside of its range, the program will
- *         give an error message and abort
- * Pre-Conditions:
- * Post-Contidions: a value will be copied into return_value
- * Design:  Look up the argument.  If found, convert to integer and 
- *          check range.
- *          If in range, copy into return value and return BOOL_TRUE.
- *          If not in range, give and error and exit()
- *          If not found, copy the default value into return_value 
- *          and return BOOL_TRUE
- * Notes: This method allows default values to be specified when arguments 
- *        are not on the command line.  It is normal for arguments not to be
- *	  found and to use the default values
- *
- ************************/
-BOOL_TYPE Parse_arguments::get_and_validate_integer(int *return_value,
-						    const char *argument_name,
-						    int default_value,
-						    int min_range,
-						    int max_range)
-{
-  char arg_buf[256];
-  int value;
-  int j;
-
-  assert(return_value != NULL);
-  assert(argument_name != NULL);
-
-  if (get_argument(argument_name,arg_buf,sizeof(arg_buf))) { //check flags
-    j = 0; // check to insure numbers for argument
-    while (j < strlen(arg_buf)) {
-      if (!(isdigit(arg_buf[j]) || (arg_buf[j] == '-' && j == 0))) {
-        cerr << "Error: -" << argument_name;
-        cerr << " flag used with invalid nondigit value: " << arg_buf << endl;
-        cerr << "Valid range is " << min_range << " to " << max_range << endl;
-        exit(1);
-      }
-    j++;
-    }
-    value = atoi(arg_buf); // check for proper range
-    if (value < min_range || value > max_range){
-      cerr << "Error: -" << argument_name;
-      cerr << " flag used with invalid value: " << arg_buf << endl;
-      cerr << "Valid range is " << min_range << " to " << max_range << endl;
-      exit(1);
-    }
-    *return_value = value;
-    return BOOL_TRUE;
-  }
-  *return_value = default_value;
-  return BOOL_FALSE;
-}
-
-/************************
- *
- * Function: get_argument
- * Description:  get a command line argument
- * Function Inputs: argument_name - the argument that you want to find 
-                                    without the hyphen
-                    return_buffer - storage for the argument text
-		    max_return_buffer - maximum size of return buffer
- * Global Inputs:
- * Return Values:  BOOL_TRUE if the argument existed, BOOL_FALSE if not
- * Global Outputs:
- * Errors:
- * Pre-Conditions:  
- * Post-Contidions: return_buffer will contain the argument text if it existed
- * Design: look through all entries for argument, return it if found
- * Notes: The lookup is not case sensitive.
-          if the argument is not found, then nothing will be copied into 
-	  the return_buffer.
- *
- ************************/
-// BOOL_TYPE Parse_arguments::get_argument(const char *argument_name, 
-// 					char *return_buffer,
-// 					int max_return_buffer)
-// {
-//   int i;
-
-//   assert(argument_name != NULL);
-//   assert(return_buffer != NULL);
-
-//   for(i=0;i<number_of_arguments;i++) {
-//     if(!strcasecmp(argument_name,data[i].name)) {
-//       safe_strncpy(return_buffer,data[i].argument,max_return_buffer);
-//       return BOOL_TRUE;
-//     }
-//   }
-//   return BOOL_FALSE;
-// }
-
-/************************
- *
- * Function: get_and_validate_float
- * Description: get a command line argument that is supposed to be an 
- *              float and validate that it is in a certain range.  
- *      	If it is not specified, then return a default value.
- * Function Inputs: return_value - the integer argument is copied here
- *                  argument_name - the name of the argument you want to
- *		                    find without the hyphen.
- *		    default_value - value to be copied into return_value
- *                                  if the argument was not found
- *                  min_range - minimum range for the value
- *                  max_range - maximum range for the value
- * Global Inputs:
- * Return Values: BOOL_TRUE if the argument was found, BOOL_FALSE otherwise
- * Global Outputs:
- * Errors: if a value was specified outside of its range, the program will
- *         give an error message and abort
- * Pre-Conditions:
- * Post-Contidions: a value will be copied into return_value
- * Design:  Look up the argument.  If found, convert to integer and 
- *          check range.
- *          If in range, copy into return value and return BOOL_TRUE.
- *          If not in range, give and error and exit()
- *          If not found, copy the default value into return_value 
- *          and return BOOL_TRUE
- * Notes: This method allows default values to be specified when arguments 
- *        are not on the command line.  It is normal for arguments not to be
- *	  found and to use the default values
- *
- ************************/
-BOOL_TYPE Parse_arguments::get_and_validate_float(double *return_value,
-						    const char *argument_name,
-						    double default_value,
-						    double min_range,
-							double max_range)
-{
-  char arg_buf[256];
-  double value;
-  int j;
-
-  assert(return_value != NULL);
-  assert(argument_name != NULL);
-
-  if (get_argument(argument_name,arg_buf,sizeof(arg_buf))) { //check flags
-    j = 0; // check to insure numbers for argument
-    while (j < strlen(arg_buf)) {
-      if (!(isdigit(arg_buf[j]) || (arg_buf[j] == '-' && j == 0)||arg_buf[j]=='.')) {
-        cerr << "Error: -" << argument_name;
-        cerr << " flag used with invalid nondigit value: " << arg_buf << endl;
-        cerr << "Valid range is " << min_range << " to " << max_range << endl;
-        exit(1);
-      }
-    j++;
-    }
-    value = atof(arg_buf); // check for proper range
-    if (value <= min_range || value > max_range){
-      cerr << "Error: -" << argument_name;
-      cerr << " flag used with invalid value: " << arg_buf << endl;
-      cerr << "Valid range is " << min_range << " to " << max_range << endl;
-      exit(1);
-    }
-    *return_value = value;
-    return BOOL_TRUE;
-  }
-  *return_value = default_value;
-  return BOOL_FALSE;
-}
-
-
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/parseArguments.h b/testcases/ballista/ballista/parseArguments.h
deleted file mode 100644
index e0636a2..0000000
--- a/testcases/ballista/ballista/parseArguments.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* parseArguments.cpp: class for parsing through command line options
- * Copyright (C) 1998-2001  Carnegie Mellon University
- *
- * This program 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 Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef _PARSE_ARGUMENTS_H_
-#define _PARSE_ARGUMENTS_H_
-
-#include "ballista.h"
-
-const int MAXIMUM_NUMBER_OF_ARGUMENTS = 30;
-const int MAXIMUM_ARGUMENT_NAME_LENGTH = 30;
-const int MAXIMUM_ARGUMENT_LENGTH = 256;
-
-struct Argument_data
-{
-  char name[MAXIMUM_ARGUMENT_NAME_LENGTH];
-  char argument[MAXIMUM_ARGUMENT_LENGTH];
-};
-
-
-class Parse_arguments
-{
-private:
-  int number_of_arguments;
-  Argument_data data[MAXIMUM_NUMBER_OF_ARGUMENTS];
-
-public:
-  Parse_arguments();
-  int init_and_find_index(int first_index, int argc, const char * const *argv);
-  BOOL_TYPE get_argument(const char *argument_name, 
-			 char *return_buffer,
-			 int max_return_buffer);
-
-  BOOL_TYPE get_and_validate_integer(int *return_value,
-				     const char *argument_name,
-				     int default_value,
-				     int min_range,
-				     int max_range);  
-  BOOL_TYPE get_and_validate_float(double *return_value,
-				     const char *argument_name,
-								   double default_value,
-				     double min_range,
-				     double max_range);  
-
-};
-
-#endif // _PARSE_ARGUMENTS_H_
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/perllib/Bundle/LWP.pm b/testcases/ballista/ballista/perllib/Bundle/LWP.pm
deleted file mode 100644
index 57335c7..0000000
--- a/testcases/ballista/ballista/perllib/Bundle/LWP.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package Bundle::LWP;
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bundle::LWP - A bundle to install all libwww-perl related modules
-
-=head1 SYNOPSIS
-
- perl -MCPAN -e 'install Bundle::LWP'
-
-=head1 CONTENTS
-
-Net::FTP 2.00      - If you want ftp://-support
-
-MIME::Base64       - Used in authentication headers
-
-MD5                - Needed to do Digest authentication
-
-HTML::HeadParser   - To get the correct $res->base
-
-LWP                - The reason why you need the modules above
-
-=head1 DESCRIPTION
-
-This bundle defines all reqreq modules for libwww-perl.
-
-
-=head1 AUTHOR
-
-Gisle Aas E<lt>aas@sn.no>
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/File/Listing.pm b/testcases/ballista/ballista/perllib/File/Listing.pm
deleted file mode 100644
index 2f298f5..0000000
--- a/testcases/ballista/ballista/perllib/File/Listing.pm
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-# $Id: Listing.pm,v 1.1 2004/10/18 17:58:16 mridge Exp $
-
-package File::Listing;
-
-sub Version { $VERSION; }
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-=head1 NAME
-
-parse_dir - parse directory listing
-
-=head1 SYNOPSIS
-
- use File::Listing;
- for (parse_dir(`ls -l`)) {
-     ($name, $type, $size, $mtime, $mode) = @$_;
-     next if $type ne 'f'; # plain file
-     #...
- }
-
- # directory listing can also be read from a file
- open(LISTING, "zcat ls-lR.gz|");
- $dir = parse_dir(\*LISTING, '+0000');
-
-=head1 DESCRIPTION
-
-The parse_dir() routine can be used to parse directory
-listings. Currently it only understand Unix C<'ls -l'> and C<'ls -lR'>
-format.  It should eventually be able to most things you might get
-back from a ftp server file listing (LIST command), i.e. VMS listings,
-NT listings, DOS listings,...
-
-The first parameter to parse_dir() is the directory listing to parse.
-It can be a scalar, a reference to an array of directory lines or a
-glob representing a filehandle to read the directory listing from.
-
-The second parameter is the time zone to use when parsing time stamps
-in the listing. If this value is undefined, then the local time zone is
-assumed.
-
-The third parameter is the type of listing to assume.  The values will
-be strings like 'unix', 'vms', 'dos'.  Currently only 'unix' is
-implemented and this is also the default value.  Ideally, the listing
-type should be determined automatically.
-
-The fourth parameter specify how unparseable lines should be treated.
-Values can be 'ignore', 'warn' or a code reference.  Warn means that
-the perl warn() function will be called.  If a code reference is
-passed, then this routine will be called and the return value from it
-will be incorporated in the listing.  The default is 'ignore'.
-
-Only the first parameter is mandatory.  The parse_dir() prototype is
-($;$$$).
-
-The return value from parse_dir() is a list of directory entries.  In
-scalar context the return value is a reference to the list.  The
-directory entries are represented by an array consisting of [
-$filename, $filetype, $filesize, $filetime, $filemode ].  The
-$filetype value is one of the letters 'f', 'd', 'l' or '?'.  The
-$filetime value is converted to seconds since Jan 1, 1970.  The
-$filemode is a bitmask like the mode returned by stat().
-
-=head1 CREDITS
-
-Based on lsparse.pl (from Lee McLoughlin's ftp mirror package) and
-Net::FTP's parse_dir (Graham Barr).
-
-=cut
-
-require Exporter;
-@ISA = qw(Exporter);
-
-@EXPORT = qw(parse_dir);
-
-use strict;
-
-use Carp ();
-use HTTP::Date qw(str2time);
-
-sub parse_dir ($;$$$)
-{
-   my($dir, $tz, $fstype, $error) = @_;
-
-   $fstype ||= 'unix';
-   $fstype = "File::Listing::" . lc $fstype;
-
-   my @args = $_[0];
-   push(@args, $tz) if(@_ >= 2);
-   push(@args, $error) if(@_ >= 4);
-
-   $fstype->parse(@args);
-}
-
-sub line { Carp::croak("Not implemented yet"); }
-sub init { } # Dummy sub
-
-sub file_mode ($)
-{
-    # This routine was originally borrowed from Graham Barr's
-    # Net::FTP package.
-
-    local $_ = shift;
-    my $mode = 0;
-    my($type,$ch);
-
-    s/^(.)// and $type = $1;
-
-    while (/(.)/g) {
-	$mode <<= 1;
-	$mode |= 1 if $1 ne "-" &&
-		      $1 ne 'S' &&
-		      $1 ne 't' &&
-		      $1 ne 'T';
-    }
-
-    $type eq "d" and $mode |= 0040000 or	# Directory
-      $type eq "l" and $mode |= 0120000 or	# Symbolic Link
-	$mode |= 0100000;			# Regular File
-
-    $mode |= 0004000 if /^...s....../i;
-    $mode |= 0002000 if /^......s.../i;
-    $mode |= 0001000 if /^.........t/i;
-
-    $mode;
-}
-
-sub parse
-{
-   my($pkg, $dir, $tz, $error) = @_;
-
-   # First let's try to determine what kind of dir parameter we have
-   # received.  We allow both listings, reference to arrays and
-   # file handles to read from.
-
-   if (ref($dir) eq 'ARRAY') {
-       # Already splitted up
-   } elsif (ref($dir) eq 'GLOB') {
-       # A file handle
-   } elsif (ref($dir)) {
-      Carp::croak("Illegal argument to parse_dir()");
-   } elsif ($dir =~ /^\*\w+(::\w+)+$/) {
-      # This scalar looks like a file handle, so we assume it is
-   } else {
-      # A normal scalar listing
-      $dir = [ split(/\n/, $dir) ];
-   }
-
-   $pkg->init();
-
-   my @files = ();
-   if (ref($dir) eq 'ARRAY') {
-       for (@$dir) {
-	   push(@files, $pkg->line($_, $tz, $error));
-       }
-   } else {
-       local($_);
-       while (<$dir>) {
-	   chomp;
-	   push(@files, $pkg->line($_, $tz, $error));
-       }
-   }
-   wantarray ? @files : \@files;
-}
-
-
-package File::Listing::unix;
-
-use HTTP::Date qw(str2time);
-
-# A place to remember current directory from last line parsed.
-use vars qw($curdir);
-no strict qw(vars);
-
-@ISA = qw(File::Listing);
-
-
-sub init
-{
-    $curdir = '';
-}
-
-sub line
-{
-    shift; # package name
-    local($_) = shift;
-    my($tz, $error) = @_;
-
-    s/\015//g;
-    #study;
-
-    my ($kind, $size, $date, $name);
-    if (($kind, $size, $date, $name) =
-	/^([\-FlrwxsStTdD]{10})                   # Type and permission bits
-	 .*                                       # Graps
-	 \D(\d+)                                  # File size
-	 \s+                                      # Some space
-	 (\w{3}\s+\d+\s+(?:\d{1,2}:\d{2}|\d{4}))  # Date
-	 \s+                                      # Some more space
-	 (.*)$                                    # File name
-	/x )
-
-    {
-	return if $name eq '.' || $name eq '..';
-	$name = "$curdir/$name" if length $curdir;
-	my $type = '?';
-	if ($kind =~ /^l/ && $name =~ /(.*) -> (.*)/ ) {
-	    $name = $1;
-	    $type = "l $2";
-	} elsif ($kind =~ /^[\-F]/) { # (hopefully) a regular file
-	    $type = 'f';
-	} elsif ($kind =~ /^[dD]/) {
-	    $type = 'd';
-	    $size = undef;  # Don't believe the reported size
-	}
-	return [$name, $type, $size, str2time($date, $tz), 
-              File::Listing::file_mode($kind)];
-
-    } elsif (/^(.+):$/ && !/^[dcbsp].*\s.*\s.*:$/ ) {
-	my $dir = $1;
-	return () if $dir eq '.';
-	$curdir = $dir;
-	return ();
-    } elsif (/^[Tt]otal\s+(\d+)$/ || /^\s*$/) {
-	return ();
-    } elsif (/not found/    || # OSF1, HPUX, and SunOS return
-             # "$file not found"
-             /No such file/ || # IRIX returns
-             # "UX:ls: ERROR: Cannot access $file: No such file or directory"
-                               # Solaris returns
-             # "$file: No such file or directory"
-             /cannot find/     # Windows NT returns
-             # "The system cannot find the path specified."
-             ) {
-	return () unless defined $error;
-	&$error($_) if ref($error) eq 'CODE';
-	warn "Error: $_\n" if $error eq 'warn';
-	return ();
-    } elsif ($_ eq '') {       # AIX, and Linux return nothing
-	return () unless defined $error;
-	&$error("No such file or directory") if ref($error) eq 'CODE';
-	warn "Warning: No such file or directory\n" if $error eq 'warn';
-	return ();
-    } else {
-        # parse failed, check if the dosftp parse understands it
-        return(File::Listing::dosftp->line($_,$tz,$error));
-    }
-
-}
-
-package File::Listing::dosftp;
-
-use HTTP::Date qw(str2time);
-
-# A place to remember current directory from last line parsed.
-use vars qw($curdir);
-no strict qw(vars);
-
-@ISA = qw(File::Listing);
-
-sub init
-{
-    $curdir = '';
-}
-
-sub line
-{
-    shift; # package name
-    local($_) = shift;
-    my($tz, $error) = @_;
-
-    s/\015//g;
-
-    my ($kind, $size, $date, $name);
-
-    # 02-05-96  10:48AM                 1415 src.slf
-    # 09-10-96  09:18AM       <DIR>          sl_util
-    if (($date,$size_or_dir,$name) =
-        /^(\d\d-\d\d-\d\d\s+\d\d:\d\d\wM)         # Date and time info
-         \s+                                      # Some space
-         (<\w{3}>|\d+)                            # Dir or Size
-         \s+                                      # Some more space
-         (.+)$                                    # File name
-        /x )
-    {
-	return if $name eq '.' || $name eq '..';
-	$name = "$curdir/$name" if length $curdir;
-	my $type = '?';
-	if ($size_or_dir eq '<DIR>') {
-	    $type = "d";
-            $size = ""; # directories have no size in the pc listing
-        } else {
-	    $type = 'f';
-            $size = $size_or_dir;
-	}
-	return [$name, $type, $size, str2time($date, $tz),
-              File::Listing::file_mode($kind)];
-
-    } else {
-	return () unless defined $error;
-	&$error($_) if ref($error) eq 'CODE';
-	warn "Can't parse: $_\n" if $error eq 'warn';
-	return ();
-    }
-
-}
-
-package File::Listing::vms;
-@File::Listing::unix::ISA = qw(File::Listing);
-
-package File::Listing::netware;
-@File::Listing::unix::ISA = qw(File::Listing);
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTML/.exists b/testcases/ballista/ballista/perllib/HTML/.exists
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/perllib/HTML/.exists
+++ /dev/null
diff --git a/testcases/ballista/ballista/perllib/HTML/Entities.pm b/testcases/ballista/ballista/perllib/HTML/Entities.pm
deleted file mode 100644
index 23ead1a..0000000
--- a/testcases/ballista/ballista/perllib/HTML/Entities.pm
+++ /dev/null
@@ -1,249 +0,0 @@
-package HTML::Entities;
-
-# $Id: Entities.pm,v 1.1 2004/10/18 17:58:14 mridge Exp $
-
-=head1 NAME
-
-HTML::Entities - Encode or decode strings with HTML entities
-
-=head1 SYNOPSIS
-
- use HTML::Entities;
-
- $a = "V&aring;re norske tegn b&oslash;r &#230res";
- decode_entities($a);
- encode_entities($a, "\200-\377");
-
-=head1 DESCRIPTION
-
-This module deals with encoding and decoding of strings with HTML
-character entites.  The module provide the following functions:
-
-=over 4
-
-=item decode_entities($string)
-
-This routine replaces HTML entities found in the $string with the
-corresponding ISO-8859/1 character.  Unrecognized entities are left
-alone.
-
-=item endode_entities($string, [$unsafe_chars])
-
-This routine replaces unsafe characters in $string with their entity
-representation.  A second argument can be given to specify which
-characters to concider as unsafe.  The default set of characters to
-expand are control chars, high-bit chars and the '<', '&', '>' and '"'
-character.
-
-=back
-
-Both routines modify the string passed in as the first argument if
-called in void context.  In scalar and array context the encoded or
-decoded string is returned (and the argument string is left
-unchanged).
-
-If you prefer not to import these routines into your namespace you can
-call them as:
-
-  use HTML::Entities ();
-  $encoded = HTML::Entities::encode($a);
-  $decoded = HTML::Entities::decode($a);
-
-The module can also export the %char2entity and the %entity2char
-hashes which contains the mapping from all characters to the
-corresponding entities.
-
-=head1 COPYRIGHT
-
-Copyright 1995-1998 Gisle Aas. All rights reserved.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-use vars qw(%entity2char %char2entity);
-
-require 5.004;
-require Exporter;
-@ISA = qw(Exporter);
-
-@EXPORT = qw(encode_entities decode_entities);
-@EXPORT_OK = qw(%entity2char %char2entity);
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-sub Version { $VERSION; }
-
-
-%entity2char = (
- # Some normal chars that have special meaning in SGML context
- amp    => '&',  # ampersand 
-'gt'    => '>',  # greater than
-'lt'    => '<',  # less than
- quot   => '"',  # double quote
-
- # PUBLIC ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML
- AElig	=> 'Æ',  # capital AE diphthong (ligature)
- Aacute	=> 'Á',  # capital A, acute accent
- Acirc	=> 'Â',  # capital A, circumflex accent
- Agrave	=> 'À',  # capital A, grave accent
- Aring	=> 'Å',  # capital A, ring
- Atilde	=> 'Ã',  # capital A, tilde
- Auml	=> 'Ä',  # capital A, dieresis or umlaut mark
- Ccedil	=> 'Ç',  # capital C, cedilla
- ETH	=> 'Ð',  # capital Eth, Icelandic
- Eacute	=> 'É',  # capital E, acute accent
- Ecirc	=> 'Ê',  # capital E, circumflex accent
- Egrave	=> 'È',  # capital E, grave accent
- Euml	=> 'Ë',  # capital E, dieresis or umlaut mark
- Iacute	=> 'Í',  # capital I, acute accent
- Icirc	=> 'Î',  # capital I, circumflex accent
- Igrave	=> 'Ì',  # capital I, grave accent
- Iuml	=> 'Ï',  # capital I, dieresis or umlaut mark
- Ntilde	=> 'Ñ',  # capital N, tilde
- Oacute	=> 'Ó',  # capital O, acute accent
- Ocirc	=> 'Ô',  # capital O, circumflex accent
- Ograve	=> 'Ò',  # capital O, grave accent
- Oslash	=> 'Ø',  # capital O, slash
- Otilde	=> 'Õ',  # capital O, tilde
- Ouml	=> 'Ö',  # capital O, dieresis or umlaut mark
- THORN	=> 'Þ',  # capital THORN, Icelandic
- Uacute	=> 'Ú',  # capital U, acute accent
- Ucirc	=> 'Û',  # capital U, circumflex accent
- Ugrave	=> 'Ù',  # capital U, grave accent
- Uuml	=> 'Ü',  # capital U, dieresis or umlaut mark
- Yacute	=> 'Ý',  # capital Y, acute accent
- aacute	=> 'á',  # small a, acute accent
- acirc	=> 'â',  # small a, circumflex accent
- aelig	=> 'æ',  # small ae diphthong (ligature)
- agrave	=> 'à',  # small a, grave accent
- aring	=> 'å',  # small a, ring
- atilde	=> 'ã',  # small a, tilde
- auml	=> 'ä',  # small a, dieresis or umlaut mark
- ccedil	=> 'ç',  # small c, cedilla
- eacute	=> 'é',  # small e, acute accent
- ecirc	=> 'ê',  # small e, circumflex accent
- egrave	=> 'è',  # small e, grave accent
- eth	=> 'ð',  # small eth, Icelandic
- euml	=> 'ë',  # small e, dieresis or umlaut mark
- iacute	=> 'í',  # small i, acute accent
- icirc	=> 'î',  # small i, circumflex accent
- igrave	=> 'ì',  # small i, grave accent
- iuml	=> 'ï',  # small i, dieresis or umlaut mark
- ntilde	=> 'ñ',  # small n, tilde
- oacute	=> 'ó',  # small o, acute accent
- ocirc	=> 'ô',  # small o, circumflex accent
- ograve	=> 'ò',  # small o, grave accent
- oslash	=> 'ø',  # small o, slash
- otilde	=> 'õ',  # small o, tilde
- ouml	=> 'ö',  # small o, dieresis or umlaut mark
- szlig	=> 'ß',  # small sharp s, German (sz ligature)
- thorn	=> 'þ',  # small thorn, Icelandic
- uacute	=> 'ú',  # small u, acute accent
- ucirc	=> 'û',  # small u, circumflex accent
- ugrave	=> 'ù',  # small u, grave accent
- uuml	=> 'ü',  # small u, dieresis or umlaut mark
- yacute	=> 'ý',  # small y, acute accent
- yuml	=> 'ÿ',  # small y, dieresis or umlaut mark
-
- # Some extra Latin 1 chars that are listed in the HTML3.2 draft (21-May-96)
- copy   => '©',  # copyright sign
- reg    => '®',  # registered sign
- nbsp   => "\240", # non breaking space
-
- # Additional ISO-8859/1 entities listed in rfc1866 (section 14)
- iexcl  => '¡',
- cent   => '¢',
- pound  => '£',
- curren => '¤',
- yen    => '¥',
- brvbar => '¦',
- sect   => '§',
- uml    => '¨',
- ordf   => 'ª',
- laquo  => '«',
-'not'   => '¬',    # not is a keyword in perl
- shy    => '­',
- macr   => '¯',
- deg    => '°',
- plusmn => '±',
- sup1   => '¹',
- sup2   => '²',
- sup3   => '³',
- acute  => '´',
- micro  => 'µ',
- para   => '¶',
- middot => '·',
- cedil  => '¸',
- ordm   => 'º',
- raquo  => '»',
- frac14 => '¼',
- frac12 => '½',
- frac34 => '¾',
- iquest => '¿',
-'times' => '×',    # times is a keyword in perl
- divide => '÷',
-);
-
-# Make the oposite mapping
-while (my($entity, $char) = each(%entity2char)) {
-    $char2entity{$char} = "&$entity;";
-}
-
-# Fill inn missing entities
-for (0 .. 255) {
-    next if exists $char2entity{chr($_)};
-    $char2entity{chr($_)} = "&#$_;";
-}
-
-my %subst;  # compiled encoding regexps
-
-
-sub decode_entities
-{
-    my $array;
-    if (defined wantarray) {
-	$array = [@_]; # copy
-    } else {
-	$array = \@_;  # modify in-place
-    }
-    my $c;
-    for (@$array) {
-	s/(&\#(\d+);?)/$2 < 256 ? chr($2) : $1/eg;
-	s/(&\#[xX]([0-9a-fA-F]+);?)/$c = hex($2); $c < 256 ? chr($c) : $1/eg;
-	s/(&(\w+);?)/$entity2char{$2} || $1/eg;
-    }
-    wantarray ? @$array : $array->[0];
-}
-
-sub encode_entities
-{
-    my $ref;
-    if (defined wantarray) {
-	my $x = $_[0];
-	$ref = \$x;     # copy
-    } else {
-	$ref = \$_[0];  # modify in-place
-    }
-    if (defined $_[1]) {
-	unless (exists $subst{$_[1]}) {
-	    # Because we can't compile regex we fake it with a cached sub
-	    $subst{$_[1]} =
-	      eval "sub {\$_[0] =~ s/([$_[1]])/\$char2entity{\$1}/g; }";
-	    die $@ if $@;
-	}
-	&{$subst{$_[1]}}($$ref);
-    } else {
-	# Encode control chars, high bit chars and '<', '&', '>', '"'
-	$$ref =~ s/([^\n\t !\#\$%\'-;=?-~])/$char2entity{$1}/g;
-    }
-    $$ref;
-}
-
-# Set up aliases
-*encode = \&encode_entities;
-*decode = \&decode_entities;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTML/Filter.pm b/testcases/ballista/ballista/perllib/HTML/Filter.pm
deleted file mode 100644
index 39e41a3..0000000
--- a/testcases/ballista/ballista/perllib/HTML/Filter.pm
+++ /dev/null
@@ -1,109 +0,0 @@
-package HTML::Filter;
-
-require HTML::Parser;
-@ISA=qw(HTML::Parser);
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-sub declaration { $_[0]->output("<!$_[1]>")     }
-sub comment     { $_[0]->output("<!--$_[1]-->") }
-sub start       { $_[0]->output($_[4])          }
-sub end         { $_[0]->output($_[2])          }
-sub text        { $_[0]->output($_[1])          }
-
-sub output      { print $_[1] }
-
-1;
-
-__END__
-
-=head1 NAME
-
-HTML::Filter - Filter HTML text through the parser
-
-=head1 SYNOPSIS
-
- require HTML::Filter;
- $p = HTML::Filter->new->parse_file("index.html");
-
-=head1 DESCRIPTION
-
-The I<HTML::Filter> is an HTML parser that by default prints the
-original text parsed (a slow version of cat(1) basically).  You can
-override the callback methods to modify the filtering for some of the
-HTML elements and you can override output() method which is called to
-print the HTML text.
-
-The I<HTML::Filter> is a subclass of I<HTML::Parser>. This means that
-the document should be given to the parser by calling the $p->parse()
-or $p->parse_file() methods.
-
-=head1 EXAMPLES
-
-The first example is a filter that will remove all comments from an
-HTML file.  This is achieved by simply overriding the comment method
-to do nothing.
-
-  package CommentStripper;
-  require HTML::Filter;
-  @ISA=qw(HTML::Filter);
-  sub comment { }  # ignore comments
-
-The second example shows a filter that will remove any E<lt>TABLE>s
-found in the HTML file.  We specialize the start() and end() methods
-to count table tags and then make output not happen when inside a
-table.
-
-  package TableStripper;
-  require HTML::Filter;
-  @ISA=qw(HTML::Filter);
-  sub start
-  {
-     my $self = shift;
-     $self->{table_seen}++ if $_[0] eq "table";
-     $self->SUPER::start(@_);
-  }  
-
-  sub end
-  {
-     my $self = shift;
-     $self->SUPER::end(@_);
-     $self->{table_seen}-- if $_[0] eq "table";
-  }
-
-  sub output
-  {
-      my $self = shift;
-      unless ($self->{table_seen}) {
-	  $self->SUPER::output(@_);
-      }
-  }
-
-If you want to collect the parsed text internally you might want to do
-something like this:
-
-  package FilterIntoString;
-  require HTML::Filter;
-  @ISA=qw(HTML::Filter);
-  sub output { push(@{$_[0]->{fhtml}}, $_[1]) }
-  sub filtered_html { join("", @{$_[0]->{fhtml}}) }
-
-=head1 BUGS
-
-Comments in declarations are removed from the declarations and then
-inserted as separate comments after the declaration.  If you turn on
-strict_comment(), then comments with embedded "--" are split into
-multiple comments.
-
-=head1 SEE ALSO
-
-L<HTML::Parser>
-
-=head1 COPYRIGHT
-
-Copyright 1997-1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTML/HeadParser.pm b/testcases/ballista/ballista/perllib/HTML/HeadParser.pm
deleted file mode 100644
index 0ec183d..0000000
--- a/testcases/ballista/ballista/perllib/HTML/HeadParser.pm
+++ /dev/null
@@ -1,288 +0,0 @@
-package HTML::HeadParser;
-
-=head1 NAME
-
-HTML::HeadParser - Parse <HEAD> section of a HTML document
-
-=head1 SYNOPSIS
-
- require HTML::HeadParser;
- $p = HTML::HeadParser->new;
- $p->parse($text) and  print "not finished";
-
- $p->header('Title')          # to access <title>....</title>
- $p->header('Content-Base')   # to access <base href="http://...">
- $p->header('Foo')            # to access <meta http-equiv="Foo" content="...">
-
-=head1 DESCRIPTION
-
-The I<HTML::HeadParser> is a specialized (and lightweight)
-I<HTML::Parser> that will only parse the E<lt>HEAD>...E<lt>/HEAD>
-section of an HTML document.  The parse() method
-will return a FALSE value as soon as some E<lt>BODY> element or body
-text are found, and should not be called again after this.
-
-The I<HTML::HeadParser> keeps a reference to a header object, and the
-parser will update this header object as the various elements of the
-E<lt>HEAD> section of the HTML document are recognized.  The following
-header fields are affected:
-
-=over 4
-
-=item Content-Base:
-
-The I<Content-Base> header is initialized from the E<lt>base
-href="..."> element.
-
-=item Title:
-
-The I<Title> header is initialized from the E<lt>title>...E<lt>/title>
-element.
-
-=item Isindex:
-
-The I<Isindex> header will be added if there is a E<lt>isindex>
-element in the E<lt>head>.  The header value is initialized from the
-I<prompt> attribute if it is present.  If not I<prompt> attribute is
-given it will have '?' as the value.
-
-=item X-Meta-Foo:
-
-All E<lt>meta> elements will initialize headers with the prefix
-"C<X-Meta->" on the name.  If the E<lt>meta> element contains a
-C<http-equiv> attribute, then it will be honored as the header name.
-
-=back
-
-=head1 METHODS
-
-The following methods (in addition to those provided by the
-superclass) are available:
-
-=over 4
-
-=cut
-
-
-require HTML::Parser;
-@ISA = qw(HTML::Parser);
-
-use HTML::Entities ();
-
-use strict;
-use vars qw($VERSION $DEBUG);
-#$DEBUG = 1;
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-my $FINISH = "HEAD PARSED\n";
-
-=item $hp = HTML::HeadParser->new( [$header] )
-
-The object constructor.  The optional $header argument should be a
-reference to an object that implement the header() and push_header()
-methods as defined by the I<HTTP::Headers> class.  Normally it will be
-of some class that isa or delegates to the I<HTTP::Headers> class.
-
-If no $header is given I<HTML::HeadParser> will create an
-I<HTTP::Header> object by itself (initially empty).
-
-=cut
-
-sub new
-{
-    my($class, $header) = @_;
-    unless ($header) {
-	require HTTP::Headers;
-	$header = HTTP::Headers->new;
-    }
-
-    my $self = $class->SUPER::new;
-    $self->{'header'} = $header;
-    $self->{'tag'} = '';   # name of active element that takes textual content
-    $self->{'text'} = '';  # the accumulated text associated with the element
-    $self;
-}
-
-=item $hp->parse( $text )
-
-Parses some HTML text (see HTML::Parser->parse()) but will return
-FALSE as soon as parsing should end.
-
-=cut
-
-sub parse
-{
-    my $self = shift;
-    eval { $self->SUPER::parse(@_) };
-    if ($@) {
-        print $@ if $DEBUG;
-	$self->{'_buf'} = '';  # flush rest of buffer
-	return '';
-    }
-    $self;
-}
-
-# more code duplication than I would like, but we need to treat the
-# return value from $self->parse as a signal to stop parsing.
-sub parse_file
-{
-    my($self, $file) = @_;
-    no strict 'refs';  # so that a symbol ref as $file works
-    local(*F);
-    unless (ref($file) || $file =~ /^\*[\w:]+$/) {
-        # Assume $file is a filename
-        open(F, $file) || die "Can't open $file: $!";
-        $file = \*F;
-    }
-    my $chunk = '';
-    while(read($file, $chunk, 512)) {
-        $self->parse($chunk) || last;
-    }
-    close($file);
-    return $self;
-}
-
-=item $hp->header;
-
-Returns a reference to the header object.
-
-=item $hp->header( $key )
-
-Returns a header value.  It is just a shorter way to write
-C<$hp-E<gt>header-E<gt>header($key)>.
-
-=cut
-
-sub header
-{
-    my $self = shift;
-    return $self->{'header'} unless @_;
-    $self->{'header'}->header(@_);
-}
-
-sub as_string    # legacy
-{
-    my $self = shift;
-    $self->{'header'}->as_string;
-}
-
-sub flush_text   # internal
-{
-    my $self = shift;
-    my $tag  = $self->{'tag'};
-    my $text = $self->{'text'};
-    $text =~ s/^\s+//; 
-    $text =~ s/\s+$//; 
-    $text =~ s/\s+/ /g;
-    print "FLUSH $tag => '$text'\n"  if $DEBUG;
-    if ($tag eq 'title') {
-	$self->{'header'}->header(Title => $text);
-    }
-    $self->{'tag'} = $self->{'text'} = '';
-}
-
-# This is an quote from the HTML3.2 DTD which shows which elements
-# that might be present in a <HEAD>...</HEAD>.  Also note that the
-# <HEAD> tags themselves might be missing:
-#
-# <!ENTITY % head.content "TITLE & ISINDEX? & BASE? & STYLE? &
-#                            SCRIPT* & META* & LINK*">
-# 
-# <!ELEMENT HEAD O O  (%head.content)>
-
-
-sub start
-{
-    my($self, $tag, $attr) = @_;  # $attr is reference to a HASH
-    print "START[$tag]\n" if $DEBUG;
-    $self->flush_text if $self->{'tag'};
-    if ($tag eq 'meta') {
-	my $key = $attr->{'http-equiv'};
-	if (!defined $key) {
-	    return unless $attr->{'name'};
-	    $key = "X-Meta-\u$attr->{'name'}";
-	}
-	$self->{'header'}->push_header($key => $attr->{content});
-    } elsif ($tag eq 'base') {
-	return unless exists $attr->{href};
-	$self->{'header'}->header('Content-Base' => $attr->{href});
-    } elsif ($tag eq 'isindex') {
-	# This is a non-standard header.  Perhaps we should just ignore
-	# this element
-	$self->{'header'}->header(Isindex => $attr->{prompt} || '?');
-    } elsif ($tag =~ /^(?:title|script|style)$/) {
-	# Just remember tag.  Initialize header when we see the end tag.
-	$self->{'tag'} = $tag;
-    } elsif ($tag eq 'link') {
-	return unless exists $attr->{href};
-	# <link href="http:..." rel="xxx" rev="xxx" title="xxx">
-	my $h_val = "<" . delete($attr->{href}) . ">";
-	for (sort keys %{$attr}) {
-	    $h_val .= qq(; $_="$attr->{$_}");
-	}
-	$self->{'header'}->header(Link => $h_val);
-    } elsif ($tag eq 'head' || $tag eq 'html') {
-	# ignore
-    } else {
-	die $FINISH;
-    }
-}
-
-sub end
-{
-    my($self, $tag) = @_;
-    print "END[$tag]\n" if $DEBUG;
-    $self->flush_text if $self->{'tag'};
-    die $FINISH if $tag eq 'head';
-}
-
-sub text
-{
-    my($self, $text) = @_;
-    print "TEXT[$text]\n" if $DEBUG;
-    my $tag = $self->{tag};
-    if (!$tag && $text =~ /\S/) {
-	# Normal text means start of body
-	die $FINISH;
-    }
-    return if $tag ne 'title';  # optimize skipping of <script> and <style>
-    HTML::Entities::decode($text);
-    $self->{'text'} .= $text;
-}
-
-1;
-
-__END__
-
-=head1 EXAMPLE
-
- $h = HTTP::Headers->new;
- $p = HTML::HeadParser->new($h);
- $p->parse(<<EOT);
- <title>Stupid example</title>
- <base href="http://www.sn.no/libwww-perl/">
- Normal text starts here.
- EOT
- undef $p;
- print $h->title;   # should print "Stupid example"
-
-=head1 SEE ALSO
-
-L<HTML::Parser>, L<HTTP::Headers>
-
-The I<HTTP::Headers> class is distributed as part of the I<libwww-perl>
-package.
-
-=head1 COPYRIGHT
-
-Copyright 1996-1998 Gisle Aas. All rights reserved.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=head1 AUTHOR
-
-Gisle Aas E<lt>aas@sn.no>
-
-=cut
-
diff --git a/testcases/ballista/ballista/perllib/HTML/LinkExtor.pm b/testcases/ballista/ballista/perllib/HTML/LinkExtor.pm
deleted file mode 100644
index 41e34da..0000000
--- a/testcases/ballista/ballista/perllib/HTML/LinkExtor.pm
+++ /dev/null
@@ -1,193 +0,0 @@
-package HTML::LinkExtor;
-
-=head1 NAME
-
-HTML::LinkExtor - Extract links from an HTML document
-
-=head1 SYNOPSIS
-
- require HTML::LinkExtor;
- $p = HTML::LinkExtor->new(\&cb, "http://www.sn.no/");
- sub cb {
-     my($tag, %links) = @_;
-     print "$tag @{[%links]}\n";
- }
- $p->parse_file("index.html");
-
-=head1 DESCRIPTION
-
-The I<HTML::LinkExtor> is an HTML parser that extract links from an
-HTML document.  The I<HTML::LinkExtor> is a subclass of
-I<HTML::Parser>. This means that the document should be given to the
-parser by calling the $p->parse() or $p->parse_file() methods.
-
-=cut
-
-require HTML::Parser;
-@ISA = qw(HTML::Parser);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use strict;
-use vars qw(%LINK_ELEMENT);
-
-# Elements that might contain links and the name of the link attribute
-%LINK_ELEMENT =
-(
- body   => 'background',
- base   => 'href',
- a      => 'href',
- img    => [qw(src lowsrc usemap)],   # 'lowsrc' is a Netscape invention
- form   => 'action',
- input  => 'src',
-'link'  => 'href',          # need quoting since link is a perl builtin
- frame  => 'src',
- applet => [qw(codebase code)],
- area   => 'href',
- frame  => 'src',   # Netscape 2.0 extention
- embed  => 'src',   # used in Netscape 2.0 for Shockwave and things like that
-);
-
-=over 4
-
-=item $p = HTML::LinkExtor->new([$callback[, $base]])
-
-The constructor takes two optional argument. The first is a reference
-to a callback routine. It will be called as links are found. If a
-callback is not provided, then links are just accumulated internally
-and can be retrieved by calling the $p->links() method.
-
-The $base is an optional base URL used to absolutize all URLs found.
-You need to have the I<URI::URL> module installed if you provide
-$base.
-
-The callback is called with the lowercase tag name as first argument,
-and then all link attributes as separate key/value pairs.  All
-non-link attributes are removed.
-
-=cut
-
-sub new
-{
-    my($class, $cb, $base) = @_;
-    my $self = $class->SUPER::new;
-    $self->{extractlink_cb} = $cb;
-    if ($base) {
-	require URI::URL;
-	$self->{extractlink_base} = URI::URL->new($base);
-    }
-    $self;
-}
-
-sub start
-{
-    my($self, $tag, $attr) = @_;  # $attr is reference to a HASH
-    return unless exists $LINK_ELEMENT{$tag};
-
-    my $base = $self->{extractlink_base};
-    my $links = $LINK_ELEMENT{$tag};
-    $links = [$links] unless ref $links;
-
-    my @links;
-    my $a;
-    for $a (@$links) {
-	next unless exists $attr->{$a};
-	push(@links, $a, $base ? URI::URL->new($attr->{$a}, $base)->abs
-                               : $attr->{$a});
-    }
-    return unless @links;
-    $self->_found_link($tag, @links);
-}
-
-sub _found_link
-{
-    my $self = shift;
-    my $cb = $self->{extractlink_cb};
-    if ($cb) {
-	&$cb(@_);
-    } else {
-	push(@{$self->{'links'}}, [@_]);
-    }
-}
-
-=item $p->links
-
-Returns a list of all links found in the document.  The returned
-values will be anonymous arrays with the follwing elements:
-
-  [$tag, $attr => $url1, $attr2 => $url2,...]
-
-The $p->links method will also truncate the internal link list.  This
-means that if the method is called twice without any parsing in
-between then the second call will return an empty list.
-
-Also note that $p->links will always be empty if a callback routine
-was provided when the I<HTML::LinkExtor> was created.
-
-=cut
-
-sub links
-{
-    my $self = shift;
-    exists($self->{'links'}) ? @{delete $self->{'links'}} : ();
-}
-
-# We override the parse_file() method so that we can clear the links
-# before we start with a new file.
-sub parse_file
-{
-    my $self = shift;
-    delete $self->{'links'};
-    $self->SUPER::parse_file(@_);
-}
-
-=back
-
-=head1 EXAMPLE
-
-This is an example showing how you can extract links from a document
-received using LWP:
-
-  use LWP::UserAgent;
-  use HTML::LinkExtor;
-  use URI::URL;
-
-  $url = "http://www.sn.no/";  # for instance
-  $ua = new LWP::UserAgent;
-
-  # Set up a callback that collect image links
-  my @imgs = ();
-  sub callback {
-     my($tag, %attr) = @_;
-     return if $tag ne 'img';  # we only look closer at <img ...>
-     push(@imgs, values %attr);
-  }
-
-  # Make the parser.  Unfortunately, we don't know the base yet
-  # (it might be diffent from $url)
-  $p = HTML::LinkExtor->new(\&callback);
-
-  # Request document and parse it as it arrives
-  $res = $ua->request(HTTP::Request->new(GET => $url),
-                      sub {$p->parse($_[0])});
-
-  # Expand all image URLs to absolute ones
-  my $base = $res->base;
-  @imgs = map { $_ = url($_, $base)->abs; } @imgs;
-
-  # Print them out
-  print join("\n", @imgs), "\n";
-
-=head1 SEE ALSO
-
-L<HTML::Parser>, L<LWP>, L<URI::URL>
-
-=head1 COPYRIGHT
-
-Copyright 1996-1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTML/Parser.pm b/testcases/ballista/ballista/perllib/HTML/Parser.pm
deleted file mode 100644
index bd8b586..0000000
--- a/testcases/ballista/ballista/perllib/HTML/Parser.pm
+++ /dev/null
@@ -1,439 +0,0 @@
-package HTML::Parser;
-
-# Author address: <gisle@aas.no>
-
-use strict;
-use HTML::Entities ();
-
-use vars qw($VERSION);
-$VERSION = "2.20";  # $Date: 2004/10/18 17:58:14 $
-
-
-sub new
-{
-    my $class = shift;
-    my $self = bless { '_buf'            => '',
-		       '_strict_comment' => 0,
-		     }, $class;
-    $self;
-}
-
-
-# A little note about the observed Netscape behaviour:
-#
-# It parse <xmp> in the depreceated 'literal' mode, i.e. no tags are
-# recognized until a </xmp> is found.
-# 
-# <listing> is parsed like <pre>, i.e. tags are recognized.  <listing>
-# are presentend in smaller font than <pre>
-#
-# Netscape does not parse this comment correctly (it terminates the comment
-# too early):
-#
-#    <! -- comment -- --> more comment -->
-#
-# Netscape ignores '<!--' and '-->' within the <SCRIPT> and <STYLE> tag.
-# This is used as a trick to make non-script-aware browsers ignore
-# the scripts.
-
-
-sub parse
-{
-    my $self = shift;
-    my $buf = \ $self->{'_buf'};
-    unless (defined $_[0]) {
-	# signals EOF (assume rest is plain text)
-	$self->text($$buf) if length $$buf;
-	$$buf = '';
-	return $self;
-    }
-    $$buf .= $_[0];
-    my $netscape_comment = !$self->{'_strict_comment'};
-
-    # Parse html text in $$buf.  The strategy is to remove complete
-    # tokens from the beginning of $$buf until we can't deside whether
-    # it is a token or not, or the $$buf is empty.
-
-  TOKEN:
-    while (1) {
-
-	# First we try to pull off any plain text (anything before a "<" char)
-	if ($$buf =~ s|^([^<]+)||) {
-	    if (length $$buf) {
-		$self->text($1);
-	    } else {
-		my $text = $1;
-		# At the end of the buffer, we should not parse white space
-		# but leave it for parsing on the next round.
-		if ($text =~ s|(\s+)$||) {
-		    $$buf = $1;
-                # Same treatment for chopped up entites and words.
-		# We must wait until we have it all.
-		} elsif ($text =~ s|(\s*\S+)$||) {
-		    $$buf = $1;
-		};
-		$self->text($text) if length $text;
-		last TOKEN;
-	    }
-
-	# Netscapes buggy comments are easy to handle
-	} elsif ($netscape_comment && $$buf =~ m|^<!--|) {
-	    if ($$buf =~ s|^<!--(.*?)-->||s) {
-		$self->comment($1);
-	    } else {
-		last TOKEN;  # must wait until we see the end of it
-	    }
-
-	# Then, markup declarations (usually either <!DOCTYPE...> or a comment)
-	} elsif ($$buf =~ s|^(<!)||) {
-	    my $eaten = $1;
-	    my $text = '';
-	    my @com = ();  # keeps comments until we have seen the end
-	    # Eat text and beginning of comment
-	    while ($$buf =~ s|^(([^>]*?)--)||) {
-		$eaten .= $1;
-		$text .= $2;
-		# Look for end of comment
-		if ($$buf =~ s|^((.*?)--)||s) {
-		    $eaten .= $1;
-		    push(@com, $2);
-		} else {
-		    # Need more data to get all comment text.
-		    $$buf = $eaten . $$buf;
-		    last TOKEN;
-		}
-	    }
-	    # Can we finish the tag
-	    if ($$buf =~ s|^([^>]*)>||) {
-		$text .= $1;
-		$self->declaration($text) if $text =~ /\S/;
-		# then tell about all the comments we found
-		for (@com) { $self->comment($_); }
-	    } else {
-		$$buf = $eaten . $$buf;  # must start with it all next time
-		last TOKEN;
-	    }
-
-        # Should we look for 'processing instructions' <? ...> ??
-	#} elsif ($$buf =~ s|<\?||) {
-	    # ...
-
-	# Then, look for a end tag
-	} elsif ($$buf =~ s|^</||) {
-	    # end tag
-	    if ($$buf =~ s|^([a-zA-Z][a-zA-Z0-9\.\-]*)(\s*>)||) {
-		$self->end(lc($1), "</$1$2");
-	    } elsif ($$buf =~ m|^[a-zA-Z]*[a-zA-Z0-9\.\-]*\s*$|) {
-		$$buf = "</" . $$buf;  # need more data to be sure
-		last TOKEN;
-	    } else {
-		# it is plain text after all
-		$self->text("</");
-	    }
-
-	# Then, finally we look for a start tag
-	} elsif ($$buf =~ s|^(<([a-zA-Z]+)>)||) {
-	    # special case plain start tags for slight speed-up (2.5%)
-	    $self->start(lc($2), {}, [], $1);
-
-	} elsif ($$buf =~ s|^<||) {
-	    # start tag
-	    my $eaten = '<';
-
-	    # This first thing we must find is a tag name.  RFC1866 says:
-	    #   A name consists of a letter followed by letters,
-	    #   digits, periods, or hyphens. The length of a name is
-	    #   limited to 72 characters by the `NAMELEN' parameter in
-	    #   the SGML declaration for HTML, 9.5, "SGML Declaration
-	    #   for HTML".  In a start-tag, the element name must
-	    #   immediately follow the tag open delimiter `<'.
-	    if ($$buf =~ s|^(([a-zA-Z][a-zA-Z0-9\.\-]*)\s*)||) {
-		$eaten .= $1;
-		my $tag = lc $2;
-		my %attr;
-		my @attrseq;
-
-		# Then we would like to find some attributes
-                #
-                # Arrgh!! Since stupid Netscape violates RCF1866 by
-                # using "_" in attribute names (like "ADD_DATE") of
-                # their bookmarks.html, we allow this too.
-		while ($$buf =~ s|^(([a-zA-Z][a-zA-Z0-9\.\-_]*)\s*)||) {
-		    $eaten .= $1;
-		    my $attr = lc $2;
-		    my $val;
-		    # The attribute might take an optional value (first we
-		    # check for an unquoted value)
-		    if ($$buf =~ s|(^=\s*([^\"\'>\s][^>\s]*)\s*)||) {
-			$eaten .= $1;
-			$val = $2;
-			HTML::Entities::decode($val);
-		    # or quoted by " or '
-		    } elsif ($$buf =~ s|(^=\s*([\"\'])(.*?)\2\s*)||s) {
-			$eaten .= $1;
-			$val = $3;
-			HTML::Entities::decode($val);
-                    # truncated just after the '=' or inside the attribute
-		    } elsif ($$buf =~ m|^(=\s*)$| or
-			     $$buf =~ m|^(=\s*[\"\'].*)|s) {
-			$$buf = "$eaten$1";
-			last TOKEN;
-		    } else {
-			# assume attribute with implicit value
-			$val = $attr;
-		    }
-		    $attr{$attr} = $val;
-		    push(@attrseq, $attr);
-		}
-
-		# At the end there should be a closing ">"
-		if ($$buf =~ s|^>||) {
-		    $self->start($tag, \%attr, \@attrseq, "$eaten>");
-		} elsif (length $$buf) {
-		    # Not a conforming start tag, regard it as normal text
-		    $self->text($eaten);
-		} else {
-		    $$buf = $eaten;  # need more data to know
-		    last TOKEN;
-		}
-
-	    } elsif (length $$buf) {
-		$self->text($eaten);
-	    } else {
-		$$buf = $eaten . $$buf;  # need more data to parse
-		last TOKEN;
-	    }
-
-	} else {
-	    #die if length($$buf);  # This should never happen
-	    last TOKEN; 	    # The buffer should be empty now
-	}
-    }
-
-    $self;
-}
-
-
-sub eof
-{
-    shift->parse(undef);
-}
-
-
-sub parse_file
-{
-    my($self, $file) = @_;
-    no strict 'refs';  # so that a symbol ref as $file works
-    local(*F);
-    unless (ref($file) || $file =~ /^\*[\w:]+$/) {
-	# Assume $file is a filename
-	open(F, $file) || die "Can't open $file: $!";
-	$file = \*F;
-    }
-    my $chunk = '';
-    while(read($file, $chunk, 512)) {
-	$self->parse($chunk);
-    }
-    close($file);
-    $self->eof;
-}
-
-
-sub strict_comment
-{
-    my $self = shift;
-    my $old = $self->{'_strict_comment'};
-    $self->{'_strict_comment'} = shift if @_;
-    return $old;
-}
-
-
-sub netscape_buggy_comment  # legacy
-{
-    my $self = shift;
-    my $old = !$self->strict_comment;
-    $self->strict_comment(!shift) if @_;
-    return $old;
-}
-
-
-sub text
-{
-    # my($self, $text) = @_;
-}
-
-sub declaration
-{
-    # my($self, $decl) = @_;
-}
-
-sub comment
-{
-    # my($self, $comment) = @_;
-}
-
-sub start
-{
-    # my($self, $tag, $attr, $attrseq, $origtext) = @_;
-    # $attr is reference to a HASH, $attrseq is reference to an ARRAY
-}
-
-sub end
-{
-    # my($self, $tag, $origtext) = @_;
-}
-
-1;
-
-
-__END__
-
-
-=head1 NAME
-
-HTML::Parser - SGML parser class
-
-=head1 SYNOPSIS
-
- require HTML::Parser;
- $p = HTML::Parser->new;  # should really a be subclass
- $p->parse($chunk1);
- $p->parse($chunk2);
- #...
- $p->eof;                 # signal end of document
-
- # Parse directly from file
- $p->parse_file("foo.html");
- # or
- open(F, "foo.html") || die;
- $p->parse_file(\*F);
-
-=head1 DESCRIPTION
-
-The C<HTML::Parser> will tokenize an HTML document when the parse()
-method is called by invoking various callback methods.  The document to
-be parsed can be supplied in arbitrary chunks.
-
-The external interface the an I<HTML::Parser> is:
-
-=over 4
-
-=item $p = HTML::Parser->new
-
-The object constructor takes no arguments.
-
-=item $p->parse( $string );
-
-Parse the $string as an HTML document.  Can be called multiple times.
-The return value is a reference to the parser object.
-
-=item $p->eof
-
-Signals end of document.  Call eof() to flush any remaining buffered
-text.  The return value is a reference to the parser object.
-
-=item $p->parse_file( $file );
-
-This method can be called to parse text from a file.  The argument can
-be a filename or an already opened file handle. The return value from
-parse_file() is a reference to the parser object.
-
-=item $p->strict_comment( [$bool] )
-
-By default we parse comments similar to how the popular browsers (like
-Netscape and MSIE) do it.  This means that comments will always be
-terminated by the first occurence of "-->".  This is not correct
-according to the "official" HTML standards.  The official behaviour
-can be enabled by calling the strict_comment() method with a TRUE
-argument.
-
-The return value from strict_comment() is the old attribute value.
-
-=back
-
-
-
-In order to make the parser do anything interesting, you must make a
-subclass where you override one or more of the following methods as
-appropriate:
-
-=over 4
-
-=item $self->declaration($decl)
-
-This method is called when a I<markup declaration> has been
-recognized.  For typical HTML documents, the only declaration you are
-likely to find is <!DOCTYPE ...>.  The initial "<!" and ending ">" is
-not part of the string passed as argument.  Comments are removed and
-entities will B<not> be expanded.
-
-=item $self->start($tag, $attr, $attrseq, $origtext)
-
-This method is called when a complete start tag has been recognized.
-The first argument is the tag name (in lower case) and the second
-argument is a reference to a hash that contain all attributes found
-within the start tag.  The attribute keys are converted to lower case.
-Entities found in the attribute values are already expanded.  The
-third argument is a reference to an array with the lower case
-attribute keys in the original order.  The fourth argument is the
-original HTML text.
-
-
-=item $self->end($tag, $origtext)
-
-This method is called when an end tag has been recognized.  The
-first argument is the lower case tag name, the second the original
-HTML text of the tag.
-
-=item $self->text($text)
-
-This method is called when plain text in the document is recognized.
-The text is passed on unmodified and might contain multiple lines.
-Note that for efficiency reasons entities in the text are B<not>
-expanded.  You should call HTML::Entities::decode($text) before you
-process the text any further.
-
-A sequence of text in the HTML document can be broken between several
-invokations of $self->text.  The parser will make sure that it does
-not break a word or a sequence of spaces between two invokations of
-$self->text().
-
-=item $self->comment($comment)
-
-This method is called as comments are recognized.  The leading and
-trailing "--" sequences have been stripped off the comment text.
-
-=back
-
-The default implementation of these methods do nothing, i.e., the
-tokens are just ignored.
-
-There is really nothing in the basic parser that is HTML specific, so
-it is likely that the parser can parse other kinds of SGML documents.
-SGML has many obscure features (not implemented by this module) that
-prevent us from renaming this module as C<SGML::Parser>.
-
-=head1 EFFICIENCY
-
-The parser is fairly inefficient if the chunks passed to $p->parse()
-are too big.  The reason is probably that perl ends up with a lot of
-character copying when tokens are removed from the beginning of the
-strings.  A chunck size of about 256-512 bytes was optimal in a test I
-made with some real world HTML documents.  (The parser was about 3
-times slower with a chunck size of 20K).
-
-=head1 SEE ALSO
-
-L<HTML::Entities>, L<HTML::TokeParser>, L<HTML::Filter>,
-L<HTML::HeadParser>, L<HTML::LinkExtor>
-
-L<HTML::TreeBuilder> (part of the I<HTML-Tree> distribution)
-
-=head1 COPYRIGHT
-
-Copyright 1996-1998 Gisle Aas. All rights reserved.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTML/TokeParser.pm b/testcases/ballista/ballista/perllib/HTML/TokeParser.pm
deleted file mode 100644
index c53b016..0000000
--- a/testcases/ballista/ballista/perllib/HTML/TokeParser.pm
+++ /dev/null
@@ -1,266 +0,0 @@
-package HTML::TokeParser;
-
-# $Id: TokeParser.pm,v 1.1 2004/10/18 17:58:14 mridge Exp $
-
-require HTML::Parser;
-@ISA=qw(HTML::Parser);
-
-use strict;
-use Carp qw(croak);
-use HTML::Entities qw(decode_entities);
-
-
-sub new
-{
-    my $class = shift;
-    my $file = shift;
-    croak "Usage: $class->new(\$file)" unless defined $file;
-    unless (ref $file) {
-	require IO::File;
-	$file = IO::File->new($file, "r") || return;
-    }
-    my $self = $class->SUPER::new;
-    $self->{file} = $file;
-    $self->{tokens} = [];
-    $self->{textify} = {img => "alt", applet => "alt"};
-    $self;
-}
-
-# Set up callback methods
-for (qw(declaration start end text comment)) {
-    my $t = uc(substr($_,0,1));
-    no strict 'refs';
-    *$_ = sub { my $self = shift; push(@{$self->{tokens}}, [$t, @_]) };
-}
-
-
-sub get_token
-{
-    my $self = shift;
-    while (!@{$self->{tokens}} && $self->{file}) {
-	# must try to parse more of the file
-	my $buf;
-	if (read($self->{file}, $buf, 512)) {
-	    $self->parse($buf);
-	} else {
-	    $self->eof;
-	    delete $self->{file};
-	}
-    }
-    shift @{$self->{tokens}};
-}
-
-
-sub unget_token
-{
-    my $self = shift;
-    unshift @{$self->{tokens}}, @_;
-    $self;
-}
-
-
-sub get_tag
-{
-    my $self = shift;
-    my $wanted = shift;
-    my $token;
-  GET_TOKEN:
-    {
-	$token = $self->get_token;
-	if ($token) {
-	    my $type = shift @$token;
-	    redo GET_TOKEN if $type !~ /^[SE]$/;
-	    substr($token->[0], 0, 0) = "/" if $type eq "E";
-	    redo GET_TOKEN if defined($wanted) && $token->[0] ne $wanted;
-	}
-    }
-    $token;
-}
-
-
-sub get_text
-{
-    my $self = shift;
-    my $endat = shift;
-    my @text;
-    while (my $token = $self->get_token) {
-	my $type = $token->[0];
-	if ($type eq "T") {
-	    push(@text, decode_entities($token->[1]));
-	} elsif ($type =~ /^[SE]$/) {
-	    my $tag = $token->[1];
-	    if ($type eq "S") {
-		if (exists $self->{textify}{$tag}) {
-		    my $alt = $self->{textify}{$tag};
-		    my $text;
-		    if (ref($alt)) {
-			$text = &$alt(@$token);
-		    } else {
-			$text = $token->[2]{$alt || "alt"};
-			$text = "[\U$tag]" unless defined $text;
-		    }
-		    push(@text, $text);
-		    next;
-		}
-	    } else {
-		$tag = "/$tag";
-	    }
-	    if (!defined($endat) || $endat eq $tag) {
-		 $self->unget_token($token);
-		 last;
-	    }
-	}
-    }
-    join("", @text);
-}
-
-
-sub get_trimmed_text
-{
-    my $self = shift;
-    my $text = $self->get_text(@_);
-    $text =~ s/^\s+//; $text =~ s/\s+$//; $text =~ s/\s+/ /g;
-    $text;
-}
-
-1;
-
-
-__END__
-
-=head1 NAME
-
-HTML::TokeParser - Alternative HTML::Parser interface
-
-=head1 SYNOPSIS
-
- require HTML::TokeParser;
- $p = HTML::TokeParser->new("index.html") || die "Can't open: $!";
- while (my $token = $p->get_token) {
-     #...
- }
-
-=head1 DESCRIPTION
-
-The HTML::TokeParser is an alternative interface to the HTML::Parser class.
-It basically turns the HTML::Parser inside out.  You associate a file
-(or any IO::Handle object) with the parser at construction time and
-then repeatedly call $parser->get_token to obtain the tags and text
-found in the parsed document.  No need to make a subclass to make the
-parser do anything.
-
-Calling the methods defined by the HTML::Parser base class will be
-confusing, so don't do that.  Use the following methods instead:
-
-=over 4
-
-=item $p = HTML::TokeParser->new( $file );
-
-The object constructor needs a file name or a reference to some file
-handle object as argument.  If a file name (plain scalar) is passed to
-the constructor and the file can't be opened for reading, then the
-constructor will return an undefined value.
-
-=item $p->get_token
-
-This method will return the next I<token> found in the HTML document,
-or C<undef> at the end of the document.  The token is returned as an
-array reference.  The first element of the array will be a single
-character string denoting the type of this token; "S" for start tag,
-"E" for end tag, "T" for text, "C" for comment, and "D" for
-declaration.  The rest of the array is the same as the arguments
-passed to the HTML::Parser callbacks (see L<HTML::Parser>).  This
-summarize the tokens that can occur:
-
-  ["S", $tag, %$attr, @$attrseq, $origtext]
-  ["E", $tag, $origtext]
-  ["T", $text]
-  ["C", $text]
-  ["D", $text]
-
-=item $p->unget_token($token,...)
-
-If you find out you have read too many tokens you can push them back,
-so that they are returned the next time $p->get_token is called.
-
-=item $p->get_tag( [$tag] )
-
-This method return the next tag (skipping any other tokens), or undef
-if there is no more tags in the document.  If an argument is given,
-then we skip tokens until the specified tag is found.  The tags are
-returned as a hash reference of the same form as for $p->get_token
-above, but the type code (first element) is missing and the name of
-end tags is prefixed with "/".  This means that the tags returned look
-like this:
-
-  [$tag, %$attr, @$attrseq, $origtext]
-  ["/$tag", $origtext]
-
-=item $p->get_text( [$endtag] )
-
-This method returns all text found at the current position. It might
-return a zero length string if there is no text.  The optional $endtag
-argument specify that any text occurring before the given tag is to be
-returned.  Any entities will be expanded to their corresponding
-character.
-
-The $p->{textify} attribute is a hash that define how certain tags can
-be treated as text.  If the name of a start tag match a key in this
-hash then this tag is converted to text.  The hash value is used to
-specify which tag attribute to obtain the text from.  If this
-attribute is missing, then the upper case name of the tag enclosed in
-brackets is returned, e.g. "[IMG]".  The hash value can also be a
-subroutine reference.  In this case the routine is called with the
-token content as parameters to obtain the text.
-
-The default $p->{textify} value is:
-
-  {img => "alt", applet => "alt"}
-
-This means that <IMG> and <APPLET> tags are treated as text, and that
-the text to substitute can be found as ALT attribute.
-
-=item $p->get_trimmed_text( [$endtag] )
-
-Same as $p->get_text above, but will collapse any sequence of white
-space to a single space character.  Leading and trailing space is
-removed.
-
-=back
-
-=head1 EXAMPLES
-
-This example extract all links from a document.  It will print one
-line for each link, containing the URL and the textual description
-between the <A>...</A> tags:
-
-  use HTML::TokeParser;
-  $p = HTML::TokeParser->new(shift||"index.html");
-
-  while (my $token = $p->get_tag("a")) {
-      my $url = $token->[1]{href} || "-";
-      my $text = $p->get_trimmed_text("/a");
-      print "$url\t$text\n";
-  }
-
-This example extract the <TITLE> from the document:
-
-  use HTML::TokeParser;
-  $p = HTML::TokeParser->new(shift||"index.html");
-  if ($p->get_tag("title")) {
-      my $title = $p->get_trimmed_text;
-      print "Title: $title\n";
-  }
-
-=head1 SEE ALSO
-
-L<HTML::Parser>
-
-=head1 COPYRIGHT
-
-Copyright 1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Cookies.pm b/testcases/ballista/ballista/perllib/HTTP/Cookies.pm
deleted file mode 100644
index 4bc7253..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Cookies.pm
+++ /dev/null
@@ -1,725 +0,0 @@
-package HTTP::Cookies;
-
-# Based on draft-ietf-http-state-man-mec-08.txt and
-# http://www.netscape.com/newsref/std/cookie_spec.html
-
-use strict;
-use HTTP::Date qw(str2time time2str);
-use HTTP::Headers::Util qw(split_header_words join_header_words);
-use LWP::Debug ();
-
-use vars qw($VERSION);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-=head1 NAME
-
-HTTP::Cookies - Cookie storage and management
-
-=head1 SYNOPSIS
-
- use HTTP::Cookies;
- $cookie_jar = HTTP::Cookies->new;
-
- $cookie_jar->add_cookie_header($request);
- $cookie_jar->extract_cookies($response);
-
-=head1 DESCRIPTION
-
-Cookies are a general mechanism which server side connections can use
-to both store and retrieve information on the client side of the
-connection.  For more information about cookies referrer to
-<URL:http://www.netscape.com/newsref/std/cookie_spec.html> and
-<URL:http://www.cookiecentral.com/>.  This module also implements the
-new style cookies as described in I<draft-ietf-http-state-man-mec-08.txt>.
-The two variants of cookies is supposed to be able to coexist happily.
-
-Instances of the class I<HTTP::Cookies> are able to store a collection
-of Set-Cookie2: and Set-Cookie:-headers and is able to use this
-information to initialize Cookie-headers in I<HTTP::Request> objects.
-The state of the I<HTTP::Cookies> can be saved and restored from
-files.
-
-=head1 METHODS
-
-The following methods are provided:
-
-=over 4
-
-=cut
-
-# A HTTP::Cookies object is a hash.  The main attribute is the
-# COOKIES 3 level hash:  $self->{COOKIES}{$domain}{$path}{$key}.
-
-
-=item $cookie_jar = HTTP::Cookies->new;
-
-The constructor.  Takes hash style parameters.  The following
-parameters are recognized:
-
-  file:            name of the file to restore and save cookies to
-  autosave:        should we save during destruction (bool)
-  ignore_discard:  save even cookies that are requested to be discarded (bool)
-
-Future parameters might include (not yet implemented):
-
-  max_cookies               300
-  max_cookies_per_domain    20
-  max_cookie_size           4096
-
-  no_cookies   list of domain names that we never return cookies to
-
-=cut
-
-sub new
-{
-    my $class = shift;
-    my $self = bless {
-	COOKIES => {},
-    }, $class;
-    my %cnf = @_;
-    for (keys %cnf) {
-	$self->{lc($_)} = $cnf{$_};
-    }
-    $self->load;
-    $self;
-}
-
-
-=item $cookie_jar->add_cookie_header($request);
-
-The add_cookie_header() method will set the appropriate Cookie:-header
-for the I<HTTP::Request> object given as argument.  The $request must
-have a valid url() attribute before this method is called.
-
-=cut
-
-sub add_cookie_header
-{
-    my $self = shift;
-    my $request = shift || return;
-    my $url = $request->url;
-    my $domain = $url->host;
-    $domain = "$domain.local" unless $domain =~ /\./;
-    my $secure_request = ($url->scheme eq "https");
-    my $req_path = $url->epath;
-    my $req_port = $url->port;
-    my $now = time();
-    $self->_normalize_path($req_path) if $req_path =~ /%/;
-
-    my @cval;    # cookie values for the "Cookie" header
-    my $set_ver;
-
-    while (($domain =~ tr/././) >= 2 || # must be at least 2 dots
-           $domain =~ /\.local$/)
-    {
-
-        LWP::Debug::debug("Checking $domain for cookies");
-	my $cookies = $self->{COOKIES}{$domain};
-	next unless $cookies;
-
-	# Want to add cookies corresponding to the most specific paths
-	# first (i.e. longest path first)
-	my $path;
-	for $path (sort {length($b) <=> length($a) } keys %$cookies) {
-            LWP::Debug::debug("- checking cookie path=$path");
-	    if (index($req_path, $path) != 0) {
-	        LWP::Debug::debug("  path $path:$req_path does not fit");
-		next;
-	    }
-
-	    my($key,$array);
-	    while (($key,$array) = each %{$cookies->{$path}}) {
-		my($version,$val,$port,$path_spec,$secure,$expires) = @$array;
-	        LWP::Debug::debug(" - checking cookie $key=$val");
-		if ($secure && !$secure_request) {
-		    LWP::Debug::debug("   not a secure requests");
-		    next;
-		}
-		if ($expires && $expires < $now) {
-		    LWP::Debug::debug("   expired");
-		    next;
-		}
-		if ($port) {
-		    my $found;
-		    if ($port =~ s/^_//) {
-			# The correponding Set-Cookie attribute was empty
-			$found++ if $port eq $req_port;
-			$port = "";
-		    } else {
-			my $p;
-			for $p (split(/,/, $port)) {
-			    $found++, last if $p eq $req_port;
-			}
-		    }
-		    unless ($found) {
-		        LWP::Debug::debug("   port $port:$req_port does not fit");
-			next;
-		    }
-		}
-	        LWP::Debug::debug("   it's a match");
-
-		# set version number of cookie header.
-	        # XXX: What should it be if multiple matching
-                #      Set-Cookie headers have different versions themselves
-		if (!$set_ver++) {
-		    if ($version >= 1) {
-			push(@cval, "\$Version=$version");
-		    } else {
-			$request->header(Cookie2 => "\$Version=1");
-		    }
-		}
-
-		# do we need to quote the value
-		if ($val =~ /\W/ && $version) {
-		    $val =~ s/([\\\"])/\\$1/g;
-		    $val = qq("$val");
-		}
-
-		# and finally remember this cookie
-		push(@cval, "$key=$val");
-		if ($version >= 1) {
-		    push(@cval, qq(\$Path="$path"))     if $path_spec;
-		    push(@cval, qq(\$Domain="$domain")) if $domain =~ /^\./;
-		    if (defined $port) {
-			my $p = '$Port';
-			$p .= qq(="$port") if length $port;
-			push(@cval, $p);
-		    }
-		}
-
-	    }
-        }
-
-    } continue {
-	# Try with a more general domain:  www.sol.no ==> .sol.no
-	$domain =~ s/^\.?[^.]*//;
-    }
-
-    $request->header(Cookie => join("; ", @cval)) if @cval;
-
-    $request;
-}
-
-
-=item $cookie_jar->extract_cookies($response);
-
-The extract_cookies() method will look for Set-Cookie: and
-Set-Cookie2:-headers in the I<HTTP::Response> object passed as
-argument.  If some of these headers are found they are used to update
-the state of the $cookie_jar.
-
-=cut
-
-sub extract_cookies
-{
-    my $self = shift;
-    my $response = shift || return;
-    my @set = split_header_words($response->_header("Set-Cookie2"));
-    my $netscape_cookies;
-    unless (@set) {
-	@set = $response->_header("Set-Cookie");
-	return $response unless @set;
-	$netscape_cookies++;
-    }
-
-    my $url = $response->request->url;
-    my $req_host = $url->host;
-    $req_host = "$req_host.local" unless $req_host =~ /\./;
-    my $req_port = $url->port;
-    my $req_path = $url->epath;
-    $self->_normalize_path($req_path) if $req_path =~ /%/;
-    
-    if ($netscape_cookies) {
-	# The old Netscape cookie format for Set-Cookie
-        # http://www.netscape.com/newsref/std/cookie_spec.html
-	# can for instance contain an unquoted "," in the expires
-	# field, so we have to use this ad-hoc parser.
-	my $now = time();
-	my @old = @set;
-	@set = ();
-	my $set;
-	for $set (@old) {
-	    my @cur;
-	    my $param;
-	    my $expires;
-	    for $param (split(/\s*;\s*/, $set)) {
-		my($k,$v) = split(/\s*=\s*/, $param, 2);
-		#print "$k => $v\n";
-		my $lc = lc($k);
-		if ($lc eq "expires") {
-		    push(@cur, "Max-Age" => str2time($v) - $now);
-		    $expires++;
-		} else {
-		    push(@cur, $k => $v);
-		}
-	    }
-	    push(@cur, "Port" => $req_port);
-	    push(@cur, "Discard" => undef) unless $expires;
-	    push(@cur, "Version" => 0);
-	    push(@set, \@cur);
-	}
-    }
-
-  SET_COOKIE:
-    for my $set (@set) {
-	next unless @$set >= 2;
-
-	my $key = shift @$set;
-	my $val = shift @$set;
-
-        LWP::Debug::debug("Set cookie $key => $val");
-
-	my %hash;
-	while (@$set) {
-	    my $k = shift @$set;
-	    my $v = shift @$set;
-	    my $lc = lc($k);
-	    # don't loose case distinction for unknown fields
-	    $k = $lc if $lc =~ /^(?:discard|domain|max-age|
-                                    path|port|secure|version)$/x;
-	    if ($k eq "discard" || $k eq "secure") {
-		$v = 1 unless defined $v;
-	    }
-	    next if exists $hash{$k};  # only first value is signigicant
-	    $hash{$k} = $v;
-	};
-
-	my %orig_hash = %hash;
-	my $version   = delete $hash{version};
-	$version = 1 unless defined($version);
-	my $discard   = delete $hash{discard};
-	my $secure    = delete $hash{secure};
-	my $maxage    = delete $hash{'max-age'};
-
-	# Check domain
-	my $domain  = delete $hash{domain};
-	if (defined($domain) && $domain ne $req_host) {
-	    if ($domain !~ /\./ && $domain ne "local") {
-	        LWP::Debug::debug("Domain $domain contains no dot");
-		next SET_COOKIE;
-	    }
-	    $domain = ".$domain" unless $domain =~ /^\./;
-	    if ($domain =~ /\.\d+$/) {
-	        LWP::Debug::debug("IP-address $domain illeagal as domain");
-		next SET_COOKIE;
-	    }
-	    my $len = length($domain);
-	    unless (substr($req_host, -$len) eq $domain) {
-	        LWP::Debug::debug("Domain $domain does not match host $req_host");
-		next SET_COOKIE;
-	    }
-	    my $hostpre = substr($req_host, 0, length($req_host) - $len);
-	    if ($hostpre =~ /\./ && !$netscape_cookies) {
-	        LWP::Debug::debug("Host prefix contain a dot: $hostpre => $domain");
-		next SET_COOKIE;
-	    }
-	} else {
-	    $domain = $req_host;
-	}
-
-	my $path = delete $hash{path};
-	my $path_spec;
-	if (defined $path) {
-	    $path_spec++;
-	    $self->_normalize_path($path) if $path =~ /%/;
-	    if (!$netscape_cookies &&
-                substr($req_path, 0, length($path)) ne $path) {
-	        LWP::Debug::debug("Path $path is not a prefix of $req_path");
-		next SET_COOKIE;
-	    }
-	} else {
-	    $path = $req_path;
-	    $path =~ s,/[^/]*$,,;
-	    $path = "/" unless length($path);
-	}
-
-	my $port;
-	if (exists $hash{port}) {
-	    $port = delete $hash{port};
-	    if (defined $port) {
-		$port =~ s/\s+//g;
-		my $found;
-		for my $p (split(/,/, $port)) {
-		    unless ($p =~ /^\d+$/) {
-		      LWP::Debug::debug("Bad port $port (not numeric)");
-			next SET_COOKIE;
-		    }
-		    $found++ if $p eq $req_port;
-		}
-		unless ($found) {
-		    LWP::Debug::debug("Request port ($req_port) not found in $port");
-		    next SET_COOKIE;
-		}
-	    } else {
-		$port = "_$req_port";
-	    }
-	}
-	$self->set_cookie($version,$key,$val,$path,$domain,$port,$path_spec,$secure,$maxage,$discard, \%hash)
-	    if $self->set_cookie_ok(\%orig_hash);
-    }
-
-    $response;
-}
-
-sub set_cookie_ok { 1 };
-
-=item $cookie_jar->set_cookie($version, $key, $val, $path, $domain, $port, $path_spec, $secure, $maxage, $discard, \%rest)
-
-The set_cookie() method updates the state of the $cookie_jar.  The
-$key, $val, $domain, $port and $path arguments are strings.  The
-$path_spec, $secure, $discard arguments are boolean values. The $maxage
-value is a number indicating number of seconds that this cookie will
-live.  A value <= 0 will delete this cookie.  The %rest are a place
-for various other attributes like "Comment" and "CommentURL".
-
-=cut
-
-sub set_cookie
-{
-    my $self = shift;
-    my($version,
-       $key, $val, $path, $domain, $port,
-       $path_spec, $secure, $maxage, $discard, $rest) = @_;
-
-    # there must always be at least 2 dots in a domain
-    return $self if ($domain =~ tr/././) < 2 &&
-                     $domain !~ /\.local$/;
-
-    # path and key can not be empty (key can't start with '$')
-    return $self if !defined($path) || $path !~ m,^/, ||
-	            !defined($key)  || $key  !~ m,[^\$],;
-
-    # ensure legal port
-    if (defined $port) {
-	return $self unless $port =~ /^_?\d+(?:,\d+)*$/;
-    }
-
-    my $expires;
-    if (defined $maxage) {
-	if ($maxage <= 0) {
-	    delete $self->{COOKIES}{$domain}{$path}{$key};
-	    return $self;
-	}
-	$expires = time() + $maxage;
-    }
-    $version = 0 unless defined $version;
-
-    my @array = ($version, $val,$port,
-		 $path_spec,
-		 $secure, $expires, $discard);
-    push(@array, {%$rest}) if defined($rest) && %$rest;
-    # trim off undefined values at end
-    pop(@array) while !defined $array[-1];
-
-    $self->{COOKIES}{$domain}{$path}{$key} = \@array;
-    $self;
-}
-
-=item $cookie_jar->save( [$file] );
-
-Calling this method file save the state of the $cookie_jar to a file.
-The state can then be restored later using the load() method.  If a
-filename is not specified we will use the name specified during
-construction.  If the attribute I<ignore_discared> is set, then we
-will even save cookies that are marked to be discarded.
-
-The default is to save a sequence of "Set-Cookie3" lines.  The
-"Set-Cookie3" is a proprietary LWP format, not known to be compatible
-with any other browser.  The I<HTTP::Cookies::Netscape> sub-class can
-be used to save in a format compatible with Netscape.
-
-=cut
-
-sub save
-{
-    my $self = shift;
-    my $file = shift || $self->{'file'} || return;
-    local(*FILE);
-    open(FILE, ">$file") or die "Can't open $file: $!";
-    print FILE "#LWP-Cookies-1.0\n";
-    print FILE $self->as_string(!$self->{ignore_discard});
-    close(FILE);
-    1;
-}
-
-=item $cookie_jar->load( [$file] );
-
-This method will read the cookies from the file and add them to the
-$cookie_jar.  The file must be in the format written by the save()
-method.
-
-=cut
-
-sub load
-{
-    my $self = shift;
-    my $file = shift || $self->{'file'} || return;
-    local(*FILE, $_);
-    open(FILE, $file) or return;
-    my $magic = <FILE>;
-    unless ($magic =~ /^\#LWP-Cookies-(\d+\.\d+)/) {
-	warn "$file does not seem to contain cookies";
-	return;
-    }
-    while (<FILE>) {
-	next unless s/^Set-Cookie3:\s*//;
-	chomp;
-	my $cookie;
-	for $cookie (split_header_words($_)) {
-	    my($key,$val) = splice(@$cookie, 0, 2);
-	    my %hash;
-	    while (@$cookie) {
-		my $k = shift @$cookie;
-		my $v = shift @$cookie;
-		$hash{$k} = $v;
-	    }
-	    my $version   = delete $hash{version};
-	    my $path      = delete $hash{path};
-	    my $domain    = delete $hash{domain};
-	    my $port      = delete $hash{port};
-	    my $expires   = str2time(delete $hash{expires});
-
-	    my $path_spec = exists $hash{path_spec}; delete $hash{path_spec};
-	    my $secure    = exists $hash{secure};    delete $hash{secure};
-	    my $discard   = exists $hash{discard};   delete $hash{discard};
-
-	    my @array =	($version,$val,$port,
-			 $path_spec,$secure,$expires,$discard);
-	    push(@array, \%hash) if %hash;
-	    $self->{COOKIES}{$domain}{$path}{$key} = \@array;
-	}
-    }
-    close(FILE);
-    1;
-}
-
-=item $cookie_jar->revert;
-
-Will revert to the state of last save.
-
-=cut
-
-sub revert
-{
-    my $self = shift;
-    $self->clear->load;
-    $self;
-}
-
-=item $cookie_jar->clear( [$domain, [$path, [$key] ] ]);
-
-Invoking this method without arguments will empty the whole
-$cookie_jar.  If given a single argument only cookies belonging to
-that domain will be removed.  If given two arguments, cookies
-belonging to the specified path within that domain is removed.  If
-given three arguments, then the cookie with the specified key, path
-and domain is removed.
-
-=cut
-
-sub clear
-{
-    my $self = shift;
-    if (@_ == 0) {
-	$self->{COOKIES} = {};
-    } elsif (@_ == 1) {
-	delete $self->{COOKIES}{$_[0]};
-    } elsif (@_ == 2) {
-	delete $self->{COOKIES}{$_[0]}{$_[1]};
-    } elsif (@_ == 3) {
-	delete $self->{COOKIES}{$_[0]}{$_[1]}{$_[2]};
-    } else {
-	require Carp;
-        Carp::carp('Usage: $c->clear([domain [,path [,key]]])');
-    }
-    $self;
-}
-
-sub DESTROY
-{
-    my $self = shift;
-    $self->save if $self->{'autosave'};
-}
-
-
-=item $cookie_jar->scan( \&callback );
-
-The argument is a subroutine that will be invoked for each cookie
-stored within the $cookie_jar.  The subroutine will be invoked with
-the following arguments:
-
-  0  version
-  1  key
-  2  val
-  3  path
-  4  domain
-  5  port
-  6  path_spec
-  7  secure
-  8  expires
-  9  discard
- 10  hash
-
-=cut
-
-sub scan
-{
-    my($self, $cb) = @_;
-    my($domain,$path,$key);
-    for $domain (sort keys %{$self->{COOKIES}}) {
-	for $path (sort keys %{$self->{COOKIES}{$domain}}) {
-	    for $key (sort keys %{$self->{COOKIES}{$domain}{$path}}) {
-		my($version,$val,$port,$path_spec,
-		   $secure,$expires,$discard,$rest) =
-		       @{$self->{COOKIES}{$domain}{$path}{$key}};
-		$rest = {} unless defined($rest);
-		&$cb($version,$key,$val,$path,$domain,$port,
-		     $path_spec,$secure,$expires,$discard,$rest);
-	    }
-	}
-    }
-}
-
-=item $cookie_jar->as_string( [$skip_discard] );
-
-The as_string() method will return the state of the $cookie_jar
-represented as a sequence of "Set-Cookie3" header lines separated by
-"\n".  If given a argument that is TRUE, it will not return lines for
-cookies with the I<Discard> attribute.
-
-=cut
-
-sub as_string
-{
-    my($self, $skip_discard) = @_;
-    my @res;
-    $self->scan(sub {
-	my($version,$key,$val,$path,$domain,$port,
-	   $path_spec,$secure,$expires,$discard,$rest) = @_;
-	return if $discard && $skip_discard;
-	my @h = ($key, $val);
-	push(@h, "path", $path);
-	push(@h, "domain" => $domain);
-	push(@h, "port" => $port) if defined $port;
-	push(@h, "path_spec" => undef) if $path_spec;
-	push(@h, "secure" => undef) if $secure;
-	push(@h, "expires" => HTTP::Date::time2isoz($expires)) if $expires;
-	push(@h, "discard" => undef) if $discard;
-	my $k;
-	for $k (sort keys %$rest) {
-	    push(@h, $k, $rest->{$k});
-	}
-	push(@h, "version" => $version);
-	push(@res, "Set-Cookie3: " . join_header_words(\@h));
-    });
-    join("\n", @res, "");
-}
-
-
-sub _normalize_path  # so that plain string compare can be used
-{
-    shift;  # $self
-    my $x;
-    $_[0] =~ s/%([0-9a-fA-F][0-9a-fA-F])/
-	         $x = uc($1);
-                 $x eq "2F" || $x eq "25" ? "%$x" :
-                                            pack("c", hex($x));
-              /eg;
-    $_[0] =~ s/([\0-\x20\x7f-\xff])/sprintf("%%%02X",ord($1))/eg;
-}
-
-
-
-=back
-
-=head1 SUB CLASSES
-
-We also provide a subclass called I<HTTP::Cookies::Netscape> which make
-cookie loading and saving compatible with Netscape cookie files.  You
-should be able to have LWP share Netscape's cookies by constructing
-your $cookie_jar like this:
-
- $cookie_jar = HTTP::Cookies::Netscape->new(
-                   File     => "$ENV{HOME}/.netscape/cookies",
-                   AutoSave => 1,
-               );
-
-Please note that the Netscape cookie file format is not able to store
-all the information available in the Set-Cookie2 headers, so you will
-probably loose some information if you save using this format.
-
-=cut
-
-package HTTP::Cookies::Netscape;
-
-use vars qw(@ISA);
-@ISA=qw(HTTP::Cookies);
-
-sub load
-{
-    my($self, $file) = @_;
-    $file ||= $self->{'file'} || return;
-    local(*FILE, $_);
-    my @cookies;
-    open(FILE, $file) || return;
-    my $magic = <FILE>;
-    unless ($magic =~ /^\# Netscape HTTP Cookie File/) {
-	warn "$file does not look like a netscape cookies file" if $^W;
-	close(FILE);
-	return;
-    }
-    my $now = time();
-    while (<FILE>) {
-	next if /^\s*\#/;
-	next if /^\s*$/;
-	chomp;
-	my($domain,$bool1,$path,$secure, $expires,$key,$val) = split(/\t/, $_);
-	$secure = ($secure eq "TRUE");
-	$self->set_cookie(undef,$key,$val,$path,$domain,undef,
-			  0,$secure,$expires-$now, 0);
-    }
-    close(FILE);
-    1;
-}
-
-sub save
-{
-    my($self, $file) = @_;
-    $file ||= $self->{'file'} || return;
-    local(*FILE, $_);
-    open(FILE, ">$file") || return;
-
-    print FILE <<EOT;
-# Netscape HTTP Cookie File
-# http://www.netscape.com/newsref/std/cookie_spec.html
-# This is a generated file!  Do not edit.
-
-EOT
-
-    my $now = time;
-    $self->scan(sub {
-	my($version,$key,$val,$path,$domain,$port,
-	   $path_spec,$secure,$expires,$discard,$rest) = @_;
-	return if $discard && !$self->{ignore_discard};
-	$expires ||= 0;
-	return if $now > $expires;
-	$secure = $secure ? "TRUE" : "FALSE";
-	my $bool = $domain =~ /^\./ ? "TRUE" : "FALSE";
-	print FILE join("\t", $domain, $bool, $path, $secure, $expires, $key, $val), "\n";
-    });
-    close(FILE);
-    1;
-}
-
-1;
-
-__END__
-
-=head1 COPYRIGHT
-
-Copyright 1997, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Daemon.pm b/testcases/ballista/ballista/perllib/HTTP/Daemon.pm
deleted file mode 100644
index dee5dcd..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Daemon.pm
+++ /dev/null
@@ -1,805 +0,0 @@
-# $Id: Daemon.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-#
-
-use strict;
-
-package HTTP::Daemon;
-
-=head1 NAME
-
-HTTP::Daemon - a simple http server class
-
-=head1 SYNOPSIS
-
-  use HTTP::Daemon;
-  use HTTP::Status;
-
-  my $d = new HTTP::Daemon;
-  print "Please contact me at: <URL:", $d->url, ">\n";
-  while (my $c = $d->accept) {
-      while (my $r = $c->get_request) {
-	  if ($r->method eq 'GET' and $r->url->path eq "/xyzzy") {
-              # remember, this is *not* recommened practice :-)
-	      $c->send_file_response("/etc/passwd");
-	  } else {
-	      $c->send_error(RC_FORBIDDEN)
-	  }
-      }
-      $c->close;
-      undef($c);
-  }
-
-=head1 DESCRIPTION
-
-Instances of the I<HTTP::Daemon> class are HTTP/1.1 servers that
-listens on a socket for incoming requests. The I<HTTP::Daemon> is a
-sub-class of I<IO::Socket::INET>, so you can do socket operations
-directly on it too.
-
-The accept() method will return when a connection from a client is
-available. The returned value will be a reference to a object of the
-I<HTTP::Daemon::ClientConn> class which is another I<IO::Socket::INET>
-subclass. Calling the get_request() method on this object will read
-data from the client and return an I<HTTP::Request> object reference.
-
-This HTTP daemon does not fork(2) for you.  Your application, i.e. the
-user of the I<HTTP::Daemon> is reponsible for forking if that is
-desirable.  Also note that the user is responsible for generating
-responses that conforms to the HTTP/1.1 protocol.  The
-I<HTTP::Daemon::ClientConn> provide some methods that make this easier.
-
-=head1 METHODS
-
-The following is a list of methods that are new (or enhanced) relative
-to the I<IO::Socket::INET> base class.
-
-=over 4
-
-=cut
-
-
-use vars qw($VERSION @ISA $PROTO $DEBUG);
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use IO::Socket ();
-@ISA=qw(IO::Socket::INET);
-
-$PROTO = "HTTP/1.1";
-
-=item $d = new HTTP::Daemon
-
-The object constructor takes the same parameters as the
-I<IO::Socket::INET> constructor.  It can be called without specifying
-any parameters. The daemon will then set up a listen queue of 5
-connections and allocate some random port number.  A server that want
-to bind to some specific address on the standard HTTP port will be
-constructed like this:
-
-  $d = new HTTP::Daemon
-        LocalAddr => 'www.someplace.com',
-        LocalPort => 80;
-
-=cut
-
-sub new
-{
-    my($class, %args) = @_;
-    $args{Listen} ||= 5;
-    $args{Proto}  ||= 'tcp';
-    my $self = $class->SUPER::new(%args);
-    return undef unless $self;
-
-    my $host = $args{LocalAddr};
-    unless ($host) {
-	require Sys::Hostname;
-	$host = Sys::Hostname::hostname();
-    }
-    ${*$self}{'httpd_server_name'} = $host;
-    $self;
-}
-
-
-=item $c = $d->accept([$pkg])
-
-Same as I<IO::Socket::accept> but will return an
-I<HTTP::Daemon::ClientConn> reference by default.  It will return
-undef if you have specified a timeout and no connection is made within
-that time.
-
-=cut
-
-sub accept
-{
-    my $self = shift;
-    my $pkg = shift || "HTTP::Daemon::ClientConn";
-    my $sock = $self->SUPER::accept($pkg);
-    ${*$sock}{'httpd_daemon'} = $self if $sock;
-    $sock;
-}
-
-
-=item $d->url
-
-Returns a URL string that can be used to access the server root.
-
-=cut
-
-sub url
-{
-    my $self = shift;
-    my $url = "http://";
-    $url .= ${*$self}{'httpd_server_name'};
-    my $port = $self->sockport;
-    $url .= ":$port" if $port != 80;
-    $url .= "/";
-    $url;
-}
-
-
-=item $d->product_tokens
-
-Returns the name that this server will use to identify itself.  This
-is the string that is sent with the I<Server> response header.  The
-main reason to have this method is that subclasses can override it if
-they want to use another product name.
-
-=cut
-
-sub product_tokens
-{
-    "libwww-perl-daemon/$HTTP::Daemon::VERSION";
-}
-
-
-package HTTP::Daemon::ClientConn;
-
-use vars qw(@ISA $DEBUG);
-use IO::Socket ();
-@ISA=qw(IO::Socket::INET);
-*DEBUG = \$HTTP::Daemon::DEBUG;
-
-use HTTP::Request  ();
-use HTTP::Response ();
-use HTTP::Status;
-use HTTP::Date qw(time2str);
-use URI::URL qw(url);
-use LWP::MediaTypes qw(guess_media_type);
-use Carp ();
-
-my $CRLF = "\015\012";   # "\r\n" is not portable
-my $HTTP_1_0 = _http_version("HTTP/1.0");
-my $HTTP_1_1 = _http_version("HTTP/1.1");
-
-=back
-
-The I<HTTP::Daemon::ClientConn> is also a I<IO::Socket::INET>
-subclass. Instances of this class are returned by the accept() method
-of the I<HTTP::Daemon>.  The following additional methods are
-provided:
-
-=over 4
-
-=item $c->get_request([$headers_only])
-
-This method will read data from the client and turn it into a
-I<HTTP::Request> object which is then returned.  It returns C<undef>
-if reading of the request fails.  If it fails, then the
-I<HTTP::Daemon::ClientConn> object ($c) should be discarded, and you
-should not call this method again.  The $c->reason method might give
-you some information on why $c->get_request returned C<undef>.
-
-The $c->get_request method support HTTP/1.1 request content bodies,
-including I<chunked> transfer encoding with footer and self delimiting
-I<multipart/*> content types.
-
-The $c->get_request method will normally not return until the whole
-request has been received from the client.  This might not be what you
-want if the request is an upload of a multi-mega-byte file (and with
-chunked transfer encoding HTTP can even support infinite request
-messages - uploading live audio for instance).  If you pass a TRUE
-value as the $headers_only argument, then $c->get_request will return
-immediately after parsing the request headers and you are responsible
-for reading the rest of the request content (and if you are going to
-call $c->get_request again on the same connection you better read the
-correct number of bytes).
-
-=cut
-
-sub get_request
-{
-    my($self, $only_headers) = @_;
-    if (${*$self}{'httpd_nomore'}) {
-        $self->reason("No more requests from this connection");
-	return;
-    }
-
-    $self->reason("");
-    my $buf = ${*$self}{'httpd_rbuf'};
-    $buf = "" unless defined $buf;
-    
-    my $timeout = $ {*$self}{'io_socket_timeout'};
-    my $fdset = "";
-    vec($fdset, $self->fileno, 1) = 1;
-    local($_);
-
-  READ_HEADER:
-    while (1) {
-	# loop until we have the whole header in $buf
-	$buf =~ s/^(?:\015?\012)+//;  # ignore leading blank lines
-	if ($buf =~ /\012/) {  # potential, has at least one line
-	    if ($buf =~ /^\w+[^\012]+HTTP\/\d+\.\d+\015?\012/) {
-		if ($buf =~ /\015?\012\015?\012/) {
-		    last READ_HEADER;  # we have it
-		} elsif (length($buf) > 16*1024) {
-		    $self->send_error(413); # REQUEST_ENTITY_TOO_LARGE
-		    $self->reason("Very long header");
-		    return;
-		}
-	    } else {
-		last READ_HEADER;  # HTTP/0.9 client
-	    }
-	} elsif (length($buf) > 16*1024) {
-	    $self->send_error(414); # REQUEST_URI_TOO_LARGE
-	    $self->reason("Very long first line");
-	    return;
-	}
-	print STDERR "Need more data for complete header\n" if $DEBUG;
-	return unless $self->_need_more($buf, $timeout, $fdset);
-    }
-    if ($buf !~ s/^(\w+)[ \t]+(\S+)(?:[ \t]+(HTTP\/\d+\.\d+))?[^\012]*\012//) {
-	$self->send_error(400);  # BAD_REQUEST
-	$self->reason("Bad request line");
-	return;
-    }
-    my $proto = $3 || "HTTP/0.9";
-    my $r = HTTP::Request->new($1, url($2, $self->daemon->url));
-    $r->protocol($proto);
-    ${*$self}{'httpd_client_proto'} = $proto = _http_version($proto);
-
-    if ($proto >= $HTTP_1_0) {
-	# we expect to find some headers
-	my($key, $val);
-      HEADER:
-	while ($buf =~ s/^([^\012]*)\012//) {
-	    $_ = $1;
-	    s/\015$//;
-	    if (/^([\w\-]+)\s*:\s*(.*)/) {
-		$r->push_header($key, $val) if $key;
-		($key, $val) = ($1, $2);
-	    } elsif (/^\s+(.*)/) {
-		$val .= " $1";
-	    } else {
-		last HEADER;
-	    }
-	}
-	$r->push_header($key, $val) if $key;
-    }
-
-    my $conn = $r->header('Connection');
-    if ($proto >= $HTTP_1_1) {
-	${*$self}{'httpd_nomore'}++ if $conn && lc($conn) =~ /\bclose\b/;
-    } else {
-	${*$self}{'httpd_nomore'}++ unless $conn &&
-                                           lc($conn) =~ /\bkeep-alive\b/;
-    }
-
-    if ($only_headers) {
-	${*$self}{'httpd_rbuf'} = $buf;
-        return $r;
-    }
-
-    # Find out how much content to read
-    my $te  = $r->header('Transfer-Encoding');
-    my $ct  = $r->header('Content-Type');
-    my $len = $r->header('Content-Length');
-
-    if ($te && lc($te) eq 'chunked') {
-	# Handle chunked transfer encoding
-	my $body = "";
-      CHUNK:
-	while (1) {
-	    print STDERR "Chunked\n" if $DEBUG;
-	    if ($buf =~ s/^([^\012]*)\012//) {
-		my $chunk_head = $1;
-		unless ($chunk_head =~ /^([0-9A-Fa-f]+)/) {
-		    $self->send_error(400);
-		    $self->reason("Bad chunk header $chunk_head");
-		    return;
-		}
-		my $size = hex($1);
-		last CHUNK if $size == 0;
-
-		my $missing = $size - length($buf) + 2; # 2=CRLF at chunk end
-		# must read until we have a complete chunk
-		while ($missing > 0) {
-		    print STDERR "Need $missing more bytes\n" if $DEBUG;
-		    my $n = $self->_need_more($buf, $timeout, $fdset);
-		    return unless $n;
-		    $missing -= $n;
-		}
-		$body .= substr($buf, 0, $size);
-		substr($buf, 0, $size+2) = '';
-
-	    } else {
-		# need more data in order to have a complete chunk header
-		return unless $self->_need_more($buf, $timeout, $fdset);
-	    }
-	}
-	$r->content($body);
-
-	# pretend it was a normal entity body
-	$r->remove_header('Transfer-Encoding');
-	$r->header('Content-Length', length($body));
-
-	my($key, $val);
-      FOOTER:
-	while (1) {
-	    if ($buf !~ /\012/) {
-		# need at least one line to look at
-		return unless $self->_need_more($buf, $timeout, $fdset);
-	    } else {
-		$buf =~ s/^([^\012]*)\012//;
-		$_ = $1;
-		s/\015$//;
-		if (/^([\w\-]+)\s*:\s*(.*)/) {
-		    $r->push_header($key, $val) if $key;
-		    ($key, $val) = ($1, $2);
-		} elsif (/^\s+(.*)/) {
-		    $val .= " $1";
-		} elsif (!length) {
-		    last FOOTER;
-		} else {
-		    $self->reason("Bad footer syntax");
-		    return;
-		}
-	    }
-	}
-	$r->push_header($key, $val) if $key;
-
-    } elsif ($te) {
-	$self->send_error(501); 	# Unknown transfer encoding
-	$self->reason("Unknown transfer encoding '$te'");
-	return;
-
-    } elsif ($ct && lc($ct) =~ m/^multipart\/\w+\s*;.*boundary\s*=\s*(\w+)/) {
-	# Handle multipart content type
-	my $boundary = "$CRLF--$1--$CRLF";
-	my $index;
-	while (1) {
-	    $index = index($buf, $boundary);
-	    last if $index >= 0;
-	    # end marker not yet found
-	    return unless $self->_need_more($buf, $timeout, $fdset);
-	}
-	$index += length($boundary);
-	$r->content(substr($buf, 0, $index));
-	substr($buf, 0, $index) = '';
-
-    } elsif ($len) {
-	# Plain body specified by "Content-Length"
-	my $missing = $len - length($buf);
-	while ($missing > 0) {
-	    print "Need $missing more bytes of content\n" if $DEBUG;
-	    my $n = $self->_need_more($buf, $timeout, $fdset);
-	    return unless $n;
-	    $missing -= $n;
-	}
-	if (length($buf) > $len) {
-	    $r->content(substr($buf,0,$len));
-	    substr($buf, 0, $len) = '';
-	} else {
-	    $r->content($buf);
-	    $buf='';
-	}
-    }
-    ${*$self}{'httpd_rbuf'} = $buf;
-
-    $r;
-}
-
-sub _need_more
-{
-    my $self = shift;
-    #my($buf,$timeout,$fdset) = @_;
-    if ($_[1]) {
-	my($timeout, $fdset) = @_[1,2];
-	print STDERR "select(,,,$timeout)\n" if $DEBUG;
-	my $n = select($fdset,undef,undef,$timeout);
-	unless ($n) {
-	    $self->reason(defined($n) ? "Timeout" : "select: $!");
-	    return;
-	}
-    }
-    print STDERR "sysread()\n" if $DEBUG;
-    my $n = sysread($self, $_[0], 2048, length($_[0]));
-    $self->reason(defined($n) ? "Client closed" : "sysread: $!") unless $n;
-    $n;
-}
-
-=item $c->read_buffer([$new_value])
-
-Bytes read by $c->get_request, but not used are placed in the I<read
-buffer>.  The next time $c->get_request is called it will consume the
-bytes in this buffer before reading more data from the network
-connection itself.  The read buffer is invalid after $c->get_request
-has returned an undefined value.
-
-If you handle the reading of the request content yourself you need to
-empty this buffer before you read more and you need to place
-unconsumed bytes here.  You also need this buffer if you implement
-services like I<101 Switching Protocols>.
-
-This method always return the old buffer content and can optionally
-update the buffer content if you pass it an argument.
-
-=cut
-
-sub read_buffer
-{
-    my $self = shift;
-    my $old = ${*$self}{'httpd_rbuf'};
-    if (@_) {
-	${*$self}{'httpd_rbuf'} = shift;
-    }
-    $old;
-}
-
-
-=item $c->reason
-
-When $c->get_request returns C<undef> you can obtain a short string
-describing why it happened by calling $c->reason.
-
-=cut
-
-sub reason
-{
-    my $self = shift;
-    my $old = ${*$self}{'httpd_reason'};
-    if (@_) {
-        ${*$self}{'httpd_reason'} = shift;
-    }
-    $old;
-}
-
-
-=item $c->proto_ge($proto)
-
-Returns TRUE if the client announced a protocol with version number
-greater or equal to the given argument.  The $proto argument can be a
-string like "HTTP/1.1" or just "1.1".
-
-=cut
-
-sub proto_ge
-{
-    my $self = shift;
-    ${*$self}{'httpd_client_proto'} >= _http_version(shift);
-}
-
-sub _http_version
-{
-    local($_) = shift;
-    return 0 unless m,^(?:HTTP/)?(\d+)\.(\d+)$,i;
-    $1 * 1000 + $2;
-}
-
-=item $c->antique_client
-
-Returns TRUE if the client speaks the HTTP/0.9 protocol.  No status
-code and no headers should be returned to such a client.  This should
-be the same as !$c->proto_ge("HTTP/1.0").
-
-=cut
-
-sub antique_client
-{
-    my $self = shift;
-    ${*$self}{'httpd_client_proto'} < $HTTP_1_0;
-}
-
-
-=item $c->force_last_request
-
-Make sure that $c->get_request will not try to read more requests off
-this connection.  If you generate a response that is not self
-delimiting, then you should signal this fact by calling this method.
-
-This attribute is turned on automatically if the client announce
-protocol HTTP/1.0 or worse and does not include a "Connection:
-Keep-Alive" header.  It is also turned on automatically when HTTP/1.1
-or better clients send the "Connection: close" request header.
-
-=cut
-
-sub force_last_request
-{
-    my $self = shift;
-    ${*$self}{'httpd_nomore'}++;
-}
-
-
-=item $c->send_status_line( [$code, [$mess, [$proto]]] )
-
-Sends the status line back to the client.  If $code is omitted 200 is
-assumed.  If $mess is omitted, then a message corresponding to $code
-is inserted.  If $proto is missing the content of the
-$HTTP::Daemon::PROTO variable is used.
-
-=cut
-
-sub send_status_line
-{
-    my($self, $status, $message, $proto) = @_;
-    return if $self->antique_client;
-    $status  ||= RC_OK;
-    $message ||= status_message($status) || "";
-    $proto   ||= $HTTP::Daemon::PROTO || "HTTP/1.1";
-    print $self "$proto $status $message$CRLF";
-}
-
-=item $c->send_crlf
-
-Send the CRLF sequence to the client.
-
-=cut
-
-
-sub send_crlf
-{
-    my $self = shift;
-    print $self $CRLF;
-}
-
-
-=item $c->send_basic_header( [$code, [$mess, [$proto]]] )
-
-Sends the status line and the "Date:" and "Server:" headers back to
-the client.  This header is assumed to be continued and does not end
-with an empty CRLF line.
-
-=cut
-
-sub send_basic_header
-{
-    my $self = shift;
-    return if $self->antique_client;
-    $self->send_status_line(@_);
-    print $self "Date: ", time2str(time), $CRLF;
-    my $product = $self->daemon->product_tokens;
-    print $self "Server: $product$CRLF" if $product;
-}
-
-
-=item $c->send_response( [$res] )
-
-Takes a I<HTTP::Response> object as parameter and write it back to the
-client as the response.  We try hard to make sure that the response is
-self delimiting so that the connection can stay persistent for further
-request/response exchanges.
-
-The content attribute of the I<HTTP::Response> object can be a normal
-string or a subroutine reference.  If it is a subroutine, then
-whatever this callback routine returns will be written back to the
-client as the response content.  The routine will be called until it
-return an undefined or empty value.  If the client is HTTP/1.1 aware
-then we will use the chunked transfer encoding for the response.
-
-=cut
-
-sub send_response
-{
-    my $self = shift;
-    my $res = shift;
-    if (!ref $res) {
-	$res ||= RC_OK;
-	$res = HTTP::Response->new($res, @_);
-    }
-    my $content = $res->content;
-    my $chunked;
-    unless ($self->antique_client) {
-	my $code = $res->code;
-	$self->send_basic_header($code, $res->message, $res->protocol);
-	if ($code =~ /^(1\d\d|[23]04)$/) {
-	    # make sure content is empty
-	    $res->remove_header("Content-Length");
-	    $content = "";
-	} elsif ($res->request && $res->request->method eq "HEAD") {
-	    # probably OK
-	} elsif (ref($content) eq "CODE") {
-	    if ($self->proto_ge("HTTP/1.1")) {
-		$res->push_header("Transfer-Encoding" => "chunked");
-		$chunked++;
-	    } else {
-		$self->force_last_request;
-	    }
-	} elsif (length($content)) {
-	    $res->header("Content-Length" => length($content));
-	} else {
-	    $self->force_last_request;
-	}
-	print $self $res->headers_as_string($CRLF);
-	print $self $CRLF;  # separates headers and content
-    }
-    if (ref($content) eq "CODE") {
-	while (1) {
-	    my $chunk = &$content();
-	    last unless defined($chunk) && length($chunk);
-	    if ($chunked) {
-		printf $self "%x%s%s%s", length($chunk), $CRLF, $chunk, $CRLF;
-	    } else {
-		print $self $chunk;
-	    }
-	}
-	print $self "0$CRLF$CRLF" if $chunked;  # no trailers either
-    } elsif (length $content) {
-	print $self $content;
-    }
-}
-
-
-=item $c->send_redirect( $loc, [$code, [$entity_body]] )
-
-Sends a redirect response back to the client.  The location ($loc) can
-be an absolute or a relative URL. The $code must be one the redirect
-status codes, and it defaults to "301 Moved Permanently"
-
-=cut
-
-sub send_redirect
-{
-    my($self, $loc, $status, $content) = @_;
-    $status ||= RC_MOVED_PERMANENTLY;
-    Carp::croak("Status '$status' is not redirect") unless is_redirect($status);
-    $self->send_basic_header($status);
-    $loc = url($loc, $self->daemon->url) unless ref($loc);
-    $loc = $loc->abs;
-    print $self "Location: $loc$CRLF";
-    if ($content) {
-	my $ct = $content =~ /^\s*</ ? "text/html" : "text/plain";
-	print $self "Content-Type: $ct$CRLF";
-    }
-    print $self $CRLF;
-    print $self $content if $content;
-    $self->force_last_request;  # no use keeping the connection open
-}
-
-
-=item $c->send_error( [$code, [$error_message]] )
-
-Send an error response back to the client.  If the $code is missing a
-"Bad Request" error is reported.  The $error_message is a string that
-is incorporated in the body of the HTML entity body.
-
-=cut
-
-sub send_error
-{
-    my($self, $status, $error) = @_;
-    $status ||= RC_BAD_REQUEST;
-    Carp::croak("Status '$status' is not an error") unless is_error($status);
-    my $mess = status_message($status);
-    $error  ||= "";
-    $mess = <<EOT;
-<title>$status $mess</title>
-<h1>$status $mess</h1>
-$error
-EOT
-    unless ($self->antique_client) {
-        $self->send_basic_header($status);
-        print $self "Content-Type: text/html$CRLF";
-	print $self "Content-Length: " . length($mess) . $CRLF;
-        print $self $CRLF;
-    }
-    print $self $mess;
-    $status;
-}
-
-
-=item $c->send_file_response($filename)
-
-Send back a response with the specified $filename as content.  If the
-file happen to be a directory we will try to generate an HTML index
-of it.
-
-=cut
-
-sub send_file_response
-{
-    my($self, $file) = @_;
-    if (-d $file) {
-	$self->send_dir($file);
-    } elsif (-f _) {
-	# plain file
-	local(*F);
-	sysopen(F, $file, 0) or 
-	  return $self->send_error(RC_FORBIDDEN);
-	my($ct,$ce) = guess_media_type($file);
-	my($size,$mtime) = (stat _)[7,9];
-	unless ($self->antique_client) {
-	    $self->send_basic_header;
-	    print $self "Content-Type: $ct$CRLF";
-	    print $self "Content-Encoding: $ce$CRLF" if $ce;
-	    print $self "Content-Length: $size$CRLF" if $size;
-	    print $self "Last-Modified: ", time2str($mtime), "$CRLF" if $mtime;
-	    print $self $CRLF;
-	}
-	$self->send_file(\*F);
-	return RC_OK;
-    } else {
-	$self->send_error(RC_NOT_FOUND);
-    }
-}
-
-
-sub send_dir
-{
-    my($self, $dir) = @_;
-    $self->send_error(RC_NOT_FOUND) unless -d $dir;
-    $self->send_error(RC_NOT_IMPLEMENTED);
-}
-
-
-=item $c->send_file($fd);
-
-Copies the file back to the client.  The file can be a string (which
-will be interpreted as a filename) or a reference to an I<IO::Handle>
-or glob.
-
-=cut
-
-sub send_file
-{
-    my($self, $file) = @_;
-    my $opened = 0;
-    if (!ref($file)) {
-	local(*F);
-	open(F, $file) || return undef;
-	binmode(F);
-	$file = \*F;
-	$opened++;
-    }
-    my $cnt = 0;
-    my $buf = "";
-    my $n;
-    while ($n = sysread($file, $buf, 8*1024)) {
-	last if !$n;
-	$cnt += $n;
-	print $self $buf;
-    }
-    close($file) if $opened;
-    $cnt;
-}
-
-
-=item $c->daemon
-
-Return a reference to the corresponding I<HTTP::Daemon> object.
-
-=cut
-
-sub daemon
-{
-    my $self = shift;
-    ${*$self}{'httpd_daemon'};
-}
-
-=back
-
-=head1 SEE ALSO
-
-RFC 2068
-
-L<IO::Socket>, L<Apache>
-
-=head1 COPYRIGHT
-
-Copyright 1996-1998, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTTP/Date.pm b/testcases/ballista/ballista/perllib/HTTP/Date.pm
deleted file mode 100644
index d8f1042..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Date.pm
+++ /dev/null
@@ -1,330 +0,0 @@
-# $Id: Date.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-#
-package HTTP::Date;
-
-=head1 NAME
-
-HTTP::Date - date conversion routines
-
-=head1 SYNOPSIS
-
- use HTTP::Date;
-
- $string = time2str($time);    # Format as GMT ASCII time
- $time = str2time($string);    # convert ASCII date to machine time
-
-=head1 DESCRIPTION
-
-This module provides two functions that deal with the HTTP date
-format.  The following functions are provided:
-
-=over 4
-
-=item time2str([$time])
-
-The time2str() function converts a machine time (seconds since epoch)
-to a string.  If the function is called without an argument, it will
-use the current time.
-
-The string returned is in the format defined by the HTTP/1.0
-specification.  This is a fixed length subset of the format defined by
-RFC 1123, represented in Universal Time (GMT).  An example of this
-format is:
-
-   Thu, 03 Feb 1994 17:09:00 GMT
-
-=item str2time($str [, $zone])
-
-The str2time() function converts a string to machine time.  It returns
-C<undef> if the format is unrecognized, or the year is not between 1970
-and 2038.  The function is able to parse the following formats:
-
- "Wed, 09 Feb 1994 22:23:32 GMT"       -- HTTP format
- "Thu Feb  3 17:03:55 GMT 1994"        -- ctime(3) format
- "Thu Feb  3 00:00:00 1994",           -- ANSI C asctime() format
- "Tuesday, 08-Feb-94 14:15:29 GMT"     -- old rfc850 HTTP format
- "Tuesday, 08-Feb-1994 14:15:29 GMT"   -- broken rfc850 HTTP format
-
- "03/Feb/1994:17:03:55 -0700"   -- common logfile format
- "09 Feb 1994 22:23:32 GMT"     -- HTTP format (no weekday)
- "08-Feb-94 14:15:29 GMT"       -- rfc850 format (no weekday)
- "08-Feb-1994 14:15:29 GMT"     -- broken rfc850 format (no weekday)
-
- "1994-02-03 14:15:29 -0100"    -- ISO 8601 format
- "1994-02-03 14:15:29"          -- zone is optional
- "1994-02-03"                   -- only date
- "1994-02-03T14:15:29"          -- Use T as separator
- "19940203T141529Z"             -- ISO 8601 compact format
- "19940203"                     -- only date
-
- "08-Feb-94"         -- old rfc850 HTTP format    (no weekday, no time)
- "08-Feb-1994"       -- broken rfc850 HTTP format (no weekday, no time)
- "09 Feb 1994"       -- proposed new HTTP format  (no weekday, no time)
- "03/Feb/1994"       -- common logfile format     (no time, no offset)
-
- "Feb  3  1994"      -- Unix 'ls -l' format
- "Feb  3 17:03"      -- Unix 'ls -l' format
-
- "11-15-96  03:52PM" -- Windows 'dir' format
-
-The parser ignores leading and trailing whitespace.  It also allow the
-seconds to be missing and the month to be numerical in most formats.
-
-The str2time() function takes an optional second argument that
-specifies the default time zone to use when converting the date.  This
-zone specification should be numerical (like "-0800" or "+0100") or
-"GMT".  This parameter is ignored if the zone is specified in the date
-string itself.  It this parameter is missing, and the date string
-format does not contain any zone specification then the local time
-zone is assumed.
-
-If the year is missing, then we assume that the date is the first
-matching date I<before> current time.
-
-=back
-
-=head1 BUGS
-
-Non-numerical time zones (like MET, PST) are all treated like GMT.
-Do not use them.  HTTP does not use them.
-
-The str2time() function has been told how to parse far too many
-formats.  This makes the module name misleading. To be sure it is
-really misleading you can also import the time2iso() and time2isoz()
-functions.  They work like time2str() but produce ISO-8601 formated
-strings (YYYY-MM-DD hh:mm:ss).
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-sub Version { $VERSION; }
-
-require 5.002;
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(time2str str2time);
-@EXPORT_OK = qw(time2iso time2isoz);
-
-use Time::Local ();
-
-use strict;
-use vars qw(@DoW @MoY %MoY);
-
-#@DoW = qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday);
-@DoW = qw(Sun Mon Tue Wed Thu Fri Sat);
-@MoY = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-# Build %MoY hash
-my $i = 0;
-foreach(@MoY) {
-   $MoY{lc $_} = $i++;
-}
-
-my($current_month, $current_year) = (localtime)[4, 5];
-
-
-
-
-sub time2str (;$)
-{
-   my $time = shift;
-   $time = time unless defined $time;
-   my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($time);
-   sprintf("%s, %02d %s %04d %02d:%02d:%02d GMT",
-	   $DoW[$wday],
-	   $mday, $MoY[$mon], $year+1900,
-	   $hour, $min, $sec);
-}
-
-
-
-sub str2time ($;$)
-{
-   local($_) = shift;
-   return undef unless defined;
-   my($default_zone) = @_;
-
-   # Remove useless weekday, if it exists
-   s/^\s*(?:sun|mon|tue|wed|thu|fri|sat)\w*,?\s*//i;
-
-   my($day, $mon, $yr, $hr, $min, $sec, $tz, $aorp);
-   my $offset = 0;  # used when compensating for timezone
-
- PARSEDATE: {
-      # Then we are able to check for most of the formats with this regexp
-      ($day,$mon,$yr,$hr,$min,$sec,$tz) =
-	/^\s*
-	 (\d\d?)               # day
-	    (?:\s+|[-\/])
-	 (\w+)                 # month
-	    (?:\s+|[-\/])
-	 (\d+)                 # year
-	 (?:
-	       (?:\s+|:)       # separator before clock
-	    (\d\d?):(\d\d)     # hour:min
-	    (?::(\d\d))?       # optional seconds
-	 )?                    # optional clock
-	    \s*
-	 ([-+]?\d{2,4}|GMT|gmt)? # timezone
-	    \s*$
-	/x
-	  and last PARSEDATE;
-
-      # Try the ctime and asctime format
-      ($mon, $day, $hr, $min, $sec, $tz, $yr) =
-	/^\s*                  # allow intial whitespace
-	 (\w{1,3})             # month
-	    \s+
-	 (\d\d?)               # day
-	    \s+
-	 (\d\d?):(\d\d)        # hour:min
-	 (?::(\d\d))?          # optional seconds
-	    \s+
-	 (?:(GMT|gmt)\s+)?     # optional GMT timezone
-	 (\d+)                 # year
-	    \s*$               # allow trailing whitespace
-	/x
-	  and last PARSEDATE;
-
-      # Then the Unix 'ls -l' date format
-      ($mon, $day, $yr, $hr, $min, $sec) =
-	/^\s*
-	 (\w{3})               # month
-	    \s+
-	 (\d\d?)               # day
-	    \s+
-	 (?:
-	    (\d\d\d\d) |       # year
-	    (\d{1,2}):(\d{2})  # hour:min
-            (?::(\d\d))?       # optional seconds
-	 )
-	 \s*$
-       /x
-	 and last PARSEDATE;
-
-      # ISO 8601 format '1996-02-29 12:00:00 -0100' and variants
-      ($yr, $mon, $day, $hr, $min, $sec, $tz) =
-	/^\s*
-	  (\d{4})              # year
-	     [-\/]?
-	  (\d\d?)              # numerical month
-	     [-\/]?
-	  (\d\d?)              # day
-	 (?:
-	       (?:\s+|:|T|-)   # separator before clock
-	    (\d\d?):?(\d\d)    # hour:min
-	    (?::?(\d\d))?      # optional seconds
-	 )?                    # optional clock
-	    \s*
-	 ([-+]?\d\d?:?(:?\d\d)?
-	  |Z|z)?               # timezone  (Z is "zero meridian", i.e. GMT)
-	    \s*$
-	/x
-	  and last PARSEDATE;
-
-      # Windows 'dir' 11-12-96  03:52PM
-      ($mon, $day, $yr, $hr, $min, $aorp) =
-        /^\s*
-          (\d{2})                # numerical month
-             -
-          (\d{2})                # day
-             -
-          (\d{2})                # year
-             \s+
-          (\d\d?):(\d\d)([apAP][mM])  # hour:min AM or PM
-             \s*$
-        /x
-          and last PARSEDATE;
-
-      # If it is not recognized by now we give up
-      return undef;
-   }
-
-   # Translate month name to number
-   if ($mon =~ /^\d+$/) {
-     # numeric month
-     return undef if $mon < 1 || $mon > 12;
-     $mon--;
-   } else {
-     $mon = lc $mon;
-     return undef unless exists $MoY{$mon};
-     $mon = $MoY{$mon};
-   }
-
-   # If the year is missing, we assume some date before the current,
-   # because these date are mostly present on "ls -l" listings.
-   unless (defined $yr) {
-	$yr = $current_year;
-	$yr-- if $mon > $current_month;
-    }
-
-   # Then we check if the year is acceptable
-   return undef if $yr > 99 && $yr < 1900;  # We ignore these years
-   $yr += 100 if $yr < 50;  # a stupid thing to do???
-   $yr -= 1900 if $yr >= 1900;
-   # The $yr is now relative to 1900 (as expected by timelocal())
-
-   # timelocal() seems to go into an infinite loop if it is given out
-   # of range parameters.  Let's check the year at least.
-
-   # Epoch counter maxes out in year 2038, assuming "time_t" is 32 bit
-   return undef if $yr > 138;
-   return undef if $yr <  70;  # 1970 is Unix epoch
-
-   # Compensate for AM/PM
-   if ($aorp) {
-       $aorp = uc $aorp;
-       $hr = 0 if $hr == 12 && $aorp eq 'AM';
-       $hr += 12 if $aorp eq 'PM' && $hr != 12;
-   }
-
-   # Make sure things are defined
-   for ($sec, $min, $hr) {  $_ = 0 unless defined   }
-
-   # Should we compensate for the timezone?
-   $tz = $default_zone unless defined $tz;
-   return eval {Time::Local::timelocal($sec, $min, $hr, $day, $mon, $yr)}
-     unless defined $tz;
-
-   # We can calculate offset for numerical time zones
-   if ($tz =~ /^([-+])?(\d\d?):?(\d\d)?$/) {
-       $offset = 3600 * $2;
-       $offset += 60 * $3 if $3;
-       $offset *= -1 if $1 && $1 ne '-';
-   }
-   eval{Time::Local::timegm($sec, $min, $hr, $day, $mon, $yr) + $offset};
-}
-
-
-
-# And then some bloat because I happen to like the ISO 8601 time
-# format.
-
-sub time2iso (;$)
-{
-   my $time = shift;
-   $time = time unless defined $time;
-   my($sec,$min,$hour,$mday,$mon,$year) = localtime($time);
-   sprintf("%04d-%02d-%02d %02d:%02d:%02d",
-	   $year+1900, $mon+1, $mday, $hour, $min, $sec);
-}
-
-
-sub time2isoz (;$)
-{
-    my $time = shift;
-    $time = time unless defined $time;
-    my($sec,$min,$hour,$mday,$mon,$year) = gmtime($time);
-    sprintf("%04d-%02d-%02d %02d:%02d:%02dZ",
-            $year+1900, $mon+1, $mday, $hour, $min, $sec);
-}
-
-1;
-
diff --git a/testcases/ballista/ballista/perllib/HTTP/Headers.pm b/testcases/ballista/ballista/perllib/HTTP/Headers.pm
deleted file mode 100644
index 39bce7f..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Headers.pm
+++ /dev/null
@@ -1,540 +0,0 @@
-#
-# $Id: Headers.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-
-package HTTP::Headers;
-
-=head1 NAME
-
-HTTP::Headers - Class encapsulating HTTP Message headers
-
-=head1 SYNOPSIS
-
- require HTTP::Headers;
- $h = new HTTP::Headers;
-
-=head1 DESCRIPTION
-
-The C<HTTP::Headers> class encapsulates HTTP-style message headers.
-The headers consist of attribute-value pairs, which may be repeated,
-and which are printed in a particular order.
-
-Instances of this class are usually created as member variables of the
-C<HTTP::Request> and C<HTTP::Response> classes, internal to the
-library.
-
-The following methods are available:
-
-=over 4
-
-=cut
-
-use strict;
-use vars qw($VERSION $TRANSLATE_UNDERSCORE);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use Carp ();
-
-# Could not use the AutoLoader becase several of the method names are
-# not unique in the first 8 characters.
-#use SelfLoader;
-
-
-# "Good Practice" order of HTTP message headers:
-#    - General-Headers
-#    - Request-Headers
-#    - Response-Headers
-#    - Entity-Headers
-# (From draft-ietf-http-v11-spec-rev-01, Nov 21, 1997)
-
-my @header_order = qw(
-   Cache-Control Connection Date Pragma Transfer-Encoding Upgrade Trailer Via
-
-   Accept Accept-Charset Accept-Encoding Accept-Language
-   Authorization Expect From Host
-   If-Modified-Since If-Match If-None-Match If-Range If-Unmodified-Since
-   Max-Forwards Proxy-Authorization Range Referer TE User-Agent
-
-   Accept-Ranges Age Location Proxy-Authenticate Retry-After Server Vary
-   Warning WWW-Authenticate
-
-   Allow Content-Base Content-Encoding Content-Language Content-Length
-   Content-Location Content-MD5 Content-Range Content-Type
-   ETag Expires Last-Modified
-);
-
-# Make alternative representations of @header_order.  This is used
-# for sorting and case matching.
-my $i = 0;
-my %header_order;
-my %standard_case;
-for (@header_order) {
-    my $lc = lc $_;
-    $header_order{$lc} = $i++;
-    $standard_case{$lc} = $_;
-}
-
-$TRANSLATE_UNDERSCORE = 1 unless defined $TRANSLATE_UNDERSCORE;
-
-
-
-=item $h = new HTTP::Headers
-
-Constructs a new C<HTTP::Headers> object.  You might pass some initial
-attribute-value pairs as parameters to the constructor.  I<E.g.>:
-
- $h = new HTTP::Headers
-     Date         => 'Thu, 03 Feb 1994 00:00:00 GMT',
-     Content_Type => 'text/html; version=3.2',
-     Content_Base => 'http://www.sn.no/';
-
-=cut
-
-sub new
-{
-    my($class) = shift;
-    my $self = bless {}, $class;
-    $self->header(@_); # set up initial headers
-    $self;
-}
-
-
-=item $h->header($field [=> $value],...)
-
-Get or set the value of a header.  The header field name is not case
-sensitive.  To make the life easier for perl users who wants to avoid
-quoting before the => operator, you can use '_' as a synonym for '-'
-in header names (this behaviour can be suppressed by setting
-$HTTP::Headers::TRANSLATE_UNDERSCORE to a FALSE value).
-
-The header() method accepts multiple ($field => $value) pairs, so you
-can update several fields with a single invocation.
-
-The optional $value argument may be a scalar or a reference to a list
-of scalars. If the $value argument is undefined or not given, then the
-header is not modified.
-
-The old value of the last of the $field values is returned.
-Multi-valued fields will be concatenated with "," as separator in
-scalar context.
-
- $header->header(MIME_Version => '1.0',
-		 User_Agent   => 'My-Web-Client/0.01');
- $header->header(Accept => "text/html, text/plain, image/*");
- $header->header(Accept => [qw(text/html text/plain image/*)]);
- @accepts = $header->header('Accept');
-
-=cut
-
-sub header
-{
-    my $self = shift;
-    my($field, $val, @old);
-    while (($field, $val) = splice(@_, 0, 2)) {
-	@old = $self->_header($field, $val);
-    }
-    return @old if wantarray;
-    return $old[0] if @old <= 1;
-    join(", ", @old);
-}
-
-sub _header
-{
-    my($self, $field, $val, $push) = @_;
-    $field =~ tr/_/-/ if $TRANSLATE_UNDERSCORE;
-
-    # $push is only used interally sub push_header
-    Carp::croak('Need a field name') unless length($field);
-
-    my $lc_field = lc $field;
-    unless(defined $standard_case{$lc_field}) {
-	# generate a %stadard_case entry for this field
-	$field =~ s/\b(\w)/\u$1/g;
-	$standard_case{$lc_field} = $field;
-    }
-
-    my $h = $self->{$lc_field};
-    my @old = ref($h) ? @$h : (defined($h) ? ($h) : ());
-
-    if (defined $val) {
-	my @new = $push ? @old : ();
-	if (!ref($val)) {
-	    push(@new, $val);
-	} elsif (ref($val) eq 'ARRAY') {
-	    push(@new, @$val);
-	} else {
-	    Carp::croak("Unexpected field value $val");
-	}
-	$self->{$lc_field} = @new > 1 ? \@new : $new[0];
-    }
-    @old;
-}
-
-
-# Compare function which makes it easy to sort headers in the
-# recommended "Good Practice" order.
-sub _header_cmp
-{
-    # Unknown headers are assign a large value so that they are
-    # sorted last.  This also helps avoiding a warning from -w
-    # about comparing undefined values.
-    $header_order{$a} = 999 unless defined $header_order{$a};
-    $header_order{$b} = 999 unless defined $header_order{$b};
-
-    $header_order{$a} <=> $header_order{$b} || $a cmp $b;
-}
-
-
-=item $h->scan(\&doit)
-
-Apply a subroutine to each header in turn.  The callback routine is
-called with two parameters; the name of the field and a single value.
-If the header has more than one value, then the routine is called once
-for each value.  The field name passed to the callback routine has
-case as suggested by HTTP Spec, and the headers will be visited in the
-recommended "Good Practice" order.
-
-=cut
-
-sub scan
-{
-    my($self, $sub) = @_;
-    my $key;
-    foreach $key (sort _header_cmp keys %$self) {
-        next if $key =~ /^_/;
-	my $vals = $self->{$key};
-	if (ref($vals)) {
-	    my $val;
-	    for $val (@$vals) {
-		&$sub($standard_case{$key} || $key, $val);
-	    }
-	} else {
-	    &$sub($standard_case{$key} || $key, $vals);
-	}
-    }
-}
-
-
-=item $h->as_string([$endl])
-
-Return the header fields as a formatted MIME header.  Since it
-internally uses the C<scan()> method to build the string, the result
-will use case as suggested by HTTP Spec, and it will follow
-recommended "Good Practice" of ordering the header fieds.  Long header
-values are not folded. 
-
-The optional parameter specifies the line ending sequence to use.  The
-default is C<"\n">.  Embedded "\n" characters in the header will be
-substitued with this line ending sequence.
-
-=cut
-
-sub as_string
-{
-    my($self, $endl) = @_;
-    $endl = "\n" unless defined $endl;
-
-    my @result = ();
-    $self->scan(sub {
-	my($field, $val) = @_;
-	if ($val =~ /\n/) {
-	    # must handle header values with embedded newlines with care
-	    $val =~ s/\s+$//;          # trailing newlines and space must go
-	    $val =~ s/\n\n+/\n/g;      # no empty lines
-	    $val =~ s/\n([^\040\t])/\n $1/g;  # intial space for continuation
-	    $val =~ s/\n/$endl/g;      # substitute with requested line ending
-	}
-	push(@result, "$field: $val");
-    });
-
-    join($endl, @result, '');
-}
-
-
-# The remaining functions should autoloaded only when needed
-
-# A bug in 5.002gamma makes it risky to have POD text inside the
-# autoloaded section of the code, so we keep the documentation before
-# the __DATA__ token.
-
-=item $h->push_header($field, $val)
-
-Add a new field value of the specified header.  The header field name
-is not case sensitive.  The field need not already have a
-value. Previous values for the same field are retained.  The argument
-may be a scalar or a reference to a list of scalars.
-
- $header->push_header(Accept => 'image/jpeg');
-
-=item $h->remove_header($field,...)
-
-This function removes the headers with the specified names.
-
-=item $h->clone
-
-Returns a copy of this HTTP::Headers object.
-
-=back
-
-=head1 CONVENIENCE METHODS
-
-The most frequently used headers can also be accessed through the
-following convenience methods.  These methods can both be used to read
-and to set the value of a header.  The header value is set if you pass
-an argument to the method.  The old header value is always returned.
-
-Methods that deal with dates/times always convert their value to system
-time (seconds since Jan 1, 1970) and they also expect this kind of
-value when the header value is set.
-
-=over 4
-
-=item $h->date
-
-This header represents the date and time at which the message was
-originated. I<E.g.>:
-
-  $h->date(time);  # set current date
-
-=item $h->expires
-
-This header gives the date and time after which the entity should be
-considered stale.
-
-=item $h->if_modified_since
-
-=item $h->if_unmodified_since
-
-This header is used to make a request conditional.  If the requested
-resource has (not) been modified since the time specified in this field,
-then the server will return a C<"304 Not Modified"> response instead of
-the document itself.
-
-=item $h->last_modified
-
-This header indicates the date and time at which the resource was last
-modified. I<E.g.>:
-
-  # check if document is more than 1 hour old
-  if ($h->last_modified < time - 60*60) {
-	...
-  }
-
-=item $h->content_type
-
-The Content-Type header field indicates the media type of the message
-content. I<E.g.>:
-
-  $h->content_type('text/html');
-
-The value returned will be converted to lower case, and potential
-parameters will be chopped off and returned as a separate value if in
-an array context.  This makes it safe to do the following:
-
-  if ($h->content_type eq 'text/html') {
-     # we enter this place even if the real header value happens to
-     # be 'TEXT/HTML; version=3.0'
-     ...
-  }
-
-=item $h->content_encoding
-
-The Content-Encoding header field is used as a modifier to the
-media type.  When present, its value indicates what additional
-encoding mechanism has been applied to the resource.
-
-=item $h->content_length
-
-A decimal number indicating the size in bytes of the message content.
-
-=item $h->content_language
-
-The natural language(s) of the intended audience for the message
-content.  The value is one or more language tags as defined by RFC
-1766.  Eg. "no" for Norwegian and "en-US" for US-English.
-
-=item $h->title
-
-The title of the document.  In libwww-perl this header will be
-initialized automatically from the E<lt>TITLE>...E<lt>/TITLE> element
-of HTML documents.  I<This header is no longer part of the HTTP
-standard.>
-
-=item $h->user_agent
-
-This header field is used in request messages and contains information
-about the user agent originating the request.  I<E.g.>:
-
-  $h->user_agent('Mozilla/1.2');
-
-=item $h->server
-
-The server header field contains information about the software being
-used by the originating server program handling the request.
-
-=item $h->from
-
-This header should contain an Internet e-mail address for the human
-user who controls the requesting user agent.  The address should be
-machine-usable, as defined by RFC822.  E.g.:
-
-  $h->from('Gisle Aas <aas@sn.no>');
-
-=item $h->referer
-
-Used to specify the address (URI) of the document from which the
-requested resouce address was obtained.
-
-=item $h->www_authenticate
-
-This header must be included as part of a "401 Unauthorized" response.
-The field value consist of a challenge that indicates the
-authentication scheme and parameters applicable to the requested URI.
-
-=item $h->proxy_authenticate
-
-This header must be included in a "407 Proxy Authentication Required"
-response.
-
-=item $h->authorization
-
-=item $h->proxy_authorization
-
-A user agent that wishes to authenticate itself with a server or a
-proxy, may do so by including these headers.
-
-=item $h->authorization_basic
-
-This method is used to get or set an authorization header that use the
-"Basic Authentication Scheme".  In array context it will return two
-values; the user name and the password.  In scalar context it will
-return I<"uname:password"> as a single string value.
-
-When used to set the header value, it expects two arguments.  I<E.g.>:
-
-  $h->authorization_basic($uname, $password);
-
-The method will croak if the $uname contains a colon ':'.
-
-=item $h->proxy_authorization_basic
-
-Same as authorization_basic() but will set the "Proxy-Authorization"
-header instead.
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright 1995-1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-1;
-
-#__DATA__
-
-sub clone
-{
-    my $self = shift;
-    my $clone = new HTTP::Headers;
-    $self->scan(sub { $clone->push_header(@_);} );
-    $clone;
-}
-
-sub push_header
-{
-    Carp::croak('Usage: $h->push_header($field, $val)') if @_ != 3;
-    shift->_header(@_, 'PUSH');
-}
-
-
-sub remove_header
-{
-    my($self, @fields) = @_;
-    my $field;
-    foreach $field (@fields) {
-	$field =~ tr/_/-/ if $TRANSLATE_UNDERSCORE;
-	delete $self->{lc $field};
-    }
-}
-
-# Convenience access functions
-
-sub _date_header
-{
-    require HTTP::Date;
-    my($self, $header, $time) = @_;
-    my($old) = $self->_header($header);
-    if (defined $time) {
-	$self->_header($header, HTTP::Date::time2str($time));
-    }
-    HTTP::Date::str2time($old);
-}
-
-sub date                { shift->_date_header('Date',                @_); }
-sub expires             { shift->_date_header('Expires',             @_); }
-sub if_modified_since   { shift->_date_header('If-Modified-Since',   @_); }
-sub if_unmodified_since { shift->_date_header('If-Unmodified-Since', @_); }
-sub last_modified       { shift->_date_header('Last-Modified',       @_); }
-
-# This is used as a private LWP extention.  The Client-Date header is
-# added as a timestamp to a response when it has been received.
-sub client_date         { shift->_date_header('Client-Date',         @_); }
-
-# The retry_after field is dual format (can also be a expressed as
-# number of seconds from now), so we don't provide an easy way to
-# access it until we have know how both these interfaces can be
-# addressed.  One possibility is to return a negative value for
-# relative seconds and a positive value for epoch based time values.
-#sub retry_after       { shift->_date_header('Retry-After',       @_); }
-
-sub content_type      {
-  my $ct = (shift->_header('Content-Type', @_))[0];
-  return '' unless defined($ct) && length($ct);
-  my @ct = split(/\s*;\s*/, lc($ct));
-  wantarray ? @ct : $ct[0];
-}
-
-sub title             { (shift->_header('Title',            @_))[0] }
-sub content_encoding  { (shift->_header('Content-Encoding', @_))[0] }
-sub content_language  { (shift->_header('Content-Language', @_))[0] }
-sub content_length    { (shift->_header('Content-Length',   @_))[0] }
-
-sub user_agent        { (shift->_header('User-Agent',       @_))[0] }
-sub server            { (shift->_header('Server',           @_))[0] }
-
-sub from              { (shift->_header('From',             @_))[0] }
-sub referer           { (shift->_header('Referer',          @_))[0] }
-sub warning           { (shift->_header('Warning',          @_))[0] }
-
-sub www_authenticate  { (shift->_header('WWW-Authenticate', @_))[0] }
-sub authorization     { (shift->_header('Authorization',    @_))[0] }
-
-sub proxy_authenticate  { (shift->_header('Proxy-Authenticate',  @_))[0] }
-sub proxy_authorization { (shift->_header('Proxy-Authorization', @_))[0] }
-
-sub authorization_basic       { shift->_basic_auth("Authorization",       @_) }
-sub proxy_authorization_basic { shift->_basic_auth("Proxy-Authorization", @_) }
-
-sub _basic_auth {
-    require MIME::Base64;
-    my($self, $h, $user, $passwd) = @_;
-    my($old) = $self->_header($h);
-    if (defined $user) {
-	Carp::croak("Basic authorization user name can't contain ':'")
-	  if $user =~ /:/;
-	$passwd = '' unless defined $passwd;
-	$self->_header($h => 'Basic ' .
-                             MIME::Base64::encode("$user:$passwd", ''));
-    }
-    if (defined $old && $old =~ s/^\s*Basic\s+//) {
-	my $val = MIME::Base64::decode($old);
-	return $val unless wantarray;
-	return split(/:/, $val, 2);
-    }
-    return;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTTP/Headers/Auth.pm b/testcases/ballista/ballista/perllib/HTTP/Headers/Auth.pm
deleted file mode 100644
index df944e0..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Headers/Auth.pm
+++ /dev/null
@@ -1,94 +0,0 @@
-package HTTP::Headers::Auth;
-
-use strict;
-use vars qw($VERSION);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-require HTTP::Headers;
-package HTTP::Headers;
-
-BEGIN {
-    # we provide a new (and better) implementations below
-    undef(&www_authenticate);
-    undef(&proxy_authenticate);
-}
-
-require HTTP::Headers::Util;
-
-sub _parse_authenticate
-{
-    my @ret;
-    for (HTTP::Headers::Util::split_header_words(@_)) {
-	if (!defined($_->[1])) {
-	    # this is a new auth scheme
-	    push(@ret, lc(shift @$_) => {});
-	    shift @$_;
-	}
-	if (@ret) {
-	    # this a new parameter pair for the last auth scheme
-	    while (@$_) {
-		my $k = lc(shift @$_);
-		my $v = shift @$_;
-	        $ret[-1]{$k} = $v;
-	    }
-	} else {
-	    # something wrong, parameter pair without any scheme seen
-	    # IGNORE
-	}
-    }
-    @ret;
-}
-
-sub _authenticate
-{
-    my $self = shift;
-    my $header = shift;
-    my @old = $self->_header($header);
-    if (@_) {
-	$self->remove_header($header);
-	my @new = @_;
-	while (@new) {
-	    my $a_scheme = shift(@new);
-	    if ($a_scheme =~ /\s/) {
-		# assume complete valid value, pass it through
-		$self->push_header($header, $a_scheme);
-	    } else {
-		my @param;
-		if (@new) {
-		    my $p = $new[0];
-		    if (ref($p) eq "ARRAY") {
-			@param = @$p;
-			shift(@new);
-		    } elsif (ref($p) eq "HASH") {
-			@param = %$p;
-			shift(@new);
-		    }
-		}
-		my $val = ucfirst(lc($a_scheme));
-		if (@param) {
-		    my $sep = " ";
-		    while (@param) {
-			my $k = shift @param;
-			my $v = shift @param;
-			if ($v =~ /[^0-9a-zA-Z]/ || lc($k) eq "realm") {
-			    # must quote the value
-			    $v =~ s,([\\\"]),\\$1,g;
-			    $v = qq("$v");
-			}
-			$val .= "$sep$k=$v";
-			$sep = ", ";
-		    }
-		}
-		$self->push_header($header, $val);
-	    }
-	}
-    }
-    return unless defined wantarray;
-    wantarray ? _parse_authenticate(@old) : join(", ", @old);
-}
-
-
-sub www_authenticate    { shift->_authenticate("WWW-Authenticate", @_)   }
-sub proxy_authenticate  { shift->_authenticate("Proxy-Authenticate", @_) }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTTP/Headers/ETag.pm b/testcases/ballista/ballista/perllib/HTTP/Headers/ETag.pm
deleted file mode 100644
index cd7e0f6..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Headers/ETag.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-package HTTP::Header::ETag;
-
-use strict;
-use vars qw($VERSION);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-require HTTP::Date;
-
-require HTTP::Headers;
-package HTTP::Headers;
-
-sub _etags
-{
-    my $self = shift;
-    my $header = shift;
-    my @old = _split_etag_list($self->_header($header));
-    if (@_) {
-	$self->_header($header => join(", ", _split_etag_list(@_)));
-    }
-    wantarray ? @old : join(", ", @old);
-}
-
-sub etag          { shift->_etags("ETag", @_); }
-sub if_match      { shift->_etags("If-Match", @_); }
-sub if_none_match { shift->_etags("If-None-Match", @_); }
-
-sub if_range {
-    # Either a date or an entity-tag
-    my $self = shift;
-    my @old = $self->_header("If-Range");
-    if (@_) {
-	my $new = shift;
-	if (!defined $new) {
-	    $self->remove_header("If-Range");
-	} elsif ($new =~ /^\d+$/) {
-	    $self->_date_header("If-Range", $new);
-	} else {
-	    $self->_etags("If-Range", $new);
-	}
-    }
-    return unless defined(wantarray);
-    for (@old) {
-	my $t = HTTP::Date::str2time($_);
-	$_ = $t if $t;
-    }
-    wantarray ? @old : join(", ", @old);
-}
-
-
-# Split a list of entity tag values.  The return value is a list
-# consisting of one element per entity tag.  Suitable for parsing
-# headers like C<If-Match>, C<If-None-Match>.  You might even want to
-# use it on C<ETag> and C<If-Range> entity tag values, because it will
-# normalize them to the common form.
-#
-#  entity-tag	  = [ weak ] opaque-tag
-#  weak		  = "W/"
-#  opaque-tag	  = quoted-string
-
-
-sub _split_etag_list
-{
-    my(@val) = @_;
-    my @res;
-    for (@val) {
-        while (length) {
-            my $weak = "";
-	    $weak = "W/" if s,^\s*[wW]/,,;
-            my $etag = "";
-	    if (s/^\s*(\"[^\"\\]*(?:\\.[^\"\\]*)*\")//) {
-		push(@res, "$weak$1");
-            } elsif (s/^\s*,//) {
-                push(@res, qq(W/"")) if $weak;
-            } elsif (s/^\s*([^,\s]+)//) {
-                $etag = $1;
-		$etag =~ s/([\"\\])/\\$1/g;
-	        push(@res, qq($weak"$etag"));
-            } elsif (s/^\s+// || !length) {
-                push(@res, qq(W/"")) if $weak;
-            } else {
-	 	die "This should not happen: '$_'";
-            }
-        }
-   }
-   @res;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/HTTP/Headers/Util.pm b/testcases/ballista/ballista/perllib/HTTP/Headers/Util.pm
deleted file mode 100644
index c53c4b1..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Headers/Util.pm
+++ /dev/null
@@ -1,180 +0,0 @@
-package HTTP::Headers::Util;
-
-use strict;
-use vars qw($VERSION @ISA @EXPORT_OK);
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-require Exporter;
-@ISA=qw(Exporter);
-
-@EXPORT_OK=qw(split_header_words join_header_words);
-
-=head1 NAME
-
-HTTP::Headers::Util - Header value parsing utility functions
-
-=head1 SYNOPSIS
-
-  use HTTP::Headers::Util qw(split_header_words);
-  @values = split_header_words($h->header("Content-Type"));
-
-=head1 DESCRIPTION
-
-This module provide a few functions that helps parsing and
-construction of valid HTTP header values.  None of the functions are
-exported by default.
-
-The following functions are provided:
-
-=over 4
-
-
-=item split_header_words( @header_values )
-
-This function will parse the header values given as argument into a
-list of anonymous arrays containing key/value pairs.  The function
-know how to deal with ",", ";" and "=" as well as quoted values after
-"=".  A list of space separated tokens are parsed as if they were
-separated by ";".
-
-If the @header_values passed as argument contains multiple values,
-then they are treated as if they were a single value separated by
-comma ",".
-
-This means that this function is useful to parse header fields that
-follow this syntax (BNF as from the HTTP/1.1 specification, but we relax
-the requirement for tokens).
-
-  headers           = #header
-  header            = (token | parameter) *( [";"] (token | parameter))
-
-  token             = 1*<any CHAR except CTLs or separators>
-  separators        = "(" | ")" | "<" | ">" | "@"
-                    | "," | ";" | ":" | "\" | <">
-                    | "/" | "[" | "]" | "?" | "="
-                    | "{" | "}" | SP | HT
-
-  quoted-string     = ( <"> *(qdtext | quoted-pair ) <"> )
-  qdtext            = <any TEXT except <">>
-  quoted-pair       = "\" CHAR
-
-  parameter         = attribute "=" value
-  attribute         = token
-  value             = token | quoted-string
-
-Each I<header> is represented by an anonymous array of key/value
-pairs.  If a token is recognized then the value will be C<undef>.
-Syntactically incorrect headers will not necessary be parsed as you
-would want.
-
-This is easier to describe with some examples:
-
-   split_header_words('foo="bar"; port="80,81"; discard, bar=baz')
-   split_header_words('text/html; charset="iso-8859-1");
-   split_header_words('Basic realm="\"foo\\bar\""');
-
-will return
-
-   [foo=>'bar', port=>'80,81', discard=> undef], [bar=>'baz' ]
-   ['text/html' => undef, charset => 'iso-8859-1']
-   [Basic => undef, realm => '"foo\bar"']
-
-=cut
-
-
-sub split_header_words
-{
-    my(@val) = @_;
-    my @res;
-    for (@val) {
-	my @cur;
-	while (length) {
-	    if (s/^\s*(=*[^\s=;,]+)//) {  # 'token' or parameter 'attribute'
-		push(@cur, $1);
-		# a quoted value
-		if (s/^\s*=\s*\"([^\"\\]*(?:\\.[^\"\\]*)*)\"//) {
-		    my $val = $1;
-		    $val =~ s/\\(.)/$1/g;
-		    push(@cur, $val);
-		# some unquoted value
-		} elsif (s/^\s*=\s*([^;,\s]*)//) {
-		    my $val = $1;
-		    $val =~ s/\s+$//;
-		    push(@cur, $val);
-		# no value, a lone token
-		} else {
-		    push(@cur, undef);
-		}
-	    } elsif (s/^\s*,//) {
-		push(@res, [@cur]) if @cur;
-		@cur = ();
-	    } elsif (s/^\s*;// || s/^\s+//) {
-		# continue
-	    } else {
-		die "This should not happen: '$_'";
-	    }
-	}
-	push(@res, \@cur) if @cur;
-    }
-    @res;
-}
-
-
-=item join_header_words( @arrays )
-
-This will do the opposite convertion of what split_header_words()
-does.  It takes a list of anonymous arrays as argument (or a list of
-key/value pairs) and produce a single header value.  Attribute values
-are quoted if needed.
-
-Example:
-
-   join_header_words(["text/plain" => undef, charset => "iso-8859/1"]);
-   join_header_words(""text/plain" => undef, charset => "iso-8859/1");
-
-will both return the string:
-
-   text/plain; charset="iso-8859/1"
-
-=cut
-
-sub join_header_words
-{
-    @_ = ([@_]) if @_ && !ref($_[0]);
-    my @res;
-    for (@_) {
-	my @cur = @$_;
-	my @attr;
-	while (@cur) {
-	    my $k = shift @cur;
-	    my $v = shift @cur;
-	    if (defined $v) {
-		if ($v =~ /^\w+$/) {
-		    $k .= "=$v";
-		} else {
-		    $v =~ s/([\"\\])/\\$1/g;  # escape " and \
-		    $k .= qq(="$v");
-		}
-	    }
-	    push(@attr, $k);
-	}
-	push(@res, join("; ", @attr)) if @attr;
-    }
-    join(", ", @res);
-}
-
-1;
-
-__END__
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright 1997-1998, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Message.pm b/testcases/ballista/ballista/perllib/HTTP/Message.pm
deleted file mode 100644
index 301b2b4..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Message.pm
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# $Id: Message.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-
-package HTTP::Message;
-
-=head1 NAME
-
-HTTP::Message - Class encapsulating HTTP messages
-
-=head1 SYNOPSIS
-
- package HTTP::Request;  # or HTTP::Response
- require HTTP::Message;
- @ISA=qw(HTTP::Message);
-
-=head1 DESCRIPTION
-
-A C<HTTP::Message> object contains some headers and a content (body).
-The class is abstract, i.e. it only used as a base class for
-C<HTTP::Request> and C<HTTP::Response> and should never instantiated
-as itself.
-
-The following methods are available:
-
-=over 4
-
-=cut
-
-#####################################################################
-
-require HTTP::Headers;
-require Carp;
-use strict;
-use vars qw($VERSION $AUTOLOAD);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-=item $mess = new HTTP::Message;
-
-This is the object constructor.  It should only be called internally
-by this library.  External code should construct C<HTTP::Request> or
-C<HTTP::Response> objects.
-
-=cut
-
-sub new
-{
-    my($class, $header, $content) = @_;
-    if (defined $header) {
-	Carp::croak("Bad header argument") unless ref $header;
-	$header = $header->clone;
-    } else {
-	$header = HTTP::Headers->new;
-    }
-    $content = '' unless defined $content;
-    bless {
-	'_headers' => $header,
-	'_content' => $content,
-    }, $class;
-}
-
-
-=item $mess->clone()
-
-Returns a copy of the object.
-
-=cut
-
-sub clone
-{
-    my $self  = shift;
-    my $clone = HTTP::Message->new($self->{'_headers'}, $self->{'_content'});
-    $clone;
-}
-
-=item $mess->protocol([$proto])
-
-Sets the HTTP protocol used for the message.  The protocol() is a string
-like "HTTP/1.0" or "HTTP/1.1".
-
-=cut
-
-sub protocol { shift->_elem('_protocol',  @_); }
-
-=item $mess->content([$content])
-
-The content() method sets the content if an argument is given.  If no
-argument is given the content is not touched.  In either case the
-previous content is returned.
-
-=item $mess->add_content($data)
-
-The add_content() methods appends more data to the end of the previous
-content.
-
-=cut
-
-sub content   { shift->_elem('_content',  @_); }
-
-sub add_content
-{
-    my $self = shift;
-    if (ref($_[0])) {
-	$self->{'_content'} .= ${$_[0]};  # for backwards compatability
-    } else {
-	$self->{'_content'} .= $_[0];
-    }
-}
-
-=item $mess->content_ref
-
-The content_ref() method will return a reference to content string.
-It can be more efficient to access the content this way if the content
-is huge, and it can be used for direct manipulation of the content,
-for instance:
-
-  ${$res->content_ref} =~ s/\bfoo\b/bar/g;
-
-=cut
-
-sub content_ref
-{
-    my $self = shift;
-    \$self->{'_content'};
-}
-
-sub as_string
-{
-    "";  # To be overridden in subclasses
-}
-
-=item $mess->headers;
-
-Return the embedded HTTP::Headers object.
-
-=item $mess->headers_as_string([$endl])
-
-Call the HTTP::Headers->as_string() method for the headers in the
-message.
-
-=cut
-
-sub headers            { shift->{'_headers'};                }
-sub headers_as_string  { shift->{'_headers'}->as_string(@_); }
-
-=back
-
-All unknown C<HTTP::Message> methods are delegated to the
-C<HTTP::Headers> object that is part of every message.  This allows
-convenient access to these methods.  Refer to L<HTTP::Headers> for
-details of these methods:
-
-  $mess->header($field => $val);
-  $mess->scan(\&doit);
-  $mess->push_header($field => $val);
-  $mess->remove_header($field);
-
-  $mess->date;
-  $mess->expires;
-  $mess->if_modified_since;
-  $mess->if_unmodified_since;
-  $mess->last_modified;
-  $mess->content_type;
-  $mess->content_encoding;
-  $mess->content_length;
-  $mess->content_language
-  $mess->title;
-  $mess->user_agent;
-  $mess->server;
-  $mess->from;
-  $mess->referer;
-  $mess->www_authenticate;
-  $mess->authorization;
-  $mess->proxy_authorization;
-  $mess->authorization_basic;
-  $mess->proxy_authorization_basic;
-
-=cut
-
-
-# delegate all other method calls the the _headers object.
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $method = substr($AUTOLOAD, rindex($AUTOLOAD, '::')+2);
-    return if $method eq "DESTROY";
-    $self->{'_headers'}->$method(@_);
-}
-
-# Private method to access members in %$self
-sub _elem
-{
-    my $self = shift;
-    my $elem = shift;
-    my $old = $self->{$elem};
-    $self->{$elem} = $_[0] if @_;
-    return $old;
-}
-
-1;
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Negotiate.pm b/testcases/ballista/ballista/perllib/HTTP/Negotiate.pm
deleted file mode 100644
index aae3d37..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Negotiate.pm
+++ /dev/null
@@ -1,505 +0,0 @@
-# $Id: Negotiate.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-#
-
-package HTTP::Negotiate;
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-sub Version { $VERSION; }
-
-require 5.002;
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(choose);
-
-require HTTP::Headers;
-
-$DEBUG = 0;
-
-sub choose ($;$)
-{
-    my($variants, $request) = @_;
-    my(%accept);
-
-    unless (defined $request) {
-	# Create a request object from the CGI envirionment variables
-	$request = new HTTP::Headers;
-	$request->header('Accept', $ENV{HTTP_ACCEPT})
-	  if $ENV{HTTP_ACCEPT};
-	$request->header('Accept-Charset', $ENV{HTTP_ACCEPT_CHARSET})
-	  if $ENV{HTTP_ACCEPT_CHARSET};
-	$request->header('Accept-Encoding', $ENV{HTTP_ACCEPT_ENCODING})
-	  if $ENV{HTTP_ACCEPT_ENCODING};
-	$request->header('Accept-Language', $ENV{HTTP_ACCEPT_LANGUAGE})
-	  if $ENV{HTTP_ACCEPT_LANGUAGE};
-    }
-
-    # Get all Accept values from the request.  Build a hash initialized
-    # like this:
-    #
-    #   %accept = ( type =>     { 'audio/*'     => { q => 0.2, mbx => 20000 },
-    #                             'audio/basic' => { q => 1 },
-    #                           },
-    #               language => { 'no'          => { q => 1 },
-    #                           }
-    #             );
-
-    $request->scan(sub {
-	my($key, $val) = @_;
-	return unless $key =~ s/^Accept-?//;
-	my $type = lc $key;
-	$type = "type" unless length $key;
-	$val =~ s/\s+//g;
-	my $name;
-	for $name (split(/,/, $val)) {
-	    my(%param, $param);
-	    if ($name =~ s/;(.*)//) {
-		for $param (split(/;/, $1)) {
-		    my ($pk, $pv) = split(/=/, $param, 2);
-		    $param{$pk} = $pv;
-		}
-	    }
-	    $name = lc $name;
-	    if (defined $param{'q'}) {
-		$param{'q'} = 1 if $param{'q'} > 1;
-		$param{'q'} = 0 if $param{'q'} < 0;
-	    } else {
-		$param{'q'} = 1;
-	    }
-
-	    $param{'q'} = 1 unless defined $param{'q'};
-	    $accept{$type}{$name} = \%param;
-	}
-    });
-
-    # Check if any of the variants specify a language.  We do this
-    # because it influence how we treat those without (they default to
-    # 0.5 instead of 1).
-    my $any_lang = 0;
-    for $var (@$variants) {
-	if ($var->[5]) {
-	    $any_lang = 1;
-	    last;
-	}
-    }
-
-    if ($DEBUG) {
-	print "Netgotiantion parameters in the request\n";
-	for $type (keys %accept) {
-	    print " $type:\n";
-	    for $name (keys %{$accept{$type}}) {
-		print "    $name\n";
-		for $pv (keys %{$accept{$type}{$name}}) {
-		    print "      $pv = $accept{$type}{$name}{$pv}\n";
-		}
-	    }
-	}
-    }
-
-    my @Q = ();  # This is where we collect the results of the
-		 # quality calcualtions
-
-    # Calculate quality for all the variant's that are available.
-    for (@$variants) {
-	my($id, $qs, $ct, $enc, $cs, $lang, $bs) = @$_;
-	$qs = 1 unless defined $qs;
-	$bs = 0 unless defined $bs;
-	if ($DEBUG) {
-	    print "\nEvaluating $id ($ct)\n";
-	    printf "  qs   = %.3f\n", $qs;
-	    print  "  enc  = $enc\n"  if $enc && !ref($enc);
-	    print  "  enc  = @$enc\n" if $enc && ref($enc);
-	    print  "  cs   = $cs\n"   if $cs;
-	    print  "  lang = $lang\n" if $lang;
-	    print  "  bs   = $bs\n"   if $bs;
-	}
-
-	# Calculate encoding quality
-	my $qe = 1;
-	# If the variant has no assignes Content-Encoding, or if no
-	# Accept-Encoding field is present, then the value assigned
-	# is "qe=1".  If *all* of the variant's content encoddings
-	# are listed in the Accept-Encoding field, then the value
-	# assigned is "qw=1".  If *any* of the variant's content
-	# encodings are not listed in the provided Accept-Encoding
-	# field, then the value assigned is "qe=0"
-	if (exists $accept{'encoding'} && $enc) {
-	    my @enc = ref($enc) ? @$enc : ($enc);
-	    for (@enc) {
-		print "Is encoding $_ accepted? " if $DEBUG;
-		unless(exists $accept{'encoding'}{$_}) {
-		    print "no\n" if $DEBUG;
-		    $qe = 0;
-		    last;
-		} else {
-		    print "yes\n" if $DEBUG;
-		}
-	    }
-	}
-
-	# Calculate charset quality
-	my $qc  = 1;
-	# If the variant's media-type has not charset parameter,
-	# or the variant's charset is US-ASCII, or if no Accept-Charset
-	# field is present, then the value assigned is "qc=1".  If the
-	# variantæs charset is listed in the Accept-Charset field,
-	# then the value assigned is "qc=1.  Otherwise, if the variant's
-	# charset is not listed in the provided Accept-Encoding field,
-	# then the value assigned is "qc=0".
-	if (exists $accept{'charset'} && $cs && $cs ne 'us-ascii' ) {
-	    $qc = 0 unless $accept{'charset'}{$cs};
-	}
-
-	# Calculate language quality
-	my $ql  = 1;
-	if ($lang && exists $accept{'language'}) {
-	    my @lang = ref($lang) ? @$lang : ($lang);
-	    # If any of the variant's content languages are listed
-	    # in the Accept-Language field, the the value assigned is
-	    # the maximus of the "q" paramet values for thos language
-	    # tags.
-	    my $q = undef;
-	    for (@lang) {
-		next unless exists $accept{'language'}{$_};
-		my $this_q = $accept{'language'}{$_}{'q'};
-		$q = $this_q unless defined $q;
-		$q = $this_q if $this_q > $q;
-	    }
-	    unless (defined $q) {
-		# If there was no exact match and at least one of
-		# the Accept-Language field values is a complete
-		# subtag prefix of the content language tag(s), then
-		# the "q" parameter value of the largest matching
-		# prefix is used.
-		my $selected = undef;
-		for $al (keys %{ $accept{'language'} }) {
-		    if (substr($lang, 0, length($al)) eq $al) {
-			$selected = $al unless defined $selected;
-			$selected = $al if length($al) > length($selected);
-		    }
-		}
-		$q = $accept{'language'}{$selected}{'q'} if $selected;
-
-		# If none of the variant's content language tags or
-		# tag prefixes are listed in the provided
-		# Accept-Language field, then the value assigned
-		# is "ql=0.001"
-		$q = 0.001 unless defined $q;
-	    }
-	    $ql = $q;
-	} else {
-	    $ql = 0.5 if $any_lang && exists $accept{'language'};
-	}
-
-	my $q   = 1;
-	my $mbx = undef;
-	# If no Accept field is given, then the value assigned is "q=1".
-	# If at least one listed media range matches the variant's media
-	# type, then the "q" parameter value assigned to the most specific
-	# of those matched is used (e.g. "text/html;version=3.0" is more
-	# specific than "text/html", which is more specific than "text/*",
-	# which in turn is more specific than "*/*"). If not media range
-	# in the provided Accept field matches the variant's media type,
-	# then the value assigned is "q=0".
-	if (exists $accept{'type'} && $ct) {
-	    # First we clean up our content-type
-	    $ct =~ s/\s+//g;
-	    my $params = "";
-	    $params = $1 if $ct =~ s/;(.*)//;
-	    my($type, $subtype) = split("/", $ct, 2);
-	    my %param = ();
-	    for $param (split(/;/, $params)) {
-		my($pk,$pv) = split(/=/, $param, 2);
-		$param{$pk} = $pv;
-	    }
-
-	    my $sel_q = undef;
-	    my $sel_mbx = undef;
-	    my $sel_specificness = 0;
-
-	    ACCEPT_TYPE:
-	    for $at (keys %{ $accept{'type'} }) {
-		print "Consider $at...\n" if $DEBUG;
-		my($at_type, $at_subtype) = split("/", $at, 2);
-		# Is it a match on the type
-		next if $at_type    ne '*' && $at_type    ne $type;
-		next if $at_subtype ne '*' && $at_subtype ne $subtype;
-		my $specificness = 0;
-		$specificness++ if $at_type ne '*';
-		$specificness++ if $at_subtype ne '*';
-		# Let's see if content-type parameters also match
-		while (($pk, $pv) = each %param) {
-		    print "Check if $pk = $pv is true\n" if $DEBUG;
-		    next unless exists $accept{'type'}{$at}{$pk};
-		    next ACCEPT_TYPE
-		      unless $accept{'type'}{$at}{$pk} eq $pv;
-		    print "yes it is!!\n" if $DEBUG;
-		    $specificness++;
-		}
-		print "Hurray, type match with specificness = $specificness\n"
-		  if $DEBUG;
-
-		if (!defined($sel_q) || $sel_specificness < $specificness) {
-		    $sel_q   = $accept{'type'}{$at}{'q'};
-		    $sel_mbx = $accept{'type'}{$at}{'mbx'};
-		    $sel_specificness = $specificness;
-		}
-	    }
-	    $q   = $sel_q || 0;
-	    $mbx = $sel_mbx;
-	}
-
-	my $Q;
-	if (!defined($mbx) || $mbx >= $bs) {
-	    $Q = $qs * $qe * $qc * $ql * $q;
-	} else {
-	    $Q = 0;
-	    print "Variant's size is too large ==> Q=0\n" if $DEBUG;
-	}
-
-	if ($DEBUG) {
-	    $mbx = "undef" unless defined $mbx;
-	    printf "Q=%.3f", $Q;
-	    print "  (q=$q, mbx=$mbx, qe=$qe, qc=$qc, ql=$ql, qs=$qs)\n";
-	}
-
-	push(@Q, [$id, $Q, $bs]);
-    }
-
-
-    @Q = sort { $b->[1] <=> $a->[1] || $a->[2] <=> $b->[2] } @Q;
-
-    return @Q if wantarray;
-    return undef unless @Q;
-    return undef if $Q[0][1] == 0;
-    $Q[0][0];
-}
-
-1;
-
-__END__
-
-
-=head1 NAME
-
-choose - choose a variant of a document to serve (HTTP content negotiation)
-
-=head1 SYNOPSIS
-
- use HTTP::Negotiate;
-
- #  ID       QS     Content-Type   Encoding Char-Set        Lang   Size
- $variants =
-  [['var1',  1.000, 'text/html',   undef,   'iso-8859-1',   'en',   3000],
-   ['var2',  0.950, 'text/plain',  'gzip',  'us-ascii',     'no',    400],
-   ['var3',  0.3,   'image/gif',   undef,   undef,          undef, 43555],
-  ];
-
- @prefered = choose($variants, $request_headers);
- $the_one  = choose($variants);
-
-=head1 DESCRIPTION
-
-This module provide a complete implementation of the HTTP content
-negotiation algorithm specified in F<draft-ietf-http-v11-spec-00.ps>
-chapter 12.  Content negotiation allows for the selection of a
-preferred content representation based upon attributes of the
-negotiable variants and the value of the various Accept* header fields
-in the request.
-
-The variants are ordered by preference by calling the function
-choose().
-
-The first parameter is a description of the variants that we can
-choose among.  The variants are described by a reference to an array.
-Each element in this array is an array with the values [$id, $qs,
-$content_type, $content_encoding, $charset, $content_language,
-$content_length].  The meaning of these values are described
-below. The $content_encoding and $content_language can be either a
-single scalar value or an array reference if there are several values.
-
-The second optional parameter is a reference to the request headers.
-This is used to look for "Accept*" headers.  You can pass a reference
-to either a HTTP::Request or a HTTP::Headers object.  If this
-parameter is missing, then the accept specification is initialized
-from the CGI environment variables HTTP_ACCEPT, HTTP_ACCEPT_CHARSET,
-HTTP_ACCEPT_ENCODING and HTTP_ACCEPT_LANGUAGE.
-
-In array context, choose() returns a list of variant
-identifier/calculated quality pairs.  The values are sorted by
-quality, highest quality first.  If the calculated quality is the same
-for two variants, then they are sorted by size (smallest first). I<E.g.>:
-
-  (['var1' => 1], ['var2', 0.3], ['var3' => 0]);
-
-Note that also zero quality variants are included in the return list
-even if these should never be served to the client.
-
-In scalar context, it returns the identifier of the variant with the
-highest score or C<undef> if none have non-zero quality.
-
-If the $HTTP::Negotiate::DEBUG variable is set to TRUE, then a lot of
-noise is generated on STDOUT during evaluation of choose().
-
-=head1 VARIANTS
-
-A variant is described by a list of the following values.  If the
-attribute does not make sense or is unknown for a variant, then use
-C<undef> instead.
-
-=over 3
-
-=item identifier
-
-This is just some string that you use as a name for the variant.  The
-identifier of the preferred variant is returned by choose().
-
-=item qs
-
-This is a number between 0.000 and 1.000 that describes the "source
-quality".  This is what F<draft-ietf-http-v11-spec-00.ps> says about this
-value:
-
-Source quality is measured by the content provider as representing the
-amount of degradation from the original source.  For example, a
-picture in JPEG form would have a lower qs when translated to the XBM
-format, and much lower qs when translated to an ASCII-art
-representation.  Note, however, that this is a function of the source
-- an original piece of ASCII-art may degrade in quality if it is
-captured in JPEG form.  The qs values should be assigned to each
-variant by the content provider; if no qs value has been assigned, the
-default is generally "qs=1".
-
-=item content-type
-
-This is the media type of the variant.  The media type does not
-include a charset attribute, but might contain other parameters.
-Examples are:
-
-  text/html
-  text/html;version=2.0
-  text/plain
-  image/gif
-  image/jpg
-
-=item content-encoding
-
-This is one or more content encodings that has been applied to the
-variant.  The content encoding is generally used as a modifier to the
-content media type.  The most common content encodings are:
-
-  gzip
-  compress
-
-=item content-charset
-
-This is the character set used when the variant contains textual
-content.  The charset value should generally be C<undef> or one of these:
-
-  us-ascii
-  iso-8859-1 ... iso-8859-9
-  iso-2022-jp
-  iso-2022-jp-2
-  iso-2022-kr
-  unicode-1-1
-  unicode-1-1-utf-7
-  unicode-1-1-utf-8
-
-=item content-language
-
-This describes one or more languages that are used in the variant.
-Language is described like this in F<draft-ietf-http-v11-spec-00.ps>: A
-language is in this context a natural language spoken, written, or
-otherwise conveyed by human beings for communication of information to
-other human beings.  Computer languages are explicitly excluded.
-
-The language tags are the same as those defined by RFC-1766.  Examples
-are:
-
-  no               Norwegian
-  en               International English
-  en-US            US English
-  en-cockney
-
-=item content-length
-
-This is the number of bytes used to represent the content.
-
-=back
-
-=head1 ACCEPT HEADERS
-
-The following Accept* headers can be used for describing content
-preferences in a request (This description is an edited extract from
-F<draft-ietf-http-v11-spec-00.ps>):
-
-=over 3
-
-=item Accept
-
-This header can be used to indicate a list of media ranges which are
-acceptable as a reponse to the request.  The "*" character is used to
-group media types into ranges, with "*/*" indicating all media types
-and "type/*" indicating all subtypes of that type.
-
-The parameter q is used to indicate the quality factor, which
-represents the user's preference for that range of media types.  The
-parameter mbx gives the maximum acceptable size of the response
-content. The default values are: q=1 and mbx=infinity. If no Accept
-header is present, then the client accepts all media types with q=1.
-
-For example:
-
-  Accept: audio/*;q=0.2;mbx=200000, audio/basic
-
-would mean: "I prefer audio/basic (of any size), but send me any audio
-type if it is the best available after an 80% mark-down in quality and
-its size is less than 200000 bytes"
-
-
-=item Accept-Charset
-
-Used to indicate what character sets are acceptable for the response.
-The "us-ascii" character set is assumed to be acceptable for all user
-agents.  If no Accept-Charset field is given, the default is that any
-charset is acceptable.  Example:
-
-  Accept-Charset: iso-8859-1, unicode-1-1
-
-
-=item Accept-Encoding
-
-Restricts the Content-Encoding values which are acceptable in the
-response.  If no Accept-Encoding field is present, the server may
-assume that the client will accept any content encoding.  An empty
-Accept-Encoding means that no content encoding is acceptable.  Example:
-
-  Accept-Encoding: compress, gzip
-
-
-=item Accept-Language
-
-This field is similar to Accept, but restrict the set of natural
-languages that are preferred as a response.  Each language may be
-given an associated quality value which represents an estimate of the
-user's comprehension of that language.  For example:
-
-  Accept-Language: no, en-gb;q=0.8, de;q=0.55
-
-would mean: "I prefer Norwegian, but will accept British English (with
-80% comprehension) or German (with 55% comprehension).
-
-=back
-
-
-=head1 COPYRIGHT
-
-Copyright 1996, Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=head1 AUTHOR
-
-Gisle Aas <aas@sn.no>
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Request.pm b/testcases/ballista/ballista/perllib/HTTP/Request.pm
deleted file mode 100644
index d90e9ad..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Request.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# $Id: Request.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-
-package HTTP::Request;
-
-=head1 NAME
-
-HTTP::Request - Class encapsulating HTTP Requests
-
-=head1 SYNOPSIS
-
- require HTTP::Request;
- $request = HTTP::Request->new(GET => 'http://www.oslonett.no/');
-
-=head1 DESCRIPTION
-
-C<HTTP::Request> is a class encapsulating HTTP style requests,
-consisting of a request line, some headers, and some (potentially empty)
-content. Note that the LWP library also uses this HTTP style requests
-for non-HTTP protocols.
-
-Instances of this class are usually passed to the C<request()> method
-of an C<LWP::UserAgent> object:
-
- $ua = LWP::UserAgent->new;
- $request = HTTP::Request->new(GET => 'http://www.oslonett.no/');
- $response = $ua->request($request);
-
-C<HTTP::Request> is a subclass of C<HTTP::Message> and therefore
-inherits its methods.  The inherited methods often used are header(),
-push_header(), remove_header(), headers_as_string() and content().
-See L<HTTP::Message> for details.
-
-The following additional methods are available:
-
-=over 4
-
-=cut
-
-require HTTP::Message;
-@ISA = qw(HTTP::Message);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use URI::URL ();
-use strict;
-
-=item $r = HTTP::Request->new($method, $url, [$header, [$content]])
-
-Constructs a new C<HTTP::Request> object describing a request on the
-object C<$url> using method C<$method>.  The C<$url> argument can be
-either a string, or a reference to a C<URI::URL> object.  The $header
-argument should be a reference to an C<HTTP::Headers> object.
-
-=cut
-
-sub new
-{
-    my($class, $method, $url, $header, $content) = @_;
-    my $self = $class->SUPER::new($header, $content);
-    $self->method($method);
-    $self->url($url);
-    $self;
-}
-
-
-sub clone
-{
-    my $self = shift;
-    my $clone = bless $self->SUPER::clone, ref($self);
-    $clone->method($self->method);
-    $clone->url($self->url);
-    $clone;
-}
-
-
-=item $r->method([$val])
-
-=item $r->url([$val])
-
-These methods provide public access to the member variables containing
-respectively the method of the request and the URL object of the
-request.
-
-If an argument is given the member variable is given that as its new
-value. If no argument is given the value is not touched. In either
-case the previous value is returned.
-
-The url() method accept both a reference to a URI::URL object and a
-string as its argument.  If a string is given, then it should be
-parseable as an absolute URL.
-
-=cut
-
-sub method  { shift->_elem('_method', @_); }
-
-sub url
-{
-    my $self = shift;
-    my $old = $self->{'_url'};
-    if (@_) {
-	my $url = shift;
-	if (!defined $url) {
-	    # that's ok
-	} elsif (ref $url) {
-	    $url = $url->abs;
-	} else {
-	    $url = eval { URI::URL->new($url) };
-	}
-	$self->{'_url'} = $url;
-    }
-    $old;
-}
-
-*uri = \&url;  # this is the same for now
-
-=item $r->as_string()
-
-Method returning a textual representation of the request.
-Mainly useful for debugging purposes. It takes no arguments.
-
-=cut
-
-sub as_string
-{
-    my $self = shift;
-    my @result;
-    #push(@result, "---- $self -----");
-    my $req_line = $self->method || "[NO METHOD]";
-    my $url = $self->url;
-    $url = (defined $url) ? $url->as_string : "[NO URL]";
-    $req_line .= " $url";
-    my $proto = $self->protocol;
-    $req_line .= " $proto" if $proto;
-
-    push(@result, $req_line);
-    push(@result, $self->headers_as_string);
-    my $content = $self->content;
-    if (defined $content) {
-	push(@result, $content);
-    }
-    #push(@result, ("-" x 40));
-    join("\n", @result, "");
-}
-
-1;
-
-=back
-
-=head1 SEE ALSO
-
-L<HTTP::Headers>, L<HTTP::Message>, L<HTTP::Request::Common>
-
-=head1 COPYRIGHT
-
-Copyright 1995-1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Request/Common.pm b/testcases/ballista/ballista/perllib/HTTP/Request/Common.pm
deleted file mode 100644
index f7266ce..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Request/Common.pm
+++ /dev/null
@@ -1,389 +0,0 @@
-# $Id: Common.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-#
-package HTTP::Request::Common;
-
-use strict;
-use vars qw(@EXPORT @EXPORT_OK $VERSION $DYNAMIC_FILE_UPLOAD);
-
-$DYNAMIC_FILE_UPLOAD ||= 0;  # make it defined (don't know why)
-
-require Exporter;
-*import = \&Exporter::import;
-@EXPORT =qw(GET HEAD PUT POST);
-@EXPORT_OK = qw($DYNAMIC_FILE_UPLOAD);
-
-require HTTP::Request;
-use Carp();
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-my $CRLF = "\015\012";   # "\r\n" is not portable
-
-sub GET  { _simple_req('GET',  @_); }
-sub HEAD { _simple_req('HEAD', @_); }
-sub PUT  { _simple_req('PUT' , @_); }
-
-sub POST
-{
-    my $url = shift;
-    my $req = HTTP::Request->new(POST => $url);
-    my $content;
-    $content = shift if @_ and ref $_[0];
-    my($k, $v);
-    while (($k,$v) = splice(@_, 0, 2)) {
-	if (lc($k) eq 'content') {
-	    $content = $v;
-	} else {
-	    $req->push_header($k, $v);
-	}
-    }
-    my $ct = $req->header('Content-Type');
-    unless ($ct) {
-	$ct = 'application/x-www-form-urlencoded';
-    } elsif ($ct eq 'form-data') {
-	$ct = 'multipart/form-data';
-    }
-
-    if (ref $content) {
-	if (lc($ct) eq 'multipart/form-data') {    #XXX: boundary="..."
-	    my $boundary;
-	    ($content, $boundary) = form_data($content, $boundary);
-	    $boundary = qq("$boundary") if $boundary =~ /\W/;
-	    $ct = qq(multipart/form-data; boundary=$boundary);
-	} else {
-	    # We use a temporary URI::URL object to format
-	    # the application/x-www-form-urlencoded content.
-	    require URI::URL;
-	    my $url = URI::URL->new('http:');
-	    $url->query_form(ref($content) eq "HASH" ? %$content : @$content);
-	    $content = $url->equery;
-	}
-    }
-
-    $req->header('Content-Type' => $ct);  # might be redundant
-    if (defined($content)) {
-	$req->header('Content-Length' =>
-		     length($content)) unless ref($content);
-	$req->content($content);
-    }
-    $req;
-}
-
-
-sub _simple_req
-{
-    my($method, $url) = splice(@_, 0, 2);
-    my $req = HTTP::Request->new($method => $url);
-    my($k, $v);
-    while (($k,$v) = splice(@_, 0, 2)) {
-	if (lc($k) eq 'content') {
-	    $req->add_content($v);
-	} else {
-	    $req->push_header($k, $v);
-	}
-    }
-    $req;
-}
-
-
-sub form_data   # RFC1867
-{
-    my($data, $boundary) = @_;
-    my @data = ref($data) eq "HASH" ? %$data : @$data;  # copy
-    my $fhparts;
-    my @parts;
-    my($k,$v);
-    while (($k,$v) = splice(@data, 0, 2)) {
-	if (!ref($v)) {
-	    $k =~ s/([\\\"])/\\$1/g;  # escape quotes and backslashes
-	    push(@parts,
-		 qq(Content-Disposition: form-data; name="$k"$CRLF$CRLF$v));
-	} else {
-	    my($file, $usename, @headers) = @$v;
-	    unless (defined $usename) {
-		$usename = $file;
-		$usename =~ s,.*/,, if defined($usename);
-	    }
-	    my $disp = qq(form-data; name="$k");
-	    $disp .= qq(; filename="$usename") if $usename;
-	    my $content = "";
-	    my $h = HTTP::Headers->new(@headers);
-	    my $ct = $h->header("Content-Type");
-	    if ($file) {
-		require Symbol;
-		my $fh = Symbol::gensym();
-		open($fh, $file) or Carp::croak("Can't open file $file: $!");
-		binmode($fh);
-		if ($DYNAMIC_FILE_UPLOAD) {
-		    # will read file later
-		    $content = $fh;
-		} else {
-		    local($/) = undef; # slurp files
-		    $content = <$fh>;
-		    close($fh);
-		    $h->header("Content-Length" => length($content));
-		}
-		unless ($ct) {
-		    require LWP::MediaTypes;
-		    $ct = LWP::MediaTypes::guess_media_type($file, $h);
-		}
-	    }
-	    if ($h->header("Content-Disposition")) {
-		# just to get it sorted first
-		$disp = $h->header("Content-Disposition");
-		$h->remove_header("Content-Disposition");
-	    }
-	    if ($h->header("Content")) {
-		$content = $h->header("Content");
-		$h->remove_header("Content");
-	    }
-	    my $head = join($CRLF, "Content-Disposition: $disp",
-			           $h->as_string($CRLF),
-			           "");
-	    if (ref $content) {
-		push(@parts, [$head, $content]);
-		$fhparts++;
-	    } else {
-		push(@parts, $head . $content);
-	    }
-	}
-    }
-    return "" unless @parts;
-
-    my $content;
-    if ($fhparts) {
-	$boundary = boundary(10) # hopefully enough randomness
-	    unless $boundary;
-
-	# add the boundaries to the @parts array
-	for (1..@parts-1) {
-	    splice(@parts, $_*2-1, 0, "$CRLF--$boundary$CRLF");
-	}
-	unshift(@parts, "--$boundary$CRLF");
-	push(@parts, "$CRLF--$boundary--$CRLF");
-
-	# set up a closure that will return content piecemeal
-	$content = sub {
-	    for (;;) {
-		return unless @parts;
-		my $p = shift @parts;
-		unless (ref $p) {
-		    $p .= shift @parts while @parts && !ref($parts[0]);
-		    return $p;
-		}
-		my($buf, $fh) = @$p;
-		my $n = read($fh, $buf, 2048, length($buf));
-		if ($n) {
-		    unshift(@parts, ["", $fh]);
-		} else {
-		    close($fh);
-		}
-		return $buf if length $buf;
-	    }
-	};
-
-    } else {
-	$boundary = boundary() unless $boundary;
-
-	my $bno = 0;
-      CHECK_BOUNDARY:
-	{
-	    for (@parts) {
-		if (index($_, "--$boundary") >= 0) {
-		    # must have a better boundary
-		    #warn "Need something better that '$boundary' as boundary\n";
-		    $boundary = boundary(++$bno);
-		    redo CHECK_BOUNDARY;
-		}
-	    }
-	    last;
-	}
-	$content = "--$boundary$CRLF" .
-	           join("$CRLF--$boundary$CRLF", @parts) .
-		   "$CRLF--$boundary--$CRLF";
-    }
-
-    wantarray ? ($content, $boundary) : $content;
-}
-
-
-sub boundary
-{
-    my $size = shift || return "000";
-    require MIME::Base64;
-    my $b = MIME::Base64::encode(join("", map chr(rand(256)), 1..$size*3), "");
-    $b =~ s/[\W]/X/g;  # ensure alnum only
-    $b;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-HTTP::Request::Common - Construct common HTTP::Request objects
-
-=head1 SYNOPSIS
-
-  use HTTP::Request::Common;
-  $ua = LWP::UserAgent->new;
-  $ua->request(GET 'http://www.sn.no/');
-  $ua->request(POST 'http://somewhere/foo', [foo => bar, bar => foo]);
-
-=head1 DESCRIPTION
-
-This module provide functions that return newly created HTTP::Request
-objects.  These functions are usually more convenient to use than the
-standard HTTP::Request constructor for these common requests.  The
-following functions are provided.
-
-=over 4
-
-=item GET $url, Header => Value,...
-
-The GET() function returns a HTTP::Request object initialized with the
-GET method and the specified URL.  Without additional arguments it
-is exactly equivalent to the following call
-
-  HTTP::Request->new(GET => $url)
-
-but is less clutter.  It also reads better when used together with the
-LWP::UserAgent->request() method:
-
-  my $ua = new LWP::UserAgent;
-  my $res = $ua->request(GET 'http://www.sn.no')
-  if ($res->is_success) { ...
-
-You can also initialize the header values in the request by specifying
-some key/value pairs as optional arguments.  For instance:
-
-  $ua->request(GET 'http://www.sn.no',
-	           If_Match => 'foo',
-                   From     => 'gisle@aas.no',
-              );
-
-A header key called 'Content' is special and when seen the value will
-initialize the content part of the request instead of setting a header.
-
-=item HEAD $url, [Header => Value,...]
-
-Like GET() but the method in the request is HEAD.
-
-=item PUT $url, [Header => Value,...]
-
-Like GET() but the method in the request is PUT.
-
-=item POST $url, [$form_ref], [Header => Value,...]
-
-This works mostly like GET() with POST as method, but this function
-also takes a second optional array or hash reference parameter
-($form_ref).  This argument can be used to pass key/value pairs for
-the form content.  By default we will initialize a request using the
-C<application/x-www-form-urlencoded> content type.  This means that
-you can emulate a HTML E<lt>form> POSTing like this:
-
-  POST 'http://www.perl.org/survey.cgi',
-       [ name   => 'Gisle Aas',
-         email  => 'gisle@aas.no',
-         gender => 'M',
-         born   => '1964',
-         perc   => '3%',
-       ];
-
-This will create a HTTP::Request object that looks like this:
-
-  POST http://www.perl.org/survey.cgi
-  Content-Length: 66
-  Content-Type: application/x-www-form-urlencoded
-
-  name=Gisle%20Aas&email=gisle%40aas.no&gender=M&born=1964&perc=3%25
-
-The POST method also supports the C<multipart/form-data> content used
-for I<Form-based File Upload> as specified in RFC 1867.  You trigger
-this content format by specifying a content type of C<'form-data'> as
-one of the request headers.  If one of the values in the $form_ref is
-an array reference, then it is treated as a file part specification
-with the following interpretation:
-
-  [ $file, $filename, Header => Value... ]
-
-The first value in the array ($file) is the name of a file to open.
-This file will be read an its content placed in the request.  The
-routine will croak if the file can't be opened.  Use an C<undef> as $file
-value if you want to specify the content directly.  The $filename is
-the filename to report in the request.  If this value is undefined,
-then the basename of the $file will be used.  You can specify an empty
-string as $filename if you don't want any filename in the request.
-
-Sending my F<~/.profile> to the survey used as example above can be
-achieved by this:
-
-  POST 'http://www.perl.org/survey.cgi',
-       Content_Type => 'form-data',
-       Content      => [ name  => 'Gisle Aas',
-                         email => 'gisle@aas.no',
-                         gender => 'M',
-                         born   => '1964',
-                         init   => ["$ENV{HOME}/.profile"],
-                       ]
-
-This will create a HTTP::Request object that almost looks this (the
-boundary and the content of your F<~/.profile> is likely to be
-different):
-
-  POST http://www.perl.org/survey.cgi
-  Content-Length: 388
-  Content-Type: multipart/form-data; boundary="6G+f"
-
-  --6G+f
-  Content-Disposition: form-data; name="name"
-  
-  Gisle Aas
-  --6G+f
-  Content-Disposition: form-data; name="email"
-  
-  gisle@aas.no
-  --6G+f
-  Content-Disposition: form-data; name="gender"
-  
-  M
-  --6G+f
-  Content-Disposition: form-data; name="born"
-  
-  1964
-  --6G+f
-  Content-Disposition: form-data; name="init"; filename=".profile"
-  Content-Type: text/plain
-  
-  PATH=/local/perl/bin:$PATH
-  export PATH
-
-  --6G+f--
-
-If you set the $DYNAMIC_FILE_UPLOAD variable (exportable) to some TRUE
-value, then you get back a request object with a subroutine closure as
-the content attribute.  This subroutine will read the content of any
-files on demand and return it in suitable chunks.  This allow you to
-upload arbitrary big files without using lots of memory.  You can even
-upload infinite files like F</dev/audio> if you wish.  Another
-difference is that there will be no Content-Length header defined for
-the request if you use this feature.  Not all servers (or server
-applications) like this.
-
-=back
-
-=head1 SEE ALSO
-
-L<HTTP::Request>, L<LWP::UserAgent>
-
-
-=head1 COPYRIGHT
-
-Copyright 1997-1998, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
diff --git a/testcases/ballista/ballista/perllib/HTTP/Response.pm b/testcases/ballista/ballista/perllib/HTTP/Response.pm
deleted file mode 100644
index ed6b6e5..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Response.pm
+++ /dev/null
@@ -1,396 +0,0 @@
-#
-# $Id: Response.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-
-package HTTP::Response;
-
-
-=head1 NAME
-
-HTTP::Response - Class encapsulating HTTP Responses
-
-=head1 SYNOPSIS
-
- require HTTP::Response;
-
-=head1 DESCRIPTION
-
-The C<HTTP::Response> class encapsulate HTTP style responses.  A
-response consist of a response line, some headers, and a (potential
-empty) content. Note that the LWP library will use HTTP style
-responses also for non-HTTP protocol schemes.
-
-Instances of this class are usually created and returned by the
-C<request()> method of an C<LWP::UserAgent> object:
-
- #...
- $response = $ua->request($request)
- if ($response->is_success) {
-     print $response->content;
- } else {
-     print $response->error_as_HTML;
- }
-
-C<HTTP::Response> is a subclass of C<HTTP::Message> and therefore
-inherits its methods.  The inherited methods often used are header(),
-push_header(), remove_header(), headers_as_string(), and content().
-The header convenience methods are also available.  See
-L<HTTP::Message> for details.
-
-The following additional methods are available:
-
-=over 4
-
-=cut
-
-
-require HTTP::Message;
-@ISA = qw(HTTP::Message);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use HTTP::Status ();
-use URI::URL ();
-use strict;
-
-
-=item $r = HTTP::Response->new($rc, [$msg, [$header, [$content]]])
-
-Constructs a new C<HTTP::Response> object describing a response with
-response code C<$rc> and optional message C<$msg>.  The message is a
-short human readable single line string that explains the response
-code.
-
-=cut
-
-sub new
-{
-    my($class, $rc, $msg, $header, $content) = @_;
-    my $self = $class->SUPER::new($header, $content);
-    $self->code($rc);
-    $self->message($msg);
-    $self;
-}
-
-
-sub clone
-{
-    my $self = shift;
-    my $clone = bless $self->SUPER::clone, ref($self);
-    $clone->code($self->code);
-    $clone->message($self->message);
-    $clone->request($self->request->clone) if $self->request;
-    # we don't clone previous
-    $clone;
-}
-
-=item $r->code([$code])
-
-=item $r->message([$message])
-
-=item $r->request([$request])
-
-=item $r->previous([$previousResponse])
-
-These methods provide public access to the member variables.  The
-first two containing respectively the response code and the message
-of the response.
-
-The request attribute is a reference the request that gave this
-response.  It does not have to be the same request as passed to the
-$ua->request() method, because there might have been redirects and
-authorization retries in between.
-
-The previous attribute is used to link together chains of responses.
-You get chains of responses if the first response is redirect or
-unauthorized.
-
-=cut
-
-sub code      { shift->_elem('_rc',      @_); }
-sub message   { shift->_elem('_msg',     @_); }
-sub previous  { shift->_elem('_previous',@_); }
-sub request   { shift->_elem('_request', @_); }
-
-=item $r->status_line
-
-Returns the string "E<lt>code> E<lt>message>".  If the message attribute
-is not set then the official name of E<lt>code> (see L<HTTP::Status>)
-is substituted.
-
-=cut
-
-sub status_line
-{
-    my $self = shift;
-    my $code = $self->{'_rc'}  || "000";
-    my $mess = $self->{'_msg'} || HTTP::Status::status_message($code) || "?";
-    return "$code $mess";
-}
-
-=item $r->base
-
-Returns the base URL for this response.  The return value will be a
-reference to a URI::URL object.
-
-The base URL is obtained from one the following sources (in priority
-order):
-
-=over 4
-
-=item 1.
-
-Embedded in the document content, for instance <BASE HREF="...">
-in HTML documents.
-
-=item 2.
-
-A "Content-Base:" or a "Content-Location:" header in the response.
-
-For backwards compatability with older HTTP implementations we will
-also look for the "Base:" header.
-
-
-=item 3.
-
-The URL used to request this response. This might not be the original
-URL that was passed to $ua->request() method, because we might have
-received some redirect responses first.
-
-=back
-
-When the LWP protocol modules produce the HTTP::Response object, then
-any base URL embedded in the document (step 1) will already have
-initialized the "Content-Base:" header. This means that this method
-only perform the last 2 steps (the content is not always available
-either).
-
-=cut
-
-sub base
-{
-    my $self = shift;
-    my $base = $self->header('Content-Base')     ||  # HTTP/1.1
-               $self->header('Content-Location') ||  # HTTP/1.1
-               $self->header('Base')             ||  # backwards compatability HTTP/1.0
-               $self->request->url;
-    $base = URI::URL->new($base) unless ref $base;
-    $base;
-}
-
-
-=item $r->as_string
-
-Method returning a textual representation of the response.  Mainly
-useful for debugging purposes. It takes no arguments.
-
-=cut
-
-sub as_string
-{
-    require HTTP::Status;
-    my $self = shift;
-    my @result;
-    #push(@result, "---- $self ----");
-    my $code = $self->code;
-    my $status_message = HTTP::Status::status_message($code) || "Unknown code";
-    my $message = $self->message || "";
-
-    my $status_line = "$code";
-    my $proto = $self->protocol;
-    $status_line = "$proto $status_line" if $proto;
-    $status_line .= " ($status_message)" if $status_message ne $message;
-    $status_line .= " $message";
-    push(@result, $status_line);
-    push(@result, $self->headers_as_string);
-    my $content = $self->content;
-    if (defined $content) {
-	push(@result, $content);
-    }
-    #push(@result, ("-" x 40));
-    join("\n", @result, "");
-}
-
-=item $r->is_info
-
-=item $r->is_success
-
-=item $r->is_redirect
-
-=item $r->is_error
-
-These methods indicate if the response was informational, sucessful, a
-redirection, or an error.
-
-=cut
-
-sub is_info     { HTTP::Status::is_info     (shift->{'_rc'}); }
-sub is_success  { HTTP::Status::is_success  (shift->{'_rc'}); }
-sub is_redirect { HTTP::Status::is_redirect (shift->{'_rc'}); }
-sub is_error    { HTTP::Status::is_error    (shift->{'_rc'}); }
-
-
-=item $r->error_as_HTML()
-
-Return a string containing a complete HTML document indicating what
-error occurred.  This method should only be called when $r->is_error
-is TRUE.
-
-=cut
-
-sub error_as_HTML
-{
-    my $self = shift;
-    my $title = 'An Error Occurred';
-    my $body  = $self->status_line;
-    return <<EOM;
-<HTML>
-<HEAD><TITLE>$title</TITLE></HEAD>
-<BODY>
-<H1>$title</h1>
-$body
-</BODY>
-</HTML>
-EOM
-}
-
-
-=item $r->current_age
-
-This function will calculate the "current age" of the response as
-specified by E<lt>draft-ietf-http-v11-spec-07> section 13.2.3.  The
-age of a response is the time since it was sent by the origin server.
-The returned value is a number representing the age in seconds.
-
-=cut
-
-sub current_age
-{
-    my $self = shift;
-    # Implementation of <draft-ietf-http-v11-spec-07> section 13.2.3
-    # (age calculations)
-    my $response_time = $self->client_date;
-    my $date = $self->date;
-
-    my $age = 0;
-    if ($response_time && $date) {
-	$age = $response_time - $date;  # apparent_age
-	$age = 0 if $age < 0;
-    }
-
-    my $age_v = $self->header('Age');
-    if ($age_v && $age_v > $age) {
-	$age = $age_v;   # corrected_received_age
-    }
-
-    my $request = $self->request;
-    if ($request) {
-	my $request_time = $request->date;
-	if ($request_time) {
-	    # Add response_delay to age to get 'corrected_initial_age'
-	    $age += $response_time - $request_time;
-	}
-    }
-    if ($response_time) {
-	$age += time - $response_time;
-    }
-    return $age;
-}
-
-
-=item $r->freshness_lifetime
-
-This function will calculate the "freshness lifetime" of the response
-as specified by E<lt>draft-ietf-http-v11-spec-07> section 13.2.4.  The
-"freshness lifetime" is the length of time between the generation of a
-response and its expiration time.  The returned value is a number
-representing the freshness lifetime in seconds.
-
-If the response does not contain an "Expires" or a "Cache-Control"
-header, then this function will apply some simple heuristic based on
-'Last-Modified' to determine a suitable lifetime.
-
-=cut
-
-sub freshness_lifetime
-{
-    my $self = shift;
-
-    # First look for the Cache-Control: max-age=n header
-    my @cc = $self->header('Cache-Control');
-    if (@cc) {
-	my $cc;
-	for $cc (@cc) {
-	    my $cc_dir;
-	    for $cc_dir (split(/\s*,\s*/, $cc)) {
-		if ($cc_dir =~ /max-age\s*=\s*(\d+)/i) {
-		    return $1;
-		}
-	    }
-	}
-    }
-
-    # Next possibility is to look at the "Expires" header
-    my $date = $self->date || $self->client_date || time;      
-    my $expires = $self->expires;
-    unless ($expires) {
-	# Must apply heuristic expiration
-	my $last_modified = $self->last_modified;
-	if ($last_modified) {
-	    my $h_exp = ($date - $last_modified) * 0.10;  # 10% since last-mod
-	    if ($h_exp < 60) {
-		return 60;  # minimum
-	    } elsif ($h_exp > 24 * 3600) {
-		# Should give a warning if more than 24 hours according to
-		# <draft-ietf-http-v11-spec-07> section 13.2.4, but I don't
-		# know how to do it from this function interface, so I just
-		# make this the maximum value.
-		return 24 * 3600;
-	    }
-	    return $h_exp;
-	} else {
-	    return 3600;  # 1 hour is fallback when all else fails
-	}
-    }
-    return $expires - $date;
-}
-
-
-=item $r->is_fresh
-
-Returns TRUE if the response is fresh, based on the values of
-freshness_lifetime() and current_age().  If the response is not longer
-fresh, then it has to be refetched or revalidated by the origin
-server.
-
-=cut
-
-sub is_fresh
-{
-    my $self = shift;
-    $self->freshness_lifetime > $self->current_age;
-}
-
-
-=item $r->fresh_until
-
-Returns the time when this entiy is no longer fresh.
-
-=cut
-
-sub fresh_until
-{
-    my $self = shift;
-    return $self->freshness_lifetime - $self->current_age + time;
-}
-
-1;
-
-=back 
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/HTTP/Status.pm b/testcases/ballista/ballista/perllib/HTTP/Status.pm
deleted file mode 100644
index 93635b4..0000000
--- a/testcases/ballista/ballista/perllib/HTTP/Status.pm
+++ /dev/null
@@ -1,233 +0,0 @@
-#
-# $Id: Status.pm,v 1.1 2004/10/18 17:58:15 mridge Exp $
-
-package HTTP::Status;
-
-use strict;
-require 5.002;   # becase we use prototypes
-
-=head1 NAME
-
-HTTP::Status - HTTP Status code processing
-
-=head1 SYNOPSIS
-
- use HTTP::Status;
-
- if ($rc != RC_OK) {
-     print status_message($rc), "\n";
- }
-
- if (is_success($rc)) { ... }
- if (is_error($rc)) { ... }
- if (is_redirect($rc)) { ... }
-
-=head1 DESCRIPTION
-
-I<HTTP::Status> is a library of routines for defining and
-classification of HTTP status codes for libwww-perl.  Status codes are
-used to encode the overall outcome of a HTTP response message.  Codes
-correspond to those defined in F<draft-ietf-http-v11-spec-rev-03> (an
-update to RFC 2068).
-
-=head1 CONSTANTS
-
-The following constant functions can be used as mnemonic status code
-names:
-
-   RC_CONTINUE				(100)
-   RC_SWITCHING_PROTOCOLS		(101)
-
-   RC_OK				(200)
-   RC_CREATED				(201)
-   RC_ACCEPTED				(202)
-   RC_NON_AUTHORITATIVE_INFORMATION	(203)
-   RC_NO_CONTENT			(204)
-   RC_RESET_CONTENT			(205)
-   RC_PARTIAL_CONTENT			(206)
-
-   RC_MULTIPLE_CHOICES			(300)
-   RC_MOVED_PERMANENTLY			(301)
-   RC_FOUND				(302)
-   RC_SEE_OTHER				(303)
-   RC_NOT_MODIFIED			(304)
-   RC_USE_PROXY				(305)
-   RC_TEMPORARY_REDIRECT		(307)
-
-   RC_BAD_REQUEST			(400)
-   RC_UNAUTHORIZED			(401)
-   RC_PAYMENT_REQUIRED			(402)
-   RC_FORBIDDEN				(403)
-   RC_NOT_FOUND				(404)
-   RC_METHOD_NOT_ALLOWED		(405)
-   RC_NOT_ACCEPTABLE			(406)
-   RC_PROXY_AUTHENTICATION_REQUIRED	(407)
-   RC_REQUEST_TIMEOUT			(408)
-   RC_CONFLICT				(409)
-   RC_GONE				(410)
-   RC_LENGTH_REQUIRED			(411)
-   RC_PRECONDITION_FAILED		(412)
-   RC_REQUEST_ENTITY_TOO_LARGE		(413)
-   RC_REQUEST_URI_TOO_LARGE		(414)
-   RC_UNSUPPORTED_MEDIA_TYPE		(415)
-   RC_REQUEST_RANGE_NOT_SATISFIABLE     (416)
-   RC_EXPECTATION_FAILED		(417)
-
-   RC_INTERNAL_SERVER_ERROR		(500)
-   RC_NOT_IMPLEMENTED			(501)
-   RC_BAD_GATEWAY			(502)
-   RC_SERVICE_UNAVAILABLE		(503)
-   RC_GATEWAY_TIMEOUT			(504)
-   RC_HTTP_VERSION_NOT_SUPPORTED	(505)
-
-=cut
-
-#####################################################################
-
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(is_info is_success is_redirect is_error status_message);
-@EXPORT_OK = qw(is_client_error is_server_error);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-# Note also addition of mnemonics to @EXPORT below
-
-my %StatusCode = (
-    100 => 'Continue',
-    101 => 'Switching Protocols',
-    200 => 'OK',
-    201 => 'Created',
-    202 => 'Accepted',
-    203 => 'Non-Authoritative Information',
-    204 => 'No Content',
-    205 => 'Reset Content',
-    206 => 'Partial Content',
-    300 => 'Multiple Choices',
-    301 => 'Moved Permanently',
-    302 => 'Found',
-    303 => 'See Other',
-    304 => 'Not Modified',
-    305 => 'Use Proxy',
-    307 => 'Temporary Redirect',
-    400 => 'Bad Request',
-    401 => 'Unauthorized',
-    402 => 'Payment Required',
-    403 => 'Forbidden',
-    404 => 'Not Found',
-    405 => 'Method Not Allowed',
-    406 => 'Not Acceptable',
-    407 => 'Proxy Authentication Required',
-    408 => 'Request Timeout',
-    409 => 'Conflict',
-    410 => 'Gone',
-    411 => 'Length Required',
-    412 => 'Precondition Failed',
-    413 => 'Request Entity Too Large',
-    414 => 'Request-URI Too Large',
-    415 => 'Unsupported Media Type',
-    416 => 'Request Range Not Satisfiable',
-    417 => 'Expectation Failed',
-    500 => 'Internal Server Error',
-    501 => 'Not Implemented',
-    502 => 'Bad Gateway',
-    503 => 'Service Unavailable',
-    504 => 'Gateway Timeout',
-    505 => 'HTTP Version Not Supported',
-);
-
-my $mnemonicCode = '';
-my ($code, $message);
-while (($code, $message) = each %StatusCode) {
-    # create mnemonic subroutines
-    $message =~ tr/a-z \-/A-Z__/;
-    $mnemonicCode .= "sub RC_$message () { $code }\t";
-    # make them exportable
-    $mnemonicCode .= "push(\@EXPORT, 'RC_$message');\n";
-}
-# warn $mnemonicCode; # for development
-eval $mnemonicCode; # only one eval for speed
-die if $@;
-
-# backwards compatibility
-*RC_MOVED_TEMPORARILY = \&RC_FOUND;  # 302 was renamed in the standard
-push(@EXPORT, "RC_MOVED_TEMPORARILY");
-
-
-=head1 FUNCTIONS
-
-The following additional functions are provided.  Most of them are
-exported by default.
-
-=over 4
-
-=item status_message($code)
-
-The status_message() function will translate status codes to human
-readable strings. The string is the same as found in the constant
-names above.  If the $code is unknown, then C<undef> is returned.
-
-=cut
-
-sub status_message ($)
-{
-    $StatusCode{$_[0]};
-}
-
-=item is_info($code)
-
-Return TRUE if C<$code> is an I<Informational> status code.  This
-class of status code indicates a provisional response which can't have
-any content.
-
-=item is_success($code)
-
-Return TRUE if C<$code> is a I<Successful> status code.
-
-=item is_redirect($code)
-
-Return TRUE if C<$code> is a I<Redirection> status code. This class of
-status code indicates that further action needs to be taken by the
-user agent in order to fulfill the request.
-
-=item is_error($code)
-
-Return TRUE if C<$code> is an I<Error> status code.  The function
-return TRUE for both client error or a server error status codes.
-
-=item is_client_error($code)
-
-Return TRUE if C<$code> is an I<Client Error> status code. This class
-of status code is intended for cases in which the client seems to have
-erred.
-
-This function is B<not> exported by default.
-
-=item is_server_error($code)
-
-Return TRUE if C<$code> is an I<Server Error> status code. This class
-of status codes is intended for cases in which the server is aware
-that it has erred or is incapable of performing the request.
-
-This function is B<not> exported by default.
-
-=back
-
-=cut
-
-sub is_info         ($) { $_[0] >= 100 && $_[0] < 200; }
-sub is_success      ($) { $_[0] >= 200 && $_[0] < 300; }
-sub is_redirect     ($) { $_[0] >= 300 && $_[0] < 400; }
-sub is_error        ($) { $_[0] >= 400 && $_[0] < 600; }
-sub is_client_error ($) { $_[0] >= 400 && $_[0] < 500; }
-sub is_server_error ($) { $_[0] >= 500 && $_[0] < 600; }
-
-1;
-
-=head1 BUGS
-
-Wished @EXPORT_OK had been used instead of @EXPORT in the beginning.
-Now too much is exported by default.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/LWP/Authen/Basic.pm b/testcases/ballista/ballista/perllib/LWP/Authen/Basic.pm
deleted file mode 100644
index f4c5f49..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Authen/Basic.pm
+++ /dev/null
@@ -1,36 +0,0 @@
-package LWP::Authen::Basic;
-use strict;
-
-require MIME::Base64;
-
-sub authenticate
-{
-    my($class, $ua, $proxy, $auth_param, $response,
-       $request, $arg, $size) = @_;
-
-    my($user, $pass) = $ua->get_basic_credentials($auth_param->{realm},
-                                                  $request->url, $proxy);
-    return $response unless defined $user and defined $pass;
-
-    my $auth_header = $proxy ? "Proxy-Authorization" : "Authorization";
-    my $auth_value = "Basic " . MIME::Base64::encode("$user:$pass", "");
-
-    # Need to check this isn't a repeated fail!
-    my $r = $response;
-    while ($r) {
-	my $auth = $r->request->header($auth_header);
-	if ($auth && $auth eq $auth_value) {
-	    # here we know this failed before
-	    $response->header("Client-Warning" =>
-			      "Credentials for '$user' failed before");
-	    return $response;
-	}
-	$r = $r->previous;
-    }
-
-    my $referral = $request->clone;
-    $referral->header($auth_header => $auth_value);
-    return $ua->request($referral, $arg, $size, $response);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Authen/Digest.pm b/testcases/ballista/ballista/perllib/LWP/Authen/Digest.pm
deleted file mode 100644
index 995413d..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Authen/Digest.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-package LWP::Authen::Digest;
-use strict;
-
-require MD5;
-
-sub authenticate
-{
-    my($class, $ua, $proxy, $auth_param, $response,
-       $request, $arg, $size) = @_;
-
-    my($user, $pass) = $ua->get_basic_credentials($auth_param->{realm},
-                                                  $request->url, $proxy);
-    return $response unless defined $user and defined $pass;
-
-    my $md5 = new MD5;
-
-    my(@digest);
-    $md5->add(join(":", $user, $auth_param->{realm}, $pass));
-    push(@digest, $md5->hexdigest);
-    $md5->reset;
-
-    push(@digest, $auth_param->{nonce});
-
-    $md5->add(join(":", $request->method, $request->url->path));
-    push(@digest, $md5->hexdigest);
-    $md5->reset;
-
-    $md5->add(join(":", @digest));
-    my($digest) = $md5->hexdigest;
-    $md5->reset;
-
-    my %resp = map { $_ => $auth_param->{$_} } qw(realm nonce opaque);
-    @resp{qw(username uri response)} = ($user, $request->url->path, $digest);
-
-    my(@order) = qw(username realm nonce uri response);
-    if($request->method =~ /^(?:POST|PUT)$/) {
-	$md5->add($request->content);
-	my $content = $md5->hexdigest;
-	$md5->reset;
-	$md5->add(join(":", @digest[0..1], $content));
-	$md5->reset;
-	$resp{"message-digest"} = $md5->hexdigest;
-	push(@order, "message-digest");
-    }
-    push(@order, "opaque");
-    my @pairs;
-    for (@order) {
-	next unless defined $resp{$_};
-	push(@pairs, "$_=" . qq("$resp{$_}"));
-    }
-
-    my $auth_header = $proxy ? "Proxy-Authorization" : "Authorization";
-    my $auth_value  = "Digest " . join(", ", @pairs);
-    
-    # Need to check this isn't a repeated fail!
-    my $r = $response;
-    while ($r) {
-	my $auth = $r->request->header($auth_header);
-	if ($auth && $auth eq $auth_value) {
-	    # here we know this failed before
-	    $response->header("Client-Warning" =>
-			      "Credentials for '$user' failed before");
-	    return $response;
-	}
-	$r = $r->previous;
-    }
-
-    my $referral = $request->clone;
-    $referral->header($auth_header => $auth_value);
-    return $ua->request($referral, $arg, $size, $response);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Debug.pm b/testcases/ballista/ballista/perllib/LWP/Debug.pm
deleted file mode 100644
index 7767d24..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Debug.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-: # use perl                            -*- mode: Perl; -*-
-        eval 'exec perl -S $0 "$@"'
-        if $running_under_some_shell;
-
-#
-# $Id: Debug.pm,v 1.2 2005/08/03 20:20:11 robbiew Exp $
-#
-package LWP::Debug;
-
-=head1 NAME
-
-LWP::Debug - debug routines for the libwww-perl library
-
-=head1 SYNOPSIS
-
- use LWP::Debug qw(+ -conns);
-
- # Used internally in the library
- LWP::Debug::trace('send()');
- LWP::Debug::debug('url ok');
- LWP::Debug::conns("read $n bytes: $data");
-
-=head1 DESCRIPTION
-
-LWP::Debug provides tracing facilities. The trace(), debug() and
-conns() function are called within the library and they log
-information at increasing levels of detail. Which level of detail is
-actually printed is controlled with the C<level()> function.
-
-The following functions are available:
-
-=over 4
-
-=item level(...)
-
-The C<level()> function controls the level of detail being
-logged. Passing '+' or '-' indicates full and no logging
-respectively. Inidividual levels can switched on and of by passing the
-name of the level with a '+' or '-' prepended.  The levels are:
-
-  trace   : trace function calls
-  debug   : print debug messages
-  conns   : show all data transfered over the connections
-
-The LWP::Debug module provide a special import() method that allows
-you to pass the level() arguments with initial use statement.  If a
-use argument start with '+' or '-' then it is passed to the level
-function, else the name is exported as usual.  The following two
-statements are thus equivalent (if you ignore that the second pollutes
-your namespace):
-
-  use LWP::Debug qw(+);
-  use LWP::Debug qw(level); level('+');
-
-=item trace($msg)
-
-The C<trace()> function is used for tracing function
-calls. The package and calling subroutine name is
-printed along with the passed argument. This should
-be called at the start of every major function.
-
-=item debug($msg)
-
-The C<debug()> function is used for high-granularity
-reporting of state in functions.
-
-=item conns($msg)
-
-The C<conns()> function is used to show data being
-transferred over the connections. This may generate
-considerable output.
-
-=back
-
-=cut
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(level trace debug conns);
-
-use Carp ();
-
-my @levels = qw(trace debug conns);
-%current_level = ();
-
-sub import
-{
-    my $pack = shift;
-    my $callpkg = caller(0);
-    my @symbols = ();
-    my @levels = ();
-    for (@_) {
-	if (/^[-+]/) {
-	    push(@levels, $_);
-	} else {
-	    push(@symbols, $_);
-	}
-    }
-    Exporter::export($pack, $callpkg, @symbols);
-    level(@levels);
-}
-
-sub level
-{
-    for (@_) {
-	if ($_ eq '+') {              # all on
-	    # switch on all levels
-	    %current_level = map { $_ => 1 } @levels;
-	} elsif ($_ eq '-') {           # all off
-	    %current_level = ();
-	} elsif (/^([-+])(\w+)$/) {
-	    $current_level{$2} = $1 eq '+';
-	} else {
-	    Carp::croak("Illegal level format $_");
-	}
-    }
-}
-
-sub trace  { _log(@_) if $current_level{'trace'}; }
-sub debug  { _log(@_) if $current_level{'debug'}; }
-sub conns  { _log(@_) if $current_level{'conns'}; }
-
-sub _log
-{
-    my $msg = shift;
-    $msg .= "\n" unless $msg =~ /\n$/;  # ensure trailing "\n"
-
-    my($package,$filename,$line,$sub) = caller(2);
-    print STDERR "$sub: $msg";
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/MediaTypes.pm b/testcases/ballista/ballista/perllib/LWP/MediaTypes.pm
deleted file mode 100644
index 0b213e1..0000000
--- a/testcases/ballista/ballista/perllib/LWP/MediaTypes.pm
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# $Id: MediaTypes.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-package LWP::MediaTypes;
-
-=head1 NAME
-
-LWP::MediaTypes - guess media type for a file or a URL
-
-=head1 SYNOPSIS
-
- use LWP::MediaTypes qw(guess_media_type);
- $type = guess_media_type("/tmp/foo.gif");
-
-=head1 DESCRIPTION
-
-This module provides functions for handling of media (also known as
-MIME) types and encodings.  The mapping from file extentions to media
-types is defined by the F<media.types> file.  If the F<~/.media.types>
-file exist it is used as a replacement.
-For backwards compatability we will also look for F<~/.mime.types>.
-
-The following functions are exported by default:
-
-=over 4
-
-=cut
-
-####################################################################
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(guess_media_type media_suffix);
-@EXPORT_OK = qw(add_type add_encoding);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-require LWP::Debug;
-use strict;
-
-# note: These hashes will also be filled with the entries found in
-# the 'media.types' file.
-
-my %suffixType = (
-    'txt'   => 'text/plain',
-    'html'  => 'text/html',
-    'gif'   => 'image/gif',
-    'jpg'   => 'image/jpeg',
-);
-
-my %suffixExt = (
-    'text/plain' => 'txt',
-    'text/html'  => 'h',
-    'image/gif'  => 'gif',
-    'image/jpeg' => 'jpg',
-);
-
-#XXX: there should be some way to define this in the media.types files.
-my %suffixEncoding = (
-    'Z'   => 'compress',
-    'gz'  => 'gzip',
-    'hqx' => 'x-hqx',
-    'uu'  => 'x-uuencode',
-    'z'   => 'x-pack'
-);
-
-sub _dump {
-    require Data::Dumper;
-    Data::Dumper->new([\%suffixType, \%suffixExt, \%suffixEncoding],
-		      [qw(*suffixType *suffixExt *suffixEncoding)])->Dump;
-}
-
-read_media_types();
-
-
-
-=item guess_media_type($filename_or_url, [$header_to_modify])
-
-This function tries to guess media type and encoding for given file.
-It returns the content-type, which is a string like C<"text/html">.
-In array context it also returns any content-encodings applied (in the
-order used to encode the file).  You can pass a URI::URL object
-reference, instead of the file name, as the first parameter too.
-
-If the type can not be deduced from looking at the file name only,
-then guess_media_type() will let the C<-T> Perl operator take a look.
-If this works (and C<-T> returns a TRUE value) then we return
-I<text/plain> as the type, otherwise we return
-I<application/octet-stream> as the type.
-
-The optional second argument should be a reference to a HTTP::Headers
-object (or any object that implement the $obj->header method in a
-similar way).  When present we will set the values of the
-'Content-Type' and 'Content-Encoding' for this header.
-
-=cut
-
-sub guess_media_type
-{
-    my($file, $header) = @_;
-    return undef unless defined $file;
-
-    my $fullname;
-    if (ref($file)) {
-	# assume URI::URL object
-	$file = $file->path;
-	#XXX should handle non http:, file: or ftp: URLs differently
-    } else {
-	$fullname = $file;  # enable peek at actual file
-    }
-
-    my @encoding = ();
-    my $ct = undef;
-    for (file_exts($file)) {
-	# first check this dot part as encoding spec
-	if (exists $suffixEncoding{$_}) {
-	    unshift(@encoding, $suffixEncoding{$_});
-	    next;
-	}
-	if (exists $suffixEncoding{lc $_}) {
-	    unshift(@encoding, $suffixEncoding{lc $_});
-	    next;
-	}
-
-	# check content-type
-	if (exists $suffixType{$_}) {
-	    $ct = $suffixType{$_};
-	    last;
-	}
-	if (exists $suffixType{lc $_}) {
-	    $ct = $suffixType{lc $_};
-	    last;
-	}
-
-	# don't know nothing about this dot part, bail out
-	last;
-    }
-    unless (defined $ct) {
-	# Take a look at the file
-	if (defined $fullname) {
-	    $ct = (-T $fullname) ? "text/plain" : "application/octet-stream";
-	} else {
-	    $ct = "application/octet-stream";
-	}
-    }
-
-    if ($header) {
-	$header->header('Content-Type' => $ct);
-	$header->header('Content-Encoding' => \@encoding) if @encoding;
-    }
-
-    wantarray ? ($ct, @encoding) : $ct;
-}
-
-
-=item media_suffix($type,...)
-
-This function will return all suffixes that can be used to denote the
-specified media type(s).  Wildcard types can be used.  In scalar
-context it will return the first suffix found.
-
-Examples:
-
-  @suffixes = media_suffix('image/*', 'audio/basic');
-  $suffix = media_suffix('text/html');
-
-=cut
-
-sub media_suffix {
-    if (!wantarray && @_ == 1 && $_[0] !~ /\*/) {
-	return $suffixExt{$_[0]};
-    }
-    my(@type) = @_;
-    my(@suffix, $ext, $type);
-    foreach (@type) {
-	if (s/\*/.*/) {
-	    while(($ext,$type) = each(%suffixType)) {
-		push(@suffix, $ext) if $type =~ /^$_$/;
-	    }
-	} else {
-	    while(($ext,$type) = each(%suffixType)) {
-		push(@suffix, $ext) if $type eq $_;
-	    }
-	}
-    }
-    wantarray ? @suffix : $suffix[0];
-}
-
-
-sub file_exts 
-{
-    my($file) = @_;
-    $file =~ s,.*/,,;   # only basename left
-    my @parts = reverse split(/\./, $file);
-    pop(@parts);        # never concider first part
-    @parts;
-}
-
-
-=back
-
-The following functions are only exported by explict request:
-
-=over 4
-
-=item add_type($type, @exts)
-
-Associate a list of file extensions with the given media type.
-
-Example:
-
-    add_type("x-world/x-vrml" => qw(wrl vrml));
-
-=cut
-
-sub add_type 
-{
-    my($type, @exts) = @_;
-    for my $ext (@exts) {
-	$ext =~ s/^\.//;
-	$suffixType{$ext} = $type;
-    }
-    $suffixExt{$type} = $exts[0] if @exts;
-}
-
-
-=item add_encoding($type, @ext)
-
-Associate a list of file extensions with and encoding type.
-
-Example:
-
- add_encoding("x-gzip" => "gz");
-
-=cut
-
-sub add_encoding
-{
-    my($type, @exts) = @_;
-    for my $ext (@exts) {
-	$ext =~ s/^\.//;
-	$suffixEncoding{$ext} = $type;
-    }
-}
-
-
-=item read_media_types(@files)
-
-Parse a media types file from disk and add the type mappings found there.
-
-Example:
-
-    read_media_types("conf/mime.types");
-
-=cut
-
-sub read_media_types 
-{
-    my(@files) = @_;
-
-    local($/, $_) = ("\n", undef);  # ensure correct $INPUT_RECORD_SEPARATOR
-
-    my @priv_files = ();
-    push(@priv_files, "$ENV{HOME}/.media.types", "$ENV{HOME}/.mime.types")
-	if defined $ENV{HOME};  # Some doesn't have a home (for instance Win32)
-
-    # Try to locate "media.types" file, and initialize %suffixType from it
-    my $typefile;
-    unless (@files) {
-	@files = map {"$_/LWP/media.types"} @INC;
-	push @files, @priv_files;
-    }
-    for $typefile (@files) {
-	local(*TYPE);
-	open(TYPE, $typefile) || next;
-        LWP::Debug::debug("Reading media types from $typefile");
-	while (<TYPE>) {
-	    next if /^\s*#/; # comment line
-	    next if /^\s*$/; # blank line
-	    s/#.*//;         # remove end-of-line comments
-	    my($type, @exts) = split(' ', $_);
-	    add_type($type, @exts);
-	}
-	close(TYPE);
-    }
-}
-
-1;
-
-=back 
-
-=head1 COPYRIGHT
-
-Copyright 1995-1998 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/LWP/MemberMixin.pm b/testcases/ballista/ballista/perllib/LWP/MemberMixin.pm
deleted file mode 100644
index 125dc71..0000000
--- a/testcases/ballista/ballista/perllib/LWP/MemberMixin.pm
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id: MemberMixin.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-package LWP::MemberMixin;
-
-=head1 NAME
-
-LWP::MemberMixin - Member access mixin class
-
-=head1 SYNOPSIS
-
- package Foo;
- require LWP::MemberMixin;
- @ISA=qw(LWP::MemberMixin);
-
-=head1 DESCRIPTION
-
-A mixin class to get methods that provide easy access to member
-variables in the %$self.
-Ideally there should be better Perl langauge support for this.
-
-There is only one method provided:
-
-=over 4
-
-=item _elem($elem [, $val])
-
-Internal method to get/set the value of member variable
-C<$elem>. If C<$val> is defined it is used as the new value
-for the member variable.  If it is undefined the current
-value is not touched. In both cases the previous value of
-the member variable is returned.
-
-=back
-
-=cut
-
-sub _elem
-{
-    my($self, $elem, $val) = @_;
-    my $old = $self->{$elem};
-    $self->{$elem} = $val if defined $val;
-    return $old;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol.pm b/testcases/ballista/ballista/perllib/LWP/Protocol.pm
deleted file mode 100644
index 54ae041..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol.pm
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: Protocol.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-package LWP::Protocol;
-
-=head1 NAME
-
-LWP::Protocol - Base class for LWP protocols
-
-=head1 SYNOPSIS
-
- package LWP::Protocol::foo;
- require LWP::Protocol;
- @ISA=qw(LWP::Protocol);
-
-=head1 DESCRIPTION
-
-This class is used a the base class for all protocol implementations
-supported by the LWP library.
-
-When creating an instance of this class using
-C<LWP::Protocol::create($url)>, and you get an initialised subclass
-appropriate for that access method. In other words, the
-LWP::Protocol::create() function calls the constructor for one of its
-subclasses.
-
-All derived LWP::Protocol classes need to override the request()
-method which is used to service a request. The overridden method can
-make use of the collect() function to collect together chunks of data
-as it is received.
-
-The following methods and functions are provided:
-
-=over 4
-
-=cut
-
-#####################################################################
-
-require LWP::MemberMixin;
-@ISA = qw(LWP::MemberMixin);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use strict;
-use Carp ();
-use HTTP::Status 'RC_INTERNAL_SERVER_ERROR';
-require HTML::HeadParser;
-
-my %ImplementedBy = (); # scheme => classname
-
-
-=item $prot = new HTTP::Protocol;
-
-The LWP::Protocol constructor is inherited by subclasses. As this is a
-virtual base class this method should B<not> be called directly.
-
-=cut
-
-sub new
-{
-    my($class) = @_;
-
-    my $self = bless {
-	'timeout' => 0,
-	'parse_head' => 1,
-    }, $class;
-    $self;
-}
-
-
-=item $prot = LWP::Protocol::create($url)
-
-Create an object of the class implementing the protocol to handle the
-given scheme. This is a function, not a method. It is more an object
-factory than a constructor. This is the function user agents should
-use to access protocols.
-
-=cut
-
-sub create
-{
-    my $scheme = shift;
-    my $impclass = LWP::Protocol::implementor($scheme) or
-	Carp::croak("Protocol scheme '$scheme' is not supported");
-
-    # hand-off to scheme specific implementation sub-class
-    return $impclass->new($scheme);
-}
-
-
-=item $class = LWP::Protocol::implementor($scheme, [$class])
-
-Get and/or set implementor class for a scheme.  Returns '' if the
-specified scheme is not supported.
-
-=cut
-
-sub implementor
-{
-    my($scheme, $impclass) = @_;
-
-    if ($impclass) {
-	$ImplementedBy{$scheme} = $impclass;
-    }
-    my $ic = $ImplementedBy{$scheme};
-    return $ic if $ic;
-
-    return '' unless $scheme =~ /^([.+\-\w]+)$/;  # check valid URL schemes
-    $scheme = $1; # untaint
-    $scheme =~ s/[.+\-]/_/g;  # make it a legal module name
-
-    # scheme not yet known, look for a 'use'd implementation
-    $ic = "LWP::Protocol::$scheme";  # default location
-    $ic = "LWP::Protocol::nntp" if $scheme eq 'news'; #XXX ugly hack
-    no strict 'refs';
-    # check we actually have one for the scheme:
-    unless (defined @{"${ic}::ISA"}) {
-	# try to autoload it
-	eval "require $ic";
-	if ($@) {
-	    if ($@ =~ /^Can't locate/) { #' #emacs get confused by '
-		$ic = '';
-	    } else {
-		die "$@\n";
-	    }
-	}
-    }
-    $ImplementedBy{$scheme} = $ic if $ic;
-    $ic;
-}
-
-
-=item $prot->request(...)
-
- $response = $protocol->request($request, $proxy, undef);
- $response = $protocol->request($request, $proxy, '/tmp/sss');
- $response = $protocol->request($request, $proxy, \&callback, 1024);
-
-Dispactches a request over the protocol, and returns a response
-object. This method needs to be overridden in subclasses.  Referer to
-L<LWP::UserAgent> for description of the arguments.
-
-=cut
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-    Carp::croak('LWP::Protocol::request() needs to be overridden in subclasses');
-}
-
-
-=item $prot->timeout($seconds)
-
-Get and set the timeout value in seconds
-
-
-=item $prot->parse_head($yesno)
-
-Should we initialize response headers from the <head> section of HTML
-documents.
-
-=cut
-
-sub timeout    { shift->_elem('timeout',    @_); }
-sub parse_head { shift->_elem('parse_head', @_); }
-sub max_size   { shift->_elem('max_size',   @_); }
-
-
-=item $prot->collect($arg, $response, $collector)
-
-Called to collect the content of a request, and process it
-appropriately into a scalar, file, or by calling a callback.  If $arg
-is undefined, then the content is stored within the $response.  If
-$arg is a simple scalar, then $arg is interpreted as a file name and
-the content is written to this file.  If $arg is a reference to a
-routine, then content is passed to this routine.
-
-The $collector is a routine that will be called and which is
-reponsible for returning pieces (as ref to scalar) of the content to
-process.  The $collector signals EOF by returning a reference to an
-empty sting.
-
-The return value from collect() is the $response object reference.
-
-B<Note:> We will only use the callback or file argument if
-$response->is_success().  This avoids sendig content data for
-redirects and authentization responses to the callback which would be
-confusing.
-
-=cut
-
-sub collect
-{
-    my ($self, $arg, $response, $collector) = @_;
-    my $content;
-    my($parse_head, $timeout, $max_size) =
-      @{$self}{qw(parse_head timeout max_size)};
-
-    my $parser;
-    if ($parse_head && $response->content_type eq 'text/html') {
-	$parser = HTML::HeadParser->new($response->{'_headers'});
-    }
-    my $content_size = 0;
-
-    if (!defined($arg) || !$response->is_success) {
-	# scalar
-	while ($content = &$collector, length $$content) {
-	    if ($parser) {
-		$parser->parse($$content) or undef($parser);
-	    }
-	    LWP::Debug::debug("read " . length($$content) . " bytes");
-	    $response->add_content($$content);
-	    $content_size += length($$content);
-	    if ($max_size && $content_size > $max_size) {
-		LWP::Debug::debug("Aborting because size limit exceeded");
-		my $tot = $response->header("Content-Length") || 0;
-		$response->header("X-Content-Range", "bytes 0-$content_size/$tot");
-		last;
-	    }
-	}
-    }
-    elsif (!ref($arg)) {
-	# filename
-	open(OUT, ">$arg") or
-	    return new HTTP::Response RC_INTERNAL_SERVER_ERROR,
-			  "Cannot write to '$arg': $!";
-        binmode(OUT);
-        local($\) = ""; # ensure standard $OUTPUT_RECORD_SEPARATOR
-	while ($content = &$collector, length $$content) {
-	    if ($parser) {
-		$parser->parse($$content) or undef($parser);
-	    }
-	    LWP::Debug::debug("read " . length($$content) . " bytes");
-	    print OUT $$content;
-	    $content_size += length($$content);
-	    if ($max_size && $content_size > $max_size) {
-		LWP::Debug::debug("Aborting because size limit exceeded");
-		my $tot = $response->header("Content-Length") || 0;
-		$response->header("X-Content-Range", "bytes 0-$content_size/$tot");
-		last;
-	    }
-	}
-	close(OUT);
-    }
-    elsif (ref($arg) eq 'CODE') {
-	# read into callback
-	while ($content = &$collector, length $$content) {
-	    if ($parser) {
-		$parser->parse($$content) or undef($parser);
-	    }
-	    LWP::Debug::debug("read " . length($$content) . " bytes");
-            eval {
-		&$arg($$content, $response, $self);
-	    };
-	    if ($@) {
-	        chomp($@);
-		$response->header('X-Died' => $@);
-		last;
-	    }
-	}
-    }
-    else {
-	return new HTTP::Response RC_INTERNAL_SERVER_ERROR,
-				  "Unexpected collect argument  '$arg'";
-    }
-    $response;
-}
-
-
-=item $prot->collect_once($arg, $response, $content)
-
-Can be called when the whole response content is available as
-$content.  This will invoke collect() with a collector callback that
-returns a reference to $content the first time and an empty string the
-next.
-
-=cut
-
-sub collect_once
-{
-    my($self, $arg, $response) = @_;
-    my $content = \ $_[3];
-    my $first = 1;
-    $self->collect($arg, $response, sub {
-	return $content if $first--;
-	return \ "";
-    });
-}
-
-1;
-
-=head1 SEE ALSO
-
-Inspect the F<LWP/Protocol/file.pm> and F<LWP/Protocol/http.pm> files
-for examples of usage.
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/data.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/data.pm
deleted file mode 100644
index 87b4b6f..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/data.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# $Id: data.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-#
-# Implements access to data:-URLs as specified in
-# draft-masinter-url-data-02.txt
-
-package LWP::Protocol::data;
-
-require HTTP::Response;
-require HTTP::Status;
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
-
-use HTTP::Date qw(time2str);
-require LWP;  # needs version number
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size) = @_;
-
-    # check proxy
-    if (defined $proxy)
-    {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'You can not proxy with data';
-    }
-
-    # check method
-    if ($request->method ne 'GET') {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'Library does not allow method ' .
-				  "$method for 'data:' URLs";
-    }
-
-    my $url = $request->url;
-    my $response = new HTTP::Response &HTTP::Status::RC_OK, "Document follows";
-
-    my($media_type, $params) = $url->media_type;
-    $media_type .= ";$params" if $params;
-
-    my $data = $url->data;
-    $response->header('Content-Type'   => $media_type,
-		      'Content-Length' => length($data),
-		      'Date'           => time2str(time),
-		      'Server'         => "libwww-perl-internal/$LWP::VERSION"
-		     );
-    $response->content($data);
-
-    return $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/file.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/file.pm
deleted file mode 100644
index dcaabcb..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/file.pm
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# $Id: file.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-package LWP::Protocol::file;
-
-require LWP::Protocol;
-require LWP::MediaTypes;
-require HTTP::Request;
-require HTTP::Response;
-require HTTP::Status;
-require HTTP::Date;
-
-require URI::Escape;
-require HTML::Entities;
-
-use Carp;
-
-@ISA = qw(LWP::Protocol);
-
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size) = @_;
-
-    LWP::Debug::trace('()');
-
-    $size = 4096 unless defined $size and $size > 0;
-
-    # check proxy
-    if (defined $proxy)
-    {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'You can not proxy through the filesystem';
-    }
-
-    # check method
-    $method = $request->method;
-
-    unless ($method eq 'GET' || $method eq 'HEAD') {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'Library does not allow method ' .
-				  "$method for 'file:' URLs";
-    }
-
-    # check url
-    my $url = $request->url;
-
-    my $scheme = $url->scheme;
-    if ($scheme ne 'file') {
-	return new HTTP::Response &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				  "LWP::file::request called for '$scheme'";
-    }
-
-    my $host = $url->host;
-    if ($host and $host !~ /^localhost$/i) {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST_CLIENT,
-				  'Only file://localhost/ allowed';
-    }
-
-    # URL OK, look at file
-    my $path  = $url->local_path;
-
-    # test file exists and is readable
-    unless (-e $path) {
-	return new HTTP::Response &HTTP::Status::RC_NOT_FOUND,
-				  "File `$path' does not exist";
-    }
-    unless (-r _) {
-	return new HTTP::Response &HTTP::Status::RC_FORBIDDEN,
-				  'User does not have read permission';
-    }
-
-    # looks like file exists
-    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$filesize,
-       $atime,$mtime,$ctime,$blksize,$blocks)
-	    = stat(_);
-
-    # XXX should check Accept headers?
-
-    # check if-modified-since
-    my $ims = $request->header('If-Modified-Since');
-    if (defined $ims) {
-	my $time = HTTP::Date::str2time($ims);
-	if (defined $time and $time >= $mtime) {
-	    return new HTTP::Response &HTTP::Status::RC_NOT_MODIFIED,
-				      "$method $path";
-	}
-    }
-
-    # Ok, should be an OK response by now...
-    $response = new HTTP::Response &HTTP::Status::RC_OK;
-
-    # fill in response headers
-    $response->header('Last-Modified', HTTP::Date::time2str($mtime));
-
-    if (-d _) {         # If the path is a directory, process it
-	# generate the HTML for directory
-	opendir(D, $path) or
-	   return new HTTP::Response &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				     "Cannot read directory '$path': $!";
-	my(@files) = sort readdir(D);
-	closedir(D);
-
-	# Make directory listing
-	for (@files) {
-	    $_ .= "/" if -d "$path/$_";
-	    my $furl = URI::Escape::uri_escape($_);
-	    my $desc = HTML::Entities::encode($_);
-	    $_ = qq{<LI><A HREF="$furl">$desc</A>};
-	}
-	# Ensure that the base URL is "/" terminated
-	my $base = $url->clone;
-	unless ($base->epath =~ m|/$|) {
-	    $base->epath($base->epath . "/");
-	}
-	my $html = join("\n",
-			"<HTML>\n<HEAD>",
-			"<TITLE>Directory $path</TITLE>",
-			"<BASE HREF=\"$base\">",
-			"</HEAD>\n<BODY>",
-			"<H1>Directory listing of $path</H1>",
-			"<UL>", @files, "</UL>",
-			"</BODY>\n</HTML>\n");
-
-	$response->header('Content-Type',   'text/html');
-	$response->header('Content-Length', length $html);
-
-	return $self->collect_once($arg, $response, $html);
-
-    } else {            # path is a regular file
-	my($type, @enc) = LWP::MediaTypes::guess_media_type($path);
-	$response->header('Content-Type',   $type) if $type;
-	$response->header('Content-Length', $filesize);
-	for (@enc) {
-	    $response->push_header('Content-Encoding', $_);
-	}
-
-	# read the file
-	open(F, $path) or return new
-	   HTTP::Response(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-			  "Cannot read file '$path': $!");
-	$response =  $self->collect($arg, $response, sub {
-	    my $content = "";
-	    my $bytes = sysread(F, $content, $size);
-	    return \$content if $bytes > 0;
-	    return \ "";
-	});
-	close(F);
-    }
-
-    $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/ftp.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/ftp.pm
deleted file mode 100644
index 5f429f7..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/ftp.pm
+++ /dev/null
@@ -1,396 +0,0 @@
-#
-# $Id: ftp.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-# Implementation of the ftp protocol (RFC 959). We let the Net::FTP
-# package do all the dirty work.
-
-package LWP::Protocol::ftp;
-
-use Carp ();
-
-use HTTP::Status ();
-use HTTP::Negotiate ();
-use HTTP::Response ();
-use LWP::MediaTypes ();
-use File::Listing ();
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
-
-use strict;
-eval {
-    require Net::FTP;
-    Net::FTP->require_version(2.00);
-};
-my $init_failed = $@;
-
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-
-    $size = 4096 unless $size;
-
-    LWP::Debug::trace('()');
-
-    # check proxy
-    if (defined $proxy)
-    {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'You can not proxy through the ftp');
-    }
-
-    my $url = $request->url;
-    if ($url->scheme ne 'ftp') {
-	my $scheme = $url->scheme;
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-		       "LWP::Protocol::ftp::request called for '$scheme'");
-    }
-
-    # check method
-    my $method = $request->method;
-
-    unless ($method eq 'GET' || $method eq 'HEAD' || $method eq 'PUT') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'Library does not allow method ' .
-				   "$method for 'ftp:' URLs");
-    }
-
-    if ($init_failed) {
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				   $init_failed);
-    }
-
-    my $host     = $url->host;
-    my $port     = $url->port;
-    my $user     = $url->user;
-    my $password = $url->password;
-
-    # If a basic autorization header is present than we prefer these over
-    # the username/password specified in the URL.
-    {
-	my($u,$p) = $request->authorization_basic;
-	if (defined $u) {
-	    $user = $u;
-	    $password = $p;
-	}
-    }
-
-    # We allow the account to be specified in the "Account" header
-    my $acct     = $request->header('Account');
-
-    # try to make a connection
-    my $ftp = Net::FTP->new($host, Port => $port);
-    unless ($ftp) {
-       $@ =~ s/^Net::FTP: //;
-       return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR, $@);
-    }
-
-    # Create an initial response object
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK,
-				       "Document follows");
-    $response->request($request);
-
-    my $mess = $ftp->message;  # welcome message
-    LWP::Debug::debug($mess);
-    $mess =~ s|\n.*||s; # only first line left
-    $mess =~ s|\s*ready\.?$||;
-    # Make the version number more HTTP like
-    $mess =~ s|\s*\(Version\s*|/| and $mess =~ s|\)$||;
-    $response->header("Server", $mess);
-
-    $ftp->timeout($timeout) if $timeout;
-
-    LWP::Debug::debug("Logging in as $user (password $password)...");
-    unless ($ftp->login($user, $password, $acct)) {
-	# Unauthorized.  Let's fake a RC_UNAUTHORIZED response
-	my $res =  HTTP::Response->new(&HTTP::Status::RC_UNAUTHORIZED,
-				       scalar($ftp->message));
-	$res->header("WWW-Authenticate", qq(Basic Realm="FTP login"));
-	return $res;
-    }
-    LWP::Debug::debug($ftp->message);
-
-    # Get & fix the path
-    my @path =  $url->path_components;
-    shift(@path);  # There will always be an empty first component
-    pop(@path) while @path && $path[-1] eq '';  # remove empty tailing comps
-    my $remote_file = pop(@path);
-    $remote_file = '' unless defined $remote_file;
-
-    my $params = $url->params;
-    if (defined($params) && $params eq 'type=a') {
-	$ftp->ascii;
-    } else {
-	$ftp->binary;
-    }
-
-    for (@path) {
-	LWP::Debug::debug("CWD $_");
-	unless ($ftp->cwd($_)) {
-	    return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-				       "Can't chdir to $_");
-	}
-    }
-
-    if ($method eq 'GET' || $method eq 'HEAD') {
-	LWP::Debug::debug("MDTM");
-	if (my $mod_time = $ftp->mdtm($remote_file)) {
-	    $response->last_modified($mod_time);
-	    if (my $ims = $request->if_modified_since) {
-		if ($mod_time <= $ims) {
-		    $response->code(&HTTP::Status::RC_NOT_MODIFIED);
-		    $response->message("Not modified");
-		    return $response;
-		}
-	    }
-	}
-
-	my $data;  # the data handle
-	LWP::Debug::debug("retrieve file?");
-	if (length($remote_file) and $data = $ftp->retr($remote_file)) {
-	    my($type, @enc) = LWP::MediaTypes::guess_media_type($remote_file);
-	    $response->header('Content-Type',   $type) if $type;
-	    for (@enc) {
-		$response->push_header('Content-Encoding', $_);
-	    }
-	    my $mess = $ftp->message;
-	    LWP::Debug::debug($mess);
-	    if ($mess =~ /\((\d+)\s+bytes\)/) {
-		$response->header('Content-Length', "$1");
-	    }
-
-	    if ($method ne 'HEAD') {
-		# Read data from server
-		$response = $self->collect($arg, $response, sub {
-		    my $content = '';
-		    my $result = $data->read($content, $size);
-		    return \$content;
-		} );
-	    }
-	    unless ($data->close) {
-		# Something did not work too well
-		if ($method ne 'HEAD') {
-		    $response->code(&HTTP::Status::RC_INTERNAL_SERVER_ERROR);
-		    $response->message("FTP close response: " . $ftp->code .
-				       " " . $ftp->message);
-		}
-	    }
-	} elsif (!length($remote_file) || $ftp->code == 550) {
-	    # 550 not a plain file, try to list instead
-	    if (length($remote_file) && !$ftp->cwd($remote_file)) {
-		LWP::Debug::debug("chdir before listing failed");
-		return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-					   "File '$remote_file' not found");
-	    }
-
-	    # It should now be safe to try to list the directory
-	    LWP::Debug::debug("dir");
-	    my @lsl = $ftp->dir;
-
-	    # Try to figure out if the user want us to convert the
-	    # directory listing to HTML.
-	    my @variants =
-	      (
-	       ['html',  0.60, 'text/html'            ],
-	       ['dir',   1.00, 'text/ftp-dir-listing' ]
-	      );
-	    #$HTTP::Negotiate::DEBUG=1;
-	    my $prefer = HTTP::Negotiate::choose(\@variants, $request);
-
-	    my $content = '';
-
-	    if (!defined($prefer)) {
-		return HTTP::Response->new(&HTTP::Status::RC_NOT_ACCEPTABLE,
-			       "Neither HTML nor directory listing wanted");
-	    } elsif ($prefer eq 'html') {
-		$response->header('Content-Type' => 'text/html');
-		$content = "<HEAD><TITLE>File Listing</TITLE>\n";
-		my $base = $request->url->clone;
-		my $path = $base->epath;
-		$base->epath("$path/") unless $path =~ m|/$|;
-		$content .= qq(<BASE HREF="$base">\n</HEAD>\n);
-		$content .= "<BODY>\n<UL>\n";
-		for (File::Listing::parse_dir(\@lsl, 'GMT')) {
-		    my($name, $type, $size, $mtime, $mode) = @$_;
-		    $content .= qq(  <LI> <a href="$name">$name</a>);
-		    $content .= " $size bytes" if $type eq 'f';
-		    $content .= "\n";
-		}
-		$content .= "</UL></body>\n";
-	    } else {
-		$response->header('Content-Type', 'text/ftp-dir-listing');
-		$content = join("\n", @lsl, '');
-	    }
-
-	    $response->header('Content-Length', length($content));
-
-	    if ($method ne 'HEAD') {
-		$response = $self->collect_once($arg, $response, $content);
-	    }
-	} else {
-	    my $res = HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-			  "FTP return code " . $ftp->code);
-	    $res->content_type("text/plain");
-	    $res->content($ftp->message);
-	    return $res;
-	}
-    } elsif ($method eq 'PUT') {
-	# method must be PUT
-	unless (length($remote_file)) {
-	    return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				       "Must have a file name to PUT to");
-	}
-	my $data;
-	if ($data = $ftp->stor($remote_file)) {
-	    LWP::Debug::debug($ftp->message);
-	    LWP::Debug::debug("$data");
-	    my $content = $request->content;
-	    my $bytes = 0;
-	    if (defined $content) {
-		if (ref($content) eq 'SCALAR') {
-		    $bytes = $data->write($$content, length($$content));
-		} elsif (ref($content) eq 'CODE') {
-		    my($buf, $n);
-		    while (length($buf = &$content)) {
-			$n = $data->write($buf, length($buf));
-			last unless $n;
-			$bytes += $n;
-		    }
-		} elsif (!ref($content)) {
-		    if (defined $content && length($content)) {
-			$bytes = $data->write($content, length($content));
-		    }
-		} else {
-		    die "Bad content";
-		}
-	    }
-	    $data->close;
-	    LWP::Debug::debug($ftp->message);
-
-	    $response->code(&HTTP::Status::RC_CREATED);
-	    $response->header('Content-Type', 'text/plain');
-	    $response->content("$bytes bytes stored as $remote_file on $host\n")
-
-	} else {
-	    my $res = HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-					  "FTP return code " . $ftp->code);
-	    $res->content_type("text/plain");
-	    $res->content($ftp->message);
-	    return $res;
-	}
-    } else {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   "Illegal method $method");
-    }
-
-    $response;
-}
-
-1;
-
-__END__
-
-# This is what RFC 1738 has to say about FTP access:
-# --------------------------------------------------
-#
-# 3.2. FTP
-#
-#    The FTP URL scheme is used to designate files and directories on
-#    Internet hosts accessible using the FTP protocol (RFC959).
-#
-#    A FTP URL follow the syntax described in Section 3.1.  If :<port> is
-#    omitted, the port defaults to 21.
-#
-# 3.2.1. FTP Name and Password
-#
-#    A user name and password may be supplied; they are used in the ftp
-#    "USER" and "PASS" commands after first making the connection to the
-#    FTP server.  If no user name or password is supplied and one is
-#    requested by the FTP server, the conventions for "anonymous" FTP are
-#    to be used, as follows:
-#
-#         The user name "anonymous" is supplied.
-#
-#         The password is supplied as the Internet e-mail address
-#         of the end user accessing the resource.
-#
-#    If the URL supplies a user name but no password, and the remote
-#    server requests a password, the program interpreting the FTP URL
-#    should request one from the user.
-#
-# 3.2.2. FTP url-path
-#
-#    The url-path of a FTP URL has the following syntax:
-#
-#         <cwd1>/<cwd2>/.../<cwdN>/<name>;type=<typecode>
-#
-#    Where <cwd1> through <cwdN> and <name> are (possibly encoded) strings
-#    and <typecode> is one of the characters "a", "i", or "d".  The part
-#    ";type=<typecode>" may be omitted. The <cwdx> and <name> parts may be
-#    empty. The whole url-path may be omitted, including the "/"
-#    delimiting it from the prefix containing user, password, host, and
-#    port.
-#
-#    The url-path is interpreted as a series of FTP commands as follows:
-#
-#       Each of the <cwd> elements is to be supplied, sequentially, as the
-#       argument to a CWD (change working directory) command.
-#
-#       If the typecode is "d", perform a NLST (name list) command with
-#       <name> as the argument, and interpret the results as a file
-#       directory listing.
-#
-#       Otherwise, perform a TYPE command with <typecode> as the argument,
-#       and then access the file whose name is <name> (for example, using
-#       the RETR command.)
-#
-#    Within a name or CWD component, the characters "/" and ";" are
-#    reserved and must be encoded. The components are decoded prior to
-#    their use in the FTP protocol.  In particular, if the appropriate FTP
-#    sequence to access a particular file requires supplying a string
-#    containing a "/" as an argument to a CWD or RETR command, it is
-#    necessary to encode each "/".
-#
-#    For example, the URL <URL:ftp://myname@host.dom/%2Fetc/motd> is
-#    interpreted by FTP-ing to "host.dom", logging in as "myname"
-#    (prompting for a password if it is asked for), and then executing
-#    "CWD /etc" and then "RETR motd". This has a different meaning from
-#    <URL:ftp://myname@host.dom/etc/motd> which would "CWD etc" and then
-#    "RETR motd"; the initial "CWD" might be executed relative to the
-#    default directory for "myname". On the other hand,
-#    <URL:ftp://myname@host.dom//etc/motd>, would "CWD " with a null
-#    argument, then "CWD etc", and then "RETR motd".
-#
-#    FTP URLs may also be used for other operations; for example, it is
-#    possible to update a file on a remote file server, or infer
-#    information about it from the directory listings. The mechanism for
-#    doing so is not spelled out here.
-#
-# 3.2.3. FTP Typecode is Optional
-#
-#    The entire ;type=<typecode> part of a FTP URL is optional. If it is
-#    omitted, the client program interpreting the URL must guess the
-#    appropriate mode to use. In general, the data content type of a file
-#    can only be guessed from the name, e.g., from the suffix of the name;
-#    the appropriate type code to be used for transfer of the file can
-#    then be deduced from the data content of the file.
-#
-# 3.2.4 Hierarchy
-#
-#    For some file systems, the "/" used to denote the hierarchical
-#    structure of the URL corresponds to the delimiter used to construct a
-#    file name hierarchy, and thus, the filename will look similar to the
-#    URL path. This does NOT mean that the URL is a Unix filename.
-#
-# 3.2.5. Optimization
-#
-#    Clients accessing resources via FTP may employ additional heuristics
-#    to optimize the interaction. For some FTP servers, for example, it
-#    may be reasonable to keep the control connection open while accessing
-#    multiple URLs from the same server. However, there is no common
-#    hierarchical model to the FTP protocol, so if a directory change
-#    command has been given, it is impossible in general to deduce what
-#    sequence should be given to navigate to another directory for a
-#    second retrieval, if the paths are different.  The only reliable
-#    algorithm is to disconnect and reestablish the control connection.
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/gopher.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/gopher.pm
deleted file mode 100644
index 3353e95..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/gopher.pm
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# $Id: gopher.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-# Implementation of the gopher protocol (RFC 1436)
-#
-# This code is based on 'wwwgopher.pl,v 0.10 1994/10/17 18:12:34 shelden'
-# which in turn is a vastly modified version of Oscar's http'get()
-# dated 28/3/94 in <ftp://cui.unige.ch/PUBLIC/oscar/scripts/http.pl>
-# including contributions from Marc van Heyningen and Martijn Koster.
-#
-
-package LWP::Protocol::gopher;
-
-use strict;
-use vars qw(@ISA);
-
-require HTTP::Response;
-require HTTP::Status;
-require IO::Socket;
-require IO::Select;
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
-
-
-my %gopher2mimetype = (
-    '0' => 'text/plain',                # 0 file
-    '1' => 'text/html',                 # 1 menu
-					# 2 CSO phone-book server
-					# 3 Error
-    '4' => 'application/mac-binhex40',  # 4 BinHexed Macintosh file
-    '5' => 'application/zip',           # 5 DOS binary archive of some sort
-    '6' => 'application/octet-stream',  # 6 UNIX uuencoded file.
-    '7' => 'text/html',                 # 7 Index-Search server
-					# 8 telnet session
-    '9' => 'application/octet-stream',  # 9 binary file
-    'h' => 'text/html',                 # html
-    'g' => 'image/gif',                 # gif
-    'I' => 'image/*',                   # some kind of image
-);
-
-my %gopher2encoding = (
-    '6' => 'x_uuencode',                # 6 UNIX uuencoded file.
-);
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-
-    LWP::Debug::trace('()');
-
-    $size = 4096 unless $size;
-
-    # check proxy
-    if (defined $proxy) {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'You can not proxy through the gopher');
-    }
-
-    my $url = $request->url;
-    die "bad scheme" if $url->scheme ne 'gopher';
-
-
-    my $method = $request->method;
-    unless ($method eq 'GET' || $method eq 'HEAD') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'Library does not allow method ' .
-				   "$method for 'gopher:' URLs");
-    }
-
-    my $gophertype = $url->gtype;
-    unless (exists $gopher2mimetype{$gophertype}) {
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED,
-				   'Library does not support gophertype ' .
-				   $gophertype);
-    }
-
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
-    $response->header('Content-type' => $gopher2mimetype{$gophertype}
-					|| 'text/plain');
-    $response->header('Content-Encoding' => $gopher2encoding{$gophertype})
-	if exists $gopher2encoding{$gophertype};
-
-    if ($method eq 'HEAD') {
-	# XXX: don't even try it so we set this header
-	$response->header('Client-Warning' => 'Client answer only');
-	return $response;
-    }
-    
-    if ($gophertype eq '7' && ! $url->search) {
-      # the url is the prompt for a gopher search; supply boiler-plate
-      return $self->collect_once($arg, $response, <<"EOT");
-<HEAD>
-<TITLE>Gopher Index</TITLE>
-<ISINDEX>
-</HEAD>
-<BODY>
-<H1>$url<BR>Gopher Search</H1>
-This is a searchable Gopher index.
-Use the search function of your browser to enter search terms.
-</BODY>
-EOT
-    }
-
-    my $host = $url->host;
-    my $port = $url->port;
-
-    my $requestLine = "";
-
-    my $selector = $url->selector;
-    if (defined $selector) {
-	$requestLine .= $selector;
-	my $search = $url->search;
-	if (defined $search) {
-	    $requestLine .= "\t$search";
-	    my $string = $url->string;
-	    if (defined $string) {
-		$requestLine .= "\t$string";
-	    }
-	}
-    }
-    $requestLine .= "\015\012";
-
-    # potential request headers are just ignored
-
-    # Ok, lets make the request
-    my $socket = IO::Socket::INET->new(PeerAddr => $host,
-				       PeerPort => $port,
-				       Timeout  => $timeout);
-    die "Can't connect to $host:$port" unless $socket;
-    my $sel = IO::Select->new($socket);
-
-    {
-	die "write timeout" if $timeout && !$sel->can_write($timeout);
-	my $n = syswrite($socket, $requestLine, length($requestLine));
-	die $! unless defined($n);
-	die "short write" if $n != length($requestLine);
-    }
-
-    my $user_arg = $arg;
-
-    # must handle menus in a special way since they are to be
-    # converted to HTML.  Undefing $arg ensures that the user does
-    # not see the data before we get a change to convert it.
-    $arg = undef if $gophertype eq '1' || $gophertype eq '7';
-
-    # collect response
-    my $buf = '';
-    $response = $self->collect($arg, $response, sub {
-	die "read timeout" if $timeout && !$sel->can_read($timeout);
-        my $n = sysread($socket, $buf, $size);
-	die $! unless defined($n);
-	return \$buf;
-      } );
-
-    # Convert menu to HTML and return data to user.
-    if ($gophertype eq '1' || $gophertype eq '7') {
-	my $content = menu2html($response->content);
-	if (defined $user_arg) {
-	    $response = $self->collect_once($user_arg, $response, $content);
-	} else {
-	    $response->content($content);
-	}
-    }
-
-    $response;
-}
-
-
-sub gopher2url
-{
-    my($gophertype, $path, $host, $port) = @_;
-
-    my $url;
-
-    if ($gophertype eq '8' || $gophertype eq 'T') {
-	# telnet session
-	$url = URI::URL->new($gophertype eq '8' ? 'telnet:' : 'tn3270:');
-	$url->user($path) if defined $path;
-    } else {
-	$path = URI::Escape::uri_escape($path);
-	$url = URI::URL->new("gopher:/$gophertype$path");
-    }
-    $url->host($host);
-    $url->port($port);
-    $url;
-}
-
-sub menu2html {
-    my($menu) = @_;
-
-    $menu =~ s/\015//g;  # remove carriage return
-    my $tmp = <<"EOT";
-<HTML>
-<HEAD>
-   <TITLE>Gopher menu</TITLE>
-</HEAD>
-<BODY>
-<H1>Gopher menu</H1>
-EOT
-    for (split("\n", $menu)) {
-	last if /^\./;
-	my($pretty, $path, $host, $port) = split("\t");
-
-	$pretty =~ s/^(.)//;
-	my $type = $1;
-
-	my $url = gopher2url($type, $path, $host, $port)->as_string;
-	$tmp .= qq{<A HREF="$url">$pretty</A><BR>\n};
-    }
-    $tmp .= "</BODY>\n</HTML>\n";
-    $tmp;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/http.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/http.pm
deleted file mode 100644
index 2e3af0c..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/http.pm
+++ /dev/null
@@ -1,252 +0,0 @@
-#
-# $Id: http.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-package LWP::Protocol::http;
-
-require LWP::Debug;
-require HTTP::Response;
-require HTTP::Status;
-require IO::Socket;
-require IO::Select;
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
-
-use strict;
-my $CRLF         = "\015\012";     # how lines should be terminated;
-				   # "\r\n" is not correct on all systems, for
-				   # instance MacPerl defines it to "\012\015"
-
-sub _new_socket
-{
-    my($self, $host, $port, $timeout) = @_;
-
-    local($^W) = 0;  # IO::Socket::INET can be noisy
-    my $sock = IO::Socket::INET->new(PeerAddr => $host,
-				     PeerPort => $port,
-				     Proto    => 'tcp',
-				     Timeout  => $timeout,
-				    );
-    unless ($sock) {
-	# IO::Socket::INET leaves additional error messages in $@
-	$@ =~ s/^.*?: //;
-	die "Can't connect to $host:$port ($@)";
-    }
-    $sock;
-}
-
-
-sub _check_sock
-{
-    #my($self, $req, $sock) = @_;
-}
-
-sub _get_sock_info
-{
-    my($self, $res, $sock) = @_;
-    $res->header("Client-Peer" =>
-		 $sock->peerhost . ":" . $sock->peerport);
-}
-
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-    LWP::Debug::trace('()');
-
-    $size ||= 4096;
-
-    # check method
-    my $method = $request->method;
-    unless ($method =~ /^[A-Za-z0-9_!\#\$%&\'*+\-.^\`|~]+$/) {  # HTTP token
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'Library does not allow method ' .
-				  "$method for 'http:' URLs";
-    }
-
-    my $url = $request->url;
-    my($host, $port, $fullpath);
-
-    # Check if we're proxy'ing
-    if (defined $proxy) {
-	# $proxy is an URL to an HTTP server which will proxy this request
-	$host = $proxy->host;
-	$port = $proxy->port;
-	$fullpath = $url->as_string;
-    }
-    else {
-	$host = $url->host;
-	$port = $url->port;
-	$fullpath = $url->full_path;
-    }
-
-    # connect to remote site
-    my $socket = $self->_new_socket($host, $port, $timeout);
-    $self->_check_sock($request, $socket);
-	    
-    my $sel = IO::Select->new($socket) if $timeout;
-
-    my $request_line = "$method $fullpath HTTP/1.0$CRLF";
-
-    my $h = $request->headers->clone;
-    my $cont_ref = $request->content_ref;
-    $cont_ref = $$cont_ref if ref($$cont_ref);
-    my $ctype = ref($cont_ref);
-
-    # If we're sending content we *have* to specify a content length
-    # otherwise the server won't know a messagebody is coming.
-    if ($ctype eq 'CODE') {
-	die 'No Content-Length header for request with dynamic content'
-	    unless defined($h->header('Content-Length')) ||
-		   $h->content_type =~ /^multipart\//;
-	# For HTTP/1.1 we could have used chunked transfer encoding...
-    } else {
-	$h->header('Content-Length' => length $$cont_ref)
-	        if defined($$cont_ref) && length($$cont_ref);
-    }
-    
-    # HTTP/1.1 will require us to send the 'Host' header, so we might
-    # as well start now.
-    my $hhost = $url->netloc;
-    $hhost =~ s/^([^\@]*)\@//;  # get rid of potential "user:pass@"
-    $h->header('Host' => $hhost) unless defined $h->header('Host');
-
-    # add authorization header if we need them.  HTTP URLs do
-    # not really support specification of user and password, but
-    # we allow it.
-    if (defined($1) && not $h->header('Authorization')) {
-	$h->authorization_basic($url->user, $url->password);
-    }
-
-    my $buf = $request_line . $h->as_string($CRLF) . $CRLF;
-    my $n;  # used for return value from syswrite/sysread
-
-    die "write timeout" if $timeout && !$sel->can_write($timeout);
-    $n = $socket->syswrite($buf, length($buf));
-    die $! unless defined($n);
-    die "short write" unless $n == length($buf);
-    LWP::Debug::conns($buf);
-
-    if ($ctype eq 'CODE') {
-	while ( ($buf = &$cont_ref()), defined($buf) && length($buf)) {
-	    die "write timeout" if $timeout && !$sel->can_write($timeout);
-	    $n = $socket->syswrite($buf, length($buf));
-	    die $! unless defined($n);
-	    die "short write" unless $n == length($buf);
-	    LWP::Debug::conns($buf);
-	}
-    } elsif (defined($$cont_ref) && length($$cont_ref)) {
-	die "write timeout" if $timeout && !$sel->can_write($timeout);
-	$n = $socket->syswrite($$cont_ref, length($$cont_ref));
-	die $! unless defined($n);
-	die "short write" unless $n == length($$cont_ref);
-	LWP::Debug::conns($buf);
-    }
-    
-    # read response line from server
-    LWP::Debug::debug('reading response');
-
-    my $response;
-    $buf = '';
-
-    # Inside this loop we will read the response line and all headers
-    # found in the response.
-    while (1) {
-	{
-	    die "read timeout" if $timeout && !$sel->can_read($timeout);
-	    $n = $socket->sysread($buf, $size, length($buf));
-	    die $! unless defined($n);
-	    die "unexpected EOF before status line seen" unless $n;
-	    LWP::Debug::conns($buf);
-	}
-	if ($buf =~ s/^(HTTP\/\d+\.\d+)[ \t]+(\d+)[ \t]*([^\012]*)\012//) {
-	    # HTTP/1.0 response or better
-	    my($ver,$code,$msg) = ($1, $2, $3);
-	    $msg =~ s/\015$//;
-	    LWP::Debug::debug("$ver $code $msg");
-	    $response = HTTP::Response->new($code, $msg);
-	    $response->protocol($ver);
-
-	    # ensure that we have read all headers.  The headers will be
-	    # terminated by two blank lines
-	    until ($buf =~ /^\015?\012/ || $buf =~ /\015?\012\015?\012/) {
-		# must read more if we can...
-		LWP::Debug::debug("need more header data");
-		die "read timeout" if $timeout && !$sel->can_read($timeout);
-		$n = $socket->sysread($buf, $size, length($buf));
-		die $! unless defined($n);
-		die "unexpected EOF before all headers seen" unless $n;
-		#LWP::Debug::conns($buf);
-	    }
-
-	    # now we start parsing the headers.  The strategy is to
-	    # remove one line at a time from the beginning of the header
-	    # buffer ($res).
-	    my($key, $val);
-	    while ($buf =~ s/([^\012]*)\012//) {
-		my $line = $1;
-
-		# if we need to restore as content when illegal headers
-		# are found.
-		my $save = "$line\012"; 
-
-		$line =~ s/\015$//;
-		last unless length $line;
-
-		if ($line =~ /^([a-zA-Z0-9_\-]+)\s*:\s*(.*)/) {
-		    $response->push_header($key, $val) if $key;
-		    ($key, $val) = ($1, $2);
-		} elsif ($line =~ /^\s+(.*)/) {
-		    unless ($key) {
-			$response->header("Client-Warning" =>
-					 => "Illegal continuation header");
-			$buf = "$save$buf";
-			last;
-		    }
-		    $val .= " $1";
-		} else {
-		    $response->header("Client-Warning" =>
-				      "Illegal header '$line'");
-		    $buf = "$save$buf";
-		    last;
-		}
-	    }
-	    $response->push_header($key, $val) if $key;
-	    last;
-
-	} elsif ((length($buf) >= 5 and $buf !~ /^HTTP\//) or
-		 $buf =~ /\012/ ) {
-	    # HTTP/0.9 or worse
-	    LWP::Debug::debug("HTTP/0.9 assume OK");
-	    $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
-	    $response->protocol('HTTP/0.9');
-	    last;
-
-	} else {
-	    # need more data
-	    LWP::Debug::debug("need more status line data");
-	}
-    };
-    $response->request($request);
-    $self->_get_sock_info($response, $socket);
-
-
-    my $usebuf = length($buf) > 0;
-    $response = $self->collect($arg, $response, sub {
-        if ($usebuf) {
-	    $usebuf = 0;
-	    return \$buf;
-	}
-	die "read timeout" if $timeout && !$sel->can_read($timeout);
-	my $n = $socket->sysread($buf, $size);
-	die $! unless defined($n);
-	#LWP::Debug::conns($buf);
-	return \$buf;
-	} );
-
-    $socket->close;
-
-    $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/https.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/https.pm
deleted file mode 100644
index d1b2ce0..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/https.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id: https.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-use strict;
-
-package LWP::Protocol::https;
-require Net::SSL;  # from Crypt-SSLeay
-
-use vars qw(@ISA);
-
-require LWP::Protocol::http;
-@ISA=qw(LWP::Protocol::http);
-
-sub _new_socket
-{
-    my($self, $host, $port, $timeout) = @_;
-    local($^W) = 0;  # IO::Socket::INET can be noisy
-    my $sock = Net::SSL->new(PeerAddr => $host,
-			     PeerPort => $port,
-			     Proto    => 'tcp',
-			     Timeout  => $timeout,
-			    );
-    unless ($sock) {
-	# IO::Socket::INET leaves additional error messages in $@
-	$@ =~ s/^.*?: //;
-	die "Can't connect to $host:$port ($@)";
-    }
-    $sock;
-}
-
-sub _check_sock
-{
-    my($self, $req, $sock) = @_;
-    my $check = $req->header("If-SSL-Cert-Subject");
-    if (defined $check) {
-	my $cert = $sock->get_peer_certificate ||
-	    die "Missing SSL certificate";
-	my $subject = $cert->subject_name;
-	die "Bad SSL certificate subject: '$subject' !~ /$check/"
-	    unless $subject =~ /$check/;
-	$req->remove_header("If-SSL-Cert-Subject");  # don't pass it on
-    }
-}
-
-sub _get_sock_info
-{
-    my $self = shift;
-    $self->SUPER::_get_sock_info(@_);
-    my($res, $sock) = @_;
-    $res->header("Client-SSL-Cipher" => $sock->get_cipher);
-    my $cert = $sock->get_peer_certificate;
-    if ($cert) {
-	$res->header("Client-SSL-Cert-Subject" => $cert->subject_name);
-	$res->header("Client-SSL-Cert-Issuer" => $cert->issuer_name);
-    }
-    $res->header("Client-SSL-Warning" => "Peer certificate not verified");
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/mailto.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/mailto.pm
deleted file mode 100644
index 4c6c520..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/mailto.pm
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# $Id: mailto.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-#
-# This module implements the mailto protocol.  It is just a simple
-# frontend to the Unix sendmail program.  In the long run this module
-# will built using the Mail::Send module.
-
-package LWP::Protocol::mailto;
-
-require LWP::Protocol;
-require HTTP::Request;
-require HTTP::Response;
-require HTTP::Status;
-
-use Carp;
-
-@ISA = qw(LWP::Protocol);
-
-$SENDMAIL = "/usr/lib/sendmail";
-
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size) = @_;
-
-    # check proxy
-    if (defined $proxy)
-    {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'You can not proxy with mail';
-    }
-
-    # check method
-    $method = $request->method;
-
-    if ($method ne 'POST') {
-	return new HTTP::Response &HTTP::Status::RC_BAD_REQUEST,
-				  'Library does not allow method ' .
-				  "$method for 'mailto:' URLs";
-    }
-
-    # check url
-    my $url = $request->url;
-
-    my $scheme = $url->scheme;
-    if ($scheme ne 'mailto') {
-	return new HTTP::Response &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				  "LWP::file::request called for '$scheme'";
-    }
-    unless (-x $SENDMAIL) {
-	return new HTTP::Response &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				  "You don't have $SENDMAIL";
-    }
-
-    open(SENDMAIL, "| $SENDMAIL -oi -t") or
-	return new HTTP::Response &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				  "Can't run $SENDMAIL: $!";
-
-    my $addr = $url->encoded822addr;
-
-    $request->header('To', $addr);
-    print SENDMAIL $request->headers_as_string;
-    print SENDMAIL "\n";
-    my $content = $request->content;
-    if (defined $content) {
-	my $contRef = ref($content) ? $content : \$content;
-	if (ref($contRef) eq 'SCALAR') {
-	    print SENDMAIL $$contRef;
-	} elsif (ref($contRef) eq 'CODE') {
-	    # Callback provides data
-	    my $d;
-	    while (length($d = &$contRef)) {
-		print SENDMAIL $d;
-	    }
-	}
-    }
-    close(SENDMAIL);
-
-    my $response = new HTTP::Response &HTTP::Status::RC_ACCEPTED,
-				     'Mail accepted by sendmail';
-    $response->header('Content-Type', 'text/plain');
-    $response->content("Mail sent to <$addr>\n");
-
-    return $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/Protocol/nntp.pm b/testcases/ballista/ballista/perllib/LWP/Protocol/nntp.pm
deleted file mode 100644
index 38eda55..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Protocol/nntp.pm
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# $Id: nntp.pm,v 1.1 2004/10/18 17:57:56 mridge Exp $
-
-# Implementation of the Network News Transfer Protocol (RFC 977)
-#
-
-package LWP::Protocol::nntp;
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
-
-require LWP::Debug;
-require HTTP::Response;
-require HTTP::Status;
-require Net::NNTP;
-
-use strict;
-
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-
-    LWP::Debug::trace('()');
-
-    $size = 4096 unless $size;
-
-    # Check for proxy
-    if (defined $proxy) {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'You can not proxy through NNTP');
-    }
-
-    # Check that the scheme is as expected
-    my $url = $request->url;
-    my $scheme = $url->scheme;
-    unless ($scheme eq 'news') {
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				   "LWP::Protocol::nntp::request called for '$scheme'");
-    }
-
-    # check for a valid method
-    my $method = $request->method;
-    unless ($method eq 'GET' || $method eq 'HEAD' || $method eq 'POST') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'Library does not allow method ' .
-				   "$method for 'news:' URLs");
-    }
-
-    # extract the identifier and check against posting to an article
-    my $groupart = $url->groupart;
-    my $is_art = $groupart =~ /@/;
-
-    if ($is_art && $method eq 'POST') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   "Can't post to an article <$groupart>");
-    }
-
-    my $nntp = Net::NNTP->new(undef,
-			      #Port    => 18574,
-			      Timeout => $timeout,
-			      #Debug   => 1,
-			     );
-    die "Can't connect to nntp server" unless $nntp;
-
-    # Check the initial welcome message from the NNTP server
-    if ($nntp->status != 2) {
-	return HTTP::Response->new(&HTTP::Status::RC_SERVICE_UNAVAILABLE,
-				   $nntp->message);
-    }
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
-
-    my $mess = $nntp->message;
-    LWP::Debug::debug($mess);
-
-    # Try to extract server name from greating message.
-    # Don't know if this works well for a large class of servers, but
-    # this works for our server.
-    $mess =~ s/\s+ready\b.*//;
-    $mess =~ s/^\S+\s+//;
-    $response->header(Server => $mess);
-
-
-    # First we handle posting of articles
-    if ($method eq 'POST') {
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED,
-				   "POST not implemented yet");
-    }
-
-    # The method must be "GET" or "HEAD" by now
-    if (!$is_art) {
-	if (!$nntp->group($groupart)) {
-	    return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-				       $nntp->message);
-	}
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED,
-				   "GET newsgroup not implemented yet");
-    }
-
-    # Send command to server to retrieve an article (or just the headers)
-    my $get = $method eq 'HEAD' ? "head" : "article";
-    my $art = $nntp->$get("<$groupart>");
-    unless ($art) {
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-				   $nntp->message);
-    }
-    LWP::Debug::debug($nntp->message);
-    
-    # Parse headers
-    my($key, $val);
-    while ($_ = shift @$art) {
-	if (/^\s+$/) {
-	    last;  # end of headers
-	} elsif (/^(\S+):\s*(.*)/) {
-	    $response->push_header($key, $val) if $key;
-	    ($key, $val) = ($1, $2);
-	} elsif (/^\s+(.*)/) {
-	    next unless $key;
-	    $val .= $1;
-	} else {
-	    unshift(@$art, $_);
-	    last;
-	}
-    }
-    $response->push_header($key, $val) if $key;
-
-    # Ensure that there is a Content-Type header
-    $response->header("Content-Type", "text/plain")
-	unless $response->header("Content-Type");
-
-    # Collect the body
-    $response = $self->collect_once($arg, $response, join("", @$art))
-      if @$art;
-
-    # Say godbye to the server
-    $nntp->quit;
-    $nntp = undef;
-
-    $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/RobotUA.pm b/testcases/ballista/ballista/perllib/LWP/RobotUA.pm
deleted file mode 100644
index 9074c6b..0000000
--- a/testcases/ballista/ballista/perllib/LWP/RobotUA.pm
+++ /dev/null
@@ -1,285 +0,0 @@
-# $Id: RobotUA.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-package LWP::RobotUA;
-
-require LWP::UserAgent;
-@ISA = qw(LWP::UserAgent);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-require WWW::RobotRules;
-require HTTP::Request;
-require HTTP::Response;
-
-use Carp ();
-use LWP::Debug ();
-use HTTP::Status ();
-use HTTP::Date qw(time2str);
-use strict;
-
-=head1 NAME
-
-LWP::RobotUA - A class for Web Robots
-
-=head1 SYNOPSIS
-
-  require LWP::RobotUA;
-  $ua = new LWP::RobotUA 'my-robot/0.1', 'me@foo.com';
-  $ua->delay(10);  # be very nice, go slowly
-  ...
-  # just use it just like a normal LWP::UserAgent
-  $res = $ua->request($req);
-
-=head1 DESCRIPTION
-
-This class implements a user agent that is suitable for robot
-applications.  Robots should be nice to the servers they visit.  They
-should consult the F<robots.txt> file to ensure that they are welcomed
-and they should not send too frequent requests.
-
-But, before you consider writing a robot take a look at
-<URL:http://info.webcrawler.com/mak/projects/robots/robots.html>.
-
-When you use a I<LWP::RobotUA> as your user agent, then you do not
-really have to think about these things yourself.  Just send requests
-as you do when you are using a normal I<LWP::UserAgent> and this
-special agent will make sure you are nice.
-
-=head1 METHODS
-
-The LWP::RobotUA is a sub-class of LWP::UserAgent and implements the
-same methods. In addition the following methods are provided:
-
-=over 4
-
-=cut
-
-
-#
-# Additional attributes in addition to those found in LWP::UserAgent:
-#
-# $self->{'delay'}    Required delay between request to the same
-#                     server in minutes.
-#
-# $self->{'rules'}     A WWW::RobotRules object
-#
-
-
-=item $ua = LWP::RobotUA->new($agent_name, $from, [$rules])
-
-Your robot's name and the mail address of the human responsible for
-the robot (i.e. you) is required by the constructor.
-
-Optionally it allows you to specify the I<WWW::RobotRules> object to
-use.
-
-=cut
-
-sub new
-{
-    my($class,$name,$from,$rules) = @_;
-
-    Carp::croak('LWP::RobotUA name required') unless $name;
-    Carp::croak('LWP::RobotUA from address required') unless $from;
-
-    my $self = new LWP::UserAgent;
-    $self = bless $self, $class;
-
-    $self->{'delay'} = 1;   # minutes
-    $self->{'agent'} = $name;
-    $self->{'from'}  = $from;
-    $self->{'use_sleep'} = 1;
-
-    if ($rules) {
-	$rules->agent($name);
-	$self->{'rules'} = $rules;
-    } else {
-	$self->{'rules'} = new WWW::RobotRules $name;
-    }
-
-    $self;
-}
-
-
-=item $ua->delay([$minutes])
-
-Set the minimum delay between requests to the same server.  The
-default is 1 minute.
-
-=item $ua->use_sleep([$boolean])
-
-Get/set a value indicating wether the UA should sleep() if request
-arrive to fast (before $ua->delay minutes has passed).  The default is
-TRUE.  If this value is FALSE then an internal SERVICE_UNAVAILABLE
-response will be generated.  It will have an Retry-After header that
-indicate when it is OK to send another request to this server.
-
-=cut
-
-sub delay     { shift->_elem('delay',     @_); }
-sub use_sleep { shift->_elem('use_sleep', @_); }
-
-sub agent
-{
-    my $self = shift;
-    my $old = $self->SUPER::agent(@_);
-    if (@_) {
-	# Changing our name means to start fresh
-	$self->{'rules'}->agent($self->{'agent'}); 
-    }
-    $old;
-}
-
-
-=item $ua->rules([$rules])
-
-Set/get which I<WWW::RobotRules> object to use. 
-
-=cut
-
-sub rules {
-    my $self = shift;
-    my $old = $self->_elem('rules', @_);
-    $self->{'rules'}->agent($self->{'agent'}) if @_;
-    $old;
-}
-
-
-=item $ua->no_visits($netloc)
-
-Returns the number of documents fetched from this server host. Yes I
-know, this method should probably have been named num_visits() or
-something like that :-(
-
-=cut
-
-sub no_visits
-{
-    my($self, $netloc) = @_;
-    $self->{'rules'}->no_visits($netloc);
-}
-
-*host_count = \&no_visits;  # backwards compatibility with LWP-5.02
-
-
-=item $ua->host_wait($netloc)
-
-Returns the number of seconds (from now) you must wait before you can
-make a new request to this host.
-
-=cut
-
-sub host_wait
-{
-    my($self, $netloc) = @_;
-    return undef unless defined $netloc;
-    my $last = $self->{'rules'}->last_visit($netloc);
-    if ($last) {
-	my $wait = int($self->{'delay'} * 60 - (time - $last));
-	$wait = 0 if $wait < 0;
-	return $wait;
-    }
-    return 0;
-}
-
-
-sub simple_request
-{
-    my($self, $request, $arg, $size) = @_;
-
-    LWP::Debug::trace('()');
-
-    # Do we try to access a new server?
-    my $allowed = $self->{'rules'}->allowed($request->url);
-
-    if ($allowed < 0) {
-	LWP::Debug::debug("Host is not visited before, or robots.txt expired.");
-	# fetch "robots.txt"
-	my $robot_url = $request->url->clone;
-	$robot_url->path("robots.txt");
-	$robot_url->params(undef);
-	$robot_url->query(undef);
-	LWP::Debug::debug("Requesting $robot_url");
-
-	# make access to robot.txt legal since this will be a recursive call
-	$self->{'rules'}->parse($robot_url, ""); 
-
-	my $robot_req = new HTTP::Request 'GET', $robot_url;
-	my $robot_res = $self->request($robot_req);
-	my $fresh_until = $robot_res->fresh_until;
-	if ($robot_res->is_success) {
-	    LWP::Debug::debug("Parsing robot rules");
-	    $self->{'rules'}->parse($robot_url, $robot_res->content, 
-				    $fresh_until);
-	} else {
-	    LWP::Debug::debug("No robots.txt file found");
-	    $self->{'rules'}->parse($robot_url, "", $fresh_until);
-	}
-
-	# recalculate allowed...
-	$allowed = $self->{'rules'}->allowed($request->url);
-    }
-
-    # Check rules
-    unless ($allowed) {
-	return new HTTP::Response
-	  &HTTP::Status::RC_FORBIDDEN, 'Forbidden by robots.txt';
-    }
-
-    my $netloc = $request->url->netloc;
-    my $wait = $self->host_wait($netloc);
-
-    if ($wait) {
-	LWP::Debug::debug("Must wait $wait seconds");
-	if ($self->{'use_sleep'}) {
-	    sleep($wait)
-	} else {
-	    my $res = new HTTP::Response
-	      &HTTP::Status::RC_SERVICE_UNAVAILABLE, 'Please, slow down';
-	    $res->header('Retry-After', time2str(time + $wait));
-	    return $res;
-	}
-    }
-
-    # Perform the request
-    my $res = $self->SUPER::simple_request($request, $arg, $size);
-
-    $self->{'rules'}->visit($netloc);
-
-    $res;
-}
-
-
-=item $ua->as_string
-
-Returns a text that describe the state of the UA.
-Mainly useful for debugging.
-
-=cut
-
-sub as_string
-{
-    my $self = shift;
-    my @s;
-    push(@s, "Robot: $self->{'agent'} operated by $self->{'from'}  [$self]");
-    push(@s, "    Minimum delay: " . int($self->{'delay'}*60) . "s");
-    push(@s, "    Will sleep if too early") if $self->{'use_sleep'};
-    push(@s, "    Rules = $self->{'rules'}");
-    join("\n", @s, '');
-}
-
-1;
-
-=back
-
-=head1 SEE ALSO
-
-L<LWP::UserAgent>, L<WWW::RobotRules>
-
-=head1 COPYRIGHT
-
-Copyright 1996-1997 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/LWP/Simple.pm b/testcases/ballista/ballista/perllib/LWP/Simple.pm
deleted file mode 100644
index a67f77f..0000000
--- a/testcases/ballista/ballista/perllib/LWP/Simple.pm
+++ /dev/null
@@ -1,329 +0,0 @@
-#
-# $Id: Simple.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-=head1 NAME
-
-get, head, getprint, getstore, mirror - Procedural LWP interface
-
-=head1 SYNOPSIS
-
- perl -MLWP::Simple -e 'getprint "http://www.sn.no"'
-
- use LWP::Simple;
- $content = get("http://www.sn.no/")
- if (mirror("http://www.sn.no/", "foo") == RC_NOT_MODIFIED) {
-     ...
- }
-
- if (is_success(getprint("http://www.sn.no/"))) {
-     ...
- }
-
-=head1 DESCRIPTION
-
-This interface is intended for those who want a simplified view of the
-libwww-perl library.  It should also be suitable for one-liners.  If
-you need more control or access to the header fields in the requests
-sent and responses received you should use the full object oriented
-interface provided by the C<LWP::UserAgent> module.
-
-The following functions are provided (and exported) by this module:
-
-=over 3
-
-=item get($url)
-
-The get() function will fetch the document identified by the given URL
-and return it.  It returns C<undef> if it fails.  The $url argument can
-be either a simple string or a reference to a URI::URL object.
-
-You will not be able to examine the response code or response headers
-(like 'Content-Type') when you are accessing the web using this
-function.  If you need this information you should use the full OO
-interface (see L<LWP::UserAgent>).
-
-=item head($url)
-
-Get document headers. Returns the following 5 values if successful:
-($content_type, $document_length, $modified_time, $expires, $server)
-
-Returns an empty list if it fails.  In scalar context returns TRUE if
-successful.
-
-=item getprint($url)
-
-Get and print a document identified by a URL. The document is printed
-on STDOUT as data is received from the network.  If the request fails,
-then the status code and message is printed on STDERR.  The return
-value is the HTTP response code.
-
-=item getstore($url, $file)
-
-Gets a document identified by a URL and stores it in the file. The
-return value is the HTTP response code.
-
-=item mirror($url, $file)
-
-Get and store a document identified by a URL, using
-I<If-modified-since>, and checking of the I<Content-Length>.  Returns
-the HTTP response code.
-
-=back
-
-This module also exports the HTTP::Status constants and procedures.
-These can be used when you check the response code from getprint(),
-getstore() and mirror().  The constants are:
-
-   RC_CONTINUE
-   RC_SWITCHING_PROTOCOLS
-   RC_OK
-   RC_CREATED
-   RC_ACCEPTED
-   RC_NON_AUTHORITATIVE_INFORMATION
-   RC_NO_CONTENT
-   RC_RESET_CONTENT
-   RC_PARTIAL_CONTENT
-   RC_MULTIPLE_CHOICES
-   RC_MOVED_PERMANENTLY
-   RC_MOVED_TEMPORARILY
-   RC_SEE_OTHER
-   RC_NOT_MODIFIED
-   RC_USE_PROXY
-   RC_BAD_REQUEST
-   RC_UNAUTHORIZED
-   RC_PAYMENT_REQUIRED
-   RC_FORBIDDEN
-   RC_NOT_FOUND
-   RC_METHOD_NOT_ALLOWED
-   RC_NOT_ACCEPTABLE
-   RC_PROXY_AUTHENTICATION_REQUIRED
-   RC_REQUEST_TIMEOUT
-   RC_CONFLICT
-   RC_GONE
-   RC_LENGTH_REQUIRED
-   RC_PRECONDITION_FAILED
-   RC_REQUEST_ENTITY_TOO_LARGE
-   RC_REQUEST_URI_TOO_LARGE
-   RC_UNSUPPORTED_MEDIA_TYPE
-   RC_INTERNAL_SERVER_ERROR
-   RC_NOT_IMPLEMENTED
-   RC_BAD_GATEWAY
-   RC_SERVICE_UNAVAILABLE
-   RC_GATEWAY_TIMEOUT
-   RC_HTTP_VERSION_NOT_SUPPORTED
-
-The HTTP::Status classification functions are:
-
-=over 3
-
-=item is_success($rc)
-
-Check if response code indicated successfull request.
-
-=item is_error($rc)
-
-Check if response code indicated that an error occured.
-
-=back
-
-The module will also export the LWP::UserAgent object as C<$ua> if you
-ask for it explicitly.
-
-The user agent created by this module will identify itself as
-"LWP::Simple/#.##" (where "#.##" is the libwww-perl version number)
-and will initialize its proxy defaults from the environment (by
-calling $ua->env_proxy).
-
-=head1 SEE ALSO
-
-L<LWP>, L<LWP::UserAgent>, L<HTTP::Status>, L<lwp-request>,
-L<lwp-mirror>
-
-=cut
-
-
-package LWP::Simple;
-
-use strict;
-use vars qw($ua %loop_check $FULL_LWP @EXPORT @EXPORT_OK $VERSION);
-
-require Exporter;
-
-@EXPORT = qw(get head getprint getstore mirror);
-@EXPORT_OK = qw($ua);
-
-# I really hate this.  I was a bad idea to do it in the first place.
-# Wonder how to get rid of it???  (It even makes LWP::Simple 7% slower
-# for trivial tests)
-use HTTP::Status;
-push(@EXPORT, @HTTP::Status::EXPORT);
-
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-$FULL_LWP++ if grep {lc($_) eq "http_proxy"} keys %ENV;
-
-
-sub import
-{
-    my $pkg = shift;
-    my $callpkg = caller;
-    if (grep $_ eq '$ua', @_) {
-	$FULL_LWP++;
-	_init_ua();
-    }
-    Exporter::export($pkg, $callpkg, @_);
-}
-
-
-sub _init_ua
-{
-    require LWP;
-    require LWP::UserAgent;
-    require HTTP::Status;
-    require HTTP::Date;
-    $ua = new LWP::UserAgent;  # we create a global UserAgent object
-    my $ver = $LWP::VERSION = $LWP::VERSION;  # avoid warning
-    $ua->agent("LWP::Simple/$LWP::VERSION");
-    $ua->env_proxy;
-}
-
-
-sub get ($)
-{
-    %loop_check = ();
-    goto \&_get;
-}
-
-
-sub get_old ($)
-{
-    my($url) = @_;
-    _init_ua() unless $ua;
-
-    my $request = HTTP::Request->new(GET => $url);
-    my $response = $ua->request($request);
-
-    return $response->content if $response->is_success;
-    return undef;
-}
-
-
-sub head ($)
-{
-    my($url) = @_;
-    _init_ua() unless $ua;
-
-    my $request = HTTP::Request->new(HEAD => $url);
-    my $response = $ua->request($request);
-
-    if ($response->is_success) {
-	return $response unless wantarray;
-	return ($response->header('Content-Type'),
-		$response->header('Content-Length'),
-		HTTP::Date::str2time($response->header('Last-Modified')),
-		HTTP::Date::str2time($response->header('Expires')),
-		$response->header('Server'),
-	       );
-    }
-    return;
-}
-
-
-sub getprint ($)
-{
-    my($url) = @_;
-    _init_ua() unless $ua;
-
-    my $request = HTTP::Request->new(GET => $url);
-    local($\) = ""; # ensure standard $OUTPUT_RECORD_SEPARATOR
-    my $response = $ua->request($request, sub { print $_[0] });
-    unless ($response->is_success) {
-	print STDERR $response->status_line, " <URL:$url>\n";
-    }
-    $response->code;
-}
-
-
-sub getstore ($$)
-{
-    my($url, $file) = @_;
-    _init_ua() unless $ua;
-
-    my $request = HTTP::Request->new(GET => $url);
-    my $response = $ua->request($request, $file);
-
-    $response->code;
-}
-
-
-sub mirror ($$)
-{
-    my($url, $file) = @_;
-    _init_ua() unless $ua;
-    my $response = $ua->mirror($url, $file);
-    $response->code;
-}
-
-
-sub _get
-{
-    my $url = shift;
-    my $ret;
-    if (!$FULL_LWP && $url =~ m,^http://([^/:]+)(?::(\d+))?(/\S*)?$,) {
-	my $host = $1;
-	my $port = $2 || 80;
-	my $path = $3;
-	$path = "/" unless defined($path);
-	return _trivial_http_get($host, $port, $path);
-    } else {
-        _init_ua() unless $ua;
-	my $request = HTTP::Request->new(GET => $url);
-	my $response = $ua->request($request);
-	return $response->is_success ? $response->content : undef;
-    }
-}
-
-
-sub _trivial_http_get
-{
-   my($host, $port, $path) = @_;
-   #print "HOST=$host, PORT=$port, PATH=$path\n";
-
-   require IO::Socket;
-   local($^W) = 0;
-   my $sock = IO::Socket::INET->new(PeerAddr => $host,
-                                    PeerPort => $port,
-                                    Proto    => 'tcp',
-                                    Timeout  => 60) || return;
-   $sock->autoflush;
-   my $netloc = $host;
-   $netloc .= ":$port" if $port != 80;
-   print $sock join("\015\012" =>
-                    "GET $path HTTP/1.0",
-                    "Host: $netloc",
-                    "User-Agent: lwp-trivial/$VERSION",
-                    "", "");
-
-   my $buf = "";
-   my $n;
-   1 while $n = sysread($sock, $buf, 8*1024, length($buf));
-   return undef unless defined($n);
-
-   if ($buf =~ m,^HTTP/\d+\.\d+\s+(\d+)[^\012]*\012,) {
-       my $code = $1;
-       #print "CODE=$code\n$buf\n";
-       if ($code =~ /^30[1237]/ && $buf =~ /\012Location:\s*(\S+)/) {
-           # redirect
-           my $url = $1;
-           return undef if $loop_check{$url}++;
-           return _get($url);
-       }
-       return undef unless $code =~ /^2/;
-       $buf =~ s/.+?\015?\012\015?\012//s;  # zap header
-   }
-
-   return $buf;
-}
-
-
-1;
diff --git a/testcases/ballista/ballista/perllib/LWP/UserAgent.pm b/testcases/ballista/ballista/perllib/LWP/UserAgent.pm
deleted file mode 100644
index 1973fc8..0000000
--- a/testcases/ballista/ballista/perllib/LWP/UserAgent.pm
+++ /dev/null
@@ -1,732 +0,0 @@
-# $Id: UserAgent.pm,v 1.1 2004/10/18 17:57:54 mridge Exp $
-
-package LWP::UserAgent;
-use strict;
-
-=head1 NAME
-
-LWP::UserAgent - A WWW UserAgent class
-
-=head1 SYNOPSIS
-
- require LWP::UserAgent;
- $ua = new LWP::UserAgent;
-
- $request = new HTTP::Request('GET', 'file://localhost/etc/motd');
-
- $response = $ua->request($request); # or
- $response = $ua->request($request, '/tmp/sss'); # or
- $response = $ua->request($request, \&callback, 4096);
-
- sub callback { my($data, $response, $protocol) = @_; .... }
-
-=head1 DESCRIPTION
-
-The C<LWP::UserAgent> is a class implementing a simple World-Wide Web
-user agent in Perl. It brings together the HTTP::Request,
-HTTP::Response and the LWP::Protocol classes that form the rest of the
-core of libwww-perl library. For simple uses this class can be used
-directly to dispatch WWW requests, alternatively it can be subclassed
-for application-specific behaviour.
-
-In normal usage the application creates a UserAgent object, and then
-configures it with values for timeouts proxies, name, etc. The next
-step is to create an instance of C<HTTP::Request> for the request that
-needs to be performed. This request is then passed to the UserAgent
-request() method, which dispatches it using the relevant protocol,
-and returns a C<HTTP::Response> object.
-
-The basic approach of the library is to use HTTP style communication
-for all protocol schemes, i.e. you will receive an C<HTTP::Response>
-object also for gopher or ftp requests.  In order to achieve even more
-similarities with HTTP style communications, gopher menus and file
-directories will be converted to HTML documents.
-
-The request() method can process the content of the response in one of
-three ways: in core, into a file, or into repeated calls of a
-subroutine.  You choose which one by the kind of value passed as the
-second argument to request().
-
-The in core variant simply returns the content in a scalar attribute
-called content() of the response object, and is suitable for small
-HTML replies that might need further parsing.  This variant is used if
-the second argument is missing (or is undef).
-
-The filename variant requires a scalar containing a filename as the
-second argument to request(), and is suitable for large WWW objects
-which need to be written directly to the file, without requiring large
-amounts of memory. In this case the response object returned from
-request() will have empty content().  If the request fails, then the
-content() might not be empty, and the file will be untouched.
-
-The subroutine variant requires a reference to callback routine as the
-second argument to request() and it can also take an optional chuck
-size as third argument.  This variant can be used to construct
-"pipe-lined" processing, where processing of received chuncks can
-begin before the complete data has arrived.  The callback function is
-called with 3 arguments: the data received this time, a reference to
-the response object and a reference to the protocol object.  The
-response object returned from request() will have empty content().  If
-the request fails, then the the callback routine will not have been
-called, and the response->content() might not be empty.
-
-The request can be aborted by calling die() within the callback
-routine.  The die message will be available as the "X-Died" special
-response header field.
-
-The library also accepts that you put a subroutine reference as
-content in the request object.  This subroutine should return the
-content (possibly in pieces) when called.  It should return an empty
-string when there is no more content.
-
-=head1 METHODS
-
-The following methods are available:
-
-=over 4
-
-=cut
-
-
-use vars qw(@ISA $VERSION);
-
-require LWP::MemberMixin;
-@ISA = qw(LWP::MemberMixin);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-
-require URI::URL;
-require HTTP::Request;
-require HTTP::Response;
-
-use HTTP::Date ();
-
-use LWP ();
-use LWP::Debug ();
-use LWP::Protocol ();
-
-use Carp ();
-
-use AutoLoader ();
-*AUTOLOAD = \&AutoLoader::AUTOLOAD;  # import the AUTOLOAD method
-
-
-=item $ua = new LWP::UserAgent;
-
-Constructor for the UserAgent.  Returns a reference to a
-LWP::UserAgent object.
-
-=cut
-
-sub new
-{
-    my($class, $init) = @_;
-    LWP::Debug::trace('()');
-
-    my $self;
-    if (ref $init) {
-	$self = $init->clone;
-    } else {
-	$self = bless {
-		'agent'       => "libwww-perl/$LWP::VERSION",
-		'from'        => undef,
-		'timeout'     => 3*60,
-		'proxy'       => undef,
-		'cookie_jar'  => undef,
-		'use_eval'    => 1,
-                'parse_head'  => 1,
-                'max_size'    => undef,
-		'no_proxy'    => [],
-	}, $class;
-    }
-}
-
-
-=item $ua->simple_request($request, [$arg [, $size]])
-
-This method dispatches a single WWW request on behalf of a user, and
-returns the response received.  The C<$request> should be a reference
-to a C<HTTP::Request> object with values defined for at least the
-method() and url() attributes.
-
-If C<$arg> is a scalar it is taken as a filename where the content of
-the response is stored.
-
-If C<$arg> is a reference to a subroutine, then this routine is called
-as chunks of the content is received.  An optional C<$size> argument
-is taken as a hint for an appropriate chunk size.
-
-If C<$arg> is omitted, then the content is stored in the response
-object itself.
-
-=cut
-
-sub simple_request
-{
-    my($self, $request, $arg, $size) = @_;
-    local($SIG{__DIE__});  # protect agains user defined die handlers
-
-    my($method, $url) = ($request->method, $request->url);
-
-    # Check that we have a METHOD and a URL first
-    return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST, "Method missing")
-	unless $method;
-    return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST, "URL missing")
-	unless $url;
-
-    LWP::Debug::trace("$method $url");
-
-    # Locate protocol to use
-    my $scheme = '';
-    my $proxy = $self->_need_proxy($url);
-    if (defined $proxy) {
-	$scheme = $proxy->scheme;
-    } else {
-	$scheme = $url->scheme;
-    }
-    my $protocol;
-    eval {
-	$protocol = LWP::Protocol::create($scheme);
-    };
-    if ($@) {
-	$@ =~ s/\s+at\s+\S+\s+line\s+\d+\.?\s*//;  # remove file/line number
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED, $@)
-    }
-
-    # Extract fields that will be used below
-    my ($agent, $from, $timeout, $cookie_jar,
-        $use_eval, $parse_head, $max_size) =
-      @{$self}{qw(agent from timeout cookie_jar
-                  use_eval parse_head max_size)};
-
-    # Set User-Agent and From headers if they are defined
-    $request->header('User-Agent' => $agent) if $agent;
-    $request->header('From' => $from) if $from;
-    $cookie_jar->add_cookie_header($request) if $cookie_jar;
-
-    # Transfer some attributes to the protocol object
-    $protocol->parse_head($parse_head);
-    $protocol->max_size($max_size);
-    
-    my $response;
-    if ($use_eval) {
-	# we eval, and turn dies into responses below
-	eval {
-	    $response = $protocol->request($request, $proxy,
-					   $arg, $size, $timeout);
-	};
-	if ($@) {
-	    $@ =~ s/\s+at\s+\S+\s+line\s+\d+\.?\s*//;
-	    $response =
-	      HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				  $@);
-	}
-    } else {
-	$response = $protocol->request($request, $proxy,
-				       $arg, $size, $timeout);
-	# XXX: Should we die unless $response->is_success ???
-    }
-
-    $response->request($request);  # record request for reference
-    $cookie_jar->extract_cookies($response) if $cookie_jar;
-    $response->header("Client-Date" => HTTP::Date::time2str(time));
-    return $response;
-}
-
-
-=item $ua->request($request, $arg [, $size])
-
-Process a request, including redirects and security.  This method may
-actually send several different simple reqeusts.
-
-The arguments are the same as for C<simple_request()>.
-
-=cut
-
-sub request
-{
-    my($self, $request, $arg, $size, $previous) = @_;
-
-    LWP::Debug::trace('()');
-
-    my $response = $self->simple_request($request, $arg, $size);
-
-    my $code = $response->code;
-    $response->previous($previous) if defined $previous;
-
-    LWP::Debug::debug('Simple result: ' . HTTP::Status::status_message($code));
-
-    if ($code == &HTTP::Status::RC_MOVED_PERMANENTLY or
-	$code == &HTTP::Status::RC_MOVED_TEMPORARILY) {
-
-	# Make a copy of the request and initialize it with the new URI
-	my $referral = $request->clone;
-
-	# And then we update the URL based on the Location:-header.
-	# Some servers erroneously return a relative URL for redirects,
-	# so make it absolute if it not already is.
-	my $referral_uri = (URI::URL->new($response->header('Location'),
-					  $response->base))->abs(undef,1);
-
-	$referral->url($referral_uri);
-
-	return $response unless $self->redirect_ok($referral);
-
-	# Check for loop in the redirects
-	my $count = 0;
-	my $r = $response;
-	while ($r) {
-	    if (++$count > 13 ||
-                $r->request->url->as_string eq $referral_uri->as_string) {
-		$response->header("Client-Warning" =>
-				  "Redirect loop detected");
-		return $response;
-	    }
-	    $r = $r->previous;
-	}
-
-	return $self->request($referral, $arg, $size, $response);
-
-    } elsif ($code == &HTTP::Status::RC_UNAUTHORIZED ||
-	     $code == &HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED
-	    )
-    {
-	my $proxy = ($code == &HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED);
-	my $ch_header = $proxy ?  "Proxy-Authenticate" : "WWW-Authenticate";
-	my $challenge = $response->header($ch_header);
-	unless (defined $challenge) {
-	    $response->header("Client-Warning" => 
-			      "Missing Authenticate header");
-	    return $response;
-	}
-
-	require HTTP::Headers::Util;
-	$challenge =~ tr/,/;/;  # "," is used to separate auth-params!!
-	($challenge) = HTTP::Headers::Util::split_header_words($challenge);
-	my $scheme = lc(shift(@$challenge));
-	shift(@$challenge); # no value
-	$challenge = { @$challenge };  # make rest into a hash
-	for (keys %$challenge) {       # make sure all keys are lower case
-	    $challenge->{lc $_} = delete $challenge->{$_};
-	}
-
-	unless ($scheme =~ /^([a-z]+(?:-[a-z]+)*)$/) {
-	    $response->header("Client-Warning" => 
-			      "Bad authentication scheme '$scheme'");
-	    return $response;
-	}
-	$scheme = $1;  # untainted now
-	my $class = "LWP::Authen::\u$scheme";
-	$class =~ s/-/_/g;
-	
-	no strict 'refs';
-	unless (defined %{"$class\::"}) {
-	    # try to load it
-	    eval "require $class";
-	    if ($@) {
-		if ($@ =~ /^Can\'t locate/) {
-		    $response->header("Client-Warning" =>
-				      "Unsupport authentication scheme '$scheme'");
-		} else {
-		    $response->header("Client-Warning" => $@);
-		}
-		return $response;
-	    }
-	}
-	return $class->authenticate($self, $proxy, $challenge, $response,
-				    $request, $arg, $size);
-    }
-    return $response;
-}
-
-
-=item $ua->redirect_ok
-
-This method is called by request() before it tries to do any
-redirects.  It should return a true value if the redirect is allowed
-to be performed. Subclasses might want to override this.
-
-The default implementation will return FALSE for POST request and TRUE
-for all others.
-
-=cut
-
-sub redirect_ok
-{
-    # draft-ietf-http-v10-spec-02.ps from www.ics.uci.edu, specify:
-    #
-    # If the 30[12] status code is received in response to a request using
-    # the POST method, the user agent must not automatically redirect the
-    # request unless it can be confirmed by the user, since this might change
-    # the conditions under which the request was issued.
-
-    my($self, $request) = @_;
-    return 0 if $request->method eq "POST";
-    1;
-}
-
-
-=item $ua->credentials($netloc, $realm, $uname, $pass)
-
-Set the user name and password to be used for a realm.  It is often more
-useful to specialize the get_basic_credentials() method instead.
-
-=cut
-
-sub credentials
-{
-    my($self, $netloc, $realm, $uid, $pass) = @_;
-    @{ $self->{'basic_authentication'}{$netloc}{$realm} } = ($uid, $pass);
-}
-
-
-=item $ua->get_basic_credentials($realm, $uri, [$proxy])
-
-This is called by request() to retrieve credentials for a Realm
-protected by Basic Authentication or Digest Authentication.
-
-Should return username and password in a list.  Return undef to abort
-the authentication resolution atempts.
-
-This implementation simply checks a set of pre-stored member
-variables. Subclasses can override this method to e.g. ask the user
-for a username/password.  An example of this can be found in
-C<lwp-request> program distributed with this library.
-
-=cut
-
-sub get_basic_credentials
-{
-    my($self, $realm, $uri, $proxy) = @_;
-    return if $proxy;
-
-    my $netloc = $uri->netloc;
-    if (exists $self->{'basic_authentication'}{$netloc}{$realm}) {
-	return @{ $self->{'basic_authentication'}{$netloc}{$realm} };
-    }
-
-    return (undef, undef);
-}
-
-
-=item $ua->agent([$product_id])
-
-Get/set the product token that is used to identify the user agent on
-the network.  The agent value is sent as the "User-Agent" header in
-the requests. The default agent name is "libwww-perl/#.##", where
-"#.##" is substitued with the version numer of this library.
-
-The user agent string should be one or more simple product identifiers
-with an optional version number separated by the "/" character.
-Examples are:
-
-  $ua->agent('Checkbot/0.4 ' . $ua->agent);
-  $ua->agent('Mozilla/5.0');
-
-=item $ua->from([$email_address])
-
-Get/set the Internet e-mail address for the human user who controls
-the requesting user agent.  The address should be machine-usable, as
-defined in RFC 822.  The from value is send as the "From" header in
-the requests.  There is no default.  Example:
-
-  $ua->from('aas@sn.no');
-
-=item $ua->timeout([$secs])
-
-Get/set the timeout value in seconds. The default timeout() value is
-180 seconds, i.e. 3 minutes.
-
-=item $ua->cookie_jar([$cookies])
-
-Get/set the I<HTTP::Cookies> object to use.  The default is to have no
-cookie_jar, i.e. never automatically add "Cookie" headers to the
-requests.
-
-=item $ua->parse_head([$boolean])
-
-Get/set a value indicating wether we should initialize response
-headers from the E<lt>head> section of HTML documents. The default is
-TRUE.  Do not turn this off, unless you know what you are doing.
-
-=item $ua->max_size([$bytes])
-
-Get/set the size limit for response content.  The default is undef,
-which means that there is not limit.  If the returned response content
-is only partial, because the size limit was exceeded, then a
-"X-Content-Range" header will be added to the response.
-
-=cut
-
-sub timeout    { shift->_elem('timeout',   @_); }
-sub agent      { shift->_elem('agent',     @_); }
-sub from       { shift->_elem('from',      @_); }
-sub cookie_jar { shift->_elem('cookie_jar',@_); }
-sub parse_head { shift->_elem('parse_head',@_); }
-sub max_size   { shift->_elem('max_size',  @_); }
-
-# depreciated
-sub use_eval   { shift->_elem('use_eval',  @_); }
-sub use_alarm
-{
-    Carp::carp("LWP::UserAgent->use_alarm(BOOL) is a no-op")
-	if @_ > 1 && $^W;
-    "";
-}
-
-
-# Declarations of AutoLoaded methods
-sub clone;
-sub is_protocol_supported;
-sub mirror;
-sub proxy;
-sub env_proxy;
-sub no_proxy;
-sub _need_proxy;
-
-
-1;
-__END__
-
-
-=item $ua->clone;
-
-Returns a copy of the LWP::UserAgent object
-
-=cut
-
-
-sub clone
-{
-    my $self = shift;
-    my $copy = bless { %$self }, ref $self;  # copy most fields
-
-    # elements that are references must be handled in a special way
-    $copy->{'no_proxy'} = [ @{$self->{'no_proxy'}} ];  # copy array
-
-    $copy;
-}
-
-
-=item $ua->is_protocol_supported($scheme)
-
-You can use this method to query if the library currently support the
-specified C<scheme>.  The C<scheme> might be a string (like 'http' or
-'ftp') or it might be an URI::URL object reference.
-
-=cut
-
-sub is_protocol_supported
-{
-    my($self, $scheme) = @_;
-    if (ref $scheme) {
-	# assume we got a reference to an URI::URL object
-	$scheme = $scheme->abs->scheme;
-    } else {
-	Carp::croak("Illeal scheme '$scheme' passed to is_protocol_supported")
-	    if $scheme =~ /\W/;
-	$scheme = lc $scheme;
-    }
-    return LWP::Protocol::implementor($scheme);
-}
-
-
-=item $ua->mirror($url, $file)
-
-Get and store a document identified by a URL, using If-Modified-Since,
-and checking of the Content-Length.  Returns a reference to the
-response object.
-
-=cut
-
-sub mirror
-{
-    my($self, $url, $file) = @_;
-
-    LWP::Debug::trace('()');
-    my $request = new HTTP::Request('GET', $url);
-
-    if (-e $file) {
-	my($mtime) = (stat($file))[9];
-	if($mtime) {
-	    $request->header('If-Modified-Since' =>
-			     HTTP::Date::time2str($mtime));
-	}
-    }
-    my $tmpfile = "$file-$$";
-
-    my $response = $self->request($request, $tmpfile);
-    if ($response->is_success) {
-
-	my $file_length = (stat($tmpfile))[7];
-	my($content_length) = $response->header('Content-length');
-
-	if (defined $content_length and $file_length < $content_length) {
-	    unlink($tmpfile);
-	    die "Transfer truncated: " .
-		"only $file_length out of $content_length bytes received\n";
-	} elsif (defined $content_length and $file_length > $content_length) {
-	    unlink($tmpfile);
-	    die "Content-length mismatch: " .
-		"expected $content_length bytes, got $file_length\n";
-	} else {
-	    # OK
-	    if (-e $file) {
-		# Some dosish systems fail to rename if the target exists
-		chmod 0777, $file;
-		unlink $file;
-	    }
-	    rename($tmpfile, $file) or
-		die "Cannot rename '$tmpfile' to '$file': $!\n";
-
-	    if (my $lm = $response->last_modified) {
-		# make sure the file has the same last modification time
-		utime $lm, $lm, $file;
-	    }
-	}
-    } else {
-	unlink($tmpfile);
-    }
-    return $response;
-}
-
-=item $ua->proxy(...)
-
-Set/retrieve proxy URL for a scheme:
-
- $ua->proxy(['http', 'ftp'], 'http://proxy.sn.no:8001/');
- $ua->proxy('gopher', 'http://proxy.sn.no:8001/');
-
-The first form specifies that the URL is to be used for proxying of
-access methods listed in the list in the first method argument,
-i.e. 'http' and 'ftp'.
-
-The second form shows a shorthand form for specifying
-proxy URL for a single access scheme.
-
-=cut
-
-sub proxy
-{
-    my($self, $key, $proxy) = @_;
-
-    LWP::Debug::trace("$key, $proxy");
-
-    if (!ref($key)) {   # single scalar passed
-	my $old = $self->{'proxy'}{$key};
-	$self->{'proxy'}{$key} = $proxy;
-	return $old;
-    } elsif (ref($key) eq 'ARRAY') {
-	for(@$key) {    # array passed
-	    $self->{'proxy'}{$_} = $proxy;
-	}
-    }
-    return undef;
-}
-
-=item $ua->env_proxy()
-
-Load proxy settings from *_proxy environment variables.  You might
-specify proxies like this (sh-syntax):
-
-  gopher_proxy=http://proxy.my.place/
-  wais_proxy=http://proxy.my.place/
-  no_proxy="my.place"
-  export gopher_proxy wais_proxy no_proxy
-
-Csh or tcsh users should use the C<setenv> command to define these
-envirionment variables.
-
-=cut
-
-sub env_proxy {
-    my ($self) = @_;
-    my($k,$v);
-    while(($k, $v) = each %ENV) {
-	$k = lc($k);
-	next unless $k =~ /^(.*)_proxy$/;
-	$k = $1;
-	if ($k eq 'no') {
-	    $self->no_proxy(split(/\s*,\s*/, $v));
-	}
-	else {
-	    $self->proxy($k, $v);
-	}
-    }
-}
-
-=item $ua->no_proxy($domain,...)
-
-Do not proxy requests to the given domains.  Calling no_proxy without
-any domains clears the list of domains. Eg:
-
- $ua->no_proxy('localhost', 'no', ...);
-
-=cut
-
-sub no_proxy {
-    my($self, @no) = @_;
-    if (@no) {
-	push(@{ $self->{'no_proxy'} }, @no);
-    }
-    else {
-	$self->{'no_proxy'} = [];
-    }
-}
-
-
-# Private method which returns the URL of the Proxy configured for this
-# URL, or undefined if none is configured.
-sub _need_proxy
-{
-    my($self, $url) = @_;
-
-    $url = new URI::URL($url) unless ref $url;
-
-    LWP::Debug::trace("($url)");
-
-    # check the list of noproxies
-
-    if (@{ $self->{'no_proxy'} }) {
-	my $host = $url->host;
-	return undef unless defined $host;
-	my $domain;
-	for $domain (@{ $self->{'no_proxy'} }) {
-	    if ($host =~ /$domain$/) {
-		LWP::Debug::trace("no_proxy configured");
-		return undef;
-	    }
-	}
-    }
-
-    # Currently configured per scheme.
-    # Eventually want finer granularity
-
-    my $scheme = $url->scheme;
-    if (exists $self->{'proxy'}{$scheme}) {
-
-	LWP::Debug::debug('Proxied');
-	return new URI::URL($self->{'proxy'}{$scheme});
-    }
-
-    LWP::Debug::debug('Not proxied');
-    undef;
-}
-
-1;
-
-=back
-
-=head1 SEE ALSO
-
-See L<LWP> for a complete overview of libwww-perl5.  See F<lwp-request> and
-F<lwp-mirror> for examples of usage.
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/LWP/media.types b/testcases/ballista/ballista/perllib/LWP/media.types
deleted file mode 100644
index a951b9e..0000000
--- a/testcases/ballista/ballista/perllib/LWP/media.types
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: media.types,v 1.1 2004/10/18 17:57:54 mridge Exp $
-#
-# This file defines the mapping from file name extentions to media types.
-# Media types where the subtype does not have the "x-" prefix should be
-# registered by IANA:
-#
-#   ftp://www.isi.edu/in-notes/iana/assignments/media-types/
-#
-# See also: RFC-1590
-
-# Text formats
-text/html			html htm
-text/plain			txt text pm el c h cc hh cxx hxx f90
-text/richtext			rtx
-text/tab-separated-values	tsv
-
-text/x-setext			etx
-text/x-pod			pod			# Perl documentation
-
-# Image formats
-image/png			png
-image/gif			gif			# Compuserve
-image/ief			ief
-image/jpeg			jpeg jpg jpe jfif
-image/tiff			tiff tif
-
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb			# SGI IRIS
-image/x-xbitmap			xbm			# X Windows
-image/x-xpixmap			xpm			# X Windows
-image/x-xwindowdump		xwd			# X Windows
-image/x-bmp			bmp			# MS Windows
-image/x-targa			tga
-image/x-fits			fts
-
-
-# Audio formats
-audio/basic			au snd
-audio/x-aiff			aif aiff aifc
-audio/x-wav			wav			# MS Windows
-audio/x-mpeg-2			mp2			# MPEG layer 2 audio
-
-# Video formats
-video/mpeg			mpeg mpg mpe
-video/quicktime			qt
-video/x-msvideo			avi
-video/x-sgi-movie		mov
-
-# Message
-message/rfc822			mail
-message/partial
-message/external-body
-message/news			art
-
-# Applications
-application/octet-stream	bin
-application/postscript		ai eps ps
-application/oda			oda
-application/atomicmail
-application/andrew-insert
-application/slate
-application/wita
-application/dec-dx
-application/dca-rtf
-application/activemessage
-application/rtf			rft			# MS Word
-application/applefile
-application/mac-binhex40	hqx
-application/news-message-id
-application/news-transmission
-application/wordperfect5.1
-application/pdf			pdf
-application/zip			zip
-application/macwriteii
-application/msword
-application/remote-printing
-application/mathematica
-application/cybercash
-application/commonground
-application/iges
-application/riscos
-application/eshop
-
-application/x-mif		mif			# FrameMaker
-application/x-maker		fm
-application/x-csh		csh
-application/x-dvi		dvi
-application/x-hdf		hdf
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-tcl		tcl
-application/x-perl		pl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man 1 2 3 4 5 6 7 8
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-wais-source	src
-application/x-bcpio		bcpio
-application/x-cpio		cpio
-application/x-gtar		gtar			# GNU tar
-application/x-shar		shar
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-ustar		ustar
-
-# Multipart
-multipart/mixed
-multipart/alternative
-multipart/digest
-multipart/parallel
-multipart/appledouble
-multipart/header-set
diff --git a/testcases/ballista/ballista/perllib/URI/Escape.pm b/testcases/ballista/ballista/perllib/URI/Escape.pm
deleted file mode 100644
index 7e0209f..0000000
--- a/testcases/ballista/ballista/perllib/URI/Escape.pm
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# $Id: Escape.pm,v 1.1 2004/10/18 17:58:13 mridge Exp $
-#
-
-package URI::Escape;
-use strict;
-
-=head1 NAME
-
-URI::Escape - Escape and unescape unsafe characters
-
-=head1 SYNOPSIS
-
- use URI::Escape;
- $safe = uri_escape("10% is enough\n");
- $verysafe = uri_escape("foo", "\0-\377");
- $str  = uri_unescape($safe);
-
-=head1 DESCRIPTION
-
-This module provide functions to escape and unescape URI strings.
-Some characters are regarded as "unsafe" and must be escaped in
-accordance with RFC 1738.  Escaped characters are represented by a
-triplet consisting of the character "%" followed by two hexadecimal
-digits.  The following functions are provided (and exported by
-default):
-
-=over 4
-
-=item uri_escape($string, [$unsafe])
-
-This function replaces all unsafe characters in the $string with their
-escape sequence and return the result.
-
-The uri_escape() function takes an optional second argument that
-overrides the set of characters that are to be escaped.  The set is
-specified as a string that can be used in a regular expression
-character class (between [ ]).  E.g.:
-
-  \x00-\x1f\x7f-\xff          # all control and hi-bit characters
-  a-z                         # all lower case characters
-  ^A-Za-z                     # everything not a letter
-
-The default set of characters to be escaped is:
-
-  \x00-\x20"#%;<>?{}|\\^~`\[\]\x7F-\xFF
-
-=item uri_unescape($string)
-
-Returns a string with all %XX sequences replaced with the actual
-character.
-
-=back
-
-The module can also export the %escapes hash which contains the
-mapping from all characters to the corresponding escape code.
-
-=head1 SEE ALSO
-
-L<URI::URL>
-
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-use vars qw(%escapes);
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(uri_escape uri_unescape);
-@EXPORT_OK = qw(%escapes);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use Carp ();
-
-# Build a char->hex map
-for (0..255) {
-    $escapes{chr($_)} = sprintf("%%%02X", $_);
-}
-
-my %subst;  # compiled patternes
-
-sub uri_escape
-{
-    my($text, $patn) = @_;
-    return undef unless defined $text;
-    if (defined $patn){
-	unless (exists  $subst{$patn}) {
-	    # Because we can't compile regex we fake it with a cached sub
-	    $subst{$patn} =
-	      eval "sub {\$_[0] =~ s/([$patn])/\$escapes{\$1}/g; }";
-	    Carp::croak("uri_escape: $@") if $@;
-	}
-	&{$subst{$patn}}($text);
-    } else {
-	# Default unsafe characters. (RFC1738 section 2.2)
-	$text =~ s/([\x00-\x20\"#%;<>?{}|\\^~`\[\]\x7F-\xFF])/$escapes{$1}/g;
-    }
-    $text;
-}
-
-sub uri_unescape
-{
-    # Note from RFC1630:  "Sequences which start with a percent sign
-    # but are not followed by two hexadecimal characters are reserved
-    # for future extension"
-    my @copy = @_;
-    for (@copy) { s/%([\dA-Fa-f]{2})/chr(hex($1))/eg; }
-    wantarray ? @copy : $copy[0];
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/Heuristic.pm b/testcases/ballista/ballista/perllib/URI/Heuristic.pm
deleted file mode 100644
index 4ac5ca8..0000000
--- a/testcases/ballista/ballista/perllib/URI/Heuristic.pm
+++ /dev/null
@@ -1,191 +0,0 @@
-package URI::Heuristic;
-
-# $Id: Heuristic.pm,v 1.1 2004/10/18 17:58:13 mridge Exp $
-
-=head1 NAME
-
-uf_urlstr - Expand URL using heuristics
-
-=head1 SYNOPSIS
-
- use URI::Heuristic qw(uf_urlstr);
- $url = uf_urlstr("perl");             # http://www.perl.com
- $url = uf_urlstr("www.sol.no/sol");   # http://www.sol.no/sol
- $url = uf_urlstr("aas");              # http://www.aas.no
- $url = uf_urlstr("ftp.funet.fi");     # ftp://ftp.funet.fi
- $url = uf_urlstr("/etc/passwd");      # file:/etc/passwd
-
-=head1 DESCRIPTION
-
-This module provide functions that expand strings into real absolute
-URLs using some builtin heuristics.  Strings that already represent
-absolute URLs (i.e. start with a C<scheme:> part) are never modified
-and are returned unchanged.  The main use of these functions are to
-allow abbreviated URLs similar to what many web browsers allow for URLs
-typed in by the user.
-
-The following functions are provided:
-
-=over 4
-
-=item uf_urlstr($str)
-
-The uf_urlstr() function will try to make the string passed as
-argument into a proper absolute URL string.  The "uf_" prefix stands
-for "User Friendly".
-
-=item uf_url($str)
-
-This functions work the same way as uf_urlstr() but it will
-return a C<URI::URL> object.
-
-=back
-
-=head1 ENVIRONMENT
-
-If the hostname portion of a URL does not contain any dots, then
-certain qualified guesses will be made.  These guesses are governed be
-the following two environment variables.
-
-=over 10
-
-=item COUNTRY
-
-This is the two letter country code (ISO 3166) for your location.  If
-the domain name of your host ends with two letters, then it is taken
-to be the default country. See also L<Locale::Country>.
-
-=item URL_GUESS_PATTERN
-
-Contain a space separated list of URL patterns to try.  The string
-"ACME" is for some reason used as a placeholder for the host name in
-the URL provided.  Example:
-
- URL_GUESS_PATTERN="www.ACME.no www.ACME.se www.ACME.com"
- export URL_GUESS_PATTERN
-
-Specifying URL_GUESS_PATTERN disables any guessing rules based on
-country.  An empty URL_GUESS_PATTERN disables any guessing that
-involves host name lookups.
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright 1997-1998, Gisle Aas
-
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
-use strict;
-
-use vars qw(@EXPORT_OK $VERSION $MY_COUNTRY %LOCAL_GUESSING $DEBUG);
-
-require Exporter;
-*import = \&Exporter::import;
-@EXPORT_OK = qw(uf_url uf_urlstr);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-eval {
-    require Net::Domain;
-    my $fqdn = Net::Domain::hostfqdn();
-    $MY_COUNTRY = lc($1) if $fqdn =~ /\.([a-zA-Z]{2})$/;
-
-    # Some other heuristics to guess country?  Perhaps looking
-    # at some environment variable (LANG, LC_ALL, ???)
-    $MY_COUNTRY = $ENV{COUNTRY} if exists $ENV{COUNTRY};
-};
-
-%LOCAL_GUESSING =
-(
- 'us' => [qw(www.ACME.gov www.ACME.mil)],
- 'uk' => [qw(www.ACME.co.uk www.ACME.org.uk www.ACME.ac.uk)],
- 'au' => [qw(www.ACME.com.au www.ACME.org.au www.ACME.edu.au)],
- 'il' => [qw(www.ACME.co.il www.ACME.org.il www.ACME.net.il)],
- # send corrections and new entries to <aas@sn.no>
-);
-
-
-sub uf_url ($)
-{
-    require URI::URL;
-    URI::URL->new(uf_urlstr($_[0]));
-}
-
-
-sub uf_urlstr ($)
-{
-    local($_) = @_;
-    print STDERR "uf_urlstr: resolving $_\n" if $DEBUG;
-    return unless defined;
-
-    s/^\s+//;
-    s/\s+$//;
-
-    if (/^(www|web|home)\./) {
-	$_ = "http://$_";
-
-    } elsif (/^(ftp|gopher|news|wais|http|https)\./) {
-	$_ = "$1://$_";
-
-    } elsif (m,^/,      ||          # absolute file name
-	     m,^\.\.?/, ||          # relative file name
-	     m,^[a-zA-Z]:[/\\],)    # dosish file name
-    {
-	$_ = "file:$_";
-
-    } elsif (/^\w+([\.\-]\w+)*\@(\w+\.)+\w{2,3}$/) {
-	$_ = "mailto:$_";
-
-    } elsif (!/^[.+\-\w]+:/) {      # no scheme specified
-	if (s/^(\w+(?:\.\w+)*)([\/:\?\#]|$)/$2/) {
-	    my $host = $1;
-
-	    if ($host !~ /\./ && $host ne "localhost") {
-		my @guess;
-		if (exists $ENV{URL_GUESS_PATTERN}) {
-		    @guess = map { s/\bACME\b/$host/; $_ }
-		             split(' ', $ENV{URL_GUESS_PATTERN});
-		} else {
-		    if ($MY_COUNTRY) {
-			my $special = $LOCAL_GUESSING{$MY_COUNTRY};
-			if ($special) {
-			    my @special = @$special;
-			    push(@guess, map { s/\bACME\b/$host/; $_ }
-                                               @special);
-			} else {
-			    push(@guess, "www.$host.$MY_COUNTRY");
-			}
-		    }
-		    push(@guess, map "www.$host.$_",
-			             "com", "org", "net", "edu", "int");
-		}
-
-
-		my $guess;
-		for $guess (@guess) {
-		    print STDERR "uf_urlstr: gethostbyname('$guess')..."
-		      if $DEBUG;
-		    if (gethostbyname($guess)) {
-			print STDERR "yes\n" if $DEBUG;
-			$host = $guess;
-			last;
-		    }
-		    print STDERR "no\n" if $DEBUG;
-		}
-	    }
-	    $_ = "http://$host$_";
-
-	} else {
-	    # pure junk, just return it unchanged...
-
-	}
-    }
-    print STDERR "uf_urlstr: ==> $_\n" if $DEBUG;
-
-    $_;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL.pm b/testcases/ballista/ballista/perllib/URI/URL.pm
deleted file mode 100644
index bb88be7..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL.pm
+++ /dev/null
@@ -1,949 +0,0 @@
-package URI::URL;
-
-$VERSION = "4.15";   # $Date: 2004/10/18 17:58:12 $
-sub Version { $VERSION; }
-
-require 5.004;
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(url);
-
-require AutoLoader;
-*AUTOLOAD = \&AutoLoader::AUTOLOAD;
-
-use Carp ();
-
-# Basic lexical elements, taken from RFC 1738:
-#
-#  safe         = "$" | "-" | "_" | "." | "+"
-#  extra        = "!" | "*" | "'" | "(" | ")" | ","
-#  national     = "{" | "}" | "|" | "\" | "^" | "~" | "[" | "]" | "`"
-#  punctuation  = "<" | ">" | "#" | "%" | <">
-#  reserved     = ";" | "/" | "?" | ":" | "@" | "&" | "="
-#  escape       = "%" hex hex
-#  unreserved   = alpha | digit | safe | extra
-#  uchar        = unreserved | escape
-#  xchar        = unreserved | reserved | escape
-
-# draft-fielding-url-syntax-05.txt adds '+' to the reserved chars and
-# takes '~' out
-
-use strict;
-use vars qw($reserved $reserved_no_slash $reserved_no_form $unsafe
-	    $Debug $Strict_URL
-	   );
-
-$reserved          = ";\\/?:\\@&=+#%"; # RFC 1738 reserved pluss '#' and '%'
-$reserved_no_slash = ";?:\\@&=+#%";    # used when escaping path
-$reserved_no_form  = ";\\/?:\\@#%";    # used when escaping params and query
-
-# This is the unsafe characters (excluding those reserved)
-$unsafe   = "\x00-\x20{}|\\\\^\\[\\]`<>\"\x7F-\xFF";
-#$unsafe .= "~";  # according to RFC1738 but not to common practice
-
-$Debug         = 0;     # set to 1 to print URLs on creation
-$Strict_URL    = 0;     # see new()
-
-use overload ( '""' => 'as_string', 'fallback' => 1 );
-
-my %Implementor = (); # mapping from scheme to implementation class
-
-
-# Easy to use constructor
-sub url ($;$)
-{
-    URI::URL->new(@_);
-}
-
-
-# URI::URL objects are implemented as blessed hashes:
-#
-# Each of the URL components (scheme, netloc, user, password, host,
-# port, path, params, query, fragment) are stored under their
-# name. The netloc, path, params and query is stored in quoted
-# (escaped) form.  The others is stored unquoted (unescaped).
-#
-# Netloc is special since it is rendundant (same as
-# "user:password@host:port") and must be kept in sync with those.
-#
-# The '_str' key stores a cached stringified version of the URL
-# (by definition in quoted form).
-# The '_base' key stores the optional base of a relative URL.
-#
-# The '_orig_url' is used while debugging is on.
-#
-# Subclasses may add their own keys but must take great care to
-# avoid names which might be used in later verions of this module.
-
-sub new
-{
-    my($class, $init, $base) = @_;
-
-    my $self;
-    if (ref $init) {
-	$self = $init->clone;
-	$self->base($base) if $base;
-    } else {
-	$init = "" unless defined $init;
-	# RFC 1738 appendix suggest that we just ignore extra whitespace
-	$init =~ s/\s+//g;
-	# Also get rid of any <URL: > wrapper
-	$init =~ s/^<(?:URL:)?(.*)>$/$1/;
-
-	# We need a scheme to determine which class to use
-	my($scheme) = $init =~ m/^([.+\-\w]+):/;
-	if (!$scheme and $base){ # get scheme from base
-	    if (ref $base){ # may be object or just a string
-		$scheme = $base->scheme;
-	    } else {
-		$scheme = $1 if $base =~ m/^([.+\-\w]+):/;
-	    }
-	}
-	unless($scheme){
-	    Carp::croak("Unable to determine scheme for '$init'")
-		if $Strict_URL;
-	    $scheme = 'http';
-	}
-	my $impclass = URI::URL::implementor($scheme);
-	unless ($impclass) {
-	    Carp::croak("URI::URL scheme '$scheme' is not supported")
-		if $Strict_URL;
-	    # use generic as fallback
-	    require URI::URL::_generic;
-	    URI::URL::implementor($scheme, 'URI::URL::_generic');
-	    $impclass = 'URI::URL::_generic';
-	}
-
-	# hand-off to scheme specific implementation sub-class
-	$self->{'_orig_url'} = $init if $Debug;
-	$self = $impclass->new($init, $base);
-    }
-    $self->print_on('STDERR') if $Debug;
-    return $self;
-}
-
-
-sub clone
-{
-    my $self = shift;
-    # this work as long as none of the components are references themselves
-    bless { %$self }, ref $self;
-}
-
-
-sub implementor
-{
-    my($scheme, $impclass) = @_;
-    unless (defined $scheme) {
-	require URI::URL::_generic;
-	return 'URI::URL::_generic';
-    }
-
-    $scheme = lc($scheme);
-    if ($impclass) {
-	$impclass->_init_implementor($scheme);
-	my $old = $Implementor{$scheme};
-	$Implementor{$scheme} = $impclass;
-	return $old;
-    }
-
-    my $ic = $Implementor{$scheme};
-    return $ic if $ic;
-
-    # scheme not yet known, look for internal or
-    # preloaded (with 'use') implementation
-    $ic = "URI::URL::$scheme";  # default location
-    no strict 'refs';
-    # check we actually have one for the scheme:
-    unless (defined @{"${ic}::ISA"}) {
-	# Try to load it
-	eval { require "URI/URL/$scheme.pm"; };
-	die $@ if $@ && $@ !~ /Can\'t locate/;
-	$ic = '' unless defined @{"${ic}::ISA"};
-    }
-    if ($ic) {
-	$ic->_init_implementor($scheme);
-	$Implementor{$scheme} = $ic;
-    }
-    $ic;
-}
-
-
-sub _init_implementor
-{
-    my($class, $scheme) = @_;
-    # Remember that one implementor class may actually
-    # serve to implement several URL schemes.
-
-    if ($] < 5.003_17) {
-	no strict qw(refs);
-	# Setup overloading inheritace - experimental
-	%{"${class}::OVERLOAD"} = %URI::URL::OVERLOAD
-	    unless defined %{"${class}::OVERLOAD"};
-    }
-}
-
-
-# This private method help us implement access to the elements in the
-# URI::URL object hash (%$self).  You can set up access to an element
-# with a routine similar to this one:
-#
-#  sub component { shift->_elem('component', @_); }
-
-sub _elem
-{
-    my $self = shift;
-    my $elem = shift;
-    my $old = $self->{$elem};
-    if (@_) {
-	$self->{$elem} = shift;
-	$self->{'_str'} = '';        # void cached string
-    }
-    $old;
-}
-
-
-# Make all standard methods available to all kinds of URLs.  This allow
-# us to call these without to much worry when URI::URL::strict(0);
-
-sub bad_method;
-
-*netloc       = \&bad_method;
-*user         = \&bad_method;
-*password     = \&bad_method;
-*host         = \&bad_method;
-*port         = \&bad_method;
-*default_port = \&bad_method;
-
-*full_path    = \&bad_method;
-*epath        = \&bad_method;
-*eparams      = \&bad_method;
-*equery       = \&bad_method;
-
-*path         = \&bad_method;
-*path_components = \&bad_method;
-*params       = \&bad_method;
-*query        = \&bad_method;
-*frag         = \&bad_method;
-
-
-#
-# A U T O  L O A D I N G
-#
-# The rest of the methods are autoloaded because they should be less
-# frequently used.  We define stubs here so that inheritance works as
-# it should.
-sub newlocal;
-sub strict;
-sub base;
-sub scheme;
-sub crack;
-sub abs;
-sub rel;
-sub as_string;
-sub eq;
-sub print_on;
-
-# Don't need DESTROY but avoid trying to AUTOLOAD it.
-sub DESTROY { }
-
-1;
-__END__
-
-sub newlocal
-{
-    require URI::URL::file;
-    my $class = shift;
-    URI::URL::file->newlocal(@_);  # pass it on the the file class
-}
-
-sub strict
-{
-    return $Strict_URL unless @_;
-    my $old = $Strict_URL;
-    $Strict_URL = $_[0];
-    $old;
-}
-
-# Access some attributes of a URL object:
-sub base {
-    my $self = shift;
-    my $base  = $self->{'_base'};
-
-    if (@_) { # set
-	my $new_base = shift;
-	$new_base = $new_base->abs if ref($new_base);  # unsure absoluteness
-	$self->{_base} = $new_base;
-    }
-    return unless defined wantarray;
-
-    # The base attribute supports 'lazy' conversion from URL strings
-    # to URL objects. Strings may be stored but when a string is
-    # fetched it will automatically be converted to a URL object.
-    # The main benefit is to make it much cheaper to say:
-    #   new URI::URL $random_url_string, 'http:'
-    if (defined($base) && !ref($base)) {
-	$base = new URI::URL $base;
-	$self->_elem('_base', $base); # set new object
-    }
-    $base;
-}
-
-sub scheme {
-    my $self = shift;
-    my $old = $self->{'scheme'};
-    if (@_) {
-	my $new_scheme = shift;
-	if (defined($new_scheme) && length($new_scheme)) {
-	    # reparse URL with new scheme
-	    my $str = $self->as_string;
-	    $str =~ s/^[\w+\-.]+://;
-	    my $newself = new URI::URL "$new_scheme:$str";
-	    %$self = %$newself;
-	    bless $self, ref($newself);
-	} else {
-	    $self->{'scheme'} = undef;
-	}
-    }
-    $old;
-}
-
-sub crack
-{
-    # should be overridden by subclasses
-    my $self = shift;
-    ($self->scheme,  # 0: scheme
-     undef,          # 1: user
-     undef,          # 2: passwd
-     undef,          # 3: host
-     undef,          # 4: port
-     undef,          # 5: path
-     undef,          # 6: params
-     undef,          # 7: query
-     undef           # 8: fragment
-    )
-}
-
-# These are overridden by _generic (this is just a noop for those schemes that
-# do not wish to be a subclass of URI::URL::_generic)
-sub abs { shift->clone; }
-sub rel { shift->clone; }
-
-# This method should always be overridden in subclasses
-sub as_string {
-    "<URL>";
-}
-
-# Compare two URLs, subclasses will provide a more correct implementation
-sub eq {
-    my($self, $other) = @_;
-    $other = URI::URL->new($other, $self) unless ref $other;
-    ref($self) eq ref($other) &&
-      $self->scheme eq $other->scheme &&
-      $self->as_string eq $other->as_string;  # Case-sensitive
-}
-
-# This is set up as an alias for various methods
-sub bad_method {
-    my $self = shift;
-    my $scheme = $self->scheme;
-    Carp::croak("Illegal method called for $scheme: URL")
-	if $Strict_URL;
-    # Carp::carp("Illegal method called for $scheme: URL")
-    #     if $^W;
-    undef;
-}
-
-sub print_on
-{
-    no strict qw(refs);  # because we use strings as filehandles
-    my $self = shift;
-    my $fh = shift || 'STDERR';
-    my($k, $v);
-    print $fh "Dump of URI::URL $self...\n";
-    foreach $k (sort keys %$self){
-	$v = $self->{$k};
-	$v = 'UNDEF' unless defined $v;
-	print $fh "  $k\t'$v'\n";
-    }
-}
-
-1;
-
-
-#########################################################################
-#### D O C U M E N T A T I O N
-#########################################################################
-
-=head1 NAME
-
-URI::URL - Uniform Resource Locators (absolute and relative)
-
-=head1 SYNOPSIS
-
- use URI::URL;
-
- # Constructors
- $url1 = new URI::URL 'http://www.perl.com/%7Euser/gisle.gif';
- $url2 = new URI::URL 'gisle.gif', 'http://www.com/%7Euser';
- $url3 = url 'http://www.sn.no/'; # handy constructor
- $url4 = $url2->abs;       # get absolute url using base
- $url5 = $url2->abs('http:/other/path');
- $url6 = newlocal URI::URL 'test';
-
- # Stringify URL
- $str1 = $url->as_string;  # complete escaped URL string
- $str2 = $url->full_path;  # escaped path+params+query
- $str3 = "$url";           # use operator overloading
-
- # Retrieving Generic-RL components:
- $scheme   = $url->scheme;
- $netloc   = $url->netloc; # see user,password,host,port below
- $path     = $url->path;
- $params   = $url->params;
- $query    = $url->query;
- $frag     = $url->frag;
-
- # Accessing elements in their escaped form
- $path     = $url->epath;
- $params   = $url->eparams;
- $query    = $url->equery;
-
- # Retrieving Network location (netloc) components:
- $user     = $url->user;
- $password = $url->password;
- $host     = $url->host;
- $port     = $url->port;   # returns default if not defined
-
- # Retrieve escaped path components as an array
- @path     = $url->path_components;
-
- # HTTP query-string access methods
- @keywords = $url->keywords;
- @form     = $url->query_form;
-
- # All methods above can set the field values, e.g:
- $url->scheme('http');
- $url->host('www.w3.org');
- $url->port($url->default_port);
- $url->base($url5);                      # use string or object
- $url->keywords(qw(dog bones));
-
- # File methods
- $url = new URI::URL "file:/foo/bar";
- open(F, $url->local_path) or die;
-
- # Compare URLs
- if ($url->eq("http://www.sn.no")) or die;
-
-=head1 DESCRIPTION
-
-This module implements the URI::URL class representing Uniform
-Resource Locators (URL). URLs provide a compact string representation
-for resources available via the Internet. Both absolute (RFC 1738) and
-relative (RFC 1808) URLs are supported.
-
-URI::URL objects are created by calling new(), which takes as argument
-a string representation of the URL or an existing URL object reference
-to be cloned. Specific individual elements can then be accessed via
-the scheme(), user(), password(), host(), port(), path(), params(),
-query() and frag() methods.  In addition escaped versions of the path,
-params and query can be accessed with the epath(), eparams() and
-equery() methods.  Note that some URL schemes will support all these
-methods.
-
-The object constructor new() must be able to determine the scheme for
-the URL.  If a scheme is not specified in the URL itself, it will use
-the scheme specified by the base URL. If no base URL scheme is defined
-then new() will croak if URI::URL::strict(1) has been invoked,
-otherwise I<http> is silently assumed.  Once the scheme has been
-determined new() then uses the implementor() function to determine
-which class implements that scheme.  If no implementor class is
-defined for the scheme then new() will croak if URI::URL::strict(1)
-has been invoked, otherwise the internal generic URL class is assumed.
-
-Internally defined schemes are implemented by the
-URI::URL::I<scheme_name> module.  The URI::URL::implementor() function
-can be used to explicitly set the class used to implement a scheme if
-you want to override this.
-
-
-=head1 HOW AND WHEN TO ESCAPE
-
-
-=over 3
-
-=item This is an edited extract from a URI specification:
-
-The printability requirement has been met by specifying a safe set of
-characters, and a general escaping scheme for encoding "unsafe"
-characters. This "safe" set is suitable, for example, for use in
-electronic mail.  This is the canonical form of a URI.
-
-There is a conflict between the need to be able to represent many
-characters including spaces within a URI directly, and the need to be
-able to use a URI in environments which have limited character sets
-or in which certain characters are prone to corruption. This conflict
-has been resolved by use of an hexadecimal escaping method which may
-be applied to any characters forbidden in a given context. When URLs
-are moved between contexts, the set of characters escaped may be
-enlarged or reduced unambiguously.  The canonical form for URIs has
-all white spaces encoded.
-
-=item Notes:
-
-A URL string I<must>, by definition, consist of escaped
-components. Complete URLs are always escaped.
-
-The components of a URL string must be I<individually> escaped.  Each
-component of a URL may have a separate requirements regarding what
-must be escaped, and those requirements are also dependent on the URL
-scheme.
-
-Never escape an already escaped component string.
-
-=back
-
-This implementation expects an escaped URL string to be passed to
-new() and will return a fully escaped URL string from as_string()
-and full_path().
-
-Individual components can be manipulated in unescaped or escaped
-form. The following methods return/accept unescaped strings:
-
-    scheme                  path
-    user                    params
-    password                query
-    host                    frag
-    port
-
-The following methods return/accept partial I<escaped> strings:
-
-    netloc                  eparams
-    epath                   equery
-
-I<Partial escaped> means that only reserved characters
-(i.e. ':', '@', '/', ';', '?', '=', '&' in addition to '%', '.' and '#')
-needs to be escaped when they are to be treated as normal characters.
-I<Fully escaped> means that all unsafe characters are escaped. Unsafe
-characters are all all control characters (%00-%1F and %7F), all 8-bit
-characters (%80-%FF) as well
-as '{', '}', '|', '\', '^', '[', ']' '`', '"', '<' and '>'.
-Note that the character '~' is B<not> considered
-unsafe by this library as it is common practice to use it to reference
-personal home pages, but it is still unsafe according to RFC 1738.
-
-=head1 ADDING NEW URL SCHEMES
-
-New URL schemes or alternative implementations for existing schemes
-can be added to your own code. To create a new scheme class use code
-like:
-
-   package MYURL::foo;
-   @ISA = (URI::URL::implementor());   # inherit from generic scheme
-
-The 'URI::URL::implementor()' function call with no parameters returns
-the name of the class which implements the generic URL scheme
-behaviour (typically C<URI::URL::_generic>). All hierarchical schemes
-should be derived from this class.
-
-Your class can then define overriding methods (e.g., new(), _parse()
-as required).
-
-To register your new class as the implementor for a specific scheme
-use code like:
-
-   URI::URL::implementor('x-foo', 'MYURL::foo');
-
-Any new URL created for scheme 'x-foo' will be implemented by your
-C<MYURL::foo> class. Existing URLs will not be affected.
-
-
-=head1 FUNCTIONS
-
-=over 3
-
-=item $url = URI::URL->new( $url_string [, $base_url] )
-
-This is the object constructor.  It will create a new URI::URL object,
-initialized from the URL string.
-
-=item $url = URI::URL->newlocal($path);
-
-Returns an URL object that denotes a path within the local filesystem.
-Paths not starting with '/' are interpreted relative to the current
-working directory.  This constructor always return an absolute 'file'
-URL.
-
-=item $url = url($url_string, [, $base_url])
-
-Alternative constructor function.  The url() function is exported by
-the URI::URL module and is easier both to type and read than calling
-C<URI::URL->new> directly.  Useful for constructs like this:
-
-   $h = url($str)->host;
-
-This function is just a wrapper for URI::URL->new.
-
-=item URI::URL::strict($bool)
-
-If strict is true then we croak on errors.  The function returns the
-previous value.
-
-=item URI::URL::implementor([$scheme, [$class]])
-
-Use this function to get or set implementor class for a scheme.
-Returns '' if specified scheme is not supported.  Returns generic URL
-class if no scheme specified.
-
-=back
-
-=head1 METHODS
-
-This section describes the methods available for an URI::URL object.
-Note that some URL schemes will disallow some of these methods and
-will croak if they are used.  Some URL schemes add additional methods
-that are described in the sections to follow.
-
-Attribute access methods marked with (*) can take an optional argument
-to set the value of the attribute, and they always return the old
-value.
-
-=over 3
-
-=item $url->abs([$base])
-
-The abs() method attempts to return a new absolute URI::URL object
-for a given URL.  In order to convert a relative URL into an absolute
-one, a I<base> URL is required. You can associate a default base with a
-URL either by passing a I<base> to the new() constructor when a
-URI::URL is created or using the base() method on the object later.
-Alternatively you can specify a one-off base as a parameter to the
-abs() method.
-
-The rel() method will do the opposite transformation.
-
-Some older parsers used to allow the scheme name to be present in the
-relative URL if it was the same as the base URL scheme.  RFC1808 says
-that this should be avoided, but you can enable this old behaviour by
-setting the $URI::URL::ABS_ALLOW_RELATIVE_SCHEME variable to a TRUE
-value.  The difference is demonstrated by the following examples:
-
-  url("http:foo")->abs("http://host/a/b")     ==>  "http:foo"
-
-  local $URI::URL::ABS_ALLOW_RELATIVE_SCHEME = 1;
-  url("http:foo")->abs("http://host/a/b")     ==>  "http:/host/a/foo"
-
-You can also have the abs() method ignore if there is too many ".."
-segments in the relative URL by setting
-$URI::URL::ABS_REMOTE_LEADING_DOTS to a TRUE value.  The difference is
-demonstrated by the following examples:
-
-  url("../../../foo")->abs("http://host/a/b")   ==> "http://host/../../foo"
-
-  local $URI::URL::ABS_REMOTE_LEADING_DOTS = 1;
-  url("../../../foo")->abs("http://host/a/b")   ==> "http://host/foo"
-
-
-=item $url->as_string
-
-Returns a string representing the URL in its canonical form.  All
-unsafe characters will be escaped.  This method is overloaded as the
-perl "stringify" operator, which means that URLs can be used as
-strings in many contexts.
-
-=item $url->base (*)
-
-Get/set the base URL associated with the current URI::URL object.  The
-base URL matters when you call the abs() method.
-
-=item $url->clone
-
-Returns a copy of the current URI::URL object.
-
-=item $url->crack
-
-Return a 9 element array with the following content:
-
-   0: $url->scheme *)
-   1: $url->user
-   2: $url->password
-   3: $url->host
-   4: $url->port
-   5: $url->epath
-   6: $url->eparams
-   7: $url->equery
-   8: $url->frag
-
-All elements except I<scheme> will be undefined if the corresponding
-URL part is not available.
-
-B<Note:> The scheme (first element) returned by crack will aways be
-defined.  This is different from what the $url->scheme returns, since
-it will return I<undef> for relative URLs.
-
-=item $url->default_port
-
-Returns the default port number for the URL scheme that the URI::URL
-belongs too.
-
-=item $url->eparams (*)
-
-Get/set the URL parameters in escaped form.
-
-=item $url->epath (*)
-
-Get/set the URL path in escaped form.
-
-=item $url->eq($other_url)
-
-Compare two URLs to decide if they match or not.  The rules for how
-comparison is made varies for different parts of the URLs; scheme and
-netloc comparison is case-insensitive, and escaped chars match their
-%XX encoding unless they are "reserved" or "unsafe".
-
-=item $url->equery (*)
-
-Get/set the URL query string in escaped form.
-
-=item $url->full_path
-
-Returns the string "/path;params?query".  This is the string that is
-passed to a remote server in order to access the document.
-
-=item $url->frag (*)
-
-Get/set the fragment (unescaped)
-
-=item $url->host (*)
-
-Get/set the host (unescaped)
-
-=item $url->netloc (*)
-
-Get/set the network location in escaped form.  Setting the network
-location will affect 'user', 'password', 'host' and 'port'.
-
-=item $url->params (*)
-
-Get/set the URL parameters (unescaped)
-
-=item $url->password (*)
-
-Get/set the password (unescaped)
-
-=item $url->path (*)
-
-Get/set the path (unescaped).  This method will croak if any of the
-path components in the return value contain the "/" character.  You
-should use the epath() method to be safe.
-
-=item $url->path_components (*)
-
-Get/set the path using a list of unescaped path components.  The
-return value will loose the distinction beween '.' and '%2E'.  When
-setting a value, a '.' is converted to be a literal '.' and is
-therefore encoded as '%2E'.
-
-=item $url->port (*)
-
-Get/set the network port (unescaped)
-
-=item $url->rel([$base])
-
-Return a relative URL if possible.  This is the opposite of what the
-abs() method does.  For instance:
-
-   url("http://www.math.uio.no/doc/mail/top.html",
-       "http://www.math.uio.no/doc/linux/")->rel
-
-will return a relative URL with path set to "../mail/top.html" and
-with the same base as the original URL.
-
-If the original URL already is relative or the scheme or netloc does
-not match the base, then a copy of the original URL is returned.
-
-
-=item $url->print_on(*FILEHANDLE);
-
-Prints a verbose presentation of the contents of the URL object to
-the specified file handle (default STDERR).  Mainly useful for
-debugging.
-
-=item $url->scheme (*)
-
-Get/set the scheme for the URL.
-
-=item $url->query (*)
-
-Get/set the query string (unescaped).  This method will croak if the
-string returned contains both '+' and '%2B' or '=' together with '%3D'
-or '%26'.  You should use the equery() method to be safe.
-
-=item $url->user (*)
-
-Get/set the URL user name (unescaped)
-
-=back
-
-=head1 HTTP METHODS
-
-For I<http> URLs you may also access the query string using the
-keywords() and the query_form() methods.  Both will croak if the query
-is not of the correct format.  The encodings look like this:
-
-  word1+word2+word3..        # keywords
-  key1=val1&key2=val2...     # query_form
-
-Note: These functions does not return the old value when they are used
-to set a value of the query string.
-
-=over 3
-
-=item $url->keywords (*)
-
-The keywords() method returns a list of unescaped strings.  The method
-can also be used to set the query string by passing in the keywords as
-individual arguments to the method.
-
-=item $url->query_form (*)
-
-The query_form() method return a list of unescaped key/value pairs.
-If you assign the return value to a hash you might loose some values
-if the key is repeated (which it is allowed to do).
-
-This method can also be used to set the query sting of the URL like this:
-
-  $url->query_form(foo => 'bar', foo => 'baz', equal => '=');
-
-If the value part of a key/value pair is a reference to an array, then
-it will be converted to separate key/value pairs for each value.  This
-means that these two calls are equal:
-
-  $url->query_form(foo => 'bar', foo => 'baz');
-  $url->query_form(foo => ['bar', 'baz']);
-
-=back
-
-=head1 FILE METHODS
-
-The I<file> URLs implement the local_path() method that returns a path
-suitable for access to files within the current filesystem.  These
-methods can B<not> be used to set the path of the URL.
-
-=over 3
-
-=item $url->local_path
-
-This method is really just an alias for one of the methods below
-depending on what system you run on.
-
-=item $url->unix_path
-
-Returns a path suitable for use on a Unix system.  This method will
-croak if any of the path segments contains a "/" or a NULL character.
-
-=item $url->dos_path
-
-Returns a path suitable for use on a MS-DOS or MS-Windows system.
-
-=item $url->mac_path
-
-Returns a path suitable for use on a Macintosh system.
-
-=item $url->vms_path
-
-Returns a path suitable for use on a VMS system.  VMS is a trademark
-of Digital.
-
-=back
-
-=head1 GOPHER METHODS
-
-The methods access the parts that are specific for the gopher URLs.
-These methods access different parts of the $url->path.
-
-=over 3
-
-=item $url->gtype (*)
-
-=item $url->selector (*)
-
-=item $url->search (*)
-
-=item $url->string (*)
-
-=back
-
-=head1 NEWS METHODS
-
-=over 3
-
-=item $url->group (*)
-
-=item $url->article (*)
-
-=back
-
-=head1 WAIS METHODS
-
-The methods access the parts that are specific for the wais URLs.
-These methods access different parts of the $url->path.
-
-=over 3
-
-=item $url->database (*)
-
-=item $url->wtype (*)
-
-=item $url->wpath (*)
-
-=back
-
-=head1 MAILTO METHODS
-
-=over 3
-
-=item $url->address (*)
-
-The mail address can also be accessed with the netloc() method.
-
-=back
-
-
-=head1 WHAT A URL IS NOT
-
-URL objects do not, and should not, know how to 'get' or 'put' the
-resources they specify locations for, anymore than a postal address
-'knows' anything about the postal system. The actual access/transfer
-should be achieved by some form of transport agent class (see
-L<LWP::UserAgent>). The agent class can use the URL class, but should
-not be a subclass of it.
-
-=head1 AUTHORS / ACKNOWLEDGMENTS
-
-This module is (distantly) based on the C<wwwurl.pl> code in the
-libwww-perl distribution developed by Roy Fielding
-<fielding@ics.uci.edu>, as part of the Arcadia project at the
-University of California, Irvine, with contributions from Brooks
-Cutter.
-
-Gisle Aas <aas@sn.no>, Tim Bunce <Tim.Bunce@ig.co.uk>, Roy Fielding
-<fielding@ics.uci.edu> and Martijn Koster <m.koster@webcrawler.com>
-(in English alphabetical order) have collaborated on the complete
-rewrite for Perl 5, with input from other people on the libwww-perl
-mailing list.
-
-If you have any suggestions, bug reports, fixes, or enhancements, send
-them to the libwww-perl mailing list at <libwww-perl@ics.uci.edu>.
-
-=head1 COPYRIGHT
-
-Copyright 1995-1997 Gisle Aas.
-Copyright 1995 Martijn Koster.
-
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/URI/URL/_generic.pm b/testcases/ballista/ballista/perllib/URI/URL/_generic.pm
deleted file mode 100644
index 25a105e..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/_generic.pm
+++ /dev/null
@@ -1,514 +0,0 @@
-#####################################################################
-#
-#       Internal pre-defined generic scheme support
-#
-# In this implementation all schemes are subclassed from
-# URI::URL::_generic. This turns out to have reasonable mileage.
-# See also draft-ietf-uri-relative-url-06.txt
-
-package URI::URL::_generic;           # base support for generic-RL's
-require URI::URL;
-@ISA = qw(URI::URL);
-
-use URI::Escape qw(uri_escape uri_unescape %escapes);
-
-
-sub new {                               # inherited by subclasses
-    my($class, $init, $base) = @_;
-    my $url = bless { }, $class;        # create empty object
-    $url->_parse($init);                # parse $init into components
-    $url->base($base) if $base;
-    $url;
-}
-
-
-# Generic-RL parser
-# See draft-ietf-uri-relative-url-06.txt Section 2
-
-sub _parse {
-    my($self, $u, @comps) = @_;
-    return unless defined $u;
-
-    # Deside which components to parse (scheme & path is manatory)
-    @comps = qw(netloc query params frag) unless (@comps);
-    my %parse = map {$_ => 1} @comps;
-
-    # This parsing code is based on
-    #   draft-ietf-uri-relative-url-06.txt Section 2.4
-
-    # 2.4.1
-    $self->{'frag'} = uri_unescape($1)
-      if $parse{'frag'} && $u =~ s/#(.*)$//;
-    # 2.4.2
-    $self->{'scheme'} = lc($1) if $u =~ s/^\s*([\w\+\.\-]+)://;
-    # 2.4.3
-    $self->netloc("$1")	# passing $1 directly fails if netloc is autoloaded
-      if $parse{'netloc'} && $u =~ s!^//([^/]*)!!;
-    # 2.4.4
-    $self->{'query'} = $1
-      if $parse{'query'} && $u =~ s/\?(.*)//;
-    # 2.4.5
-    $self->{'params'} = $1
-      if $parse{'params'} && $u =~ s/;(.*)//;
-
-    # 2.4.6
-    #
-    # RFC 1738 says:
-    #
-    #     Note that the "/" between the host (or port) and the
-    #     url-path is NOT part of the url-path.
-    #
-    # however, RFC 1808, 2.4.6. says:
-    #
-    #    Even though the initial slash is not part of the URL path,
-    #    the parser must remember whether or not it was present so
-    #    that later processes can differentiate between relative
-    #    and absolute paths.  Often this is done by simply storing
-    #    he preceding slash along with the path.
-    #
-    # In version < 4.01 of URI::URL we used to strip the leading
-    # "/" when asked for $self->path().  This created problems for
-    # the consitency of the interface, so now we just consider the
-    # slash to be part of the path and we also make an empty path
-    # default to "/".
-
-    # we don't test for $parse{path} becase it is mandatory
-    $self->{'path'} = $u;
-}
-
-
-# Generic-RL stringify
-#
-sub as_string
-{
-    my $self = shift;
-    return $self->{'_str'} if $self->{'_str'};
-
-    my($scheme, $netloc, $frag) = @{$self}{qw(scheme netloc frag)};
-
-    my $u = $self->full_path(1);  # path+params+query
-
-    # rfc 1808 says:
-    #    Note that the fragment identifier (and the "#" that precedes
-    #    it) is not considered part of the URL.  However, since it is
-    #    commonly used within the same string context as a URL, a parser
-    #    must be able to recognize the fragment when it is present and
-    #    set it aside as part of the parsing process.
-    $u .= "#" . uri_escape($frag, $URI::URL::unsafe) if defined $frag;
-
-    $u = "//$netloc$u" if defined $netloc;
-    $u = "$scheme:$u" if $scheme;
-    # Inline: uri_escape($u, $URI::URL::unsafe);
-    $u =~ s/([$URI::URL::unsafe])/$escapes{$1}/go;
-    $self->{'_str'} = $u;  # set cache and return
-}
-
-# Generic-RL stringify full path "path;params?query"
-#
-sub full_path
-{
-    my($self, $dont_escape)  = @_;
-    my($path, $params, $query) = @{$self}{'path', 'params', 'query'};
-    my $p = '';
-    $p .= $path if defined $path;
-    # see comment in _parse 2.4.6 about the next line
-    $p = "/$p" if defined($self->{netloc}) && $p !~ m:^/:;
-    $p .= ";$params" if defined $params;
-    $p .= "?$query"  if defined $query;
-    return $p if $dont_escape;
-    # Inline: URI::Escape::uri_escape($p, $URI::URL::unsafe);
-    $p =~ s/([$URI::URL::unsafe])/$escapes{$1}/go;
-    $p;
-}
-
-# default_port()
-#
-# subclasses will usually want to override this
-#
-sub default_port { undef; }
-
-
-#####################################################################
-#
-# Methods to handle URL's elements
-
-# These methods always return the current value,
-# so you can use $url->path to read the current value.
-# If a new value is passed, e.g. $url->path('foo'),
-# it also sets the new value, and returns the previous value.
-# Use $url->path(undef) to set the value to undefined.
-
-sub netloc {
-    my $self = shift;
-    my $old = $self->_elem('netloc', @_);
-    return $old unless @_;
-
-    # update fields derived from netloc
-    my $nl = $self->{'netloc'} || '';
-    if ($nl =~ s/^([^:@]*):?(.*?)@//){
-	$self->{'user'}     = uri_unescape($1);
-	$self->{'password'} = uri_unescape($2) if $2 ne '';
-    }
-    if ($nl =~ /^([^:]*):?(\d*)$/){
-	my $port = $2;
-	# Since this happes so frequently, we inline this call:
-	#    my $host = uri_unescape($1);
-	my $host = $1;
-	$host =~ s/%([\dA-Fa-f]{2})/chr(hex($1))/eg;
-	$self->{'host'} = $host;
-	if ($port ne '') {
-	    $self->{'port'} = $port;
-	    if ($self->default_port == $port) {
-		$self->{'netloc'} =~ s/:\d+//;
-	    }
-	} elsif (defined $self->{'netloc'}) {
-	    $self->{'netloc'} =~ s/:$//;  # handle empty port spec
-	}
-    }
-    $self->{'_str'} = '';
-    $old;
-}
-
-
-# A U T O  L O A D E R
-# Don't remove this comment, it keeps AutoSplit happy!!
-# @ISA = qw(AutoLoader)
-#
-# The rest of the methods are only loaded on demand.  Stubs are neccesary
-# for inheritance to work.
-
-#sub netloc;  # because netloc is used by the _parse()
-sub user;
-sub password;
-sub host;
-sub port;
-sub _netloc_elem;
-sub epath;
-sub path;
-sub path_components;
-sub eparams;
-sub params;
-sub equery;
-sub query;
-sub frag;
-sub crack;
-sub abs;
-sub rel;
-sub eq;
-
-1;
-__END__
-
-
-# Fields derived from generic netloc:
-sub user     { shift->_netloc_elem('user',    @_); }
-sub password { shift->_netloc_elem('password',@_); }
-sub host     { shift->_netloc_elem('host',    @_); }
-
-sub port {
-    my $self = shift;
-    my $old = $self->_netloc_elem('port', @_);
-    defined($old) ? $old : $self->default_port;
-}
-
-sub _netloc_elem {
-    my($self, $elem, @val) = @_;
-    my $old = $self->_elem($elem, @val);
-    return $old unless @val;
-
-    # update the 'netloc' element
-    my $nl = '';
-    my $host = $self->{'host'};
-    if (defined $host) {  # can't be any netloc without any host
-	my $user = $self->{'user'};
-	$nl .= uri_escape($user, $URI::URL::reserved) if defined $user;
-	$nl .= ":" . uri_escape($self->{'password'}, $URI::URL::reserved)
-	  if defined($user) and defined($self->{'password'});
-	$nl .= '@' if length $nl;
-	$nl .= uri_escape($host, $URI::URL::reserved);
-	my $port = $self->{'port'};
-	$nl .= ":$port" if defined($port) && $port != $self->default_port;
-    }
-    $self->{'netloc'} = $nl;
-    $self->{'_str'} = '';
-    $old;
-}
-
-sub epath {
-     my $self = shift;
-     my $old = $self->_elem('path', @_);
-     return '/' if !defined($old) || !length($old);
-     return "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-     $old;
-}
-
-sub path {
-    my $self = shift;
-    my $old = $self->_elem('path',
-		      map uri_escape($_, $URI::URL::reserved_no_slash), @_);
-    return unless defined wantarray;
-    return '/' if !defined($old) || !length($old);
-    Carp::croak("Path components contain '/' (you must call epath)")
-	if $old =~ /%2[fF]/ and !@_;
-    $old = "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-    return uri_unescape($old);
-}
-
-sub path_components {
-    my $self = shift;
-    my $old = $self->{'path'};
-    $old = '' unless defined $old;
-    $old = "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-    if (@_) {
-	$self->_elem('path',
-		     join("/", map {uri_escape($_, $URI::URL::reserved)} @_));
-    }
-    map { uri_unescape($_) } split("/", $old, -1);
-}
-
-sub eparams  { shift->_elem('params',  @_); }
-
-sub params {
-    my $self = shift;
-    my $old = $self->_elem('params', map {uri_escape($_,$URI::URL::reserved_no_form)} @_);
-    return uri_unescape($old) if defined $old;
-    undef;
-}
-
-sub equery   { shift->_elem('query',   @_); }
-
-sub query {
-    my $self = shift;
-    my $old = $self->_elem('query', map { uri_escape($_, $URI::URL::reserved_no_form) } @_);
-    if (defined(wantarray) && defined($old)) {
-	if ($old =~ /%(?:26|2[bB]|3[dD])/) {  # contains escaped '=' '&' or '+'
-	    my $mess;
-	    for ($old) {
-		$mess = "Query contains both '+' and '%2B'"
-		  if /\+/ && /%2[bB]/;
-		$mess = "Form query contains escaped '=' or '&'"
-		  if /=/  && /%(?:3[dD]|26)/;
-	    }
-	    if ($mess) {
-		Carp::croak("$mess (you must call equery)");
-	    }
-	}
-	# Now it should be safe to unescape the string without loosing
-	# information
-	return uri_unescape($old);
-    }
-    undef;
-
-}
-
-# No efrag method because the fragment is always stored unescaped
-sub frag     { shift->_elem('frag', @_); }
-
-sub crack
-{
-    my $self = shift;
-    return $self unless wantarray;
-    my @c = @{$self}{qw(scheme user password host port path params query frag)};
-    if (!$c[0]) {
-	# try to determine scheme
-	my $base = $self->base;
-	$c[0] = $base->scheme if $base;
-	$c[0] ||= 'http';  # last resort, default in URI::URL::new
-    }
-    $c[4] ||= $self->default_port;
-    @c;
-}
-
-# Generic-RL: Resolving Relative URL into an Absolute URL
-#
-# Based on RFC1808 section 4
-#
-sub abs
-{
-    my($self, $base, $allow_relative_scheme) = @_;
-    $allow_relative_scheme = $URI::URL::ABS_ALLOW_RELATIVE_SCHEME if @_ < 3;
-    my $embed = $self->clone;
-
-    $base = $self->base unless $base;      # default to default base
-    return $embed unless $base;            # we have no base (step1)
-
-    $base = new URI::URL $base unless ref $base; # make obj if needed
-
-    my($scheme, $host, $path, $params, $query, $frag) =
-	@{$embed}{qw(scheme host path params query frag)};
-
-    # just use base if we are empty             (2a)
-    return $base->clone
-      unless grep(defined($_) && $_ ne '',
-		  $scheme,$host,$port,$path,$params,$query,$frag);
-
-    # if we have a scheme we must already be absolute   (2b),
-    #
-    # but sec. 5.2 also says: Some older parsers allow the scheme name
-    # to be present in a relative URL if it is the same as the base
-    # URL scheme.  This is considered to be a loophole in prior
-    # specifications of the partial URLs and should be avoided by
-    # future parsers.
-    #
-    # The old behavoir can be enabled by passing a TRUE value to the
-    # $allow_relative_scheme parameter.
-    return $embed if $scheme &&
-      (!$allow_relative_scheme || $scheme ne $base->{'scheme'});
-
-    $embed->{'_str'} = '';                      # void cached string
-    $embed->{'scheme'} = $base->{'scheme'};     # (2c)
-
-    return $embed if $embed->{'netloc'};        # (3)
-    $embed->netloc($base->{'netloc'});          # (3)
-
-    return $embed if $path =~ m:^/:;            # (4)
-
-    if ($path eq '') {                          # (5)
-	$embed->{'path'} = $base->{'path'};     # (5)
-
-	return $embed if defined $embed->{'params'}; # (5a)
-	$embed->{'params'} = $base->{'params'};      # (5a)
-
-	return $embed if defined $embed->{'query'};  # (5b)
-	$embed->{'query'} = $base->{'query'};        # (5b)
-
-	return $embed;
-    }
-
-    # (Step 6)  # draft 6 suggests stack based approach
-
-    my $basepath = $base->{'path'};
-    my $relpath  = $embed->{'path'};
-
-    $basepath =~ s!^/!!;
-    $basepath =~ s!/$!/.!;                # prevent empty segment
-    my @path = split('/', $basepath);     # base path into segments
-    pop(@path);                           # remove last segment
-
-    $relpath =~ s!/$!/.!;                 # prevent empty segment
-
-    push(@path, split('/', $relpath));    # append relative segments
-
-    my @newpath = ();
-    my $isdir = 0;
-    my $segment;
-
-    foreach $segment (@path) {            # left to right
-	if ($segment eq '.') {            # ignore "same" directory
-	    $isdir = 1;
-	}
-	elsif ($segment eq '..') {
-	    $isdir = 1;
-	    my $last = pop(@newpath);
-	    if (!defined $last) {         # nothing to pop
-		push(@newpath, $segment); # so must append
-	    }
-	    elsif ($last eq '..') {       # '..' cannot match '..'
-		# so put back again, and append
-		push(@newpath, $last, $segment);
-	    }
-	    #else
-		# it was a component,
-		# keep popped
-	} else {
-	    $isdir = 0;
-	    push(@newpath, $segment);
-	}
-    }
-
-    if ($URI::URL::ABS_REMOTE_LEADING_DOTS) {
-	shift @newpath while @newpath && $newpath[0] =~ /^\.\.?$/;
-    }
-
-    $embed->{'path'} = '/' . join('/', @newpath) .
-	($isdir && @newpath ? '/' : '');
-
-    $embed;
-}
-
-# The oposite of $url->abs.  Return a URL as much relative as possible
-sub rel {
-    my($self, $base) = @_;
-    my $rel = $self->clone;
-    $base = $self->base unless $base;
-    return $rel unless $base;
-    $base = new URI::URL $base unless ref $base;
-    $rel->base($base);
-
-    my($scheme, $netloc, $path) = @{$rel}{qw(scheme netloc path)};
-    if (!defined($scheme) && !defined($netloc)) {
-	# it is already relative
-	return $rel;
-    }
-
-    my($bscheme, $bnetloc, $bpath) = @{$base}{qw(scheme netloc path)};
-    for ($bscheme, $bnetloc, $netloc) { $_ = '' unless defined }
-
-    unless ($scheme eq $bscheme && $netloc eq $bnetloc) {
-	# different location, can't make it relative
-	return $rel;
-    }
-
-    for ($path, $bpath) {  $_ = "/$_" unless m,^/,; }
-
-    # Make it relative by eliminating scheme and netloc
-    $rel->{'scheme'} = undef;
-    $rel->netloc(undef);
-
-    # This loop is based on code from Nicolai Langfeldt <janl@ifi.uio.no>.
-    # First we calculate common initial path components length ($li).
-    my $li = 1;
-    while (1) {
-	my $i = index($path, '/', $li);
-	last if $i < 0 ||
-                $i != index($bpath, '/', $li) ||
-	        substr($path,$li,$i-$li) ne substr($bpath,$li,$i-$li);
-	$li=$i+1;
-    }
-    # then we nuke it from both paths
-    substr($path, 0,$li) = '';
-    substr($bpath,0,$li) = '';
-
-    if ($path eq $bpath && defined($rel->frag) && !defined($rel->equery)) {
-        $rel->epath('');
-    } else {
-        # Add one "../" for each path component left in the base path
-        $path = ('../' x $bpath =~ tr|/|/|) . $path;
-	$path = "./" if $path eq "";
-        $rel->epath($path);
-    }
-
-    $rel;
-}
-
-
-# Compare two URLs
-sub eq {
-    my($self, $other) = @_;
-    local($^W) = 0; # avoid warnings if we compare undef values
-    $other = URI::URL->new($other, $self) unless ref $other;
-
-    # Compare scheme and netloc
-    return 0 if ref($self) ne ref($other);                # must be same class
-    return 0 if $self->scheme ne $other->scheme;          # Always lower case
-    return 0 if lc($self->netloc) ne lc($other->netloc);  # Case-insensitive
-
-    # Compare full_path:
-    # According to <draft-ietf-http-v11-spec-05>:
-    # Characters other than those in the "reserved" and "unsafe" sets
-    # are equivalent to their %XX encodings.
-    my $fp1 = $self->full_path;
-    my $fp2 = $other->full_path;
-    for ($fp1, $fp2) {
-	s,%([\dA-Fa-f]{2}),
-	  my $x = $1;
-	  my $c = chr(hex($x));
-	  $c =~ /^[;\/?:\@&=+\"\#%<>\0-\040\177]/ ? "%\L$x" : $c;
-	,eg;
-    }
-    return 0 if $fp1 ne $fp2;
-    return 0 if $self->frag ne $other->frag;
-    1;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/_login.pm b/testcases/ballista/ballista/perllib/URI/URL/_login.pm
deleted file mode 100644
index c1d7a0a..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/_login.pm
+++ /dev/null
@@ -1,25 +0,0 @@
-package URI::URL::_login;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-
-# Generic terminal logins.  This is used as a base class for 'telnet',
-# 'tn3270', and 'rlogin' URL schemes.
-
-
-sub _parse {
-    my($self, $init) = @_;
-    # All we want from _generic is the 'netloc' handling.
-    $self->URI::URL::_generic::_parse($init, 'netloc');
-}
-
-
-*path      = \&URI::URL::bad_method;
-*epath     = \&URI::URL::bad_method;
-*query     = \&URI::URL::bad_method;
-*equery    = \&URI::URL::bad_method;
-*params    = \&URI::URL::bad_method;
-*eparams   = \&URI::URL::bad_method;
-*frag      = \&URI::URL::bad_method;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/data.pm b/testcases/ballista/ballista/perllib/URI/URL/data.pm
deleted file mode 100644
index 958f353..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/data.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-package URI::URL::data;
-
-# Implements data:-URLs as specified in draft-masinter-url-data-02.txt
-#
-# Abstract
-#
-# A new URL scheme, "data", is defined. It allows inclusion of small
-# data items as "immediate" data, as if it had been included externally.
-#
-# Description
-#
-# Some applications that use URLs also have a need to embed (small)
-# media type data directly inline. This document defines a new URL
-# scheme that would work like 'immediate addressing'. The URLs are of
-# the form:
-#
-#        data:[<mediatype>][;base64],<data>
-#
-
-require URI::URL;
-@ISA = qw(URI::URL);
-
-use URI::Escape;
-use MIME::Base64 ();
-
-# as defined in rfc1522.txt
-my $tspecial  = qq(()<>@,;:/[]?.=);
-my $tokenchar = qq([^\\s\000-\037\177-\377\Q$tspecial\E]);
-
-
-sub new {
-    my($class, $init, $base) = @_;
-
-    my $self = bless { }, $class;
-
-    $self->{'scheme'} = lc($1) if $init =~ s/^\s*([\w\+\.\-]+)://;
-    $self->{'frag'} = $1 if $init =~ s/\#(.*)$//;
-
-    my $type = "";
-    if ($init =~ s/^($tokenchar+\/$tokenchar+)//o) {
-	$type = $1;
-    }
-    while ($init =~ s/^;($tokenchar+)=([^,;]*)//o) {
-	# XXX should we unescape the parst
-	$type .= ";$1=$2";
-    }
-
-    $self->{'media_type'} = $type;
-
-    my $base64;
-    if ($init =~ s/^;base64//i) {
-	$base64 = 1;
-    }
-    
-    $init =~ s/^,//;
-    if ($base64) {
-	$self->{'base64'} = uri_unescape($init);
-    } else {
-	$self->{'data'} = uri_unescape($init);
-    }
-    $self->base($base) if $base;
-    $self;
-}
-
-sub media_type
-{
-    my $self = shift;
-    my $old = $self->{'media_type'};
-    if (@_) {
-	$self->{'media_type'} = shift || "";
-	delete $self->{'_str'};
-    }
-    my($type, $param) = split(/;/, $old, 2);
-    if ($type) {
-	$type = lc $type;
-    } else {
-	$type = "text/plain";
-	$param = "charset=US-ASCII" unless $param;
-    }
-    if (wantarray) {
-	return ($type, $param);
-    } else {
-	return $type;
-    }
-}
-
-sub data
-{
-    my $self = shift;
-    my $old_data;
-    my $old_base64;
-    $old_data = $self->{'data'};
-    $old_base64 = $self->{'base64'};
-    if (@_) {
-	if ($_[1]) { # base64 flag
-	    $self->{'base64'} = $_[0];
-	    delete $self->{'data'};
-	} else {
-	    $self->{'data'} = $_[0];
-	    delete $self->{'base64'};
-	}
-	delete $self->{'_str'};
-    }
-    unless (defined $old_data) {
-	$old_data = MIME::Base64::decode($old_base64);
-	$self->{'data'} = $old_data unless @_;
-    }
-    $old_data;
-}
-
-
-sub crack
-{
-    my $self = shift;
-    ($self->{'scheme'}
-     || 'data',          # scheme
-     undef,              # user
-     undef,              # passwd
-     undef,              # host
-     undef,              # port
-     $self->data,        # path
-     $self->{'media_type'},  # params
-     undef,              # query
-     $self->{'frag'}     # fragment
-    )
-}
-
-sub as_string {
-    my $self = shift;
-    return $self->{'_str'} if $self->{'_str'};
-    my $str = ($self->{'scheme'} || 'data') . ":";
-    $str .= $self->{'media_type'};
-    if (defined $self->{'base64'}) {
-	$str .= ";base64,$self->{'base64'}";
-    } else {
-	my $urlenc = uri_escape($self->{'data'});
-	my $base64 = MIME::Base64::encode($self->{'data'});
-	if (length($base64) + 7 < length($urlenc)) {
-	    $str .= ";base64,$base64";
-	    $self->{'base64'} = $base64;
-	} else {
-	    $str .= ",$urlenc";
-	}
-    }
-    $self->{'_str'} = $str;
-}
-
-sub eq {
-    my($self, $other) = @_;
-    return 0 if ref($self) ne ref($other);
-    return 0 if $self->scheme ne $other->scheme;
-
-    my $mt1 = join(";", $self->media_type);
-    my $mt2 = join(";", $other->media_type);
-    return 0 if $mt1 ne $mt2;
-
-    $self->data eq $other->data;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/file.pm b/testcases/ballista/ballista/perllib/URI/URL/file.pm
deleted file mode 100644
index 649fce4..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/file.pm
+++ /dev/null
@@ -1,165 +0,0 @@
-package URI::URL::file;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-require Carp;
-require Config;
-
-# First we try to determine what kind of system we run on
-my $os = $Config::Config{'osname'};
-OS: {
-    $ostype = 'vms', last if $os eq 'VMS';
-    $ostype = 'dos', last if $os =~ /^(?:os2|mswin32|msdos)$/i;
-    $ostype = 'mac', last if $os eq "Mac";
-    $ostype = 'unix';  # The default
-}
-# NOTE: If you add more types to this list, remember to add a xxx_path
-# method as well.
-
-# This is the BNF found in RFC 1738:
-#
-# fileurl        = "file://" [ host | "localhost" ] "/" fpath
-# fpath          = fsegment *[ "/" fsegment ]
-# fsegment       = *[ uchar | "?" | ":" | "@" | "&" | "=" ]
-# Note that fsegment can contain '?' (query) but not ';' (param)
-
-sub _parse {
-    my($self, $init) = @_;
-    # The file URL can't have query
-    $self->URI::URL::_generic::_parse($init, qw(netloc path params frag));
-}
-
-# sub local_path { ... }
-#
-# Returns a path suitable for use on the local system (we just
-# set up an alias (derived from $ostype) to one of the path methods
-# defined below)
-*local_path = \&{$ostype . "_path"};
-
-*query  = \&URI::URL::bad_method;
-*equery = \&URI::URL::bad_method;
-
-# A U T O  L O A D E R
-# Don't remove this comment, it keeps AutoSplit happy!!
-# @ISA = qw(AutoLoader)
-#
-# These methods are autoloaded as needed
-sub newlocal;
-sub unix_path;
-sub dos_path ;
-sub mac_path ;
-sub vms_path ;
-1;
-__END__
-
-sub newlocal {
-    my($class, $path) = @_;
-
-    Carp::croak("Only implemented for Unix and OS/2 file systems")
-      unless $ostype eq "unix" or $^O =~ /os2|mswin32/i;
-    # XXX: Should implement the same thing for other systems
-
-    my $url = new URI::URL "file:";
-    unless (defined $path and
-    	    ($path =~ m:^/: or 
-	     ($^O eq 'os2' and Cwd::sys_is_absolute($path)) or
-	     ($^O eq 'MSWin32' and $path =~ m<^[A-Za-z]:[\\/]|^[\\/]{2}>))) {
-	require Cwd;
-	my $cwd = Cwd::fastcwd();
-	$cwd =~ s:/?$:/:; # force trailing slash on dir
-	$path = (defined $path) ? $cwd . $path : $cwd;
-    }
-    $url->path($path);
-    $url;
-}
-
-sub unix_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains '/' or '\0'") if m|[\0/]|;
-	if (@p) {
-	    next unless length $_;   # skip empty path segments
-	    next if $_ eq '.';       # skip these too
-	    if ($_ eq '..' && $p[-1] ne '..') {  # go up one level
-		pop(@p) if $p[-1] ne '';
-		next;
-	    }
-	}
-	push(@p, $_);
-    }
-    shift(@p) if @p > 1 && $p[0] eq '.';   # './' rendundant if there is more
-    return '/' if !@p || (@p == 1 && $p[0] eq '');
-    join('/', @p);
-}
-
-sub dos_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains '/' or '\\'") if m|[/\\]|;
-	push(@p, uc $_);
-    }
-    my $p = join("\\", @p);
-    $p =~ s/^\\([A-Z]:)/$1/;  # Fix drive letter specification
-    $p;
-}
-
-sub mac_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains ':'") if /:/;
-	# XXX: Should probably want to do something about ".." and "."
-	# path segments.  I don't know how these are represented in
-	# the Machintosh file system.  If these are valid file names
-	# then we should split the path ourself, as $u->path_components
-	# loose the distinction between '.' and '%2E'.
-	push(@p, $_);
-    }
-    if (@p && $p[0] eq '') {
-	shift @p;
-    } else {
-	unshift(@p, '');
-    }
-    join(':', @p);
-}
-
-sub vms_path
-{
-    # ????? Can some VMS people please redo this function ??????
-
-    # This is implemented based on what RFC1738 (sec 3.10) says in the
-    # VMS file example:
-    #
-    #  DISK$USER:[MY.NOTES]NOTE123456.TXT
-    #
-    #      that might become
-    #
-    #  file:/disk$user/my/notes/note12345.txt
-    #
-    # BEWARE: I don't have a VMS machine myself so this is pure guesswork!!!
-
-    my $self = shift;
-    my @p = $self->path_components;
-    my $abs = 0;
-    if (@p && $p[0] eq '') {
-	shift @p;
-	$abs = 1;
-    }
-    # First I assume there must be a dollar in a disk spesification
-    my $p = '';
-    $p = uc(shift(@p)) . ":"  if @p && $p[0] =~ /\$/;
-    my $file = pop(@p);
-    $p .= "[" . join(".", map{uc($_)} @p) . "]" if @p;
-    $p .= uc $file;
-    # XXX: How is an absolute path different from a relative one??
-    $p =~ s/\[/[./ unless $abs;
-    # XXX: How is a directory denoted??
-    $p;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/finger.pm b/testcases/ballista/ballista/perllib/URI/URL/finger.pm
deleted file mode 100644
index 390788b..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/finger.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package URI::URL::finger;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-sub default_port { 79 }
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/ftp.pm b/testcases/ballista/ballista/perllib/URI/URL/ftp.pm
deleted file mode 100644
index dc2befe..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/ftp.pm
+++ /dev/null
@@ -1,76 +0,0 @@
-package URI::URL::ftp;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-sub default_port { 21 }
-
-sub _parse {
-    my($self, $init) = @_;
-    # The ftp URLs can't have any query string
-    $self->URI::URL::_generic::_parse($init, qw(netloc path params frag));
-    1;
-}
-
-
-sub user
-{
-    my($self, @val) = @_;
-    my $old = $self->SUPER::user(@val);
-    defined $old ? $old : "anonymous";
-}
-
-BEGIN {
-    $whoami = undef;
-    $fqdn   = undef;
-}
-
-sub password
-{
-    my($self, @val) = @_;
-    my $old = $self->SUPER::password(@val);
-    unless (defined $old) {
-	my $user = $self->user;
-	if ($user eq 'anonymous' || $user eq 'ftp') {
-	    # anonymous ftp login password
-	    unless (defined $fqdn) {
-		eval {
-		    require Net::Domain;
-		    $fqdn = Net::Domain::hostfqdn();
-		};
-		if ($@) {
-		    $fqdn = '';
-		}
-	    }
-	    unless (defined $whoami) {
-		$whoami = $ENV{USER} || $ENV{LOGNAME} || $ENV{USERNAME};
-		unless ($whoami) {
-		    if ($^O eq 'MSWin32') { $whoami = Win32::LoginName() }
-		    else {
-		        $whoami = getlogin || getpwuid($<) || 'unknown';
-		    }
-		}
-	    }
-	    $old = "$whoami\@$fqdn";
-	} else {
-	    $old = "";
-	}
-    }
-    $old;
-}
-
-sub crack
-{
-    my $self = shift;
-    my @c = $self->SUPER::crack;
-    if ($c[3] && !$c[1]) {
-	# hostname defined, but user is undefined
-	$c[1] = $self->user;
-	$c[2] = $self->password;
-    }
-    @c;
-}
-
-*query  = \&URI::URL::bad_method;
-*equery = \&URI::URL::bad_method;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/gopher.pm b/testcases/ballista/ballista/perllib/URI/URL/gopher.pm
deleted file mode 100644
index 6da6598..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/gopher.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-package URI::URL::gopher;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-use URI::Escape qw(uri_unescape);
-
-sub default_port { 70 }
-
-sub _parse {
-    my($self, $init)   = @_;
-    $self->URI::URL::_generic::_parse($init, qw(netloc path));
-    $self->_parse_gopherpath;
-}
-
-sub path {
-    my $self = shift;
-    my $old = $self->URI::URL::_generic::path(@_);
-    return $old unless @_;
-    $self->_parse_gopherpath;
-    $old;
-}
-
-sub epath {
-    my $self = shift;
-    my $old = $self->URI::URL::_generic::epath(@_);
-    return $old unless @_;
-    $self->_parse_gopherpath;
-    $old;
-}
-
-sub _parse_gopherpath {
-    my $self = shift;
-    my $p = $self->{'path'};
-    # not according to RFC1738, but many popular browsers accept
-    # gopher URLs with a '?' before the search string.
-    $p =~ s/\?/\t/;
-    $p = uri_unescape($p);
-
-    if (defined($p) && $p ne '/' && $p =~ s!^/?(.)!!) {
-	$self->{'gtype'} = $1;
-    } else {
-	$self->{'gtype'} = "1";
-	$p = "";
-    }
-
-    delete $self->{'selector'};
-    delete $self->{'search'};
-    delete $self->{'string'};
-
-    my @parts = split(/\t/, $p, 3);
-    $self->{'selector'} = shift @parts if @parts;
-    $self->{'search'}   = shift @parts if @parts;
-    $self->{'string'}   = shift @parts if @parts;
-}
-
-
-sub gtype    { shift->_path_elem('gtype',    @_); }
-sub selector { shift->_path_elem('selector', @_); }
-sub search   { shift->_path_elem('search',   @_); }
-sub string   { shift->_path_elem('string',   @_); }
-
-sub _path_elem {
-    my($self, $elem, @val) = @_;
-    my $old = $self->_elem($elem, @val);
-    return $old unless @val;
-
-    # construct new path based on elements
-    my $path = "/$self->{'gtype'}";
-    $path .= "$self->{'selector'}" if defined $self->{'selector'};
-    $path .= "\t$self->{'search'}" if defined $self->{'search'};
-    $path .= "\t$self->{'string'}" if defined $self->{'string'};
-    $self->{'path'} = $path;
-
-    $old;
-}
-
-*params  = \&URI::URL::bad_method;
-*qparams = \&URI::URL::bad_method;
-*query   = \&URI::URL::bad_method;
-*equery  = \&URI::URL::bad_method;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/http.pm b/testcases/ballista/ballista/perllib/URI/URL/http.pm
deleted file mode 100644
index 0d9b69c..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/http.pm
+++ /dev/null
@@ -1,57 +0,0 @@
-package URI::URL::http;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-sub default_port { 80 }
-
-require Carp;
-
-# @ISA = qw(AutoLoader)      # This comment is needed by AutoSplit.
-sub keywords;
-sub query_form;
-1;
-__END__
-
-# Handle ...?dog+bones type of query
-sub keywords {
-    my $self = shift;
-    $old = $self->{'query'};
-    if (@_) {
-	# Try to set query string
-	$self->equery(join('+', map { URI::Escape::uri_escape($_, $URI::URL::reserved) } @_));
-    }
-    return if !defined($old) || !defined(wantarray);
-
-    Carp::croak("Query is not keywords") if $old =~ /=/;
-    map { URI::Escape::uri_unescape($_) } split(/\+/, $old);
-}
-
-# Handle ...?foo=bar&bar=foo type of query
-sub query_form {
-    my $self = shift;
-    $old = $self->{'query'};
-    if (@_) {
-	# Try to set query string
-	my @query;
-	my($key,$vals);
-        my $esc = $URI::URL::reserved . $URI::URL::unsafe;
-	while (($key,$vals) = splice(@_, 0, 2)) {
-	    $key = '' unless defined $key;
-	    $key =  URI::Escape::uri_escape($key, $esc);
-	    $vals = [$vals] unless ref($vals) eq 'ARRAY';
-	    my $val;
-	    for $val (@$vals) {
-		$val = '' unless defined $val;
-		$val = URI::Escape::uri_escape($val, $esc);
-		push(@query, "$key=$val");
-	    }
-	}
-	$self->equery(join('&', @query));
-    }
-    return if !defined($old) || length($old) == 0 || !defined(wantarray);
-    Carp::croak("Query is not a form") unless $old =~ /=/;
-    map { s/\+/ /g; URI::Escape::uri_unescape($_) }
-	 map { /=/ ? split(/=/, $_, 2) : ($_ => '')} split(/&/, $old);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/https.pm b/testcases/ballista/ballista/perllib/URI/URL/https.pm
deleted file mode 100644
index b816141..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/https.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package URI::URL::https;
-require URI::URL::http;
-@ISA = qw(URI::URL::http);
-
-sub default_port { 443 }
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/mailto.pm b/testcases/ballista/ballista/perllib/URI/URL/mailto.pm
deleted file mode 100644
index 0e8fc5e..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/mailto.pm
+++ /dev/null
@@ -1,78 +0,0 @@
-package URI::URL::mailto;
-require URI::URL;
-@ISA = qw(URI::URL);
-
-use URI::Escape;
-
-sub new {
-    my($class, $init, $base) = @_;
-
-    my $self = bless { }, $class;
-    $self->{'scheme'} = lc($1) if $init =~ s/^\s*([\w\+\.\-]+)://;
-    $self->{'address'} = uri_unescape($init);
-    $self->base($base) if $base;
-    $self;
-}
-
-sub address { shift->_elem('address', @_); }
-
-# can use these as aliases
-*encoded822addr = \&address;   # URI::URL v3 compatibility
-*netloc         = \&address;
-
-sub user {
-    my $self = shift;
-    $old = $self->{'address'};
-    if (@_) {
-	my $new = $old;
-	$new =~ s/.*\@?/$_[0]\@/;
-	$self->{'address'} = $new;
-    }
-    $old =~ s/\@.*//;
-    $old;
-}
-
-sub host {
-    my $self = shift;
-    $old = $self->{'address'};
-    if (@_) {
-	my $new = $old;
-	$new =~ s/\@.*/\@$_[0]/;
-	$self->{'address'} = $new;
-    }
-    $old =~ s/.*\@//;
-    $old;
-}
-
-sub crack
-{
-    my $self = shift;
-    ('mailto',           # scheme
-     $self->user,        # user
-     undef,              # passwd
-     $self->host,        # host
-     undef,              # port
-     $self->{'address'}, # path
-     undef,              # params
-     undef,              # query
-     undef               # fragment
-    )
-}
-
-sub as_string {
-    my $self = shift;
-    my $str = ($self->{'scheme'} || "mailto") . ":";
-    $str .= uri_escape($self->{'address'}) if defined $self->{'address'};
-    $str;
-}
-
-sub eq {
-    my($self, $other) = @_;
-    $other = URI::URL->new($other) unless ref $other;
-
-    # Mail adresses are case-insensitive
-    $self->scheme eq $other->scheme &&
-      lc($self->{'address'}) eq lc($other->{'address'});
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/news.pm b/testcases/ballista/ballista/perllib/URI/URL/news.pm
deleted file mode 100644
index 098dbdd..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/news.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-package URI::URL::news;
-require URI::URL;
-@ISA = qw(URI::URL);
-
-use URI::Escape;
-
-sub new {
-    my($class, $init, $base) = @_;
-    my $self = bless { }, $class;
-    $self->{'scheme'}  = lc($1) if $init =~ s/^\s*([\w\+\.\-]+)://;
-    $self->groupart(uri_unescape($init));
-    $self->base($base) if $base;
-    $self;
-}
-
-sub groupart {
-    my $self = shift;
-    my $old = $self->{'path'};
-    if (@_) {
-	my $p = shift;
-	if (defined $p && $p =~ /\@/) {
-	    # it is an message id
-	    $p =~ s/^<(.*)>$/$1/;  # "<" and ">" should not be part of it
-	}
-	$self->{'path'} = $p;
-    }
-    $old;
-}
-
-*path = \&groupart;
-
-sub article   {
-    my $self = shift;
-    Carp::croak("Illegal article id name (does not contain '\@')")
-      if @_ && $_[0] !~ /\@/;
-    my $old = $self->groupart(@_);
-    return undef if $old !~ /\@/;
-    $old;
-}
-
-
-sub group {
-    my $self = shift;
-    Carp::croak("Illegal group name (contains '\@')")
-      if @_ && $_[0] =~ /\@/;
-    my $old = $self->groupart(@_);
-    return undef if $old =~ /\@/;
-    $old;
-}
-
-sub crack
-{
-    my $self = shift;
-    ('news',             # scheme
-     undef,              # user
-     undef,              # passwd
-     undef,              # host
-     undef,              # port
-     $self->{'path'},    # path
-     undef,              # params
-     undef,              # query
-     undef               # fragment
-    )
-}
-
-
-sub as_string {
-    my $self = shift;
-    my $scheme = $self->{'scheme'} || "news";
-    "$scheme:" . uri_escape($self->{'path'});
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/nntp.pm b/testcases/ballista/ballista/perllib/URI/URL/nntp.pm
deleted file mode 100644
index d9d1349..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/nntp.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package URI::URL::nntp;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-use URI::Escape;
-
-sub default_port { 119 }
-
-sub _parse {
-    my($self, $init) = @_;
-    $self->URI::URL::_generic::_parse($init, qw(netloc path frag));
-
-    my @parts = $self->path_components;
-    shift @parts if @parts && $parts[0] eq '';
-
-    $self->{'group'} = uri_unescape($parts[0]);
-    $self->{'digits'}= uri_unescape($parts[1]);
-}
-
-sub group   { shift->_elem('group',  @_); }
-sub digits  { shift->_elem('digits', @_); }
-sub article { shift->_elem('digits', @_); }
-
-sub as_string {
-    my $self = shift;
-    my $str = "$self->{'scheme'}:";
-    $str .= "//$self->{'netloc'}" if defined $self->{'netloc'};
-    $str .= "/" . uri_escape($self->{'group'}) . "/" .
-		  uri_escape($self->{'digits'});
-    $str;
-}
-
-# Standard methods are not legal for nntp URLs
-*path      = \&URI::URL::bad_method;
-*epath     = \&URI::URL::bad_method;
-*query     = \&URI::URL::bad_method;
-*equery    = \&URI::URL::bad_method;
-*params    = \&URI::URL::bad_method;
-*eparams   = \&URI::URL::bad_method;
-*frag      = \&URI::URL::bad_method;
-*user      = \&URI::URL::bad_method;
-*password  = \&URI::URL::bad_method;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/prospero.pm b/testcases/ballista/ballista/perllib/URI/URL/prospero.pm
deleted file mode 100644
index 08932ba..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/prospero.pm
+++ /dev/null
@@ -1,27 +0,0 @@
-package URI::URL::prospero;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-# RFC 1738 says:
-#
-#   A prospero URLs takes the form:
-#
-#      prospero://<host>:<port>/<hsoname>;<field>=<value>
-#
-#   where <host> and <port> are as described in Section 3.1. If :<port>
-#   is omitted, the port defaults to 1525. No username or password is
-#   allowed.
-#
-#   The <hsoname> is the host-specific object name in the Prospero
-#   protocol, suitably encoded.  This name is opaque and interpreted by
-#   the Prospero server.  The semicolon ";" is reserved and may not
-#   appear without quoting in the <hsoname>.
-
-sub default_port { 1525 }       # says rfc1738, section 3.11
-
-sub _parse {
-    my($self, $init) = @_;
-    $self->URI::URL::_generic::_parse($init, qw(netloc path params frag));
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/rlogin.pm b/testcases/ballista/ballista/perllib/URI/URL/rlogin.pm
deleted file mode 100644
index 8ef00af..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/rlogin.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package URI::URL::rlogin;
-require URI::URL::_login;
-@ISA = qw(URI::URL::_login);
-
-sub default_port { 513 }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/telnet.pm b/testcases/ballista/ballista/perllib/URI/URL/telnet.pm
deleted file mode 100644
index b78dc93..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/telnet.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package URI::URL::telnet;
-require URI::URL::_login;
-@ISA = qw(URI::URL::_login);
-
-sub default_port { 23 }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/tn3270.pm b/testcases/ballista/ballista/perllib/URI/URL/tn3270.pm
deleted file mode 100644
index 3e3b878..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/tn3270.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package URI::URL::tn3270;
-require URI::URL::_login;
-@ISA = qw(URI::URL::_login);
-
-# sub default_port { 0 }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/wais.pm b/testcases/ballista/ballista/perllib/URI/URL/wais.pm
deleted file mode 100644
index fe325f6..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/wais.pm
+++ /dev/null
@@ -1,50 +0,0 @@
-package URI::URL::wais;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-use URI::Escape;
-
-# RFC 1738 says:
-#
-#   A WAIS URL takes one of the following forms:
-#
-#     wais://<host>:<port>/<database>
-#     wais://<host>:<port>/<database>?<search>
-#     wais://<host>:<port>/<database>/<wtype>/<wpath>
-#
-#   where <host> and <port> are as described in Section 3.1. If :<port>
-#   is omitted, the port defaults to 210.  The first form designates a
-#   WAIS database that is available for searching. The second form
-#   designates a particular search.  <database> is the name of the WAIS
-#   database being queried.
-
-
-sub default_port { 210 }
-
-sub _parse {
-    my($self, $init) = @_;
-    $self->URI::URL::_generic::_parse($init, qw(netloc path query frag));
-}
-
-# Set the path component with the specified number
-sub _path_comp
-{
-    my $self = shift;
-    my $no   = shift;
-    my @p = $self->path_components;
-    shift(@p) if @p && $p[0] eq '';
-    my $old = $p[$no];
-    if (@_) {
-	$p[$no] = $_[0];
-	$self->path_components(@p);
-    }
-    $old;
-}
-
-sub database { shift->_path_comp(0, @_); }
-sub wtype    { shift->_path_comp(1, @_); }
-sub wpath    { shift->_path_comp(2, @_); }
-
-*params   = \&URI::URL::bad_method;
-*eparams  = \&URI::URL::bad_method;
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/webster.pm b/testcases/ballista/ballista/perllib/URI/URL/webster.pm
deleted file mode 100644
index e86c841..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/webster.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package URI::URL::webster;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-sub default_port { 765 }
-1;
diff --git a/testcases/ballista/ballista/perllib/URI/URL/whois.pm b/testcases/ballista/ballista/perllib/URI/URL/whois.pm
deleted file mode 100644
index 5792be0..0000000
--- a/testcases/ballista/ballista/perllib/URI/URL/whois.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package URI::URL::whois;
-require URI::URL::_generic;
-@ISA = qw(URI::URL::_generic);
-
-sub default_port { 43 }
-1;
diff --git a/testcases/ballista/ballista/perllib/WWW/RobotRules.pm b/testcases/ballista/ballista/perllib/WWW/RobotRules.pm
deleted file mode 100644
index 6274c0f..0000000
--- a/testcases/ballista/ballista/perllib/WWW/RobotRules.pm
+++ /dev/null
@@ -1,364 +0,0 @@
-# $Id: RobotRules.pm,v 1.1 2004/10/18 17:58:13 mridge Exp $
-
-package WWW::RobotRules;
-
-=head1 NAME
-
-WWW::RobotsRules - Parse robots.txt files
-
-=head1 SYNOPSIS
-
- require WWW::RobotRules;
- my $robotsrules = new WWW::RobotRules 'MOMspider/1.0';
-
- use LWP::Simple qw(get);
-
- $url = "http://some.place/robots.txt";
- my $robots_txt = get $url;
- $robotsrules->parse($url, $robots_txt);
-
- $url = "http://some.other.place/robots.txt";
- my $robots_txt = get $url;
- $robotsrules->parse($url, $robots_txt);
-
- # Now we are able to check if a URL is valid for those servers that
- # we have obtained and parsed "robots.txt" files for.
- if($robotsrules->allowed($url)) {
-     $c = get $url;
-     ...
- }
-
-=head1 DESCRIPTION
-
-This module parses a F<robots.txt> file as specified in
-"A Standard for Robot Exclusion", described in
-<URL:http://info.webcrawler.com/mak/projects/robots/norobots.html>
-Webmasters can use the F<robots.txt> file to disallow conforming
-robots access to parts of their WWW server.
-
-The parsed file is kept in the WWW::RobotRules object, and this object
-provide methods to check if access to a given URL is prohibited.  The
-same WWW::RobotRules object can parse multiple F<robots.txt> files.
-
-The following methods are provided:
-
-=over 4
-
-=cut
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-sub Version { $VERSION; }
-
-
-use URI::URL ();
-use strict;
-
-
-=item $rules = new WWW::RobotRules 'MOMspider/1.0'
-
-This is the constructor for WWW::RobotRules objects.  The first 
-argument given to new() is the name of the robot. 
-
-=cut
-
-sub new {
-    my($class, $ua) = @_;
-
-    # This ugly hack is needed to ensure backwards compatability.
-    # The "WWW::RobotRules" class is now really abstract.
-    $class = "WWW::RobotRules::InCore" if $class eq "WWW::RobotRules";
-
-    my $self = bless { }, $class;
-    $self->agent($ua);
-    $self;
-}
-
-
-=item $rules->parse($url, $content, $fresh_until)
-
-The parse() method takes as arguments the URL that was used to
-retrieve the F</robots.txt> file, and the contents of the file.
-
-=cut
-
-sub parse {
-    my($self, $url, $txt, $fresh_until) = @_;
-
-    $url = new URI::URL $url unless ref($url);	# make it URL
-    my $netloc = $url->netloc;
-
-    $self->clear_rules($netloc);
-    $self->fresh_until($netloc, $fresh_until || (time + 365*24*3600));
-
-    my $ua;
-    my $is_me = 0;		# 1 iff this record is for me
-    my $is_anon = 0;		# 1 iff this record is for *
-    my @me_disallowed = ();	# rules disallowed for me
-    my @anon_disallowed = ();	# rules disallowed for *
-
-    # blank lines are significant, so turn CRLF into LF to avoid generating
-    # false ones
-    $txt =~ s/\015\012/\012/g;
-
-    # split at \012 (LF) or \015 (CR) (Mac text files have just CR for EOL)
-    for(split(/[\012\015]/, $txt)) {
-
-	# Lines containing only a comment are discarded completely, and
-        # therefore do not indicate a record boundary.
-	next if /^\s*\#/;
-
-	s/\s*\#.*//;        # remove comments at end-of-line
-
-	if (/^\s*$/) {	    # blank line
-	    last if $is_me; # That was our record. No need to read the rest.
-	    $is_anon = 0;
-	}
-        elsif (/^User-Agent:\s*(.*)/i) {
-	    $ua = $1;
-	    $ua =~ s/\s+$//;
-	    if ($is_me) {
-		# This record already had a User-agent that
-		# we matched, so just continue.
-	    }
-	    elsif ($ua eq '*') {
-		$is_anon = 1;
-	    }
-	    elsif($self->is_me($ua)) {
-		$is_me = 1;
-	    }
-	}
-	elsif (/^Disallow:\s*(.*)/i) {
-	    unless (defined $ua) {
-		warn "RobotRules: Disallow without preceding User-agent\n";
-		$is_anon = 1;  # assume that User-agent: * was intended
-	    }
-	    my $disallow = $1;
-	    $disallow =~ s/\s+$//;
-	    if (length $disallow) {
-		$disallow = URI::URL->new($disallow, $url)->full_path;
-	    }
-
-	    if ($is_me) {
-		push(@me_disallowed, $disallow);
-	    }
-	    elsif ($is_anon) {
-		push(@anon_disallowed, $disallow);
-	    }
-	}
-	else {
-	    warn "RobotRules: Unexpected line: $_\n";
-	}
-    }
-
-    if ($is_me) {
-	$self->push_rules($netloc, @me_disallowed);
-    } else {
-	$self->push_rules($netloc, @anon_disallowed);
-    }
-}
-
-# is_me()
-#
-# Returns TRUE if the given name matches the
-# name of this robot
-#
-sub is_me {
-    my($self, $ua) = @_;
-    my $me = $self->agent;
-    return index(lc($ua), lc($me)) >= 0;
-}
-
-=item $rules->allowed($url)
-
-Returns TRUE if this robot is allowed to retrieve this URL.
-
-=cut
-
-sub allowed {
-    my($self, $url) = @_;
-    $url = URI::URL->new($url) unless ref $url;	# make it URL
-
-    my $netloc = $url->netloc;
-
-    my $fresh_until = $self->fresh_until($netloc);
-    return -1 if !defined($fresh_until) || $fresh_until < time;
-
-    my $str = $url->full_path;
-    my $rule;
-    for $rule ($self->rules($netloc)) {
-	return 1 unless length $rule;
-	return 0 if index($str, $rule) == 0;
-    }
-    return 1;
-}
-
-# The following methods must be provided by the subclass.
-sub agent;
-sub visit;
-sub no_visits;
-sub last_visits;
-sub fresh_until;
-sub push_rules;
-sub clear_rules;
-sub rules;
-sub dump;
-
-package WWW::RobotRules::InCore;
-
-use vars qw(@ISA);
-@ISA = qw(WWW::RobotRules);
-
-=item $rules->agent([$name])
-
-Get/set the agent name. NOTE: Changing the agent name will clear the robots.txt
-rules and expire times out of the cache.
-
-=cut
-
-sub agent {
-    my ($self, $name) = @_;
-    my $old = $self->{'ua'};
-    if ($name) {
-	delete $self->{'loc'};   # all old info is now stale
-	$name =~ s!/?\s*\d+.\d+\s*$!!;  # loose version
-	$self->{'ua'}=$name;
-    }
-    $old;
-}
-
-sub visit {
-    my($self, $netloc, $time) = @_;
-    $time ||= time;
-    $self->{'loc'}{$netloc}{'last'} = $time;
-    
-    my $count = \$self->{'loc'}{$netloc}{'count'};
-    if (!defined $$count) {
-	$$count = 1;
-    } else {
-	$$count++;
-    }
-}
-
-sub no_visits {
-    my ($self, $netloc) = @_;
-    $self->{'loc'}{$netloc}{'count'};
-}
-
-sub last_visit {
-    my ($self, $netloc) = @_;
-    $self->{'loc'}{$netloc}{'last'};
-}
-
-sub fresh_until {
-    my ($self, $netloc, $fresh_until) = @_;
-    my $old = $self->{'loc'}{$netloc}{'fresh'};
-    if (defined $fresh_until) {
-	$self->{'loc'}{$netloc}{'fresh'} = $fresh_until;
-    }
-    $old;
-}
-
-sub push_rules {
-    my($self, $netloc, @rules) = @_;
-    push (@{$self->{'loc'}{$netloc}{'rules'}}, @rules);
-}
-
-sub clear_rules {
-    my($self, $netloc) = @_;
-    delete $self->{'loc'}{$netloc}{'rules'};
-}
-
-sub rules {
-    my($self, $netloc) = @_;
-    if (defined $self->{'loc'}{$netloc}{'rules'}) {
-	return @{$self->{'loc'}{$netloc}{'rules'}};
-    } else {
-	return ();
-    }
-}
-
-sub dump
-{
-    my $self = shift;
-    for (keys %$self) {
-	next if $_ eq 'loc';
-	print "$_ = $self->{$_}\n";
-    }
-    for (keys %{$self->{'loc'}}) {
-	my @rules = $self->rules($_);
-	print "$_: ", join("; ", @rules), "\n";
-	
-    }
-}
-
-1;
-
-__END__
-
-=back
-
-=head1 ROBOTS.TXT
-
-The format and semantics of the "/robots.txt" file are as follows
-(this is an edited abstract of
-<URL:http://info.webcrawler.com/mak/projects/robots/norobots.html>):
-
-The file consists of one or more records separated by one or more
-blank lines. Each record contains lines of the form
-
-  <field-name>: <value>
-
-The field name is case insensitive.  Text after the '#' character on a
-line is ignored during parsing.  This is used for comments.  The
-following <field-names> can be used:
-
-=over 3
-
-=item User-Agent
-
-The value of this field is the name of the robot the record is
-describing access policy for.  If more than one I<User-Agent> field is
-present the record describes an identical access policy for more than
-one robot. At least one field needs to be present per record.  If the
-value is '*', the record describes the default access policy for any
-robot that has not not matched any of the other records.
-
-=item Disallow
-
-The value of this field specifies a partial URL that is not to be
-visited. This can be a full path, or a partial path; any URL that
-starts with this value will not be retrieved
-
-=back
-
-=head1 ROBOTS.TXT EXAMPLES
-
-The following example "/robots.txt" file specifies that no robots
-should visit any URL starting with "/cyberworld/map/" or "/tmp/":
-
-  User-agent: *
-  Disallow: /cyberworld/map/ # This is an infinite virtual URL space
-  Disallow: /tmp/ # these will soon disappear
-
-This example "/robots.txt" file specifies that no robots should visit
-any URL starting with "/cyberworld/map/", except the robot called
-"cybermapper":
-
-  User-agent: *
-  Disallow: /cyberworld/map/ # This is an infinite virtual URL space
-
-  # Cybermapper knows where to go.
-  User-agent: cybermapper
-  Disallow:
-
-This example indicates that no robots should visit this site further:
-
-  # go away
-  User-agent: *
-  Disallow: /
-
-=head1 SEE ALSO
-
-L<LWP::RobotUA>, L<WWW::RobotRules::AnyDBM_File>
-
-=cut
diff --git a/testcases/ballista/ballista/perllib/WWW/RobotRules/AnyDBM_File.pm b/testcases/ballista/ballista/perllib/WWW/RobotRules/AnyDBM_File.pm
deleted file mode 100644
index 9a2e74c..0000000
--- a/testcases/ballista/ballista/perllib/WWW/RobotRules/AnyDBM_File.pm
+++ /dev/null
@@ -1,170 +0,0 @@
-# $Id: AnyDBM_File.pm,v 1.1 2004/10/18 17:58:14 mridge Exp $
-
-package WWW::RobotRules::AnyDBM_File;
-
-require  WWW::RobotRules;
-@ISA = qw(WWW::RobotRules);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
-
-use Carp ();
-use AnyDBM_File;
-use Fcntl;
-use strict;
-
-=head1 NAME
-
-WWW::RobotRules::AnyDBM_File - Persistent RobotRules
-
-=head1 SYNOPSIS
-
- require WWW::RobotRules::AnyDBM_File;
- require LWP::RobotUA;
-
- # Create a robot useragent that uses a diskcaching RobotRules
- my $rules = new WWW::RobotRules::AnyDBM_File 'my-robot/1.0', 'cachefile';
- my $ua = new WWW::RobotUA 'my-robot/1.0', 'me@foo.com', $rules;
-
- # Then just use $ua as usual
- $res = $ua->request($req);
-
-=head1 DESCRIPTION
-
-This is a subclass of I<WWW::RobotRules> that uses the AnyDBM_File
-package to implement persistent diskcaching of F<robots.txt> and host
-visit information.
-
-The constructor (the new() method) takes an extra argument specifying
-the name of the DBM file to use.  If the DBM file already exists, then
-you can specify undef as agent name as the name can be obtained from
-the DBM database.
-
-=cut
-
-sub new 
-{ 
-  my ($class, $ua, $file) = @_;
-  Carp::croak('WWW::RobotRules::AnyDBM_File filename required') unless $file;
-
-  my $self = bless { }, $class;
-  $self->{'filename'} = $file;
-  tie %{$self->{'dbm'}}, 'AnyDBM_File', $file, O_CREAT|O_RDWR, 0640
-    or Carp::croak("Can't open $file: $!");
-  
-  if ($ua) {
-      $self->agent($ua);
-  } else {
-      # Try to obtain name from DBM file
-      $ua = $self->{'dbm'}{"|ua-name|"};
-      Carp::croak("No agent name specified") unless $ua;
-  }
-
-  $self;
-}
-
-sub agent {
-    my($self, $newname) = @_;
-    my $old = $self->{'dbm'}{"|ua-name|"};
-    if (defined $newname) {
-	$newname =~ s!/?\s*\d+.\d+\s*$!!;  # loose version
-	unless ($old && $old eq $newname) {
-	# Old info is now stale.
-	    my $file = $self->{'filename'};
-	    untie %{$self->{'dbm'}};
-	    tie %{$self->{'dbm'}}, 'AnyDBM_File', $file, O_TRUNC|O_RDWR, 0640;
-	    $self->{'dbm'}{"|ua-name|"} = $newname;
-	}
-    }
-    $old;
-}
-
-sub no_visits {
-    my ($self, $netloc) = @_;
-    my $t = $self->{'dbm'}{"$netloc|vis"};
-    return 0 unless $t;
-    (split(/;\s*/, $t))[0];
-}
-
-sub last_visit {
-    my ($self, $netloc) = @_;
-    my $t = $self->{'dbm'}{"$netloc|vis"};
-    return undef unless $t;
-    (split(/;\s*/, $t))[1];
-}
-
-sub fresh_until {
-    my ($self, $netloc, $fresh) = @_;
-    my $old = $self->{'dbm'}{"$netloc|exp"};
-    if ($old) {
-	$old =~ s/;.*//;  # remove cleartext
-    }
-    if (defined $fresh) {
-	$fresh .= "; " . localtime($fresh);
-	$self->{'dbm'}{"$netloc|exp"} = $fresh;
-    }
-    $old;
-}
-
-sub visit {
-    my($self, $netloc, $time) = @_;
-    $time ||= time;
-
-    my $count = 0;
-    my $old = $self->{'dbm'}{"$netloc|vis"};
-    if ($old) {
-	my $last;
-	($count,$last) = split(/;\s*/, $old);
-	$time = $last if $last > $time;
-    }
-    $count++;
-    $self->{'dbm'}{"$netloc|vis"} = "$count; $time; " . localtime($time);
-}
-
-sub push_rules {
-    my($self, $netloc, @rules) = @_;
-    my $cnt = 1;
-    $cnt++ while $self->{'dbm'}{"$netloc|r$cnt"};
-
-    foreach (@rules) {
-	$self->{'dbm'}{"$netloc|r$cnt"} = $_;
-	$cnt++;
-    }
-}
-
-sub clear_rules {
-    my($self, $netloc) = @_;
-    my $cnt = 1;
-    while ($self->{'dbm'}{"$netloc|r$cnt"}) {
-	delete $self->{'dbm'}{"$netloc|r$cnt"};
-	$cnt++;
-    }
-}
-
-sub rules {
-    my($self, $netloc) = @_;
-    my @rules = ();
-    my $cnt = 1;
-    while (1) {
-	my $rule = $self->{'dbm'}{"$netloc|r$cnt"};
-	last unless $rule;
-	push(@rules, $rule);
-	$cnt++;
-    }
-    @rules;
-}
-
-sub dump
-{
-}
-
-1;
-
-=head1 SEE ALSO
-
-L<WWW::RobotRules>, L<LWP::RobotUA>
-
-=head1 AUTHORS
-
-Hakan Ardo E<lt>hakan@munin.ub2.lu.se>, Gisle Aas E<lt>aas@sn.no>
-
-=cut
-
diff --git a/testcases/ballista/ballista/perllib/auto/HTML/Parser/.exists b/testcases/ballista/ballista/perllib/auto/HTML/Parser/.exists
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/perllib/auto/HTML/Parser/.exists
+++ /dev/null
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/_need_proxy.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/_need_proxy.al
deleted file mode 100644
index 1a5759a..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/_need_proxy.al
+++ /dev/null
@@ -1,44 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-# Private method which returns the URL of the Proxy configured for this
-# URL, or undefined if none is configured.
-sub _need_proxy
-{
-    my($self, $url) = @_;
-
-    $url = new URI::URL($url) unless ref $url;
-
-    LWP::Debug::trace("($url)");
-
-    # check the list of noproxies
-
-    if (@{ $self->{'no_proxy'} }) {
-	my $host = $url->host;
-	return undef unless defined $host;
-	my $domain;
-	for $domain (@{ $self->{'no_proxy'} }) {
-	    if ($host =~ /$domain$/) {
-		LWP::Debug::trace("no_proxy configured");
-		return undef;
-	    }
-	}
-    }
-
-    # Currently configured per scheme.
-    # Eventually want finer granularity
-
-    my $scheme = $url->scheme;
-    if (exists $self->{'proxy'}{$scheme}) {
-
-	LWP::Debug::debug('Proxied');
-	return new URI::URL($self->{'proxy'}{$scheme});
-    }
-
-    LWP::Debug::debug('Not proxied');
-    undef;
-}
-
-1;
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/autosplit.ix b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/autosplit.ix
deleted file mode 100644
index 6c19a73..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/autosplit.ix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Index created by AutoSplit for ./blib/lib/LWP/UserAgent.pm (file acts as timestamp)
-package LWP::UserAgent;
-sub clone ;
-sub is_protocol_supported ;
-sub mirror ;
-sub proxy ;
-sub env_proxy ;
-sub no_proxy ;
-sub _need_proxy ;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/clone.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/clone.al
deleted file mode 100644
index c25d95c..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/clone.al
+++ /dev/null
@@ -1,15 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub clone
-{
-    my $self = shift;
-    my $copy = bless { %$self }, ref $self;  # copy most fields
-
-    # elements that are references must be handled in a special way
-    $copy->{'no_proxy'} = [ @{$self->{'no_proxy'}} ];  # copy array
-
-    $copy;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/env_proxy.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/env_proxy.al
deleted file mode 100644
index 9364efb..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/env_proxy.al
+++ /dev/null
@@ -1,20 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub env_proxy {
-    my ($self) = @_;
-    my($k,$v);
-    while(($k, $v) = each %ENV) {
-	$k = lc($k);
-	next unless $k =~ /^(.*)_proxy$/;
-	$k = $1;
-	if ($k eq 'no') {
-	    $self->no_proxy(split(/\s*,\s*/, $v));
-	}
-	else {
-	    $self->proxy($k, $v);
-	}
-    }
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/is_protocol_supported.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/is_protocol_supported.al
deleted file mode 100644
index 35f8398..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/is_protocol_supported.al
+++ /dev/null
@@ -1,18 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub is_protocol_supported
-{
-    my($self, $scheme) = @_;
-    if (ref $scheme) {
-	# assume we got a reference to an URI::URL object
-	$scheme = $scheme->abs->scheme;
-    } else {
-	Carp::croak("Illeal scheme '$scheme' passed to is_protocol_supported")
-	    if $scheme =~ /\W/;
-	$scheme = lc $scheme;
-    }
-    return LWP::Protocol::implementor($scheme);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/mirror.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/mirror.al
deleted file mode 100644
index 7947b02..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/mirror.al
+++ /dev/null
@@ -1,55 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub mirror
-{
-    my($self, $url, $file) = @_;
-
-    LWP::Debug::trace('()');
-    my $request = new HTTP::Request('GET', $url);
-
-    if (-e $file) {
-	my($mtime) = (stat($file))[9];
-	if($mtime) {
-	    $request->header('If-Modified-Since' =>
-			     HTTP::Date::time2str($mtime));
-	}
-    }
-    my $tmpfile = "$file-$$";
-
-    my $response = $self->request($request, $tmpfile);
-    if ($response->is_success) {
-
-	my $file_length = (stat($tmpfile))[7];
-	my($content_length) = $response->header('Content-length');
-
-	if (defined $content_length and $file_length < $content_length) {
-	    unlink($tmpfile);
-	    die "Transfer truncated: " .
-		"only $file_length out of $content_length bytes received\n";
-	} elsif (defined $content_length and $file_length > $content_length) {
-	    unlink($tmpfile);
-	    die "Content-length mismatch: " .
-		"expected $content_length bytes, got $file_length\n";
-	} else {
-	    # OK
-	    if (-e $file) {
-		# Some dosish systems fail to rename if the target exists
-		chmod 0777, $file;
-		unlink $file;
-	    }
-	    rename($tmpfile, $file) or
-		die "Cannot rename '$tmpfile' to '$file': $!\n";
-
-	    if (my $lm = $response->last_modified) {
-		# make sure the file has the same last modification time
-		utime $lm, $lm, $file;
-	    }
-	}
-    } else {
-	unlink($tmpfile);
-    }
-    return $response;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/no_proxy.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/no_proxy.al
deleted file mode 100644
index 21af88c..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/no_proxy.al
+++ /dev/null
@@ -1,14 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub no_proxy {
-    my($self, @no) = @_;
-    if (@no) {
-	push(@{ $self->{'no_proxy'} }, @no);
-    }
-    else {
-	$self->{'no_proxy'} = [];
-    }
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/proxy.al b/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/proxy.al
deleted file mode 100644
index c8546e7..0000000
--- a/testcases/ballista/ballista/perllib/auto/LWP/UserAgent/proxy.al
+++ /dev/null
@@ -1,22 +0,0 @@
-# NOTE: Derived from ./blib/lib/LWP/UserAgent.pm.  Changes made here will be lost.
-package LWP::UserAgent;
-
-sub proxy
-{
-    my($self, $key, $proxy) = @_;
-
-    LWP::Debug::trace("$key, $proxy");
-
-    if (!ref($key)) {   # single scalar passed
-	my $old = $self->{'proxy'}{$key};
-	$self->{'proxy'}{$key} = $proxy;
-	return $old;
-    } elsif (ref($key) eq 'ARRAY') {
-	for(@$key) {    # array passed
-	    $self->{'proxy'}{$_} = $proxy;
-	}
-    }
-    return undef;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/_netloc_elem.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/_netloc_elem.al
deleted file mode 100644
index ff4d188..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/_netloc_elem.al
+++ /dev/null
@@ -1,27 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub _netloc_elem {
-    my($self, $elem, @val) = @_;
-    my $old = $self->_elem($elem, @val);
-    return $old unless @val;
-
-    # update the 'netloc' element
-    my $nl = '';
-    my $host = $self->{'host'};
-    if (defined $host) {  # can't be any netloc without any host
-	my $user = $self->{'user'};
-	$nl .= uri_escape($user, $URI::URL::reserved) if defined $user;
-	$nl .= ":" . uri_escape($self->{'password'}, $URI::URL::reserved)
-	  if defined($user) and defined($self->{'password'});
-	$nl .= '@' if length $nl;
-	$nl .= uri_escape($host, $URI::URL::reserved);
-	my $port = $self->{'port'};
-	$nl .= ":$port" if defined($port) && $port != $self->default_port;
-    }
-    $self->{'netloc'} = $nl;
-    $self->{'_str'} = '';
-    $old;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/abs.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/abs.al
deleted file mode 100644
index 9aecddc..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/abs.al
+++ /dev/null
@@ -1,111 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-# Generic-RL: Resolving Relative URL into an Absolute URL
-#
-# Based on RFC1808 section 4
-#
-sub abs
-{
-    my($self, $base, $allow_relative_scheme) = @_;
-    $allow_relative_scheme = $URI::URL::ABS_ALLOW_RELATIVE_SCHEME if @_ < 3;
-    my $embed = $self->clone;
-
-    $base = $self->base unless $base;      # default to default base
-    return $embed unless $base;            # we have no base (step1)
-
-    $base = new URI::URL $base unless ref $base; # make obj if needed
-
-    my($scheme, $host, $path, $params, $query, $frag) =
-	@{$embed}{qw(scheme host path params query frag)};
-
-    # just use base if we are empty             (2a)
-    return $base->clone
-      unless grep(defined($_) && $_ ne '',
-		  $scheme,$host,$port,$path,$params,$query,$frag);
-
-    # if we have a scheme we must already be absolute   (2b),
-    #
-    # but sec. 5.2 also says: Some older parsers allow the scheme name
-    # to be present in a relative URL if it is the same as the base
-    # URL scheme.  This is considered to be a loophole in prior
-    # specifications of the partial URLs and should be avoided by
-    # future parsers.
-    #
-    # The old behavoir can be enabled by passing a TRUE value to the
-    # $allow_relative_scheme parameter.
-    return $embed if $scheme &&
-      (!$allow_relative_scheme || $scheme ne $base->{'scheme'});
-
-    $embed->{'_str'} = '';                      # void cached string
-    $embed->{'scheme'} = $base->{'scheme'};     # (2c)
-
-    return $embed if $embed->{'netloc'};        # (3)
-    $embed->netloc($base->{'netloc'});          # (3)
-
-    return $embed if $path =~ m:^/:;            # (4)
-
-    if ($path eq '') {                          # (5)
-	$embed->{'path'} = $base->{'path'};     # (5)
-
-	return $embed if defined $embed->{'params'}; # (5a)
-	$embed->{'params'} = $base->{'params'};      # (5a)
-
-	return $embed if defined $embed->{'query'};  # (5b)
-	$embed->{'query'} = $base->{'query'};        # (5b)
-
-	return $embed;
-    }
-
-    # (Step 6)  # draft 6 suggests stack based approach
-
-    my $basepath = $base->{'path'};
-    my $relpath  = $embed->{'path'};
-
-    $basepath =~ s!^/!!;
-    $basepath =~ s!/$!/.!;                # prevent empty segment
-    my @path = split('/', $basepath);     # base path into segments
-    pop(@path);                           # remove last segment
-
-    $relpath =~ s!/$!/.!;                 # prevent empty segment
-
-    push(@path, split('/', $relpath));    # append relative segments
-
-    my @newpath = ();
-    my $isdir = 0;
-    my $segment;
-
-    foreach $segment (@path) {            # left to right
-	if ($segment eq '.') {            # ignore "same" directory
-	    $isdir = 1;
-	}
-	elsif ($segment eq '..') {
-	    $isdir = 1;
-	    my $last = pop(@newpath);
-	    if (!defined $last) {         # nothing to pop
-		push(@newpath, $segment); # so must append
-	    }
-	    elsif ($last eq '..') {       # '..' cannot match '..'
-		# so put back again, and append
-		push(@newpath, $last, $segment);
-	    }
-	    #else
-		# it was a component,
-		# keep popped
-	} else {
-	    $isdir = 0;
-	    push(@newpath, $segment);
-	}
-    }
-
-    if ($URI::URL::ABS_REMOTE_LEADING_DOTS) {
-	shift @newpath while @newpath && $newpath[0] =~ /^\.\.?$/;
-    }
-
-    $embed->{'path'} = '/' . join('/', @newpath) .
-	($isdir && @newpath ? '/' : '');
-
-    $embed;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/autosplit.ix b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/autosplit.ix
deleted file mode 100644
index 34105a2..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/autosplit.ix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Index created by AutoSplit for ./blib/lib/URI/URL/_generic.pm (file acts as timestamp)
-package URI::URL::_generic;
-sub user ;
-sub password ;
-sub host ;
-sub port ;
-sub _netloc_elem ;
-sub epath ;
-sub path ;
-sub path_components ;
-sub eparams ;
-sub params ;
-sub equery ;
-sub query ;
-sub frag ;
-sub crack ;
-sub abs ;
-sub rel ;
-sub eq ;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/crack.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/crack.al
deleted file mode 100644
index 08ec66f..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/crack.al
+++ /dev/null
@@ -1,19 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub crack
-{
-    my $self = shift;
-    return $self unless wantarray;
-    my @c = @{$self}{qw(scheme user password host port path params query frag)};
-    if (!$c[0]) {
-	# try to determine scheme
-	my $base = $self->base;
-	$c[0] = $base->scheme if $base;
-	$c[0] ||= 'http';  # last resort, default in URI::URL::new
-    }
-    $c[4] ||= $self->default_port;
-    @c;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eparams.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eparams.al
deleted file mode 100644
index 5ea93b8..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eparams.al
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub eparams  { shift->_elem('params',  @_); }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/epath.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/epath.al
deleted file mode 100644
index 408676a..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/epath.al
+++ /dev/null
@@ -1,12 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub epath {
-     my $self = shift;
-     my $old = $self->_elem('path', @_);
-     return '/' if !defined($old) || !length($old);
-     return "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-     $old;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eq.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eq.al
deleted file mode 100644
index 959efc2..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/eq.al
+++ /dev/null
@@ -1,34 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-# Compare two URLs
-sub eq {
-    my($self, $other) = @_;
-    local($^W) = 0; # avoid warnings if we compare undef values
-    $other = URI::URL->new($other, $self) unless ref $other;
-
-    # Compare scheme and netloc
-    return 0 if ref($self) ne ref($other);                # must be same class
-    return 0 if $self->scheme ne $other->scheme;          # Always lower case
-    return 0 if lc($self->netloc) ne lc($other->netloc);  # Case-insensitive
-
-    # Compare full_path:
-    # According to <draft-ietf-http-v11-spec-05>:
-    # Characters other than those in the "reserved" and "unsafe" sets
-    # are equivalent to their %XX encodings.
-    my $fp1 = $self->full_path;
-    my $fp2 = $other->full_path;
-    for ($fp1, $fp2) {
-	s,%([\dA-Fa-f]{2}),
-	  my $x = $1;
-	  my $c = chr(hex($x));
-	  $c =~ /^[;\/?:\@&=+\"\#%<>\0-\040\177]/ ? "%\L$x" : $c;
-	,eg;
-    }
-    return 0 if $fp1 ne $fp2;
-    return 0 if $self->frag ne $other->frag;
-    1;
-}
-
-1;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/equery.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/equery.al
deleted file mode 100644
index 68185f0..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/equery.al
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub equery   { shift->_elem('query',   @_); }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/frag.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/frag.al
deleted file mode 100644
index cc9fac9..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/frag.al
+++ /dev/null
@@ -1,7 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-# No efrag method because the fragment is always stored unescaped
-sub frag     { shift->_elem('frag', @_); }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/host.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/host.al
deleted file mode 100644
index d7613fc..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/host.al
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub host     { shift->_netloc_elem('host',    @_); }
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/params.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/params.al
deleted file mode 100644
index 5a5149f..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/params.al
+++ /dev/null
@@ -1,11 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub params {
-    my $self = shift;
-    my $old = $self->_elem('params', map {uri_escape($_,$URI::URL::reserved_no_form)} @_);
-    return uri_unescape($old) if defined $old;
-    undef;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/password.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/password.al
deleted file mode 100644
index fa862c3..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/password.al
+++ /dev/null
@@ -1,5 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub password { shift->_netloc_elem('password',@_); }
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path.al
deleted file mode 100644
index 2adca20..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path.al
+++ /dev/null
@@ -1,16 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub path {
-    my $self = shift;
-    my $old = $self->_elem('path',
-		      map uri_escape($_, $URI::URL::reserved_no_slash), @_);
-    return unless defined wantarray;
-    return '/' if !defined($old) || !length($old);
-    Carp::croak("Path components contain '/' (you must call epath)")
-	if $old =~ /%2[fF]/ and !@_;
-    $old = "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-    return uri_unescape($old);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path_components.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path_components.al
deleted file mode 100644
index f1e6e66..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/path_components.al
+++ /dev/null
@@ -1,16 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub path_components {
-    my $self = shift;
-    my $old = $self->{'path'};
-    $old = '' unless defined $old;
-    $old = "/$old" if $old !~ m|^/| && defined $self->{'netloc'};
-    if (@_) {
-	$self->_elem('path',
-		     join("/", map {uri_escape($_, $URI::URL::reserved)} @_));
-    }
-    map { uri_unescape($_) } split("/", $old, -1);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/port.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/port.al
deleted file mode 100644
index 7db15d6..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/port.al
+++ /dev/null
@@ -1,10 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub port {
-    my $self = shift;
-    my $old = $self->_netloc_elem('port', @_);
-    defined($old) ? $old : $self->default_port;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/query.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/query.al
deleted file mode 100644
index 83d9472..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/query.al
+++ /dev/null
@@ -1,28 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-sub query {
-    my $self = shift;
-    my $old = $self->_elem('query', map { uri_escape($_, $URI::URL::reserved_no_form) } @_);
-    if (defined(wantarray) && defined($old)) {
-	if ($old =~ /%(?:26|2[bB]|3[dD])/) {  # contains escaped '=' '&' or '+'
-	    my $mess;
-	    for ($old) {
-		$mess = "Query contains both '+' and '%2B'"
-		  if /\+/ && /%2[bB]/;
-		$mess = "Form query contains escaped '=' or '&'"
-		  if /=/  && /%(?:3[dD]|26)/;
-	    }
-	    if ($mess) {
-		Carp::croak("$mess (you must call equery)");
-	    }
-	}
-	# Now it should be safe to unescape the string without loosing
-	# information
-	return uri_unescape($old);
-    }
-    undef;
-
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/rel.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/rel.al
deleted file mode 100644
index 5741b4c..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/rel.al
+++ /dev/null
@@ -1,59 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-# The oposite of $url->abs.  Return a URL as much relative as possible
-sub rel {
-    my($self, $base) = @_;
-    my $rel = $self->clone;
-    $base = $self->base unless $base;
-    return $rel unless $base;
-    $base = new URI::URL $base unless ref $base;
-    $rel->base($base);
-
-    my($scheme, $netloc, $path) = @{$rel}{qw(scheme netloc path)};
-    if (!defined($scheme) && !defined($netloc)) {
-	# it is already relative
-	return $rel;
-    }
-
-    my($bscheme, $bnetloc, $bpath) = @{$base}{qw(scheme netloc path)};
-    for ($bscheme, $bnetloc, $netloc) { $_ = '' unless defined }
-
-    unless ($scheme eq $bscheme && $netloc eq $bnetloc) {
-	# different location, can't make it relative
-	return $rel;
-    }
-
-    for ($path, $bpath) {  $_ = "/$_" unless m,^/,; }
-
-    # Make it relative by eliminating scheme and netloc
-    $rel->{'scheme'} = undef;
-    $rel->netloc(undef);
-
-    # This loop is based on code from Nicolai Langfeldt <janl@ifi.uio.no>.
-    # First we calculate common initial path components length ($li).
-    my $li = 1;
-    while (1) {
-	my $i = index($path, '/', $li);
-	last if $i < 0 ||
-                $i != index($bpath, '/', $li) ||
-	        substr($path,$li,$i-$li) ne substr($bpath,$li,$i-$li);
-	$li=$i+1;
-    }
-    # then we nuke it from both paths
-    substr($path, 0,$li) = '';
-    substr($bpath,0,$li) = '';
-
-    if ($path eq $bpath && defined($rel->frag) && !defined($rel->equery)) {
-        $rel->epath('');
-    } else {
-        # Add one "../" for each path component left in the base path
-        $path = ('../' x $bpath =~ tr|/|/|) . $path;
-	$path = "./" if $path eq "";
-        $rel->epath($path);
-    }
-
-    $rel;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/user.al b/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/user.al
deleted file mode 100644
index bd4118b..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/_generic/user.al
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/_generic.pm.  Changes made here will be lost.
-package URI::URL::_generic;
-
-# Fields derived from generic netloc:
-sub user     { shift->_netloc_elem('user',    @_); }
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/abs.al b/testcases/ballista/ballista/perllib/auto/URI/URL/abs.al
deleted file mode 100644
index 4ec282b..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/abs.al
+++ /dev/null
@@ -1,7 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-# These are overridden by _generic (this is just a noop for those schemes that
-# do not wish to be a subclass of URI::URL::_generic)
-sub abs { shift->clone; }
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/as_string.al b/testcases/ballista/ballista/perllib/auto/URI/URL/as_string.al
deleted file mode 100644
index 220dd19..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/as_string.al
+++ /dev/null
@@ -1,8 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub as_string {
-    "<URL>";
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/autosplit.ix b/testcases/ballista/ballista/perllib/auto/URI/URL/autosplit.ix
deleted file mode 100644
index 0059fe4..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/autosplit.ix
+++ /dev/null
@@ -1,14 +0,0 @@
-# Index created by AutoSplit for ./blib/lib/URI/URL.pm (file acts as timestamp)
-package URI::URL;
-sub newlocal ;
-sub strict ;
-sub base ;
-sub scheme ;
-sub crack ;
-sub abs ;
-sub rel ;
-sub as_string ;
-sub eq ;
-sub bad_method ;
-sub print_on ;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/bad_method.al b/testcases/ballista/ballista/perllib/auto/URI/URL/bad_method.al
deleted file mode 100644
index 693d109..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/bad_method.al
+++ /dev/null
@@ -1,15 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-# This is set up as an alias for various methods
-sub bad_method {
-    my $self = shift;
-    my $scheme = $self->scheme;
-    Carp::croak("Illegal method called for $scheme: URL")
-	if $Strict_URL;
-    # Carp::carp("Illegal method called for $scheme: URL")
-    #     if $^W;
-    undef;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/base.al b/testcases/ballista/ballista/perllib/auto/URI/URL/base.al
deleted file mode 100644
index fa65a73..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/base.al
+++ /dev/null
@@ -1,28 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-# Access some attributes of a URL object:
-sub base {
-    my $self = shift;
-    my $base  = $self->{'_base'};
-
-    if (@_) { # set
-	my $new_base = shift;
-	$new_base = $new_base->abs if ref($new_base);  # unsure absoluteness
-	$self->{_base} = $new_base;
-    }
-    return unless defined wantarray;
-
-    # The base attribute supports 'lazy' conversion from URL strings
-    # to URL objects. Strings may be stored but when a string is
-    # fetched it will automatically be converted to a URL object.
-    # The main benefit is to make it much cheaper to say:
-    #   new URI::URL $random_url_string, 'http:'
-    if (defined($base) && !ref($base)) {
-	$base = new URI::URL $base;
-	$self->_elem('_base', $base); # set new object
-    }
-    $base;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/crack.al b/testcases/ballista/ballista/perllib/auto/URI/URL/crack.al
deleted file mode 100644
index 01ad3f4..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/crack.al
+++ /dev/null
@@ -1,20 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub crack
-{
-    # should be overridden by subclasses
-    my $self = shift;
-    ($self->scheme,  # 0: scheme
-     undef,          # 1: user
-     undef,          # 2: passwd
-     undef,          # 3: host
-     undef,          # 4: port
-     undef,          # 5: path
-     undef,          # 6: params
-     undef,          # 7: query
-     undef           # 8: fragment
-    )
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/eq.al b/testcases/ballista/ballista/perllib/auto/URI/URL/eq.al
deleted file mode 100644
index 6cf2a75..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/eq.al
+++ /dev/null
@@ -1,13 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-# Compare two URLs, subclasses will provide a more correct implementation
-sub eq {
-    my($self, $other) = @_;
-    $other = URI::URL->new($other, $self) unless ref $other;
-    ref($self) eq ref($other) &&
-      $self->scheme eq $other->scheme &&
-      $self->as_string eq $other->as_string;  # Case-sensitive
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/autosplit.ix b/testcases/ballista/ballista/perllib/auto/URI/URL/file/autosplit.ix
deleted file mode 100644
index 7887ce4..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/autosplit.ix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Index created by AutoSplit for ./blib/lib/URI/URL/file.pm (file acts as timestamp)
-package URI::URL::file;
-sub newlocal ;
-sub unix_path ;
-sub dos_path ;
-sub mac_path ;
-sub vms_path ;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/dos_path.al b/testcases/ballista/ballista/perllib/auto/URI/URL/file/dos_path.al
deleted file mode 100644
index 33331d7..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/dos_path.al
+++ /dev/null
@@ -1,17 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/file.pm.  Changes made here will be lost.
-package URI::URL::file;
-
-sub dos_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains '/' or '\\'") if m|[/\\]|;
-	push(@p, uc $_);
-    }
-    my $p = join("\\", @p);
-    $p =~ s/^\\([A-Z]:)/$1/;  # Fix drive letter specification
-    $p;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/mac_path.al b/testcases/ballista/ballista/perllib/auto/URI/URL/file/mac_path.al
deleted file mode 100644
index c771593..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/mac_path.al
+++ /dev/null
@@ -1,25 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/file.pm.  Changes made here will be lost.
-package URI::URL::file;
-
-sub mac_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains ':'") if /:/;
-	# XXX: Should probably want to do something about ".." and "."
-	# path segments.  I don't know how these are represented in
-	# the Machintosh file system.  If these are valid file names
-	# then we should split the path ourself, as $u->path_components
-	# loose the distinction between '.' and '%2E'.
-	push(@p, $_);
-    }
-    if (@p && $p[0] eq '') {
-	shift @p;
-    } else {
-	unshift(@p, '');
-    }
-    join(':', @p);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/newlocal.al b/testcases/ballista/ballista/perllib/auto/URI/URL/file/newlocal.al
deleted file mode 100644
index 2bfd70b..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/newlocal.al
+++ /dev/null
@@ -1,25 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/file.pm.  Changes made here will be lost.
-package URI::URL::file;
-
-sub newlocal {
-    my($class, $path) = @_;
-
-    Carp::croak("Only implemented for Unix and OS/2 file systems")
-      unless $ostype eq "unix" or $^O =~ /os2|mswin32/i;
-    # XXX: Should implement the same thing for other systems
-
-    my $url = new URI::URL "file:";
-    unless (defined $path and
-    	    ($path =~ m:^/: or 
-	     ($^O eq 'os2' and Cwd::sys_is_absolute($path)) or
-	     ($^O eq 'MSWin32' and $path =~ m<^[A-Za-z]:[\\/]|^[\\/]{2}>))) {
-	require Cwd;
-	my $cwd = Cwd::fastcwd();
-	$cwd =~ s:/?$:/:; # force trailing slash on dir
-	$path = (defined $path) ? $cwd . $path : $cwd;
-    }
-    $url->path($path);
-    $url;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/unix_path.al b/testcases/ballista/ballista/perllib/auto/URI/URL/file/unix_path.al
deleted file mode 100644
index 05313dd..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/unix_path.al
+++ /dev/null
@@ -1,25 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/file.pm.  Changes made here will be lost.
-package URI::URL::file;
-
-sub unix_path
-{
-    my $self = shift;
-    my @p;
-    for ($self->path_components) {
-	Carp::croak("Path component contains '/' or '\0'") if m|[\0/]|;
-	if (@p) {
-	    next unless length $_;   # skip empty path segments
-	    next if $_ eq '.';       # skip these too
-	    if ($_ eq '..' && $p[-1] ne '..') {  # go up one level
-		pop(@p) if $p[-1] ne '';
-		next;
-	    }
-	}
-	push(@p, $_);
-    }
-    shift(@p) if @p > 1 && $p[0] eq '.';   # './' rendundant if there is more
-    return '/' if !@p || (@p == 1 && $p[0] eq '');
-    join('/', @p);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/file/vms_path.al b/testcases/ballista/ballista/perllib/auto/URI/URL/file/vms_path.al
deleted file mode 100644
index 0c4fbae..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/file/vms_path.al
+++ /dev/null
@@ -1,39 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/file.pm.  Changes made here will be lost.
-package URI::URL::file;
-
-sub vms_path
-{
-    # ????? Can some VMS people please redo this function ??????
-
-    # This is implemented based on what RFC1738 (sec 3.10) says in the
-    # VMS file example:
-    #
-    #  DISK$USER:[MY.NOTES]NOTE123456.TXT
-    #
-    #      that might become
-    #
-    #  file:/disk$user/my/notes/note12345.txt
-    #
-    # BEWARE: I don't have a VMS machine myself so this is pure guesswork!!!
-
-    my $self = shift;
-    my @p = $self->path_components;
-    my $abs = 0;
-    if (@p && $p[0] eq '') {
-	shift @p;
-	$abs = 1;
-    }
-    # First I assume there must be a dollar in a disk spesification
-    my $p = '';
-    $p = uc(shift(@p)) . ":"  if @p && $p[0] =~ /\$/;
-    my $file = pop(@p);
-    $p .= "[" . join(".", map{uc($_)} @p) . "]" if @p;
-    $p .= uc $file;
-    # XXX: How is an absolute path different from a relative one??
-    $p =~ s/\[/[./ unless $abs;
-    # XXX: How is a directory denoted??
-    $p;
-}
-
-1;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/http/autosplit.ix b/testcases/ballista/ballista/perllib/auto/URI/URL/http/autosplit.ix
deleted file mode 100644
index 840d54f..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/http/autosplit.ix
+++ /dev/null
@@ -1,5 +0,0 @@
-# Index created by AutoSplit for ./blib/lib/URI/URL/http.pm (file acts as timestamp)
-package URI::URL::http;
-sub keywords ;
-sub query_form ;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/http/keywords.al b/testcases/ballista/ballista/perllib/auto/URI/URL/http/keywords.al
deleted file mode 100644
index 51eb4f1..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/http/keywords.al
+++ /dev/null
@@ -1,18 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/http.pm.  Changes made here will be lost.
-package URI::URL::http;
-
-# Handle ...?dog+bones type of query
-sub keywords {
-    my $self = shift;
-    $old = $self->{'query'};
-    if (@_) {
-	# Try to set query string
-	$self->equery(join('+', map { URI::Escape::uri_escape($_, $URI::URL::reserved) } @_));
-    }
-    return if !defined($old) || !defined(wantarray);
-
-    Carp::croak("Query is not keywords") if $old =~ /=/;
-    map { URI::Escape::uri_unescape($_) } split(/\+/, $old);
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/http/query_form.al b/testcases/ballista/ballista/perllib/auto/URI/URL/http/query_form.al
deleted file mode 100644
index 9738560..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/http/query_form.al
+++ /dev/null
@@ -1,33 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL/http.pm.  Changes made here will be lost.
-package URI::URL::http;
-
-# Handle ...?foo=bar&bar=foo type of query
-sub query_form {
-    my $self = shift;
-    $old = $self->{'query'};
-    if (@_) {
-	# Try to set query string
-	my @query;
-	my($key,$vals);
-        my $esc = $URI::URL::reserved . $URI::URL::unsafe;
-	while (($key,$vals) = splice(@_, 0, 2)) {
-	    $key = '' unless defined $key;
-	    $key =  URI::Escape::uri_escape($key, $esc);
-	    $vals = [$vals] unless ref($vals) eq 'ARRAY';
-	    my $val;
-	    for $val (@$vals) {
-		$val = '' unless defined $val;
-		$val = URI::Escape::uri_escape($val, $esc);
-		push(@query, "$key=$val");
-	    }
-	}
-	$self->equery(join('&', @query));
-    }
-    return if !defined($old) || length($old) == 0 || !defined(wantarray);
-    Carp::croak("Query is not a form") unless $old =~ /=/;
-    map { s/\+/ /g; URI::Escape::uri_unescape($_) }
-	 map { /=/ ? split(/=/, $_, 2) : ($_ => '')} split(/&/, $old);
-}
-
-1;
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/newlocal.al b/testcases/ballista/ballista/perllib/auto/URI/URL/newlocal.al
deleted file mode 100644
index 6601693..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/newlocal.al
+++ /dev/null
@@ -1,11 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub newlocal
-{
-    require URI::URL::file;
-    my $class = shift;
-    URI::URL::file->newlocal(@_);  # pass it on the the file class
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/print_on.al b/testcases/ballista/ballista/perllib/auto/URI/URL/print_on.al
deleted file mode 100644
index 3b235be..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/print_on.al
+++ /dev/null
@@ -1,25 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub print_on
-{
-    no strict qw(refs);  # because we use strings as filehandles
-    my $self = shift;
-    my $fh = shift || 'STDERR';
-    my($k, $v);
-    print $fh "Dump of URI::URL $self...\n";
-    foreach $k (sort keys %$self){
-	$v = $self->{$k};
-	$v = 'UNDEF' unless defined $v;
-	print $fh "  $k\t'$v'\n";
-    }
-}
-
-1;
-
-
-#########################################################################
-#### D O C U M E N T A T I O N
-#########################################################################
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/rel.al b/testcases/ballista/ballista/perllib/auto/URI/URL/rel.al
deleted file mode 100644
index 7b301c0..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/rel.al
+++ /dev/null
@@ -1,7 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub rel { shift->clone; }
-
-# This method should always be overridden in subclasses
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/scheme.al b/testcases/ballista/ballista/perllib/auto/URI/URL/scheme.al
deleted file mode 100644
index 17dcda3..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/scheme.al
+++ /dev/null
@@ -1,23 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub scheme {
-    my $self = shift;
-    my $old = $self->{'scheme'};
-    if (@_) {
-	my $new_scheme = shift;
-	if (defined($new_scheme) && length($new_scheme)) {
-	    # reparse URL with new scheme
-	    my $str = $self->as_string;
-	    $str =~ s/^[\w+\-.]+://;
-	    my $newself = new URI::URL "$new_scheme:$str";
-	    %$self = %$newself;
-	    bless $self, ref($newself);
-	} else {
-	    $self->{'scheme'} = undef;
-	}
-    }
-    $old;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/URI/URL/strict.al b/testcases/ballista/ballista/perllib/auto/URI/URL/strict.al
deleted file mode 100644
index a2d9ac2..0000000
--- a/testcases/ballista/ballista/perllib/auto/URI/URL/strict.al
+++ /dev/null
@@ -1,12 +0,0 @@
-# NOTE: Derived from ./blib/lib/URI/URL.pm.  Changes made here will be lost.
-package URI::URL;
-
-sub strict
-{
-    return $Strict_URL unless @_;
-    my $old = $Strict_URL;
-    $Strict_URL = $_[0];
-    $old;
-}
-
-1;
diff --git a/testcases/ballista/ballista/perllib/auto/libwww-perl/.exists b/testcases/ballista/ballista/perllib/auto/libwww-perl/.exists
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/perllib/auto/libwww-perl/.exists
+++ /dev/null
diff --git a/testcases/ballista/ballista/replacer.cpp b/testcases/ballista/ballista/replacer.cpp
deleted file mode 100644
index 520dfbd..0000000
--- a/testcases/ballista/ballista/replacer.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// replacer.cpp: looks for //replacekey and substitutes correct section of code
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-using namespace std;
-
-// From: John Peter DeVale <jdevale@ece.cmu.edu>
-// To: karner@andrew.cmu.edu
-// Message-ID: <Pine.OSF.4.02.9811090812520.3462-100000@skate.ece.cmu.edu>
-//
-// Replacer, which as you point out only inlines strings, is an artifact of
-// some wierd bug in cxx on digital unix.  As it turns out, cxx dies a
-// horrible screaming death if you try to inline code with #include
-// directives in the middle of a function.  The same thing compiles clean on
-// gcc.  It's odd.  So, I wrote replacer to actually shove the code into
-// place to work around the problem.
-
-int main()
-{
-  char buf[1024];
-  ifstream os;
-
-  while (!cin.eof())
-    {
-      cin.getline(buf,1024,'\n');
-      if (strcmp(buf,"//replacekey")==0)
-	{
-	  
-	  cout<<"//inlining userSetup, callInclude, and userShutdown\n";
-
-	  os.open("userSetup.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  os.open("callInclude.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  os.open("userShutdown.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-
-
-	  cin.getline(buf,1024,'\n');
-	  cin.getline(buf,1024,'\n');
-	  cin.getline(buf,1024,'\n');
-	}
-      else if (strcmp(buf,"//replacetoken")==0)
-	{
-	  
-	  cout<<"//inlining userCatches\n";
-
-	  os.open("userCatches.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  cin.getline(buf,1024,'\n');
-	}
-      else if (strcmp(buf,"//placeVariables")==0)
-	{
-	  
-	  cout<<"//inlining variable instantiations\n";
-
-	  os.open("vardefs.cpp",ios::in);
-	  while (!os.eof())
-	    {
-	      os.getline(buf,1024,'\n');
-	      cout<<buf<<endl;
-	    }
-	  os.close();
-	  cin.getline(buf,1024,'\n');
-	}
-      else
-	cout<<buf<<endl;
-
-    }
-
-}
diff --git a/testcases/ballista/ballista/selfHost.cpp b/testcases/ballista/ballista/selfHost.cpp
deleted file mode 100644
index 02b625a..0000000
--- a/testcases/ballista/ballista/selfHost.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/* selfHost.cpp: Implementation of Selfhost_test_manager class
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <assert.h>  //for asserts in manage_test
-#include <dlfcn.h>  //for dynamic loading in constructor
-#include <iostream>  //for cout and cerr
-#include <signal.h>  //for SIGKILL
-#include <stdio.h>  //generally needed
-#include <stdlib.h>  //generally needed
-#include <string.h>  //for strncpy, strcat, strstr in manage_test
-#include <sys/types.h>  //for pid_t and other types
-#include <sys/wait.h>  //for waitpid
-#undef _XOPEN_SOURCE //dec unix hack by ece team
-#include <unistd.h>  //generally needed, fork, process stuff
-#include <errno.h>   //added 11/16/99 for error reporting
-
-#include "ballista.h"
-#include "ballistaError.h"
-#include "ballistaUtil.h"
-#include "marshal.h"
-#include "selfHost.h"
-
-using namespace std;
-
-extern "C" int execute_test_case (char *marshalled_parameters);
-
-#ifdef SUN
-//Our Sun's at CMU seem to be missing the usleep proto
-//from unistd.h
-
-extern "C" int usleep(unsigned int useconds);
-#endif
-
-#define TEMP_BUF_SIZE 1024
-
-#define RVAL_STRING "rval:"
-
-
-
-/************************
- *
- * Function:        Selfhost_test_manager
- * Description:     Constructor for class Selfhost_test_manager
- * Function Inputs: None
- * Global Inputs:   
- * Return Values:   N/A
- * Global Outputs:  
- * Errors:          throws an error if handle or test_exec_ptr cannot be set
- * Pre-Conditions:  None
- * Post-Contidions: pid, child_exists_flag, test_exec_ptr, handle are set
- * Design: Since we are using dynamic loading, the test_exec_ptr and handle
- *         must be set here.
- * Notes: 
- *        set test_exec_ptr to execute_test_case in that file, 
- *        set pid to 0.
- *
- ************************/
-
-Selfhost_test_manager::Selfhost_test_manager(const char *mut_filename)
-  throw (Ballistic_error)
-{
-  void *handle;  //handle for dynamically loaded file
-
-  if (!(handle = dlopen(mut_filename, RTLD_NOW))) {
-    throw Ballistic_error(dlerror());
-  }
-  
-  if (!(test_exec_ptr = (int (*) (char *)) dlsym (handle, "execute_test_case"))) {
-    throw Ballistic_error(dlerror());
-  }
-  
-  pid = 0;
-
-}
-
-/************************
- *
- * Function:        ~Selfhost_test_manager
- * Description:     Destructor for class Selfhost_test_manager
- * Function Inputs: N/A
- * Global Inputs:   N/A
- * Return Values:   N/A
- * Global Outputs:  N/A
- * Errors:          N/A
- * Pre-Conditions:  Object must have been constructed previously
- * Post-Contidions: Object does not exist; leftover child process will
- *                  be reaped
- * Design:          N/A
- * Notes:  If child exists, reap it
- *
- ************************/
-Selfhost_test_manager::~Selfhost_test_manager() {
-  cout << "Cleaning up test manager." << endl;
-  
-  if (pid != 0) {
-    // clean up child process
-    kill (pid, SIGTERM);
-    waitpid (pid, NULL, 0);  //we don't care about status, so we use NULL
-  }  
-}
-
-/************************
- *
- * Function:        manage_test
- * Description:     Selfhost-specific implementation of the virtual
- *                  function derived from the base class Test_manager
- *                  This function controls all the Ballista testing on the
- *                  client.
- * Function Inputs: MARSHAL_DATA_TYPE arguments,
- *                  long timeout_value,
- *                  char *pass_status,
- *                  int max_pass_status,
- *                  int *call_ret,
- *                  char *sys_err,
- *                  int max_sys_err,
- *                  char *mut_return,
- *                  int max_mut_return
- * Global Inputs:   
- * Return Values:   Integer 0 if function is successful, nonzero integer
- *                  otherwise
- * Global Outputs:  
- * Errors:          waitpid fails, marshal fails, fork fails, undefined test
- *                  result
- * Pre-Conditions:  All pointers in parameters are valid
- * Post-Contidions: One test case will be completed.  All the output variables
- *                  will be set.
- * Design: Section 5.2.2.3 has the pseudocode algorithm
- * Notes:
- *
- ************************/
-
-int Selfhost_test_manager::manage_test(MARSHAL_DATA_TYPE arguments,
-				      long timeout_value,
-				      char *pass_status,
-				      int max_pass_status,
-				      int *call_ret,
-				      char *sys_err, int max_sys_err,
-				      char *mut_return, 
-				      int max_mut_return) {
-
-  char marshalled_arguments [MAX_MARSHAL_STRING];   //marshalled string
-  int marshal_return_value = 0;    //return value of marshal()
-  int status = 0;  //Status of forked process
-                                           //to see if there are problems.
-  pid_t wait_pid_return = 0;  // Return value of waitpid
-  int pipe_file_desc [2]; //file descriptors for pipe between parent & child
-  FILE * mut_output;
-  char * temp_mut_return = NULL; //temporary string to hold piped output
-  char * mut_return_start = NULL; //pointer to actual return value from mut
-  long long start_time = 0;
-  long long timeout = timeout_value;
-
-  int num_matching = 0; // how many characters did we match out of 'rval:'
-  int num_to_match = 0; // how many characters must we match
-  char *string_to_match = NULL;  // string to match against
-  int c = 0;  // character read from file
-  int bytes_read = 0; // number of bytes read from pipe
-
-  struct sigaction action; //signal-handling struct
-
-
-  // Abort if null pointer
-  assert(arguments != NULL);
-  assert(call_ret != NULL);
-  assert(sys_err != NULL);
-  assert(mut_return != NULL);
-  assert(pass_status != NULL);
-  
-  //marshal arguments into string for test execution
-  if ((marshal_return_value = marshal(arguments, marshalled_arguments)) != 0) {
-    return MARSHAL_STRING_FAILED;
-  }
-
-  //set up pipe for communication between parent and child processes
-  if (pipe (pipe_file_desc) < 0) {
-    cerr << "Pipe Failed" << endl;
-    return PIPE_FAILED;
-  }
-  
-  // Fork off a process and check for errors
-  if ((pid = fork()) < 0) {
-    cerr << "Fork Failed." << endl;
-    return FORK_FAILED;
-  }
-  
-  else if (pid == 0) {  //child process to execute test
-    close(pipe_file_desc[0]);
-    //redirect Output only from this child to the pipe
-    dup2 (pipe_file_desc[1], STDOUT_FILENO); //stdout
-
-    // remove signal handlers that were installed
-    sigemptyset (&action.sa_mask);
-    action.sa_handler = SIG_DFL;
-    (void) sigaction (SIGINT, &action, NULL);
-    (void) sigaction (SIGQUIT, &action, NULL);
-    (void) sigaction (SIGTERM, &action, NULL);
-    (void) sigaction (SIGABRT, &action, NULL);
-        
-    exit(test_exec_ptr (marshalled_arguments)); //exits with errno status
-  }  //end child process
-  
- //parent process to monitor child
-  close(pipe_file_desc[1]);
-  mut_output = fdopen(pipe_file_desc[0], "r");
-
-  start_time = get_time_in_microseconds();
-
-  while(start_time + timeout > get_time_in_microseconds())  {
-    wait_pid_return = waitpid (pid, &status, WNOHANG);
-    
-    //check if waitpid error
-    if (wait_pid_return < 0) {
-      cerr << "Error waiting for child process.  Child %d " << pid;
-      cerr << "does not exist, its group does not exist," << endl;
-      cerr << "or the process is not a child of the Test Manager." << endl;
-      return WAITPID_FAILED;
-    }
-    // check if process terminated
-    if(wait_pid_return > 0) {
-      pid = 0;  //signal to parent child no longer exists
-      break;
-    }
-    
-    // sleep for 500 microseconds before checking again
-    usleep(500);      
-  } //end while
-  
-  // check that the loop terminated because the process terminated
-  if (wait_pid_return > 0) {
-    pid = 0;
-
-    // read one character at a time from the pipe.
-    // keep checking against RVAL_STRING to see if we match
-    // after we match, copy up until max_mut_return-1 characters into 
-    // mut_return.  Then NULL terminate mut_return.  Finally remove the
-    // last carriage return in mut_return.  That '\n' comes from 
-    // execute_test_case
-
-    num_matching = 0;
-    num_to_match = strlen(RVAL_STRING);
-    string_to_match = RVAL_STRING;
-
-    while((c = fgetc(mut_output)) != EOF) {
-      if(c == string_to_match[num_matching]) {
-	num_matching++;
-	if(num_matching == num_to_match) {
-	  // we've found 'rval:', now read in the rest
-	  bytes_read = fread(mut_return,
-			     sizeof(char), 
-			     max_mut_return-1,
-			     mut_output);
-	  
-	  if((bytes_read < 0) || (bytes_read > max_mut_return-1)) {
-	    cerr << "Error reading from pipe." << endl;
-	    return READING_PIPE_FAILED;
-	  }
-	  mut_return[bytes_read] = '\0'; // null terminate
-
-	  // take out trailing carriage return if it is there
-	  if(bytes_read > 0) {
-	    if(mut_return[bytes_read - 1] == '\n') {
-	      mut_return[bytes_read - 1] = '\0';
-	    }
-	  }
-	  break;
-	}
-      }
-      else {  // we didn't match this char, so reset the count
-	num_matching = 0;
-      }
-    }
-
-    
-    fclose(mut_output);
-
-    // process has terminated, either a Pass or an Abort has occurred
-    if (WIFSIGNALED(status)) {
-      *call_ret = -1;
-      safe_strncpy(pass_status, "Done - Abort", max_pass_status);
-    }
-    else if (WIFEXITED(status)) {
-      *call_ret = WEXITSTATUS(status);
-      if (*call_ret == 99)
-      {
-        safe_strncpy(pass_status, "Done - Setup Failed", max_pass_status);
-      }
-      else
-      {
-        safe_strncpy(pass_status, "Done - Pass", max_pass_status);
-      }
-      if (*call_ret >= 0) {
-        // Copy error message string for reporting. added 11/16/99
-        safe_strncpy(sys_err, strerror(*call_ret), max_sys_err);
-      }
-    }
-    else if (WIFSTOPPED(status)) {
-      *call_ret = -1;
-      safe_strncpy(pass_status, "Done - Stopped", max_pass_status);
-    }
-    else { //something has gone wrong, we should never fall through here
-      cerr << "Test is not an Abort, Restart, or Pass" << endl;
-      return UNDEFINED_RESULT;
-    }
-  } //end if process termination ended loop
-  else { 
-    // did not terminate, clean up child processes
-    kill (pid, SIGKILL);
-    *call_ret = waitpid (pid, &status, 0);
-    pid = 0;
-    safe_strncpy(pass_status, "Done - Restart", max_pass_status);
-  } 
-
-  return RETURN_OK;
-} //end manage_test()
-
diff --git a/testcases/ballista/ballista/selfHost.h b/testcases/ballista/ballista/selfHost.h
deleted file mode 100644
index 968ca6e..0000000
--- a/testcases/ballista/ballista/selfHost.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* selfHost.h:  Header file for definition of Selfhost_test_manager class
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _B_SELFHOST_H
-#define _B_SELFHOST_H
-
-#include "ballista.h"
-#include "ballistaError.h"
-#include "testManager.h"
-
-
-// Constant for maximum length of the marshaled dial settings
-// Enough space to hold all the the b_param fields
-// PLUS a single character seperator between the dials in each list
-// PLUS a single character terminator for each list
-#define MAX_MARSHAL_STRING ((MAXP * MAXD) * sizeof(b_param)+(MAXD -1) * MAXP + MAXP)
-
-//Return values of manage_test method
-#define READING_PIPE_FAILED -7
-#define MALLOC_FAILED -6
-#define PIPE_FAILED -5
-#define UNDEFINED_RESULT -4
-#define WAITPID_FAILED -3
-#define MARSHAL_STRING_FAILED -2
-#define FORK_FAILED -1
-#define RETURN_OK 0
-
-/************************
- *
- * Function:        class Selfhost_test_manager
- * Description:     Class definition for self-host-specific Test_manager
- *                  implementation
- * Function Inputs: N/A
- * Global Inputs:   N/A
- * Return Values:   N/A
- * Global Outputs:  N/A
- * Errors:          Throws exceptions if test execution file cannot be
- *                  dynamically loaded
- * Pre-Conditions:  test execution file exists
- * Post-Contidions: N/A
- * Design:          Based on original Ballista functionality, 
- *                  and implementation of VxWorks-specific Test_manager
- * Notes:           N/A
- *
- ************************/
-
-class Selfhost_test_manager : public Test_manager {
-
- public:
-
-  // Constructor
-  Selfhost_test_manager (const char *mut_filename)
-    throw (Ballistic_error);
-
-  //Destructor
-  virtual ~Selfhost_test_manager (void);
-  
-  virtual int manage_test(MARSHAL_DATA_TYPE arguments,
-			  long timeout_value,
-			  char *pass_status, int max_pass_status,
-			  int *call_ret,
-			  char *sys_err, int max_sys_err,
-			  char *mut_return, int max_mut_return);
-  
- private:
-  // Private member variables
-  
-  // Variable to hold process id number of child for test
-  // 0 for no child, positive integer if child exists
-  pid_t pid;
-  //Function pointer for the execute_test_case function (to be dynamically
-  //loaded in)
-  int (*test_exec_ptr) (char *);
-};
-
-#endif // _B_SELFHOST_H
diff --git a/testcases/ballista/ballista/serverCommunication.cpp b/testcases/ballista/ballista/serverCommunication.cpp
deleted file mode 100644
index fe48399..0000000
--- a/testcases/ballista/ballista/serverCommunication.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/* serverCommunication.cpp: This file contains the Server_communication class.
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-/************************
- *
- * Description: This file contains the Server_communication class.  
- *              It abstracts the RPC calls to the server away from the 
- *              rest of the program
- *
- ************************/
-
-#include <assert.h>
-
-#include "serverCommunication.h"
-#include "ballistaRPC.h"
-#include "ballistaUtil.h"
-
-using namespace std;
-
-#ifdef HP
-extern "C" CLIENT * clnt_create(char *, u_long, u_long, char*);
-extern "C" void clnt_pcreateerror(char *);
-extern "C" void clnt_perror(CLIENT *, char *);
-void CLNT_DESTROY2(CLIENT *rh){
-  //  ((*(rh)->cl_ops->cl_destroy)(rh));
-  rh->cl_ops->cl_destroy();
-}
-#endif
-
-
-/************************
- *
- * Function: Server_communcation constructor
- * Description: make a copy of the name and create the client.
- * Function Inputs: server_name
- * Global Inputs:
- * Return Values:
- * Global Outputs:
- * Errors:  If the client cannot be created, the program will throw an 
-            exception
- * Pre-Conditions:
- * Post-Conditions: clnt is initialized
- * Design:
- * Notes:
- *
- ************************/
-#include <iostream>
-#include <netdb.h>
-#include <fstream>
-#include <signal.h>
-#include <string.h>
-
-#ifdef SUN
-
-#include <strings.h> 
-
-#endif
-
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-
-//new socket addressing variables for firewalls
-  struct   sockaddr_in server_addr, client_addr;
-  int sock;
-  int Stupid;
-  
-  struct hostent *hp;
-
-Server_communication::Server_communication(const char *server_name)     
-  throw(Ballistic_error)
-{
-  assert(server_name != NULL);
-
-  safe_strncpy(name,server_name,sizeof(name));
-  
-  Stupid=1;
-
-/*    
-    client_addr.sin_family = AF_INET;
-    client_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    client_addr.sin_port = htons(4255);
-    sock= socket (PF_INET,SOCK_STREAM,0);
-    
-    if (setsockopt(sock,SOL_SOCKET,SO_REUSEADDR, &Stupid,sizeof(int)))
-    {
-    	perror("Failed to set sock option : ");
-    	exit (1);
-    }
-  
-    if (bind(sock,(struct sockaddr *)&client_addr,sizeof(client_addr))==-1)
-    {
-    	perror ("Error binding socket : ");
-    	exit(1);
-    }
-*/
-    
-    hp = gethostbyname(name);
-    if (hp==NULL)
-      {
-        cerr<<"Error: could not locate host "<<server_name<<".\n";
-        assert(0);
-      }
-
-
-    memcpy((char *)&(server_addr.sin_addr.s_addr),(const char *)hp->h_addr,hp->h_length);
-
-
-    server_addr.sin_family = AF_INET;
-    server_addr.sin_port = htons (4255);
-     
-    
-    //if (connect(sock,(struct sockaddr *)&server_addr,sizeof(client_addr))==-1)
-    //{
-    //	throw Ballistic_error ("Error connecting socket : ");
-    //}
- 
- //   close(sock);
-    sock = RPC_ANYSOCK;
-    clnt = clnttcp_create(&server_addr,BALLISTA, BALLISTAVERS,&sock,0,0);
-    if (clnt == NULL) {
-      clnt_pcreateerror(name);
-      throw Ballistic_error("Failed to create TCP socket for client\n");
-     }
-
-  
-  
-  //Try and create a connection to the host, we are using tcp here
-  //because it can support larger datatypes and is much more reliable
-  //then udp, plus it segfaults if you even try to use udp
-
-/*   Old client create code
-  clnt = clnt_create(name, BALLISTA, BALLISTAVERS, "tcp");
-  if (clnt == NULL) {
-    clnt_pcreateerror(name);
-    throw Ballistic_error("Error: Cannot initiate RPC with server.");
-  }
-  */
-}
-
-
-/************************
- *
- * Function: get_name
- * Description: copies the name of the server into server_name
- * Function Inputs: server_name, max_server_name
- * Global Inputs:
- * Return Values: server_name
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Conditions: name of the server is copied into server_name
- * Design:
- * Notes:
- *
- ************************/
-void Server_communication::get_name(char *server_name,int max_server_name)
-{
-  assert(server_name != NULL);
-
-  safe_strncpy(server_name,name,max_server_name);
-}
-
-
-/************************
- *
- * Function: get_test_set
- * Description: this function gets the test set from the server
- * Function Inputs: param_file_data
- * Global Inputs:
- * Return Values:  return_info
- * Global Outputs:
- * Errors: If the RPC call failed, the method will throw an exception
- * Pre-Conditions:
- * Post-Contidions:
- * Design: call the RPC call.  If it fails, exit the program.
- * Notes:
- *
- ************************/
-return_info *Server_communication::get_test_set(info *param_file_data)
-  throw(Ballistic_error)
-{
-  assert(param_file_data != NULL);
-
-  return_info *result_temp = get_array_3(param_file_data, clnt);
-  if (result_temp == NULL) {
-    clnt_perror(clnt, "call failed:");
-    throw(Ballistic_error("Error: Cannot get test set from server."));
-  }
-
-#ifdef UNIT_TEST
-  FILE *fptr = fopen("server.txt","a");
-  if(fptr) {
-    fprintf(fptr,"received tests from %s\n",name);
-    fprintf(fptr,"total = %d\n",result_temp->total);
-    int i,j,k;
-    two_dim *td;
-    for(i=0;i<result_temp->total;i++) {
-      td = &result_temp->my_three_dim.three_dim_val[i];
-      for(j=0;j<td->two_dim_len;j++) {
-      for(k=0;k<td->two_dim_val[j].one_dim_len;k++) {
-	fprintf(fptr,"%s\t",td->two_dim_val[j].one_dim_val[k]);
-      }
-      fprintf(fptr,"\n");
-      }
-      fprintf(fptr,"---\n");
-    }
-    fclose(fptr);
-  }
-#endif
-  return result_temp;
-}
-
-/************************
- *
- * Function: send_test_results
- * Description: send the results of a single test to the server
- * Function Inputs: data_from_client representing the results of the last test
- * Global Inputs:
- * Return Values: none
- * Global Outputs:
- * Errors: If the RPC call failed, the program will throw an exception
- * Pre-Conditions:
- * Post-Contidions: server has received the data
- * Design: call the RPC call.  If it fails, throw an exception
- * Notes:
- *
- ************************/
-void Server_communication::send_test_results(struct data_from_client *data)
-  throw(Ballistic_error)
-{
-  int *result;
-
-  assert(data != NULL);
-
-  result = send_data_3(data,clnt);
-  if (result == NULL) {
-    clnt_perror(clnt, "call failed:");
-    throw(Ballistic_error("Error: Cannot pass test results to server."));
-  }
-}
-
-
-/************************
- *
- * Function: ~Server_communication
- * Description: destructor for the class
- * Function Inputs:
- * Global Inputs:
- * Return Values:
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions: client is destroyed
- * Design: destroy the client
- * Notes:
- *
- ************************/
-Server_communication::~Server_communication()
-{
-#ifdef  HP
-  CLNT_DESTROY2(clnt);
-#else
-  clnt_destroy( clnt );
-#endif
-  
-}
diff --git a/testcases/ballista/ballista/serverCommunication.h b/testcases/ballista/ballista/serverCommunication.h
deleted file mode 100644
index bffc6ef..0000000
--- a/testcases/ballista/ballista/serverCommunication.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* serverCommunication.h: This file contains the Server_communication class.
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _SERVER_COMMUNICATION_H_
-#define _SERVER_COMMUNICATION_H_
-
-#include "ballistaRPC.h"
-#include "ballistaError.h"
-
-
-class Server_communication 
-{
-private:
-  CLIENT *clnt;
-  char name[255];
-
-public:
-  Server_communication(const char *server_name) 
-    throw(Ballistic_error);
-  virtual ~Server_communication();
-  void get_name(char *server_name, int max_server_name);
-  void send_test_results(struct data_from_client *data) 
-    throw(Ballistic_error);
-  return_info *get_test_set(info *param_file_data)
-    throw(Ballistic_error);
-};
-
-
-#endif // _SERVER_COMMUNICATION_H_
diff --git a/testcases/ballista/ballista/so_locations b/testcases/ballista/ballista/so_locations
deleted file mode 100644
index 4dfa032..0000000
--- a/testcases/ballista/ballista/so_locations
+++ /dev/null
@@ -1,4 +0,0 @@
-a.so \
-		:st = .text 0x000003ffbffe0000, 0x0000000000010000:\
-		:st = .data 0x000003ffffff0000, 0x0000000000010000:\
-
diff --git a/testcases/ballista/ballista/temp/functioncall.cpp b/testcases/ballista/ballista/temp/functioncall.cpp
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/temp/functioncall.cpp
+++ /dev/null
diff --git a/testcases/ballista/ballista/temp/funny.txt b/testcases/ballista/ballista/temp/funny.txt
deleted file mode 100644
index 64686dc..0000000
--- a/testcases/ballista/ballista/temp/funny.txt
+++ /dev/null
@@ -1 +0,0 @@
-Error - could not locatechmod  in the calltable.
diff --git a/testcases/ballista/ballista/temp/output.temp b/testcases/ballista/ballista/temp/output.temp
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/temp/output.temp
+++ /dev/null
diff --git a/testcases/ballista/ballista/templates/Makefile b/testcases/ballista/ballista/templates/Makefile
deleted file mode 100644
index 30d5250..0000000
--- a/testcases/ballista/ballista/templates/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile: Makefile for Ballista Datatype Templates
-# Copyright (C) 1998-2001  Carnegie Mellon University
-#
-# This program 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 Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-########################
-#
-# File:         Makefile
-#
-# Description:  manage generation of datatype object files
-#
-# Author:       Keith Arner
-#
-# Reviews:
-#
-########################
-#
-# Entry Conditions: 
-# 	The following environment variables are set:
-#	 ${CC} : <<appropriate C compiler for target platform>>
-#	 ${CFLAGS} : <<appropriate C compiler flags for target platform>>
-#
-#	Any other env. vars. specific to the target platform compiler
-#	 should also be set.
-#
-# Notes:
-#	The datatype object files are built from template files.  These
-#	 template files are listed in the 'dataTypes' file.  All datatypes
-#	 listed in that file will be built and linked into the
-#	 execute_test_case executeable.  The ordering of the entries in the
-#	 dataTypes file is important.  See the Design Document for details.
-#
-########################
-
-#  Define suffixes to be recognized by make
-.SUFFIXES: .o .tpl
-
-# Suffix rule to build <datatype>.o from <datatype>.tpl
-#  as a side effect, build <datatype>.cpp and <datatype>.h,
-#  and <datatype>.param
-.tpl.o :
-	../paramGen $<
-	../bdc_standalone $<
-	${CC} ${CFLAGS} -O -c $*.cpp
-
-# Special case rule to build bTypes.o, as there is no bTypes.tpl
-bTypes.o : bTypes.cpp
-	${CC} ${CFLAGS} -O -c bTypes.cpp
-
-# remove all the object files, and all .cpp and .h files *except*
-#  bTypes.cpp, bTypes.h, ptr_gen.cpp and ptr_gen.h
-clean :
-	rm -f *.o `ls *.cpp *.h *.param | grep -v 'bTypes\.' | grep -v 'paramAccess\.param'`
diff --git a/testcases/ballista/ballista/templates/bTypes.cpp b/testcases/ballista/ballista/templates/bTypes.cpp
deleted file mode 100644
index a314870..0000000
--- a/testcases/ballista/ballista/templates/bTypes.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// bTypes.cpp : Ballista Template Base Definition
-// Copyright (C) 1997-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-/*
-
-TITLE
-   
-   bTypes.cpp
-
-REVISION RECORD
-
-Date            Engineer        Change
-----            --------        ------
-18 NOV 97       J DeVale        Original release
-
-IMPLEMENTATION DESIGN
-
-1. General
-   
-   Implementation for accessing random space in file pointer variable
-
-   Type name must not have whitespace
-   
-2. Specification
-   fp_gen.h
-                                                
-*/
-
-//---------------------------------------------------------------------------
-#include <stdio.h>
-#include <stdlib.h>
-#include <fstream>
-#include <iostream>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "bTypes.h"
-
-using namespace std;
-//---------------------------------------------------------------------------
-
-paramAccess::paramAccess()
-{
-  strcpy(_rootName,"ROOT_PARAMETER");
-}
-
-//---------------------------------------------------------------------------
-
-void *paramAccess::access(b_param data[])
-{
-  cerr<<"Error - paramAccess::access() should never be invoked\n";
-  cerr<<"The offending type string is "<<data[0]<<endl;
-  exit(1);
-  return NULL;
-}
-
-
-//---------------------------------------------------------------------------
-
-int paramAccess::commit(b_param tname)
-{
-  cerr<<"Error - paramAccess::commit() should never be invoked\n";
-  cerr<<"The offending type string is "<<tname<<endl;
-  exit(1);
-  return 1;
-}
-
-//---------------------------------------------------------------------------
-
-int paramAccess::cleanup(b_param tname)
-{
-  cerr<<"Error - paramAccess::commit() should never be invoked\n";
-  cerr<<"The offending type string is "<<tname<<endl;
-  exit(1);
-  return 1;
-}
-
-//---------------------------------------------------------------------------
-
-int paramAccess::numDials(b_param tname)
-{
-  if (strcmp(tname,(char *)typeName())!=0)
-    {
-      cerr<<"Error - paramAccess::numDials() was invoked ";
-      cerr<<"with an invalid typename\n";
-      cerr<<"The offending type string is "<<tname<<endl;
-      exit(1);
-    }
-  return 0;
-}
-
-//---------------------------------------------------------------------------
-
-int paramAccess::numItems(b_param tname,int dialNumber)
-{
-  if (strcmp(tname,(char *)typeName())!=0)
-    {
-      cerr<<"Error - paramAccess::numItems() was invoked with an ";
-      cerr<<"invalid typename\n";
-      cerr<<"The offending type string is "<<tname<<endl;
-      exit(1);
-    }
-  return 0;
-}
-
-//---------------------------------------------------------------------------
-
-b_param *paramAccess::paramName(b_param tname,int dialNumber, int position)
-{
-  if (strcmp(tname,(char *)typeName())!=0)
-    {
-      cerr<<"Error - paramAccess::paramName() was invoked with ";
-      cerr<<"an invalid typename\n";
-      cerr<<"The offending type string is "<<tname<<endl;
-      exit(1);
-    }
-  return NULL;
-}
-
-//---------------------------------------------------------------------------
-
-b_param *paramAccess::typeName()
-{
-  return &_rootName;
-}
-
-//---------------------------------------------------------------------------
-
-int paramAccess::distanceFromBase()
-{
-  return 0;
-}
-
-//---------------------------------------------------------------------------
-
-void paramAccess::typeList(b_param list[], int num)
-{
-  strcpy(list[num],(char *) typeName());
-}
-
-//---------------------------------------------------------------------------
diff --git a/testcases/ballista/ballista/templates/bTypes.h b/testcases/ballista/ballista/templates/bTypes.h
deleted file mode 100644
index faac1c4..0000000
--- a/testcases/ballista/ballista/templates/bTypes.h
+++ /dev/null
@@ -1,408 +0,0 @@
-// bTypes.h : Ballista Template Base Definition Header
-// Copyright (C) 1997-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/*
-
-TITLE
-   bTypes.h
-
-CLASSES
-   paramAccess
-
-ABSTRACT
-   This file provides data types common to ballista modules.
-   paramAccess is the root data type for the entire ballista 
-   object hierarchy.
-
-
-REVISION RECORD
-Date            Engineer        Change
-----            --------        ------
-18 NOV 97       J DeVale        Original release
-
-1. Provides general definitions for ballista data types
-
-2. Many methods describe here take a typeName parameter.  This is to allow
-   the objects to know which object in the inheritance tree is being 
-   addressed.
- 
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-  
-   paramAccess();
-
-DESCRIPTION
-   
-   This is the object constructor.  It initializes the type name varible 
-   _rootName to be ROOT_PARAMETER.
-
-PARAMETERS
-
-   None.
-
-REQUIREMENTS
-
-   None.
-
-RETURNED VALUE
-
-   None.
-
-NOTES
-
-   Derived classes will initialize string equivalent variables for dial 
-   settings here, as well as any other type-specific initialization.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-   virtual void *paramAccess::access(b_param data[])
-
-DESCRIPTION
-
-   This is the function which accepts dial settings, and returns a pointer to
-   the variable type it represents.  In the case of the root class, it
-   aborts program execution, and returns an error message.
-
-PARAMETERS
-
-   b_param        *in*           data[]   - Type name in 0, followed by 
-                                            dial setting strings
-
-REQUIREMENTS
-
-   Valid type name in position 0 of the array.
-   All required dial setting strings for the type in the subsequent array 
-   slots.
-
-RETURNED VALUE
-
-   void pointer to the actual variable being returned.  Note then that if
-   the type is itself a pointer, it returns a pointer to the pointer, or 
-   as some might term is, a handle to the actual data type.
-
-NOTES
-
-   Every derived class MUST OVERRIDE this method in order to function
-   properly.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-   
-   virtual int paramAccess::commit(b_param tname)
-
-DESCRIPTION
-
-   This is "phase two" of the variable creation - or as Phil Koopman 
-   euphamisticly says, it is the "mangle phase".  This phase performs any
-   actions necsarry to change the variable prior to its use.  Note that in
-   order to implement this phase, the data object must keep a copy of the
-   pointer to the data type returned.
-
-   This can typically be deallocation of memory, closing a file, etc.
-
-
-PARAMETERS
-
-   tname          in            Data type name it is to mangle.
-
-REQUIREMENTS
-
-   Name to a type in the objects inheritance tree to be mangled exists 
-   as a type in its class inheritance path.
-
-   For each call to commit(), there must be exactly one sucessful call 
-   to access() preceeding it, with no other interveneing calls to 
-   commit(), or cleanup().
-
-RETURNED VALUE
-
-   0 for success, otherwise and error code.
-   This base class returns an error, similar to access.
-
-NOTES
-
-   As with access(), commit() MUST BE OVERRIDDEN by each derived class.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   virtual int paramAccess::cleanup(b_param tname)
-
-DESCRIPTION
-
-   This is the final phase in the life of a generated parameter.  This 
-   method is responsible for freeing any resources created during the 
-   parameter generation phase.  Note that this means that the "unmangled"
-   should be saved for freeing.  Of course, creation mangling and freeing
-   are done in the forked process, so theoretically the resources should 
-   be freed when the process terminates.
-
-PARAMETERS
-
-  tname       in        Data type name it is to mangle.
-
-REQUIREMENTS
-
-   Name to a type in the objects inheritance tree to be freed exists as
-   a type in its class inheritance path.
-
-   For each call to cleanup(), there must be exactly one sucessful call 
-   to access() preceeding it, with no other interveneing calls to 
-   cleanup().
-
-RETURNED VALUE
-
-   0 for success, otherwise and error code.
-   This base class returns an error, similar to access.
-
-NOTES
-
-   As with access(), cleanup() MUST BE OVERRIDDEN by each derived class.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   virtual int paramAccess::numDials(b_param tname)
-
-DESCRIPTION
-
-   This method must return the integer value of the number of dials 
-   associated with the data type it represents.
-
-   The base class paramAccess returns 0.
-
-PARAMETERS
-
-  tname       in          Data type name it is to mangle.
-
-REQUIREMENTS
-
-   Name to a type in the objects inheritance tree to be freed exists 
-   as a type in its class inheritance path.
-
-RETURNED VALUE
-
-   Integer value representing the number of dials which can be twiddled
-   to build different parameters.
-
-NOTES
-
-   As with access(), numDials() MUST BE OVERRIDDEN by each derived class.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   virtual int paramAccess::numItems(b_param tname,int dialNumber)
-
-DESCRIPTION
-
-   This method returns the number of settings a particular dial has.
-   The base class always returns 0.
-
-PARAMETERS
-
-  tname          in            Data type name it is to mangle.
-  dialNumber     in            The number of the dial in question.
-
-REQUIREMENTS
-
-   Name to a type in the objects inheritance tree to be freed exists 
-   as a type in its class inheritance path.
-
-   The dial indicated exists for the specified data type.
-
-RETURNED VALUE
-
-   Integer value of the number of dial settings for the specified dial.
-
-NOTES
-
-   As with access(), numItems() MUST BE OVERRIDDEN by each derived class.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   b_param *paramAccess::typeName()
-
-DESCRIPTION
-
-   This method returns the name of the type the object is representing.
-
-PARAMETERS
-
-   None.
-
-REQUIREMENTS
-
-   None.
-
-RETURNED VALUE
-
-   The string value name of the type represented by the object.
-
-NOTES
-
-   Must be implemented by each derived class.
-
-   This is *NOT* a virtual function.  THis is so that the typeName() 
-   for the scope currently in execution will be dispatched.  Otherwise, 
-   when calling inherited virtual methods that check typenames, the 
-   typename string of the class actually instantiated would be called.  
-   That would be bad, bad bad.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   int paramAccess::distanceFromBase()
-
-DESCRIPTION
-
-   This method returns the integer value representing the instantiated 
-   class' distance from the root class paramAccess.
-
-   Obviously, this being the root class, it returns 0.
-
-   In derived classes this method functions using a recursive descent 
-   into the class hierarchy.  In practice, if simply returns the value 
-   of its immediate parent class' distanceFromBase() method +1.
-
-PARAMETERS
-
-   None.
-
-REQUIREMENTS
-
-   None.
-
-RETURNED VALUE
-
-   Integer value distance from base class paramAccess.  in this case 0;
-
-NOTES
-
-   As with access(), numDials() MUST BE OVERRIDDEN by each derived class.
-     
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-   void paramAccess::typeList(b_param list[], int num)
-
-DESCRIPTION
-
-   This method returns an array with the typename of it, and each of 
-   its parent classes.  
-
-   The num parameter is used to tell the method which array slot to place
-   the typename in.  The first outside call to this method should be called
-   with num = 0, thus the name of the instantiated class' data type is in
-   index 0, and the root classes type name is in list[distanceFromRoot()-1].
-
-   The caller is responsible for creating an appropriately sized array, 
-   and is most easily done as follows:
-
-   b_param *theList= new b_param[distanceFromRoot()];
-
-PARAMETERS
-
-   list     in/out      The array in which to store typenames
-   num      in          The index in list at which to store the typename
-
-
-REQUIREMENTS
-
-   The list parameter must have be an array of sufficient size to store
-   all required data.
-
-RETURNED VALUE
-
-   None.
-
-NOTES
-
-   Must be implemented by each derived class.
-
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-
-NAME
-
-DESCRIPTION
-
-PARAMETERS
-
-REQUIREMENTS
-
-RETURNED VALUE
-
-NOTES
-
-*/
-
-#ifndef BTYPES_H
-#define BTYPES_H 
-
-#ifdef SUN
-extern char *sys_errlist[ ];    //bug in aix and sunos errno.h ( at least )
-#endif 
-
-#define B_PARAM_LENGTH 255
-
-typedef char b_param[B_PARAM_LENGTH];
-
-#define MAXP 16            //arbitrary parameter max
-#define MAXD 32            //arbitrary max number of dials
-
-class paramAccess
-{
-
-public:
-
-  b_param _rootName;   //identifies the type associated with the object.
-  
-  
-  paramAccess();
-  
-  virtual void *access(b_param data[]);
-  virtual int commit(b_param tname);
-  virtual int cleanup(b_param tname);
-  virtual int numDials(b_param tname);
-  virtual int numItems(b_param tname,int dialNumber);
-  virtual int distanceFromBase();
-  virtual b_param *paramName(b_param tname,int dialNumber, int position);
-  b_param *typeName();
-  virtual void typeList(b_param list[],int num);
-};
-
-#endif   //BTYPES_H
diff --git a/testcases/ballista/ballista/templates/b_aio_mode.tpl b/testcases/ballista/ballista/templates/b_aio_mode.tpl
deleted file mode 100644
index 1d27b9f..0000000
--- a/testcases/ballista/ballista/templates/b_aio_mode.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_aio_mode.tpl : Ballista Datatype Template for AIO mode
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_aio_mode;
-
-parent b_int;
-
-includes
-[
- {
-   #include <aio.h>
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : LIO_WAIT, LIO_NOWAIT;
-]
-
-access
-[
-  LIO_WAIT
-  {
-    _theVariable= LIO_WAIT;
-  }
-  LIO_NOWAIT
-  {
-    _theVariable= LIO_NOWAIT;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_char.tpl b/testcases/ballista/ballista/templates/b_char.tpl
deleted file mode 100644
index bda9a54..0000000
--- a/testcases/ballista/ballista/templates/b_char.tpl
+++ /dev/null
@@ -1,142 +0,0 @@
-// b_char.tpl : Ballista Datatype Template for a character
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char b_char;
-
-parent paramAccess;
-includes
-[
- {
-  #include "values.h"  //for digital unix
-  #include "bTypes.h"
- }
-]
-
-global_defines
-[
- {
-  #define MaxBytes sizeof(unsigned short);
- }
-]
-
-dials
-[
-  enum_dial HVAL : NUL, SOH, TAB, LF, CR, DLE, ESC, SPACE, COMMA, NUM0, NUM9, AT, BIGA, BIGZ, LEFTSQBRKT, APST, SMLA, SMLZ, LEFTCUVBRKT, FF;
-]
-
-access
-[
- NUL
-    {
-       _theVariable=0;
-    }
- SOH
-    {
-       _theVariable=1;//smilly face
-    }
- TAB
-    {
-       _theVariable=9;
-    }
- LF
-    {
-       _theVariable=10;//line feed
-    }
- CR
-    {
-       _theVariable=13;//carriage return
-    }
- DLE
-    {
-       _theVariable=16;//delete
-    }
- ESC
-    {
-       _theVariable=27;
-    }
- SPACE
-    {
-       _theVariable=32;
-    }
- COMMA
-    {
-       _theVariable=44;
-    }
- NUM0
-    {
-       _theVariable=48; //'0'
-    }
- NUM9
-    {
-       _theVariable=57;//'9'
-    }
- AT
-    {
-       _theVariable=64; //'@'
-    }
- BIGA
-    {
-       _theVariable=65;//'A'
-    }
- BIGZ
-    {
-       _theVariable=90;//'Z'
-    }
- LEFTSQBRKT
-    {
-       _theVariable=91;//'['
-    }
- APST
-    {
-       _theVariable=96;//'`'
-    }
- SMLA
-    {
-       _theVariable=97;//'a'
-    }
- SMLZ
-    {
-       _theVariable=122;//'z'
-    }
- LEFTCUVBRKT
-    {
-       _theVariable=123;//'{'
-    }
-
- FF
-    {
-       _theVariable=255;//blank 'FF'
-    }
-]
-
-commit
-[
-{
-#ifdef DEBUG
-	printf("VALUE:%c in commit\n", _theVariable);
-#endif
-}
-]
-
-cleanup
-[
-{
-#ifdef DEBUG
-	printf("VALUE:%c in cleanup\n", _theVariable);
-#endif
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_clockid.tpl b/testcases/ballista/ballista/templates/b_clockid.tpl
deleted file mode 100644
index 5ff4cd3..0000000
--- a/testcases/ballista/ballista/templates/b_clockid.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-// b_clockid.tpl : Ballista Datatype Template for clock identification
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name clockid_t b_clockid;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <time.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : REALTIME;
-]
-
-access
-[
-  REALTIME
-  {
-    _theVariable= CLOCK_REALTIME;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_double.tpl b/testcases/ballista/ballista/templates/b_double.tpl
deleted file mode 100644
index 98221b7..0000000
--- a/testcases/ballista/ballista/templates/b_double.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-// b_double.tpl : Ballista Datatype Template for double datatypes
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name double b_double;
-
-parent b_float;
-
-includes
-[
- {
-   #include "b_float.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : DMAXEXP, DMINEXP, MAXDOUBLE, MINDOUBLE, NEGMAXDOUBLE, NEGMINDOUBLE;
-]
-
-access
-[
-  DMAXEXP
-  {
-    _theVariable = DMAXEXP;
-  }
-  DMINEXP
-  {
-    _theVariable = DMINEXP;
-  }
-  MAXDOUBLE
-  {
-    _theVariable = MAXDOUBLE;
-  }
-  MINDOUBLE
-  {
-    _theVariable = MINDOUBLE;
-  }
-  NEGMAXDOUBLE
-  {
-    _theVariable = -MAXDOUBLE;
-  }
-  NEGMINDOUBLE
-  {
-    _theVariable = -MINDOUBLE;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_fd.tpl b/testcases/ballista/ballista/templates/b_fd.tpl
deleted file mode 100644
index cc10190..0000000
--- a/testcases/ballista/ballista/templates/b_fd.tpl
+++ /dev/null
@@ -1,359 +0,0 @@
-// b_fd.tpl : Ballista Datatype Template for file descriptors
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_fd;
-
-parent b_int;
-
-includes
-[
-{
-#include <fcntl.h>
-#include <sys/stat.h> 
-#include <unistd.h>
-#include <errno.h>
-#include "b_int.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_fp"
-}
-]
-
-dials
-[
-  // Note removed X_GRP, RWX_ALL, RWX_UG from PERMISSIONS to make shorter
-  enum_dial MODE : READ, WRITE, APPEND, READ_PLUS, WRITE_PLUS, APPEND_PLUS;
-  enum_dial PERMISSIONS : R_USER, W_USER, X_USER, RWX_USER, R_GRP, NONE;
-  enum_dial EXISTANCE : EXIST, CLOSED, DELETED, NO_EXIST;   
-  enum_dial STATE : EMPTY, BEGINNING, EOF, PAST_EOF;   
-]
-
-access
-[
-{
-   mode_t permissionMode;
-   int oflag;
-   int exist_flag = 1;
-   int pos;
-   int empty_flag = 0;
-
-   struct stat stat_buf_temp;
-   int fd;
-
-   // Setup log file for template information
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-   //fprintf (logFile, "\nNEW TEST \n");
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */   
-   {  
-     //if the directory already exists ignore the error
-     if (errno != EEXIST) 
-     {
-       fprintf(logFile,"mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT) 
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_fd datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-}
-
-   EMPTY
-   {
-     empty_flag = 1;
-   }
-
-   READ, READ_PLUS, APPEND, APPEND_PLUS
-   {    
-     if (! empty_flag)
-     {
-       write (fd, "I am a test file.\n", 18);
-     }
-   }
-
-{  // all values
-   if (close (fd)!=0) 
-   {
-     fprintf(logFile,"b_fd datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);	
-   }
-}
-  NO_EXIST
-  {
-    exist_flag = 0;
-    remove(TESTFILE);
-  }
-
-  // using the "default" oflag values used in open to correspond with fopen values.
-  READ
-  {
-    oflag = O_RDONLY;   
-  }
-  WRITE
-  {
-    if (exist_flag)
-    {
-      oflag = O_WRONLY | O_CREAT | O_TRUNC;
-    }
-    else    
-    {
-      oflag = O_WRONLY | O_TRUNC;
-    }
-  }
-  APPEND
-  {
-    if (exist_flag)
-    {
-      oflag = O_WRONLY | O_CREAT | O_APPEND;
-    }
-    else     
-    {
-      oflag = O_WRONLY | O_APPEND;
-    }   
-  }
-  READ_PLUS
-  {
-    oflag = O_RDWR;    
-  }
-  WRITE_PLUS
-  {
-    if (exist_flag)
-    {
-      oflag = O_RDWR | O_CREAT | O_TRUNC;
-    }   
-    else        
-    {   
-      oflag = O_RDWR | O_TRUNC;
-    }
-  }
-  APPEND_PLUS
-  {
-    if (exist_flag)
-    { 
-      oflag = O_RDWR | O_CREAT | O_APPEND;
-    }   
-    else        
-    {
-      oflag = O_RDWR | O_APPEND;
-    }      
-  }
-
-  R_USER
-  {
-    permissionMode = S_IRUSR;
-  } 
-  W_USER
-  {
-    permissionMode = S_IWUSR;
-  }
-  X_USER
-  {
-    permissionMode = S_IXUSR;
-  }
-  RWX_USER
-  {
-    permissionMode = S_IRWXU;
-  }
-  R_GRP
-  {
-    permissionMode = S_IRGRP;
-  }
-  NONE
-  {
-    permissionMode = 0;
-  }
-
-//  X_GRP 
-//  {
-//    permissionMode = S_IXGRP;
-//  }
-//  RWX_ALL
-//  {
-//    permissionMode = S_IRWXU | S_IRWXG | S_IRWXO;
-//  } 
-//  RWX_UG
-//  {
-//    permissionMode = S_IRWXU | S_IRWXG;
-//  }
-
-
-{
-  if ((fd  = open(TESTFILE, oflag, permissionMode)) == -1)
-  {
-    if (exist_flag)
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - open failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-  }
-}   
-
-  WRITE, WRITE_PLUS
-  {
-    if (! empty_flag)
-    {
-      write (fd, "I am a test file.\n", 18);
-    }
-  }
-
-
-  BEGINNING
-  {
-    if (exist_flag && ((pos = lseek(fd, 0L, SEEK_SET)) == -1L))
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - lseek SET failed\n");
-      fclose(logFile);
-      exit (99);     
-    }
-  }
-  EOF
-  {
-    if (exist_flag && ((pos = lseek(fd, 0L, SEEK_END)) == -1L))
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - lseek END failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-  }
-  PAST_EOF
-  {
-    if (exist_flag && ((pos = lseek(fd, 10L, SEEK_END)) == -1L))
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - lseek END failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-  }
-
-{  // generic statement for all values
-  _theVariable = fd;
-  fclose (logFile);
-}
-]
-
-commit
-[
-{
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-   
-   int exist_flag = 1;
-}
-
-  NO_EXIST
-  {
-    exist_flag = 0;
-  }
-
-  CLOSED
-  {
-    if (exist_flag)
-    {
-      close(_theVariable);
-    }
-  }
-
-  DELETED
-  {
-    if (exist_flag)
-    {
-      // try deleting without closing the file first
-      char buffer[128];
-      if ((sprintf(buffer, "rm %s", TESTFILE)) <= 0)
-      {
-        fprintf(logFile,"b_fd datatype not setup properly - rm of the TESTFILE failed. Function not tested\n");
-        fclose(logFile);
-        exit(99);
-      }
-      system(buffer);
-      //system("ls testdir/testfil* >> testdir/deleteDebug.txt");
-    }
-  }
-
-{
-  fclose(logFile);
-}  
-]
-
-cleanup
-[
-{  
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-} 
-
-  CLOSED, EXIST
-  {
-    chown(TESTFILE, getuid(), getgid()); //attempt to change ownership
-    chmod(TESTFILE,  S_IRUSR|S_IWUSR|S_IROTH|S_IWOTH);//permits others to read/write; ignore errors
-    if (close (_theVariable)!=0) 
-    {       //ignore error if file already closed
-      if (errno != EBADF) perror("close fname_tempfd");
-    }
-  }
-
-{
-  if (unlink(TESTFILE)!=0)
-  {
-    //ignore error if already removed.
-    if (errno != ENOENT) 
-    {
-      fprintf(logFile,"unlink fname_testfilename\n");
-    }
-  }
-
-  //also try to rmdir it because it may be a directory. ignore error messages
-  rmdir(TESTFILE);
-  fclose(logFile);
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_float.tpl b/testcases/ballista/ballista/templates/b_float.tpl
deleted file mode 100644
index fad6f1d..0000000
--- a/testcases/ballista/ballista/templates/b_float.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-// b_float.tpl : Ballista Datatype Template for float datatypes
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name float b_float;
-
-parent paramAccess;
-
-includes
-[
- {
-  #include "values.h"  //for digital unix
-  #include "bTypes.h"
-  #include <math.h>
-  #define intBase unsigned short
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL :  ZERO, ONE, NEGONE, FMINEXP, MLN2, MPI, HALF_PI, QUARTER_PI, TWO_PI, MSQRT2, E, MAXFLOAT, MINFLOAT, NEGMAXFLOAT, NEGMINFLOAT;
-]
-
-access
-[
-  ZERO
-  {
-    _theVariable=0.0;
-  }
-  ONE
-  {
-    _theVariable=1.0;
-  }
-  NEGONE
-  {
-    _theVariable=-1.0;
-  }
-  FMINEXP
-  {
-    _theVariable=FMINEXP; // (-(DMAXEXP + DSIGNIF - _HIDDENBIT - 3))
-  }
-  MLN2
-  {
-    _theVariable=M_LN2; // 6.9314718055994530942E-1 /*Hex  2^-1 * 1.62E42FEFA39EF */
-  }
-  MPI
-  {
-    _theVariable=M_PI;// 3.1415926535897932385E0  /*Hex  2^ 1 * 1.921FB54442D18 */
-  }
-  HALF_PI
-  {
-    _theVariable = M_PI/2;
-  }
-  QUARTER_PI
-  {
-    _theVariable = M_PI/4;
-  }
-  TWO_PI
-  {
-    _theVariable = M_PI * 2.0;
-  }
-  MSQRT2
-  {
-    _theVariable=M_SQRT2;// 1.4142135623730950488E0  /*Hex  2^ 0 * 1.6A09E667F3BCD */
-  }
-  E
-  {
-    _theVariable= M_E;   //2.718281828459045235360287
-  }
-  MAXFLOAT
-  {
-    _theVariable=MAXFLOAT;
-  }
-  MINFLOAT
-  {
-    _theVariable=MINFLOAT;
-  }
-  NEGMAXFLOAT
-  {
-    _theVariable=-MAXFLOAT;
-  }
-  NEGMINFLOAT
-  {
-    _theVariable=-MINFLOAT;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_fname.tpl b/testcases/ballista/ballista/templates/b_fname.tpl
deleted file mode 100644
index 9f51947..0000000
--- a/testcases/ballista/ballista/templates/b_fname.tpl
+++ /dev/null
@@ -1,339 +0,0 @@
-// b_fname.tpl : Ballista Datatype Template for file names
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char* b_fname;
-
-parent b_ptr_char;
-
-includes
-[
-{
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "bTypes.h"
-#include "b_ptr_char.h"
-}
-]
-
-global_defines
-[
-{
-
-#define TESTDIR "testdir/"
-#define TESTFILE	"testdir/testfile_fname"
-#define TESTSUBDIR "testdir/testsubdir_fname"
-
-#define BMAX_STR 1028
-static FILE* filePtr = NULL;
-static char *fnameString = NULL;
-static char *cp_fnameStr = NULL;
-}
-]
-
-dials
-[
-  // Note: removed W_GRP,X_GRP,RWX_UG, RWX_ALL in an effort to speed up tests
-  enum_dial PERMISSIONS : R_USER, W_USER, X_USER, RWX_USER, R_GRP, NONE;
-  enum_dial STATE : NOT_EXIST_FILE, NOT_EXIST_DIR, OPEN_WRITE, OPEN_READ, CLOSED, LINK;
-  enum_dial CONTENTS : EMPTY, NON_EMPTY;
-  enum_dial NAME : LOCAL, TMP, EMBEDDED_SPACE, LONG, SPECIAL_CHAR, DIR;
-]
-
-access
-[
-{
-  char fname[128];
-  char tempStr[64];
-  char linkName[BMAX_STR +4];
-
-  int dirFlag = 0;
-  int emptyFlag = 0;
-  int linkFlag = 0;
-
-  mode_t permissionMode = 777;
-
-  static int fname_count = 0;	/* count for multiple instances	*/
-  char fname_count_str [127];	/* count, in string format	*/
-
-  // Setup log file for template information
-
-  FILE* logFile = NULL;
-
-  if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-  {
-    exit(99);
-  }
-  //fprintf (logFile, "\nNEW TEST \n");
-
-
-   
-  if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0)	/* create test directory, u+rwx */
-  {
-    //if the directory already exists ignore the error
-    if (errno != EEXIST) 
-    {
-      fprintf(logFile, "problems creating test directory - b_fname\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  
-  // cleanup existing files - should only be necessary if testing stopped midstream
-  system("rm -rf testdir/testfile_fname*");
-  system("rm -rf testdir/testsubdir_fname");
-  system ("rm -rf /tmp/ballista_test_b_fname*");
-
-}
-
-  R_USER
-  {
-    permissionMode = 0400;
-  }
-  W_USER
-  {
-    permissionMode = 0200;
-  } 
-  X_USER
-  { 
-    permissionMode = 0100;
-  }
-  RWX_USER
-  {
-    permissionMode = 0700;
-  }
-  R_GRP
-  { 
-    permissionMode = 0040;
-  }
-  NONE
-  {
-    permissionMode = 0000;
-  }
-
-// removed to speed up tests
-//  W_GRP
-//  {
-//    permissionMode = 0020;   
-//  }
-//  X_GRP
-//  {
-//    permissionMode = 0010;
-//  }
-//  RWX_ALL
-//  {
-//    permissionMode = 0777;
-//  }
-//  RWX_UG
-//  { 
-//    permissionMode = 0770;
-//  }
- 
- 
-  LOCAL
-  {
-    fnameString = fname;
-    strcpy(fnameString,TESTFILE);
-  }
-  DIR
-  {
-    fnameString = fname;
-    strcpy(fnameString,TESTSUBDIR);
-  }
-  EMBEDDED_SPACE
-  {
-    fnameString = fname;
-    strcpy(fnameString,TESTFILE);
-    strcat(fnameString,"_Embedded Space");
-  }
-  LONG
-  {
-    fnameString = (char*) malloc(sizeof(char) * BMAX_STR);
-    if (fnameString == NULL)
-    { 
-      fprintf (logFile, "b_fname LONG - malloc failed - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy(fnameString, TESTFILE);
-    int i;
-    for (i = strlen(fnameString); i < (BMAX_STR -2); i++)
-    {
-       fnameString[i] = 'a';
-    }
-    fnameString[BMAX_STR-1] = '\0';
-  }
-
-  SPECIAL_CHAR
-  {
-    fnameString = fname;
-    strcpy(fnameString,TESTFILE);
-    strcat(fnameString,"_SPECIAL!@#$%^&*(){}[]<>?/-CHAR");
-  }
-
-  TMP
-  {
-    fnameString = fname;
-    strcpy(fnameString,"/tmp/ballista_test_b_fname");
-  }
-
-
-  EMPTY
-  {
-    emptyFlag = 1;
-  }
-
-  NON_EMPTY
-  {
-    emptyFlag = 0;
-  }
-
-  NOT_EXIST_FILE
-  {
-    strcpy(tempStr, "rm -f ");
-    strcat(tempStr, fnameString);
-    _theVariable = fnameString;
-  }
-
-  NOT_EXIST_DIR
-  {
-    strcpy(tempStr, "rm -rf ");
-    strcat(tempStr, TESTDIR);
-    system(tempStr);
-    _theVariable = fnameString;
-  }
-
-  LINK
-  {
-    linkFlag = 1;
-  }
-
-  OPEN_WRITE, OPEN_READ, CLOSED, LINK
-  {
-    // Create the file with the data  - chmod later for proper permissions
-    if (!linkFlag)
-    {
-      filePtr = fopen(fnameString, "w+");
-    }
-    else
-    {
-      strcpy(linkName,fnameString);
-      strcat(linkName,"LINK");
-      filePtr = fopen(linkName, "w+");
-    }      
-    if (filePtr == NULL)
-    {
-      fprintf(logFile, "b_fname OPEN_WRITE, OPEN_READ, LINK, or CLOSED had problems opening file %s - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    } 
-
-    if (!emptyFlag)
-    {
-      fprintf(filePtr, "This is a test file!\n");
-    }
-    fclose(filePtr);
-
-    if(!linkFlag)
-    {    
-      chmod(fnameString, permissionMode);
-    }
-    else
-    {
-      chmod(linkName, permissionMode);
-    }
-  }
-
-  OPEN_READ
-  {
-    filePtr = fopen(fnameString, "r+");
-    if (filePtr == NULL)
-    {
-      fprintf(logFile, "b_fname OPEN_READ had problems opening file %s - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = fnameString;
-  }  
-
-  OPEN_WRITE
-  {
-    filePtr = fopen(fnameString, "w+");
-    if (filePtr == NULL)
-    {
-      fprintf(logFile, "b_fname OPEN_WRITE had problems opening file - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = fnameString;
-  }  
-
-  LINK
-  {
-    if (link(linkName,fnameString) == -1)
-    {
-      fprintf(logFile,"b_fname LINK -error creating link - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    chmod(fnameString, permissionMode);
-    _theVariable = fnameString;
-  } 
-{
-  cp_fnameStr = fnameString;
-  fclose(logFile);
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-  OPEN_READ, OPEN_WRITE
-  {
-    fclose(filePtr);
-  }
-
-  LINK
-  {
-    unlink(cp_fnameStr);
-  }
-  
-  LONG
-  {
-    free(cp_fnameStr);
-  }
-
-{
-  system ("rm -rf testdir/testfile_fname*");
-  system ("rm -rf testdir/testsubdir_fname");
-  rmdir(TESTDIR);
-}
-  TMP
-  {
-    system ("rm -rf /tmp/ballista_test_b_fname*");
-  }
-]
diff --git a/testcases/ballista/ballista/templates/b_id.tpl b/testcases/ballista/ballista/templates/b_id.tpl
deleted file mode 100644
index 8c953db..0000000
--- a/testcases/ballista/ballista/templates/b_id.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-// b_id.tpl : Ballista Datatype Template for id (user & group)
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name uid_t b_id;   // using uid_t arbitarily could have used gid_t
-
-parent b_int;
-
-includes
-[
-{
-#include <sys/types.h>
-#include <unistd.h>
-#include "bTypes.h"
-#include "b_int.h" 
-
-}
-]
-
-global_defines
-[
-{
-}
-]
-
-dials
-[
-  enum_dial ID : 
-    UID_SELF,
-    GID_SELF,
-    EUID_SELF,
-    EGID_SELF,
-    UID_PLUS1,
-    GID_PLUS1;
-]
-
-access
-[
-   UID_SELF
-   {
-      _theVariable = getuid();
-   }
-   GID_SELF
-   {
-      _theVariable = getgid();
-   }
-   EUID_SELF
-   {
-      _theVariable = geteuid();
-   }
-   EGID_SELF
-   {
-      _theVariable = getegid();
-   }
-   UID_PLUS1 
-   {
-      _theVariable = getuid() + 1; 
-   } 
-   GID_PLUS1
-   {
-      _theVariable = getgid() + 1;
-   }   
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int.tpl b/testcases/ballista/ballista/templates/b_int.tpl
deleted file mode 100644
index 0fb2151..0000000
--- a/testcases/ballista/ballista/templates/b_int.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-// b_int.tpl : Ballista Datatype Template for integer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int;
-
-parent b_short;
-
-includes
-[
- {
-   #include "b_short.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : MAXINT, NEG_MAXINT, A;
-]
-
-access
-[
-  MAXINT
-  {
-       _theVariable= MAXINT;
-  }
-  NEG_MAXINT
-  {
-       _theVariable= -MAXINT;
-  }
-  A  
-  {
-       _theVariable= (int)'A';
-  }
-    
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_amode.tpl b/testcases/ballista/ballista/templates/b_int_amode.tpl
deleted file mode 100644
index 1e1721b..0000000
--- a/testcases/ballista/ballista/templates/b_int_amode.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-// b_int_amode.tpl : Ballista Datatype Template for amode flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_amode;   
-
-parent b_int;
-
-includes
-[
-{
-#include <sys/types.h>
-#include <unistd.h>
-#include "bTypes.h"
-#include "b_int.h" 
-
-}
-]
-
-global_defines
-[
-{
-}
-]
-
-dials
-[
-  enum_dial AMODE : 
-    R_OK,
-    F_OK,
-    RWX_OK,
-    FRWX_OK;
-]
-
-access
-[
-{
-   _theVariable = 0;
-}
-   F_OK, FRWX_OK  
-   {
-      _theVariable |= F_OK;
-   }
-   R_OK
-   {
-      _theVariable |= R_OK;
-   }
-   RWX_OK
-   {
-      _theVariable |= R_OK | W_OK | X_OK;
-   }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_buffer_mode.tpl b/testcases/ballista/ballista/templates/b_int_buffer_mode.tpl
deleted file mode 100644
index 13c59ba..0000000
--- a/testcases/ballista/ballista/templates/b_int_buffer_mode.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-// b_int_buffer_mode.tpl : Ballista Datatype Template for buffer mode flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_buffer_mode;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : IOFBF, IONBF, IOLBF;
-]
-
-access
-[
-  IOFBF
-  {
-    _theVariable= _IOFBF;
-  }
-  IONBF
-  {
-    _theVariable= _IONBF;
-  }
-  IOLBF
-  {
-    _theVariable= _IOLBF;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_category.tpl b/testcases/ballista/ballista/templates/b_int_category.tpl
deleted file mode 100644
index 7e6f25c..0000000
--- a/testcases/ballista/ballista/templates/b_int_category.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_int_category.tpl : Ballista Datatype Template for category flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_category;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <locale.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : LC_ALL, LC_NUMERIC;
-]
-
-access
-[
-  LC_ALL
-  {
-    _theVariable= LC_ALL;
-  }
-  LC_NUMERIC
-  {
-    _theVariable= LC_NUMERIC;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_file_var.tpl b/testcases/ballista/ballista/templates/b_int_file_var.tpl
deleted file mode 100644
index a2ab47e..0000000
--- a/testcases/ballista/ballista/templates/b_int_file_var.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-// b_int_file_var.tpl : Ballista Datatype Template for file variable
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_file_var;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : NAME_MAX, SYNC_IO;
-]
-
-access
-[
-  NAME_MAX
-    {
-       _theVariable= _PC_NAME_MAX;
-    }
-  SYNC_IO
-    {
-       _theVariable= _PC_SYNC_IO;
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_sys_var.tpl b/testcases/ballista/ballista/templates/b_int_sys_var.tpl
deleted file mode 100644
index ae98d45..0000000
--- a/testcases/ballista/ballista/templates/b_int_sys_var.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-// b_int_sys_var.tpl : Ballista Datatype Template for system variable flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_sys_var;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : PAGESIZE, MEMLOCK;
-]
-
-access
-[
-  PAGESIZE
-  {
-    _theVariable= _SC_PAGESIZE;
-  }
-  MEMLOCK
-  {
-    _theVariable= _SC_MEMLOCK;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_tc.tpl b/testcases/ballista/ballista/templates/b_int_tc.tpl
deleted file mode 100644
index 4c7a8c3..0000000
--- a/testcases/ballista/ballista/templates/b_int_tc.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_int_tc.tpl : Ballista Datatype Template for tc function flags
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_tc;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <termios.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : TCIFLUSH,TCSANOW;
-]
-
-access
-[
-  TCIFLUSH
-  {
-    _theVariable= TCIFLUSH;
-  }
-  TCSANOW
-  {
-    _theVariable= TCSANOW;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_int_whence.tpl b/testcases/ballista/ballista/templates/b_int_whence.tpl
deleted file mode 100644
index ce9aa10..0000000
--- a/testcases/ballista/ballista/templates/b_int_whence.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-// b_int_whence.tpl : Ballista Datatype Template for whence position flags
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_int_whence;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : SEEK_SET, SEEK_CUR, SEEK_END;
-]
-
-access
-[
-  SEEK_SET
-  {
-    _theVariable= SEEK_SET;
-  }
-  SEEK_CUR
-  {
-    _theVariable= SEEK_CUR;
-  }
-  SEEK_END
-  {
-    _theVariable= SEEK_END;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_jmp_buf.tpl b/testcases/ballista/ballista/templates/b_jmp_buf.tpl
deleted file mode 100644
index 2ec97b9..0000000
--- a/testcases/ballista/ballista/templates/b_jmp_buf.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-// b_jmp_bufLINUX.tpl : Ballista Datatype Template for jump buffer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name jmp_buf b_jmp_buf;
-
-parent b_ptr_int;
-
-includes
-[
-{
-#include "b_ptr_int.h"
-#include <setjmp.h>
-}
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial VALUE : VALID, SIG_VALID_SAVE, SIG_VALID_NOSAVE;
-]
-
-access
-[
-  VALID
-  {
-    setjmp(_theVariable);
-  }
-
-  SIG_VALID_SAVE
-  {
-    sigsetjmp(_theVariable,1);
-  }
-
-  SIG_VALID_NOSAVE
-  {
-    sigsetjmp(_theVariable,0);
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_jmp_bufDEFAULT.tpl b/testcases/ballista/ballista/templates/b_jmp_bufDEFAULT.tpl
deleted file mode 100644
index a70a2e7..0000000
--- a/testcases/ballista/ballista/templates/b_jmp_bufDEFAULT.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-// b_jmp_bufDEFAULT.tpl : Ballista Datatype Template for jump buffer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name jmp_buf b_jmp_buf;
-
-parent b_ptr_int;
-
-includes
-[
-{
-#include "b_ptr_int.h"
-#include <setjmp.h>
-}
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial VALUE : VALID, VALID_PLUS1, SIG_VALID_SAVE, SIG_VALID_NOSAVE, SIG_VALID_NOSAVE_PLUS1;
-]
-
-access
-[
-  VALID
-  {
-    setjmp(_theVariable);
-  }
-
-  VALID_PLUS1
-  {
-    setjmp(_theVariable);
-    _theVariable[0] ++;
-  }
-
-  SIG_VALID_SAVE
-  {
-    sigsetjmp(_theVariable,1);
-  }
-
-  SIG_VALID_NOSAVE
-  {
-    sigsetjmp(_theVariable,0);
-  }
-
-  SIG_VALID_NOSAVE_PLUS1
-  {
-    sigsetjmp(_theVariable,0);
-    _theVariable[0] ++;
-  }
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_jmp_bufLINUX.tpl b/testcases/ballista/ballista/templates/b_jmp_bufLINUX.tpl
deleted file mode 100644
index 2ec97b9..0000000
--- a/testcases/ballista/ballista/templates/b_jmp_bufLINUX.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-// b_jmp_bufLINUX.tpl : Ballista Datatype Template for jump buffer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name jmp_buf b_jmp_buf;
-
-parent b_ptr_int;
-
-includes
-[
-{
-#include "b_ptr_int.h"
-#include <setjmp.h>
-}
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial VALUE : VALID, SIG_VALID_SAVE, SIG_VALID_NOSAVE;
-]
-
-access
-[
-  VALID
-  {
-    setjmp(_theVariable);
-  }
-
-  SIG_VALID_SAVE
-  {
-    sigsetjmp(_theVariable,1);
-  }
-
-  SIG_VALID_NOSAVE
-  {
-    sigsetjmp(_theVariable,0);
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_long.tpl b/testcases/ballista/ballista/templates/b_long.tpl
deleted file mode 100644
index b9bfc62..0000000
--- a/testcases/ballista/ballista/templates/b_long.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-// b_long.tpl : Ballista Datatype Template for long datatype
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name long b_long;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : MAXLONG, NEG_MAXLONG;
-]
-
-access
-[
-  MAXLONG
-  {
-    _theVariable= MAXLONG;
-  }
-  NEG_MAXLONG
-  {
-    _theVariable= - MAXLONG;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_map_flag.tpl b/testcases/ballista/ballista/templates/b_map_flag.tpl
deleted file mode 100644
index 9b94434..0000000
--- a/testcases/ballista/ballista/templates/b_map_flag.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-// b_map_flag.tpl : Ballista Datatype Template for mapping flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_map_flag;   
-
-parent b_int;
-
-includes
-[
-{
-#include <sys/mman.h>
-#include <unistd.h>
-#include "bTypes.h"
-#include "b_int.h" 
-
-}
-]
-
-global_defines
-[
-{
-}
-]
-
-dials
-[
-  enum_dial MAP_FLAG : 
-    SHARED,
-    PRIVATE,
-    FIXED,
-    ALL;
-]
-
-access
-[
-{
-   _theVariable = 0;
-}
-   SHARED,ALL  
-   {
-      _theVariable |= MAP_SHARED;
-   }
-   PRIVATE,ALL
-   {
-      _theVariable |= MAP_PRIVATE;
-   }
-   FIXED,ALL
-   {
-      _theVariable |= MAP_FIXED;
-   }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_mcl_flag.tpl b/testcases/ballista/ballista/templates/b_mcl_flag.tpl
deleted file mode 100644
index 5841de0..0000000
--- a/testcases/ballista/ballista/templates/b_mcl_flag.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_mcl_flag.tpl : Ballista Datatype Template for MCL flags
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_mcl_flag;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <sys/mman.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : CURRENT, FUTURE;
-]
-
-access
-[
-  CURRENT
-  {
-    _theVariable= MCL_CURRENT;
-  }
-  FUTURE
-  {
-    _theVariable= MCL_FUTURE;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_mode_t.tpl b/testcases/ballista/ballista/templates/b_mode_t.tpl
deleted file mode 100644
index fcd5df0..0000000
--- a/testcases/ballista/ballista/templates/b_mode_t.tpl
+++ /dev/null
@@ -1,158 +0,0 @@
-// b_mode_t.tpl : Ballista Datatype Template for mode_t datatype
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name mode_t b_mode_t;
-
-parent b_int;
-
-includes
-[
-{
-  #include <fcntl.h>
-  #include <sys/stat.h>
-  #include <sys/types.h>
-  #include "b_int.h"
-}
-]
-
-global_defines
-[
-{
-}
-]
-
-dials
-[
-  // Note removed U_RW, U_RX, U_WX, G_RW, G_RX, G_WX, O_RW, O_RX, O_WX, G_RWX, O_RWX to short
-  // run time
-  enum_dial OWNER : U_READ, U_WRITE, U_EXEC, U_RWX, U_NONE;
-  enum_dial GROUP : G_READ, G_WRITE, G_EXEC, G_NONE;
-  enum_dial OTHER : O_READ, O_WRITE, O_EXEC, O_NONE;
-  enum_dial S_ISUID : UID_SET, UID_CLEAR;
-  enum_dial S_ISGID : GID_SET, GID_CLEAR;
-]
-
-access
-[
-{
-_theVariable = 0;
-}
-	U_READ
-	{//owner read permission
-	_theVariable = (_theVariable | S_IRUSR);
-	}
-	U_WRITE
-	{//owner write permission
-	_theVariable = (_theVariable | S_IWUSR);
-	}
-	U_EXEC
-	{//owner exec permission
-	_theVariable = (_theVariable | S_IXUSR);
-	}
-//	U_RW
-//	{//owner r/w permission
-//	_theVariable = (_theVariable | S_IRUSR | S_IWUSR);
-//	}
-//	U_RX
-//	{//owner r/x permission
-//	_theVariable = (_theVariable | S_IRUSR | S_IXUSR);
-//	}
-//	U_WX
-//	{//owner x/w permission
-//	_theVariable = (_theVariable | S_IXUSR | S_IWUSR);
-//	}
-	U_RWX
-	{//owner r/w/x permission
-	_theVariable = (_theVariable | S_IRUSR | S_IWUSR | S_IXUSR);
-	}
-
-
-	G_READ
-	{//owner read permission
-	_theVariable = (_theVariable | S_IRGRP);
-	}
-	G_WRITE
-	{//owner write permission
-	_theVariable = (_theVariable | S_IWGRP);
-	}
-	G_EXEC
-	{//owner exec permission
-	_theVariable = (_theVariable | S_IXGRP);
-	}
-//	G_RW
-//	{//owner r/w permission
-//	_theVariable = (_theVariable | S_IRGRP | S_IWGRP);
-//	}
-//	G_RX
-//	{//owner r/x permission
-//	_theVariable = (_theVariable | S_IRGRP | S_IXGRP);
-//	}
-//	G_WX
-//	{//owner x/w permission
-//	_theVariable = (_theVariable | S_IXGRP | S_IWGRP);
-//	}
-//	G_RWX
-//	{//owner r/w/x permission
-//	_theVariable = (_theVariable | S_IRGRP | S_IWGRP | S_IXGRP);
-//	}
-
-	O_READ
-	{//owner read permission
-	_theVariable = (_theVariable | S_IROTH);
-	}
-	O_WRITE
-	{//owner write permission
-	_theVariable = (_theVariable | S_IWOTH);
-	}
-	O_EXEC
-	{//owner exec permission
-	_theVariable = (_theVariable | S_IXOTH);
-	}
-//	O_RW
-//	{//owner r/w permission
-//	_theVariable = (_theVariable | S_IROTH | S_IWOTH);
-//	}
-//	O_RX
-//	{//owner r/x permission
-//	_theVariable = (_theVariable | S_IROTH | S_IXOTH);
-//	}
-//	O_WX
-//	{//owner x/w permission
-//	_theVariable = (_theVariable | S_IXOTH | S_IWOTH);
-//	}
-//	O_RWX
-//	{//owner r/w/x permission
-//	_theVariable = (_theVariable | S_IROTH | S_IWOTH | S_IXOTH);
-//	}
-
-	UID_SET
-	{
-	_theVariable = (_theVariable | S_ISUID);
-	}
-	GID_SET
-	{
-	_theVariable = (_theVariable | S_ISGID);
-	}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_mq_attr.tpl b/testcases/ballista/ballista/templates/b_mq_attr.tpl
deleted file mode 100644
index 92b164b..0000000
--- a/testcases/ballista/ballista/templates/b_mq_attr.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-// b_mq_attr.tpl : Ballista Datatype Template for message queue attributes 
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name mq_attr* b_mq_attr;
-
-parent b_ptr_void;
-
-// The POSIX functions states that only the member of mq_attr that will be matter is mq_flags 
-// Therefore this member is the focus of the testing
-
-includes
-[
- {
-   #include "b_ptr_void.h"
-   #include <mqueue.h>
-   #include <fcntl.h>
- }
-]
-
-global_defines
-[
- {
-   static mq_attr temp_mq_attr;
-   static mqd_t temp_mqd;
-#define	QUEUE_NAME	"/tmp/ballista_queue"
- }
-]
-
-dials
-[
-  enum_dial HVAL : QUEUE,ZERO,NONBLOCK,MAX,MIN;
-]
-
-access
-[
-QUEUE,NONBLOCK
-{
-  // mode and attr parameters are necessary
-  temp_mqd = mq_open(QUEUE_NAME, O_RDWR|O_CREAT);
-
-  FILE* logFile = NULL;
-  if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-  {
-    exit(99);
-  }
-
-  if (mq_getattr(temp_mqd, &temp_mq_attr) !=0)
-  {
-    fprintf(logFile,"Problems setting up b_mq_attr QUEUE with mq_getattr - function not tested\n");
-    fclose(logFile);
-    exit(99);
-  }
-  fclose(logFile);
-
-}
-
-ZERO
-{
-  temp_mq_attr.mq_flags =0;
-  temp_mq_attr.mq_maxmsg =0;
-  temp_mq_attr.mq_msgsize =0;
-  temp_mq_attr.mq_curmsgs =0;
-}
-
-MAX
-{
-  temp_mq_attr.mq_flags = MAXLONG;
-  temp_mq_attr.mq_maxmsg = MAXLONG;
-  temp_mq_attr.mq_msgsize = MAXLONG;
-  temp_mq_attr.mq_curmsgs = MAXLONG;
-}
-
-MIN
-{
-  temp_mq_attr.mq_flags = -MAXLONG;
-  temp_mq_attr.mq_maxmsg = -MAXLONG;
-  temp_mq_attr.mq_msgsize = -MAXLONG;
-  temp_mq_attr.mq_curmsgs = -MAXLONG;
-}
-
-NONBLOCK
-{
-  temp_mq_attr.mq_flags |= O_NONBLOCK;
-}
-
-{
-  _theVariable = &temp_mq_attr;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-QUEUE, NONBLOCK
-{
-  mq_close(temp_mqd);
-  mq_unlink(QUEUE_NAME);
-}  
-]
diff --git a/testcases/ballista/ballista/templates/b_mqd.tpl b/testcases/ballista/ballista/templates/b_mqd.tpl
deleted file mode 100644
index 545e464..0000000
--- a/testcases/ballista/ballista/templates/b_mqd.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-// b_mqd.tpl : Ballista Datatype Template for message queue descriptors
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name mqd_t b_mqd;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <mqueue.h>
-   #include <fcntl.h>
- }
-]
-
-global_defines
-[
- {
-   static mqd_t temp_mqd;
-#define	QUEUE_NAME	"/tmp/ballista_queue"
- }
-]
-
-dials
-[
-  enum_dial HVAL : OPEN_QUEUE, CLOSE_QUEUE, UNLINK_QUEUE;
-]
-
-access
-[
-{
-    // mode and attr parameters are necessary
-    temp_mqd = mq_open(QUEUE_NAME, O_RDWR|O_CREAT);
-
-    FILE* logFile = NULL;
-    if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-    {
-      exit(99);
-    }
-    // fprintf (logFile, "message_queue %d \n", temp_mqd);
-}
-
-  CLOSE_QUEUE
-  {
-    if ((mq_close(temp_mqd)) == -1)
-    {
-       fprintf (logFile, "b_msg CLOSE_QUEUE - error closing queue - function not tested\n");
-       fclose(logFile);
-       exit(99);
-    }
-  }
-  UNLINK_QUEUE
-  {
-    if ((mq_unlink(QUEUE_NAME)) == -1)
-    {
-       fprintf (logFile, "b_msg UNLINK_QUEUE - error unlinking queue - function not tested\n");
-       fclose(logFile);
-       exit(99);
-    }
-  }
-
-{
-  fclose(logFile);
-  _theVariable = temp_mqd;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-{
-  mq_close(temp_mqd);
-  mq_unlink(QUEUE_NAME);
-}  
-]
diff --git a/testcases/ballista/ballista/templates/b_mqdSUN.tpl b/testcases/ballista/ballista/templates/b_mqdSUN.tpl
deleted file mode 100644
index 5abaa4a..0000000
--- a/testcases/ballista/ballista/templates/b_mqdSUN.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-// b_mqdSUN.tpl : Ballista Datatype Template for message queue descriptors
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name mqd_t b_mqd;
-
-parent b_ptr_void;
-
-includes
-[
- {
-   #include "b_ptr_void.h"
-   #include <mqueue.h>
- }
-]
-
-global_defines
-[
- {
-   static mqd_t temp_mqd;
-#define	QUEUE_NAME	"/tmp/ballista_queue"
- }
-]
-
-dials
-[
-  enum_dial HVAL : OPEN_QUEUE, CLOSE_QUEUE, UNLINK_QUEUE;
-]
-
-access
-[
-{
-    // mode and attr parameters are necessary
-    temp_mqd = mq_open(QUEUE_NAME, O_RDWR|O_CREAT);
-
-    FILE* logFile = NULL;
-    if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-    {
-      exit(99);
-    }
-    fprintf (logFile, "message_queue %d \n", temp_mqd);
-}
-
-  CLOSE_QUEUE
-  {
-    if ((mq_close(temp_mqd)) == -1)
-    {
-       fprintf (logFile, "b_msg CLOSE_QUEUE - error closing queue - function not tested\n");
-       fclose(logFile);
-       exit(99);
-    }
-  }
-  UNLINK_QUEUE
-  {
-    if ((mq_unlink(QUEUE_NAME)) == -1)
-    {
-       fprintf (logFile, "b_msg UNLINK_QUEUE - error unlinking queue - function not tested\n");
-       fclose(logFile);
-       exit(99);
-    }
-  }
-
-{
-  fclose(logFile);
-  _theVariable = temp_mqd;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-{
-  mq_close(temp_mqd);
-  mq_unlink(QUEUE_NAME);
-}  
-]
diff --git a/testcases/ballista/ballista/templates/b_ms_flag.tpl b/testcases/ballista/ballista/templates/b_ms_flag.tpl
deleted file mode 100644
index 48e2e9d..0000000
--- a/testcases/ballista/ballista/templates/b_ms_flag.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-// b_ms_flag.tpl : Ballista Datatype Template for memory sync. flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_ms_flag;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <sys/mman.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : ASYNC,SYNC,INVALIDATE,ALL;
-]
-
-access
-[
-  ASYNC
-  {
-    _theVariable= MS_ASYNC;
-  }
-  SYNC
-  {
-    _theVariable= MS_SYNC;
-  }
-  INVALIDATE
-  {
-    _theVariable = MS_INVALIDATE;
-  }
-  ALL
-  {
-    _theVariable = MS_ASYNC | MS_SYNC | MS_INVALIDATE;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_oflag.tpl b/testcases/ballista/ballista/templates/b_oflag.tpl
deleted file mode 100644
index 1a11863..0000000
--- a/testcases/ballista/ballista/templates/b_oflag.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-// b_oflag.tpl : Ballista Datatype Template for open file flags
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_oflag;
-
-parent b_int;
-
-includes
-[
-{
-#include <stdio.h>
-#include <fcntl.h>
-#include "b_int.h"
-
-}
-]
-
-global_defines
-[
-{ 
-
-}
-]
-
-dials
-[
-enum_dial ACCESS : RDONLY_SET, WRONLY_SET, RDWR_SET, NONE;
-enum_dial O_APPEND : A_SET, A_CLEAR;
-enum_dial O_CREAT :  C_SET, C_CLEAR;
-enum_dial O_DSYNC :  D_SET, D_CLEAR;
-enum_dial O_EXCL   : E_SET, E_CLEAR;
-enum_dial O_NOCTTY : NCT_SET, NCT_CLEAR;
-enum_dial O_NONBLOCK : NBLK_SET, NBLK_CLEAR;
-enum_dial O_RSYNC    : R_SET, R_CLEAR;
-enum_dial O_SYNC     : SYNC_SET, SYNC_CLEAR;
-enum_dial O_TRUNC  : T_SET, T_CLEAR;
-]
-
-access
-[
-  {_theVariable = 0;} 
-	RDONLY_SET {_theVariable |=  O_RDONLY;   }
-	WRONLY_SET {_theVariable |=  O_WRONLY;   }
-	RDWR_SET   {_theVariable |=  O_RDWR;     }
-	A_SET      {_theVariable |=  O_APPEND;   }
-	C_SET      {_theVariable |=  O_CREAT;    }
-	D_SET      {_theVariable |=  O_DSYNC;    }
-	E_SET      {_theVariable |=  O_EXCL;     }
-	NCT_SET    {_theVariable |=  O_NOCTTY;   }
-	NBLK_SET   {_theVariable |=  O_NONBLOCK; }
-	R_SET      {_theVariable |=  O_RSYNC;    }
-	SYNC_SET   {_theVariable |=  O_SYNC;     }
-	T_SET      {_theVariable |=  O_TRUNC;    }
-]
-
-commit
-[
-{
-}
-]
-
-cleanup
-[
-{
-}
-
-]
diff --git a/testcases/ballista/ballista/templates/b_pid.tpl b/testcases/ballista/ballista/templates/b_pid.tpl
deleted file mode 100644
index b3a549e..0000000
--- a/testcases/ballista/ballista/templates/b_pid.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-// b_pid.tpl : Ballista Datatype Template for process id
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name pid_t b_pid;
-
-parent b_int;
-
-includes
-[
-{
-#include <sys/types.h>
-#include <unistd.h>
-#include "bTypes.h"
-#include "b_int.h" 
-
-}
-]
-
-global_defines
-[
-{
-}
-]
-
-dials
-[
-  enum_dial PID : 
-            PID_SELF,
-            PID_CHILD,
-            PID_65535,
-            PID_65536;
-]
-
-access
-[
-
-  PID_SELF
-  {
-     _theVariable = getpid();
-  }
-
-  PID_CHILD
-  {
-     static int pid_kid;
-     if((pid_kid = fork())==0)   /* many syscalls taking a pid need a child to exist */
-     {
-        sleep (1); //child wait for sometime long enough
-        exit(0); //child exits
-     }
-     _theVariable = pid_kid;
-  }
-
-  PID_65535
-  {
-     _theVariable = 65535;
-  }
-
-  PID_65536
-  {
-     _theVariable = 65536;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_prot_flag.tpl b/testcases/ballista/ballista/templates/b_prot_flag.tpl
deleted file mode 100644
index 55fb9d6..0000000
--- a/testcases/ballista/ballista/templates/b_prot_flag.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-// b_prot_flag.tpl : Ballista Datatype Template for access protocol flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_prot_flag;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <sys/mman.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : READ, WRITE, EXEC, ALL, NONE;
-]
-
-access
-[
-  READ
-  {
-    _theVariable= PROT_READ;
-  }
-  WRITE
-  {
-    _theVariable= PROT_WRITE;
-  }
-  EXEC 
-  {
-    _theVariable= PROT_EXEC;
-  }
-  ALL
-  {
-    _theVariable= PROT_READ | PROT_WRITE | PROT_EXEC;
-  }
-  NONE
-  {
-    _theVariable= PROT_NONE;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_aiocb.tpl b/testcases/ballista/ballista/templates/b_ptr_aiocb.tpl
deleted file mode 100644
index 2c72ec1..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_aiocb.tpl
+++ /dev/null
@@ -1,429 +0,0 @@
-// b_ptr_aiocb.tpl : Ballista Datatype Template for pointer to aiocb structure
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structaiocbptr b_ptr_aiocb;
-
-parent b_ptr_void;
-// normally parent would be b_ptr_buf but memory runs out 
-
-includes
-[
-{
-#include <aio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include "b_ptr_void.h"
-#define structaiocbptr struct aiocb*
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_aiocb"
-}
-]
-
-global_defines
-[
-{
-  static struct aiocb aiocb_temp;
-  static int fd;
-  static char* buf_ptr;
-  static char* cp_bufPtr;
-}
-]
-
-dials
-[
-  // it would be nice if all the b_fd values could be tested
-  enum_dial FD :   
-     FD_OPEN_READ,
-     FD_OPEN_WRITE,
-     FD_OPEN_APPEND_EMPTY,
-     FD_OPEN_APPEND_BEGIN,
-     FD_OPEN_APPEND_EOF,
-     FD_CLOSED,
-     FD_DELETED,
-     FD_ZERO,
-     FD_NEGONE,
-     FD_ONE,
-     FD_MAXINT,
-     FD_MININT,
-     FD_READ_ONLY;
-
-  enum_dial OFFSET :
-     OFFSET_ZERO,
-     OFFSET_ONE,
-     OFFSET_NEGONE,
-     OFFSET_MAXINT,
-     OFFSET_MININT;
-//     OFFSET_SIXTYFOUR
-
-  // it would be nice if all the b_ptr_buf values could be tested
-  enum_dial BUFFER : 
-     BUF_NULL,
-     BUF_FILLED_PAGE,
-     BUF_ONE_CHAR,
-     BUF_CONST;
-//     BUF_EMPTY_PAGE,
-
-  enum_dial NBYTES : 
-     NBYTE_ZERO,
-     NBYTE_ONE,
-     NBYTE_MAXULONG;
-//     NBYTE_SIXTYFOUR;
-
-  enum_dial REQPRIO :
-     PRI_ZERO,
-     PRI_ONE,
-     PRI_NEGONE,
-     PRI_MAXINT,
-     PRI_MININT;
-
-  enum_dial SIGEVENT : 
-     NONE_SIGSEGV,
-     SIGNAL_SIGSEGV,
-     ZERO_ZERO,
-     MAXINT_MAXINT;
-
-  enum_dial OPCODE :
-     OP_ZERO,
-     OP_NEGONE,
-     OP_MAXINT,
-     OP_READ,
-     OP_WRITE;
-//     OP_NOP;
-//     OP_ONE,
-//     OP_MININT,
-
-]
-
-access
-[
-{
-   mode_t permissionMode;
-   int oflag;
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-     exit(99);
-   }  
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-   {
-     //if the directory already exists ignore the error
-     if (errno != EEXIST)
-     {
-       fprintf(logFile,"mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT)
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_aiocb datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-}
-
-  FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    write (fd, "I am a test file.\n", 18);
-  }
-
-
-{
-   if (close (fd)!=0)
-   {
-     fprintf(logFile,"b_ptr_aiocb datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-   permissionMode = S_IRWXU | S_IRWXG | S_IRWXO;
-}
-
-  FD_OPEN_READ, FD_READ_ONLY
-  {
-    oflag = O_RDONLY;
-  }   
-  FD_OPEN_WRITE
-  {
-    oflag = O_WRONLY | O_CREAT | O_TRUNC;
-  }
-  FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF
-  {
-    oflag = O_RDWR | O_CREAT | O_APPEND;
-  }
-  FD_READ_ONLY
-  {
-    permissionMode = S_IRUSR;
-  }
-
-  FD_OPEN_READ, FD_OPEN_WRITE, FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    if ((fd  = open(TESTFILE, oflag,  permissionMode)) == -1)
-    {
-      fprintf(logFile,"b_ptr_aiocb datatype not setup properly - open failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-    aiocb_temp.aio_fildes = fd;
-  }
-
-  FD_DELETED
-  {
-    aiocb_temp.aio_fildes = fd;    
-    char buffer[128];
-    if ((sprintf(buffer, "rm %s", TESTFILE)) <= 0)
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - rm of the TESTFILE failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    system(buffer);
-  }
-
-  FD_OPEN_APPEND_EOF
-  {
-    int pos;
-    if ((pos = lseek(fd, 0L, SEEK_END)) == -1L)
-    {
-      fprintf(logFile,"b_ptr_aiocb datatype not setup properly - lseek to end of file failed.  Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-
-  FD_CLOSED
-  {
-    aiocb_temp.aio_fildes = fd;
-  }
-
-  FD_ZERO
-  {
-    aiocb_temp.aio_fildes = 0;
-  }
-  FD_NEGONE
-  {
-    aiocb_temp.aio_fildes = -1;
-  }
-  FD_ONE
-  {
-    aiocb_temp.aio_fildes = 1;
-  }
-  FD_MAXINT
-  {
-    aiocb_temp.aio_fildes = MAXINT;
-  }
-  FD_MININT
-  {
-    aiocb_temp.aio_fildes = -MAXINT;
-  }
-
-  //----------------------------------------------------------------------
-  OFFSET_ZERO
-  {
-    aiocb_temp.aio_offset = 0;
-  }
-  OFFSET_ONE
-  {
-    aiocb_temp.aio_offset = 1;
-  }
-  OFFSET_NEGONE
-  {
-    aiocb_temp.aio_offset = -1;
-  }
-  OFFSET_MAXINT
-  {
-    aiocb_temp.aio_offset = MAXINT;
-  }
-  OFFSET_MININT
-  {
-    aiocb_temp.aio_offset = -MAXINT;
-  }
-//  OFFSET_SIXTYFOUR
-//  {
-//    aiocb_temp.aio_offset = 64;
-//  }
-  //----------------------------------------------------------------------
-  BUF_NULL
-  {
-    aiocb_temp.aio_buf = NULL;
-  }
-  BUF_FILLED_PAGE
-  {
-    int pagesize = getpagesize();
-    buf_ptr = (char*) malloc(pagesize);
-    int i;
-    for (i = 0; i < (pagesize-1); i++)
-    {
-      buf_ptr[i] = 'a';
-    }
-    buf_ptr[pagesize -1] = '\0';
-
-    aiocb_temp.aio_buf = (void*) buf_ptr;
-  }
-//  BUF_EMPTY_PAGE
-//  {
-//    int pagesize = getpagesize();
-//    aiocb_temp.aio_buf =  malloc(pagesize);
-//  }
-  BUF_ONE_CHAR
-  {
-    buf_ptr = (char*) malloc(sizeof(char));
-    aiocb_temp.aio_buf = (void*) buf_ptr;
-  }
-  BUF_CONST
-  {
-    aiocb_temp.aio_buf =  (void*)"                                             ";
-  }  
-
-  //----------------------------------------------------------------------
-  NBYTE_ZERO
-  {
-    aiocb_temp.aio_nbytes = 0;
-  }
-  NBYTE_ONE
-  {
-    aiocb_temp.aio_nbytes = 1;
-  }
-  NBYTE_MAXULONG
-  {
-    aiocb_temp.aio_nbytes =  2*MAXLONG + 1;
-  }
-//  NBYTE_SIXTYFOUR
-//  {
-//    aiocb_temp.aio_nbytes = 64;
-//  }
-  
-  //----------------------------------------------------------------------
-  PRI_ZERO
-  {
-    aiocb_temp.aio_reqprio = 0;
-  }
-  PRI_ONE
-  {
-    aiocb_temp.aio_reqprio = 1;
-  }
-  PRI_NEGONE
-  {
-    aiocb_temp.aio_reqprio = -1;
-  }
-  PRI_MAXINT
-  {
-    aiocb_temp.aio_reqprio = MAXINT;
-  }
-  PRI_MININT
-  {
-    aiocb_temp.aio_reqprio = -MAXINT;
-  }
-  //----------------------------------------------------------------------
-  NONE_SIGSEGV
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = SIGEV_NONE;
-    aiocb_temp.aio_sigevent.sigev_signo = SIGSEGV;
-  }
-  SIGNAL_SIGSEGV
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-    aiocb_temp.aio_sigevent.sigev_signo = SIGSEGV;   
-  }
-  ZERO_ZERO
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = 0;
-    aiocb_temp.aio_sigevent.sigev_signo = 0;   
-  }
-  MAXINT_MAXINT
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = MAXINT;
-    aiocb_temp.aio_sigevent.sigev_signo = MAXINT;   
-  }
-
-  //----------------------------------------------------------------------
-  OP_ZERO
-  {
-    aiocb_temp.aio_lio_opcode = 0;
-  }
-//  OP_ONE
-//  {
-//    aiocb_temp.aio_lio_opcode = 1;
-//  }
-  OP_NEGONE
-  {
-    aiocb_temp.aio_lio_opcode = -1;
-  }
-  OP_MAXINT
-  {
-    aiocb_temp.aio_lio_opcode = MAXINT;
-  }
-//  OP_MININT
-//  {
-//    aiocb_temp.aio_lio_opcode = -MAXINT;
-//  }
-  OP_READ
-  {
-    aiocb_temp.aio_lio_opcode = LIO_READ;
-  }
-  OP_WRITE
-  {
-    aiocb_temp.aio_lio_opcode = LIO_WRITE;
-  }
-//  OP_NOP
-//  {
-//    aiocb_temp.aio_lio_opcode = LIO_NOP;
-//  }
-{
-  cp_bufPtr = buf_ptr;  
-  _theVariable = &aiocb_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-  FD_OPEN_READ, FD_OPEN_WRITE, FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    close(fd);
-  }
-
-{
-  system("rm -f testdir/testfile_aiocb");
-  system("rm -rf testdir"); 
-}
-
-  // BUF_EMPTY_PAGE
-  BUF_FILLED_PAGE, BUF_ONE_CHAR               
-  {
-    free(cp_bufPtr);
-  }
-
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_buf.tpl b/testcases/ballista/ballista/templates/b_ptr_buf.tpl
deleted file mode 100644
index ac5fd9e..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_buf.tpl
+++ /dev/null
@@ -1,258 +0,0 @@
-// b_ptr_buf.tpl : Ballista Datatype Template for a buffer pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name void* b_ptr_buf;
-
-parent b_ptr_void;
-
-includes
-[
-{
-#include <stdlib.h>
-#include <values.h>
-#include <limits.h>
-#include "bTypes.h"
-#include "b_ptr_void.h"
-}
-]
-
-global_defines
-[
-{
-#define bm_PAGESIZE 4096
-#define fillbuf(buf,len)   for (int i=0; i<len; i++) buf[i] = 'a'
-static char *save_loc_buf = NULL;	
-
-// a generic function to eat up clock cycles, and give us something
-//  to point to
-int fib(int i) 
-{
-   if (i <= 1) 
-   {
-     return (1);
-   } 
-   else 
-   {
-     return (fib(i-1) + fib(i-2));
-   }
-}
-
-}
-]
-
-dials
-[
-  enum_dial BUF_SIZE : BUF_SMALL,BUF_MED,BUF_LARGE,BUF_XLARGE,BUF_HUGE,BUFMAX,BUF_64k,BUF_END_MED,BUF_FAR_PAST,BUF_ODD,BUF_FREED,BUF_CODE,BUF_LOW;
-]
-
-access
-[
-{
-   char *buf_ptr;
-   const int buf_SMALL = 1;             /* size of small buf */
-   const int buf_MED = bm_PAGESIZE;     /* size of medium buf */
-
-   // Setup log file for template information
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      fclose(logFile);
-      exit(99);
-   }
-}
-
- BUF_SMALL
- {
-    save_loc_buf = buf_ptr = (char *) malloc (buf_SMALL);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_SMALL, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, buf_SMALL);
-    _theVariable = buf_ptr;
- }
-
- BUF_MED
- {
-    save_loc_buf = buf_ptr = (char *)malloc (buf_MED);  /* try to put this on a page boundary */
-    if(buf_ptr == NULL)
-    {
-        fprintf(logFile, "malloc failed in b_ptr_buf - BUF_MED, function not tested\n");
-	fclose(logFile);
-        exit(99);
-    }
-    fillbuf(buf_ptr, buf_MED);
-    _theVariable = buf_ptr;
- }
-
- BUF_LARGE
- {
-    save_loc_buf = buf_ptr = (char *)malloc ((1 << 29) + 1);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_LARGE, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    /* don't fill this one because it takes too long */
-    _theVariable = buf_ptr;
- }
-
- BUF_XLARGE
- {
-   save_loc_buf = buf_ptr = (char *)malloc ((1 << 30) + 1);
-   if(buf_ptr == NULL)
-   {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_XLARGE, function not tested\n");
-	fclose(logFile);
-	exit(99);
-   }
-   /* don't fill this one because it takes too long */
-   _theVariable= buf_ptr;
-
- }	
-
- BUF_HUGE
- {
-    save_loc_buf = buf_ptr =(char *) malloc (( 1 << 31) + 1);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_HUGE, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    /* don't fill this one because it takes too long */
-    _theVariable= buf_ptr;
- }
-
- BUFMAX
- {
-    save_loc_buf = buf_ptr =(char *) malloc (ULONG_MAX);
-    if(buf_ptr == NULL)
-    {
-        fprintf(logFile, "malloc failed in b_ptr_buf - BUFMAX, function not tested\n");
-	fclose(logFile);
-        exit(99);
-    }
-    /* don't fill this one because it takes too long */
-    _theVariable= buf_ptr;
- }
-
-
- BUF_64k
- {
-    save_loc_buf = buf_ptr = (char *)malloc ((1 << 16) + 1);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_64K, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, (1 << 16) + 1);
-    _theVariable = buf_ptr;
- } 
-
- BUF_END_MED
- {
-    save_loc_buf = buf_ptr = (char *)malloc (buf_MED);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_END_MED, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, buf_MED);
-    _theVariable = (void *) (((unsigned long) buf_ptr) + buf_MED - 1);
- }
-
- 
- BUF_FAR_PAST
- { 
-    save_loc_buf = buf_ptr = (char *)malloc (buf_MED);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_FAR_PAST, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, buf_MED);
-    _theVariable = (void *) (((unsigned long) buf_ptr) + (bm_PAGESIZE * 1000));
- }
- 
- BUF_ODD
- {
-    save_loc_buf = buf_ptr =  (char *)malloc (buf_MED);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_ODD, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, buf_MED);
-    _theVariable = (void *) (((unsigned long) buf_ptr) + 1);
- }
-
- BUF_FREED
- {
-    save_loc_buf = buf_ptr =  (char *)malloc (buf_MED);
-    if(buf_ptr == NULL)
-    {
-	fprintf(logFile, "malloc failed in b_ptr_buf - BUF_FREED, function not tested\n");
-	fclose(logFile);
-	exit(99);
-    }
-    fillbuf(buf_ptr, buf_MED);
- } 
-
- BUF_CODE
- {
-  _theVariable = (void *) &fib;
- }
-
- BUF_LOW
- {
-    _theVariable = (void *) 16;
- }
-
-{
-   fclose(logFile);
-}
-]
-
-commit
-[
- BUF_FREED
- {
-    free (save_loc_buf);
-    _theVariable = save_loc_buf;
- }
-]
-
-cleanup
-[
-{
-   if (save_loc_buf != NULL) 
-   {
-      free(save_loc_buf);
-   }
-
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_char.tpl b/testcases/ballista/ballista/templates/b_ptr_char.tpl
deleted file mode 100644
index a302cd1..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_char.tpl
+++ /dev/null
@@ -1,157 +0,0 @@
-// b_ptr_char.tpl : Ballista Datatype Template for character/string pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char* b_ptr_char;
-
-parent b_ptr_buf;
-
-includes
-[
- {
-  #include "b_ptr_buf.h" //parent class include file
- }
-]
-
-global_defines
-[
- {
-   static char  *save_b_ptr_char=NULL;
-#define sup_fillstring(buf,len,fillChar)   for (int i=0; i<len; i++) buf[i] = fillChar
- }
-]
-
-dials
-[
-  enum_dial SIZE : S1,S4,S16,S8K;
-  enum_dial CONTENTS : CHAR,NUM,NASTY,ESC;
-  enum_dial FILL : EMPTY,SOME,FULL;
-]
-
-access
-[
-{
-  char  fillVar;
-  int   divisor;
-  int  size;
-  char  *temp_b_ptr_char=NULL;
-  FILE* logFile = NULL;
-
-  if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-  {
-    exit(99);
-  }
-}
-
-
-  S1
-  {
-    size = 1;
-    temp_b_ptr_char = (char *)malloc(size);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S1 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S4
-  { 
-    size = 4;
-    temp_b_ptr_char = (char *)malloc(size);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile, "b_ptr_char - S4 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S16
-  {
-    size = 16;
-    temp_b_ptr_char = (char *)malloc(size);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S16 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S8K
-  {
-    size = 8192;
-    temp_b_ptr_char = (char *)malloc(size);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S8K malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  CHAR
-    {
-      fillVar = 'A';
-    }
-  NUM
-    {
-      fillVar = '1';
-    }
-  NASTY
-    {
-      fillVar = char(22);
-    }
-  ESC
-    {
-      fillVar = char(27);
-    }
-  SOME
-    {
-      sup_fillstring(temp_b_ptr_char, (int)(size/3), fillVar);
-      temp_b_ptr_char[(int)(size/3)+1]='\0';
-    }
-  FULL
-    {
-      sup_fillstring(temp_b_ptr_char, size, fillVar);
-    }
-  EMPTY
-    {
-      temp_b_ptr_char[0]='\0';
-    }
-{
-  fclose(logFile);
-  save_b_ptr_char = temp_b_ptr_char;
-  _theVariable = temp_b_ptr_char;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
- {
-   if (save_b_ptr_char !=NULL)
-   {
-     free(save_b_ptr_char);
-   }
- }
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_char_id.tpl b/testcases/ballista/ballista/templates/b_ptr_char_id.tpl
deleted file mode 100644
index c3c37e1..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_char_id.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-// b_ptr_char_id.tpl : Ballista Datatype Template for char id pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char* b_ptr_char_id;
-
-parent b_ptr_char;
-
-includes
-[
- {
-  #include "b_ptr_char.h" //parent class include file
-  #include <sys/types.h>
-  #include <pwd.h>
-  #include <grp.h>
- }
-]
-
-global_defines
-[
- {
-   static char  charArray[64];
- }
-]
-
-dials
-[
-  enum_dial NAME : SYSTEM, ROOT, GROUP, USER;  
-]
-
-access
-[
-
-  SYSTEM
-  {
-     strcpy (charArray,"SYSTEM");
-  }
-  ROOT 
-  { 
-     strcpy (charArray,"ROOT");
-  }  
-  GROUP
-  {
-     struct group* tempGroup;
-     tempGroup = getgrgid(getgid());
-     strncpy(charArray,tempGroup->gr_name, 63);
-  }
-  USER
-  {
-    struct passwd* tempPasswd;
-    tempPasswd = getpwuid(getuid());
-    strncpy(charArray, tempPasswd->pw_name,63);
-  }
-  
-{
-  charArray[63] = '\0';
-  _theVariable = charArray;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_char_mode.tpl b/testcases/ballista/ballista/templates/b_ptr_char_mode.tpl
deleted file mode 100644
index 28f86a6..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_char_mode.tpl
+++ /dev/null
@@ -1,105 +0,0 @@
-// b_ptr_char_mode.tpl : Ballista Datatype Template for file modes
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char* b_ptr_char_mode;
-
-parent b_ptr_char;
-
-includes
-[
- {
-  #include "b_ptr_char.h" //parent class include file
- }
-]
-
-global_defines
-[
- {
-   static char  charArray[3];
- }
-]
-
-dials
-[
-  enum_dial MODE : R,W,A,R_PLUS,W_PLUS,A_PLUS,B,C,N;  // note c and n are Microsoft defined but not std. - good exceptional cases
-]
-
-access
-[
-
-  R
-  {
-     charArray[0] = 'r';
-     charArray[1] = '\0';
-  }
-  R_PLUS 
-  { 
-     charArray[0] = 'r';
-     charArray[1] = '+';
-     charArray[2] = '\0';
-  }  
-  W 
-  { 
-     charArray[0] = 'w';
-     charArray[1] = '\0';
-  }  
-  W_PLUS 
-  { 
-     charArray[0] = 'w';
-     charArray[1] = '+';
-     charArray[2] = '\0';
-  }  
-  A 
-  { 
-     charArray[0] = 'a';
-     charArray[1] = '\0';
-  }  
-  A_PLUS 
-  { 
-     charArray[0] = 'a';
-     charArray[1] = '+';
-     charArray[2] = '\0';
-  }
-  B 
-  { 
-     charArray[0] = 'b';
-     charArray[1] = '\0';
-  }  
-  C 
-  { 
-     charArray[0] = 'c';
-     charArray[1] = '\0';
-  }  
-  N 
-  { 
-     charArray[0] = 'n';
-     charArray[1] = '\0';
-  }  
-  
-{
-  _theVariable = charArray;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_dir.tpl b/testcases/ballista/ballista/templates/b_ptr_dir.tpl
deleted file mode 100644
index eff3c69..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_dir.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-// b_ptr_dir.tpl : Ballista Datatype Template for a directory pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name DIR* b_ptr_dir;
-
-parent b_ptr_char;
-
-includes
-[
-{
-#include <stdlib.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <errno.h>
-#include "bTypes.h"
-#include "b_ptr_char.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR2	"testdir2"
-
-static DIR* dirPtr;
-static DIR* copy_dirPtr;
-}
-]
-
-dials
-[
-  enum_dial STATE : DIR_CLOSED,DIR_OPEN,DIR_REMOVED,DIR_MIDWAY;
-  enum_dial CONTENT : EMPTY, WITH_FILES;
-]
-
-access
-[ 
-{
-  int withFileFlag = 0;
-  dirPtr = NULL;
-  copy_dirPtr = NULL;
-
-  // cleanup from any prior runs
-  system("rm -rf testdir2");
-
-   // Setup log file for template information
-   FILE* logFile = NULL;
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-  if (mkdir(TESTDIR2,S_IRWXU|S_IRWXG|S_IRWXO)!=0)	/* create test directory, u+rwx */
-  {
-    //if the directory already exists ignore the error
-    if (errno != EEXIST) 
-    {
-      fprintf (logFile, "b_ptr_dir error creating directory testdir2 - values not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-} 
-
-  WITH_FILES
-  {
-    char fname[16];
-    int i;
-    FILE* filePtr = NULL;
-    for (i=0; i < 5; i++)
-    {
-      strcpy(fname,"testfile");
-      sprintf (&fname[8], "%d", i);
-      if ((filePtr = fopen(fname, "w+")) == NULL)
-      {
-        fprintf(logFile,"b_ptr_dir WITH_FILES -error creating file - value not tested\n");
-        fclose(logFile);
-        exit(99);
-      }
-
-      fprintf(filePtr, "This is a testfile!\n");
-      fclose(filePtr);
-    }
-    withFileFlag = 1;
-  }
-
-{
-  if ((dirPtr = opendir(TESTDIR2)) == NULL)
-  {
-    fprintf (logFile,"b_ptr_dir - error opening directory - value not tested\n");
-    fclose(logFile);
-    exit(99);
-  }
-}
-
-
-  DIR_CLOSED
-  {
-    if (closedir (dirPtr) == -1) 
-    {
-      fprintf (logFile, "b_ptr_dir.tpl CLOSED - unable to close directory - value not tested \n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = dirPtr;
-    copy_dirPtr = dirPtr; 
-  }
-  DIR_OPEN
-  {	
-    _theVariable = dirPtr;     
-    copy_dirPtr = dirPtr;
-  }
-  DIR_MIDWAY
-  {
-    struct dirent* temp_dirent = NULL;
-
-    if (withFileFlag)
-    {
-      if ((temp_dirent = readdir(dirPtr))==NULL)
-      {
-        fprintf(logFile,"b_ptr_dir.tpl DIR_MIDWAY  - error reading through files in directory - value not tested\n");
-        fclose(logFile);
-        exit(99);
-      }
-    }
-    _theVariable = dirPtr;
-    copy_dirPtr = dirPtr;
-  }
-
-  DIR_REMOVED
-  {
-    if (rmdir(TESTDIR2) != 0) 
-    {
-      fprintf(logFile, "b_ptr_dir DIR_REMOVED - error encountered removing directory - value not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = dirPtr;
-    copy_dirPtr = dirPtr;
-  }
-{
-  fclose(logFile);
-}
- 
-]
-
-commit
-[
-]
-
-cleanup
-[
-  DIR_OPEN, DIR_MIDWAY
-  {
-    closedir(copy_dirPtr);
-  }
-  
-{  
-  system("rm -rf testdir2");
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_double.tpl b/testcases/ballista/ballista/templates/b_ptr_double.tpl
deleted file mode 100644
index 6235163..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_double.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-// b_ptr_double.tpl : Ballista Datatype Template for a double pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name double* b_ptr_double;
-
-parent b_ptr_float; 
-
-includes
-[
- {
-//double: usually 8 bytes(64bits). sizeof(double)=8  15-16bit mantissa
-//for more read /usr/include/values.h
-   #include "b_ptr_float.h"
-   #include "math.h"
- }
-]
-
-global_defines
-[
- {
-  static double temp_double;
- }
-]
-
-dials
-[
-  enum_dial HVAL : DMAXEXP, MAXDOUBLE, MINDOUBLE, NEGMAXDOUBLE, NEGMINDOUBLE;
-]
-
-access
-[
-  DMAXEXP
-    {
-      temp_double = DMAXEXP;
-    }
-  MAXDOUBLE
-    {
-      temp_double = MAXDOUBLE;
-    }
-  MINDOUBLE
-    {
-      temp_double = MINDOUBLE;
-    }
-  NEGMAXDOUBLE
-    {
-      temp_double = -MAXDOUBLE;
-    }
-  NEGMINDOUBLE
-    {
-      temp_double = -MINDOUBLE;
-    }
-{
-   _theVariable = &temp_double;
-}
-
-
-]
-
-commit
-[
-{
-}
-]
-
-cleanup
-[
-{
-}
-
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_file.tpl b/testcases/ballista/ballista/templates/b_ptr_file.tpl
deleted file mode 100644
index a9c55a2..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_file.tpl
+++ /dev/null
@@ -1,321 +0,0 @@
-// b_ptr_file.tpl : Ballista Datatype Template for a FILE pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name FILE* b_ptr_file;
-
-parent b_ptr_void;
-
-includes
-[
-{
-#include <fcntl.h>
-#include <sys/stat.h> 
-#include <unistd.h>
-#include <errno.h>
-#include "b_ptr_void.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_fp"
-}
-]
-
-dials
-[
-  //Note removed X_GRP, RWX_ALL, RWX_UG to speed up run
-  enum_dial MODE : READ, WRITE, APPEND, READ_PLUS, WRITE_PLUS, APPEND_PLUS;
-  enum_dial PERMISSIONS : R_USER, W_USER, X_USER, RWX_USER, R_GRP, NONE;
-  enum_dial EXISTANCE : EXIST, CLOSED, DELETED;   
-  enum_dial STATE : EMPTY, BEGINNING, EOF, PAST_EOF;   
-]
-
-access
-[
-{
-   char fileMode[2];
-   mode_t permissionMode;
-   int oflag;
-   int pos;
-   int empty_flag = 0;
-
-   struct stat stat_buf_temp;
-   int fd;
-
-   // Setup log file for template information
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-   //fprintf (logFile, "\nNEW TEST \n");
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */   
-   {  
-     //if the directory already exists ignore the error
-     if (errno != EEXIST) 
-     {
-       fprintf(logFile,"mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT) 
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_file datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-}
-
-   EMPTY
-   {
-     empty_flag = 1;
-   }
-
-   READ, READ_PLUS, APPEND, APPEND_PLUS
-   {    
-     if (! empty_flag)
-     {
-       write (fd, "I am a test file.\n", 18);
-     }
-   }
-
-{  // all values
-   if (close (fd)!=0) 
-   {
-     fprintf(logFile,"b_ptr_file datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);	
-   }
-}
-  // using the "default" oflag values used in open to correspond with fopen values.
-  READ
-  {
-    fileMode[0] = 'r';
-    oflag = O_RDONLY;   
-  }
-  WRITE
-  {
-    fileMode[0] = 'w';
-    oflag = O_WRONLY | O_CREAT | O_TRUNC;
-  }
-  APPEND
-  {
-    fileMode[0] = 'a';
-    oflag = O_WRONLY | O_CREAT | O_APPEND;
-  }
-  READ_PLUS
-  {
-    fileMode[0] = 'r';
-    fileMode[1] = '+';
-    oflag = O_RDWR;    
-  }
-  WRITE_PLUS
-  {
-    fileMode[0] = 'w';
-    fileMode[1] = '+';
-    oflag = O_RDWR | O_CREAT | O_TRUNC;
-  }
-  APPEND_PLUS
-  {
-    fileMode[0] = 'a';
-    fileMode[1] = '+';
-    oflag = O_RDWR | O_CREAT | O_APPEND;
-  }
-
-
-  R_USER
-  {
-    permissionMode = S_IRUSR;
-  } 
-  W_USER
-  {
-    permissionMode = S_IWUSR;
-  }
-  X_USER
-  {
-    permissionMode = S_IXUSR;
-  }
-  RWX_USER
-  {
-    permissionMode = S_IRWXU;
-  }
-  R_GRP
-  {
-    permissionMode = S_IRGRP;
-  }
-//  X_GRP 
-//  {
-//    permissionMode = S_IXGRP;
-//  }
-//  RWX_ALL
-//  {
-//    permissionMode = S_IRWXU | S_IRWXG | S_IRWXO;
-//  } 
-//  RWX_UG
-//  {
-//    permissionMode = S_IRWXU | S_IRWXG;
-//  }
-  NONE
-  {
-    permissionMode = 0;
-  }
-
-
-{
-  if ((fd  = open(TESTFILE, oflag, permissionMode)) == -1)
-  {
-    fprintf(logFile,"b_ptr_file datatype not setup properly - open failed\n");
-    fclose(logFile);
-    exit (99);
-  }
-}   
-
-  WRITE, WRITE_PLUS
-  {
-    if (! empty_flag)
-    {
-      write (fd, "I am a test file.\n", 18);
-    }
-  }
-
-
-  BEGINNING
-  {
-    if ((pos = lseek(fd, 0L, SEEK_SET)) == -1L)
-    {
-      fprintf(logFile,"b_ptr_file datatype not setup properly - lseek SET failed\n");
-      fclose(logFile);
-      exit (99);     
-    }
-  }
-  EOF
-  {
-    if ((pos = lseek(fd, 0L, SEEK_END)) == -1L)
-    {
-      fprintf(logFile,"b_ptr_file datatype not setup properly - lseek END failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-  }
-  PAST_EOF
-  {
-    if ((pos = lseek(fd, 10L, SEEK_END)) == -1L)
-    {
-      fprintf(logFile,"b_ptr_file datatype not setup properly - lseek END failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-  }
-
-{  // generic statement for all values
-  _theVariable = fdopen(fd,fileMode);
-  if (_theVariable == NULL)
-  {
-    fprintf(logFile,"b_ptr_file datatype not setup properly - fdopen TESTFILE failed. Function not tested\n");
-    fclose(logFile);
-    exit(99);
-  }
-
-  fclose (logFile);
-}
-]
-
-commit
-[
-{
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-}
-
-  CLOSED
-  {
-    fclose(_theVariable);
-  }
-
-  DELETED
-  {
-    // try deleting without closing the file first
-    char buffer[128];
-    if ((sprintf(buffer, "rm %s", TESTFILE)) <= 0)
-    {
-      fprintf(logFile,"b_ptr_file datatype not setup properly - rm of the TESTFILE failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    system(buffer);
-    // system("ls testdir/testfil* >> testdir/deleteDebug.txt");
-  }
-]
-
-cleanup
-[
-{  
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-} 
-
-  CLOSED, EXIST
-  {
-    chown(TESTFILE, getuid(), getgid()); //attempt to change ownership
-    chmod(TESTFILE,  S_IRUSR|S_IWUSR|S_IROTH|S_IWOTH);//permits others to read/write; ignore errors
-    if (fclose (_theVariable)!=0) 
-    {       //ignore error if file already closed
-      if (errno != EBADF) perror("close fname_tempfd");
-    }
-  }
-
-{
-  if (unlink(TESTFILE)!=0)
-  {
-    //ignore error if already removed.
-    if (errno != ENOENT) 
-    {
-      fprintf(logFile,"unlink fname_testfilename\n");
-    }
-  }
-
-  //also try to rmdir it because it may be a directory. ignore error messages
-  rmdir(TESTFILE);
-  fclose(logFile);
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_float.tpl b/testcases/ballista/ballista/templates/b_ptr_float.tpl
deleted file mode 100644
index 154eb31..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_float.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-// b_ptr_float.tpl : Ballista Datatype Template for a float pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name float* b_ptr_float;
-
-parent b_ptr_void;
-
-includes
-[
-{
-#include "b_ptr_void.h"
-#include "math.h"
-}
-]
-
-global_defines
-[
- {
-   static float temp_float;
- }
-]
-
-dials
-[
-  enum_dial VALUE :  FMINEXP,  LN2, PI, HALF_PI, TWO_PI, SQRT2, E, MAXFLOAT, MINFLOAT, NEGMAXFLOAT, NEGMINFLOAT, 
-                     ZERO, NEGONE, ONE;
-]
-
-access
-[
-  FMINEXP
-  {
-     temp_float = FMINEXP; // (-(DMAXEXP + DSIGNIF - _HIDDENBIT - 3))
-  }
-  LN2
-  {
-     temp_float = M_LN2; // 6.9314718055994530942E-1 /*Hex  2^-1 * 1.62E42FEFA39EF */
-  }
-  PI
-  {
-     temp_float = M_PI;// 3.1415926535897932385E0  /*Hex  2^ 1 * 1.921FB54442D18 */
-  }
-  HALF_PI
-  {
-     temp_float = M_PI_2;  // PI/2
-  }
-  TWO_PI
-  {
-     temp_float = M_PI * 2.0;  
-  }
-  SQRT2
-  {
-     temp_float= M_SQRT2;// 1.4142135623730950488E0  /*Hex  2^ 0 * 1.6A09E667F3BCD */
-  }
-  E
-  {
-     temp_float = M_E; // 2.718281828459045235360287
-  }
-  MAXFLOAT
-  {
-     temp_float = MAXFLOAT;
-  }
-  MINFLOAT
-  {
-     temp_float = MINFLOAT;
-  }
-  NEGMAXFLOAT
-  {
-     temp_float = -MAXFLOAT;
-  }
-  NEGMINFLOAT
-  {
-     temp_float = -MINDOUBLE;
-  }
-  ZERO
-  {
-     temp_float = 0.0;
-  }
-  NEGONE
-  {
-     temp_float = -1.0;
-  }
-  ONE
-  {
-     temp_float = 1.0;
-  }
-{
-   _theVariable = &temp_float;
-}  
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_fpos_t.tpl b/testcases/ballista/ballista/templates/b_ptr_fpos_t.tpl
deleted file mode 100644
index 9b9972b..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_fpos_t.tpl
+++ /dev/null
@@ -1,185 +0,0 @@
-// b_ptr_fpos_tLINUX.tpl : Ballista Datatype Template for file position pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name fpos_t* b_ptr_fpos_t;
-
-parent b_ptr_void;
-
-// LINUX fpos_t is a structure instead of an long
-includes
-[
-{
-#include <unistd.h>
-#include <fcntl.h>
-#include "b_ptr_void.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_fpos_t"
-static FILE* filePtr  = NULL;
-static fpos_t temp_fpos_t;
-}
-]
-
-dials
-[
-  enum_dial VALUE : BEGINNING, MIDDLE, END, MAX_STRUCT, MIN_STRUCT;
-]
-
-access
-[
-{
-  int position = 0;
-}
-
-BEGINNING
-{
-  position = 1;
-}
-MIDDLE
-{
-  position = 9;
-}
-END
-{
-  position = 72;  // should be EOF
-}
-
-BEGINNING, MIDDLE, END
-{
-   int fd;
-   char buffer[128];
-
-   // Setup log file for template information
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-   {
-     //if the directory already exists ignore the error
-     if (errno != EEXIST)
-     {
-       fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT)
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile); 
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-
-   if (close (fd)!=0)  
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   if ((filePtr = fopen (TESTFILE,"r+")) == NULL)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fopen failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-   
-   fread(buffer, sizeof(char), position, filePtr);
-   
-   if (fgetpos(filePtr, _theVariable) != 0)
-   {
-     fclose(filePtr);
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fgetpos failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   fclose(logFile);
-}
-
-MAX_STRUCT
-{
-  temp_fpos_t.__pos = MAXINT;
-  temp_fpos_t.__state.__count = MAXINT;
-}
-
-MIN_STRUCT
-{
-  temp_fpos_t.__pos = -MAXINT;
-  temp_fpos_t.__state.__count = -MAXINT;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-BEGINNING, MIDDLE, END
-{
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-  if (filePtr != NULL)
-  {
-    fclose(filePtr);
-  }
-  
-  //remove file
-  if (unlink(TESTFILE)!=0)
-  {  
-    //ignore error if already removed.
-    if (errno != ENOENT)
-    {
-       fprintf(logFile,"unlink testfile_fpos_t failed\n");
-    }
-  }
-  fclose(logFile);
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_fpos_tDEFAULT.tpl b/testcases/ballista/ballista/templates/b_ptr_fpos_tDEFAULT.tpl
deleted file mode 100644
index 2819b81..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_fpos_tDEFAULT.tpl
+++ /dev/null
@@ -1,170 +0,0 @@
-// b_ptr_fpos_tDEFAULT.tpl : Ballista Datatype Template for file position pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name fpos_t* b_ptr_fpos_t;
-
-parent b_ptr_long;
-
-includes
-[
-{
-#include <unistd.h>
-#include <fcntl.h>
-#include "b_ptr_long.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_fpos_t"
-static FILE* filePtr  = NULL;
-
-}
-]
-
-dials
-[
-  enum_dial VALUE : BEGINNING, MIDDLE, END;
-]
-
-access
-[
-{
-  int position = 0;
-}
-
-BEGINNING
-{
-  position = 1;
-}
-MIDDLE
-{
-  position = 9;
-}
-END
-{
-  position = 72;  // should be EOF
-}
-
-{
-   int fd;
-   char buffer[128];
-
-   // Setup log file for template information
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-   {
-     //if the directory already exists ignore the error
-     if (errno != EEXIST)
-     {
-       fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT)
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile); 
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-
-   if (close (fd)!=0)  
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   if ((filePtr = fopen (TESTFILE,"r+")) == NULL)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fopen failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-   
-   fread(buffer, sizeof(char), position, filePtr);
-   
-   if (fgetpos(filePtr, _theVariable) != 0)
-   {
-     fclose(filePtr);
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fgetpos failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   fclose(logFile);
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-{
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-  if (filePtr != NULL)
-  {
-    fclose(filePtr);
-  }
-  
-  //remove file
-  if (unlink(TESTFILE)!=0)
-  {  
-    //ignore error if already removed.
-    if (errno != ENOENT)
-    {
-      fprintf(logFile,"unlink testfile_fpos_t failed\n");
-    }
-  }
-
-  fclose(logFile);
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_fpos_tLINUX.tpl b/testcases/ballista/ballista/templates/b_ptr_fpos_tLINUX.tpl
deleted file mode 100644
index 9b9972b..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_fpos_tLINUX.tpl
+++ /dev/null
@@ -1,185 +0,0 @@
-// b_ptr_fpos_tLINUX.tpl : Ballista Datatype Template for file position pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name fpos_t* b_ptr_fpos_t;
-
-parent b_ptr_void;
-
-// LINUX fpos_t is a structure instead of an long
-includes
-[
-{
-#include <unistd.h>
-#include <fcntl.h>
-#include "b_ptr_void.h"
-}
-]
-
-global_defines
-[
-{
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_fpos_t"
-static FILE* filePtr  = NULL;
-static fpos_t temp_fpos_t;
-}
-]
-
-dials
-[
-  enum_dial VALUE : BEGINNING, MIDDLE, END, MAX_STRUCT, MIN_STRUCT;
-]
-
-access
-[
-{
-  int position = 0;
-}
-
-BEGINNING
-{
-  position = 1;
-}
-MIDDLE
-{
-  position = 9;
-}
-END
-{
-  position = 72;  // should be EOF
-}
-
-BEGINNING, MIDDLE, END
-{
-   int fd;
-   char buffer[128];
-
-   // Setup log file for template information
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-   {
-     //if the directory already exists ignore the error
-     if (errno != EEXIST)
-     {
-       fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT)
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile); 
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-   write (fd, "I am a test file.\n", 18);
-
-   if (close (fd)!=0)  
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   if ((filePtr = fopen (TESTFILE,"r+")) == NULL)
-   {
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fopen failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-   
-   fread(buffer, sizeof(char), position, filePtr);
-   
-   if (fgetpos(filePtr, _theVariable) != 0)
-   {
-     fclose(filePtr);
-     fprintf(logFile,"b_ptr_fpos_t datatype not setup properly - fgetpos failed.  Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-
-   fclose(logFile);
-}
-
-MAX_STRUCT
-{
-  temp_fpos_t.__pos = MAXINT;
-  temp_fpos_t.__state.__count = MAXINT;
-}
-
-MIN_STRUCT
-{
-  temp_fpos_t.__pos = -MAXINT;
-  temp_fpos_t.__state.__count = -MAXINT;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-BEGINNING, MIDDLE, END
-{
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-
-  if (filePtr != NULL)
-  {
-    fclose(filePtr);
-  }
-  
-  //remove file
-  if (unlink(TESTFILE)!=0)
-  {  
-    //ignore error if already removed.
-    if (errno != ENOENT)
-    {
-       fprintf(logFile,"unlink testfile_fpos_t failed\n");
-    }
-  }
-  fclose(logFile);
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_gid_t.tpl b/testcases/ballista/ballista/templates/b_ptr_gid_t.tpl
deleted file mode 100644
index 60df6fb..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_gid_t.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-// b_gid_t.tpl : Ballista Datatype Template for group id pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name gid_t* b_ptr_gid_t;
-
-parent b_ptr_unsigned_int;
-
-includes
-[
-{
-//unsigned int gid_t
-#include <sys/types.h>
-#include <unistd.h>//for getgid()
-#include "b_ptr_unsigned_int.h"
-}
-]
-
-global_defines
-[
-{
-  static gid_t temp_gid;
-}
-]
-
-dials
-[
-  enum_dial VALUE : GID_SELF, EGID_SELF, UID_SELF, EUID_SELF, GID_PLUS1;
-]
-
-access
-[
-  GID_SELF
-  {
-    temp_gid= getgid();
-    _theVariable=&temp_gid;
-  }
-  EGID_SELF 
-  {
-    temp_gid= getegid();
-    _theVariable=&temp_gid;
-  }
-  UID_SELF 
-  {
-    temp_gid= getuid();
-    _theVariable=&temp_gid;
-  }
-  EUID_SELF 
-  {
-    temp_gid= geteuid();
-    _theVariable=&temp_gid;
-  }
-  GID_PLUS1 
-  {
-    temp_gid= getgid() +1;
-    _theVariable=&temp_gid;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_int.tpl b/testcases/ballista/ballista/templates/b_ptr_int.tpl
deleted file mode 100644
index aba8803..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_int.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-// b_ptr_int.tpl : Ballista Datatype Template for an integer pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int* b_ptr_int;
-
-parent b_ptr_void;
-
-includes
-[
-{
-#include "b_ptr_void.h"
-#include "bTypes.h"
-}
-]
-
-global_defines
-[
- {
-   static int temp_int;
- }
-]
-
-dials
-[
-  enum_dial VALUE : ZERO,ONE,MININT,NEG_ONE;    // MAXINT is in b_ptr_void
-]
-
-access
-[
-
-  ZERO
-  {
-    temp_int = 0;
-  }
-  ONE
-  {
-    temp_int = 1;
-  }
-  MININT
-  {
-    temp_int = -MAXINT-1;
-  }
-  NEG_ONE
-  {
-    temp_int = -1;
-  }
-
-{
-  _theVariable = &temp_int;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_itimerspec.tpl b/testcases/ballista/ballista/templates/b_ptr_itimerspec.tpl
deleted file mode 100644
index 4900b8b..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_itimerspec.tpl
+++ /dev/null
@@ -1,210 +0,0 @@
-// b_ptr_itimerspec.tpl : Ballista Datatype Template for itimerspec pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structitimerspecptr b_ptr_itimerspec;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_buf.h"
-#define structitimerspecptr struct itimerspec*
-}
-]
-
-global_defines
-[
-{
-  static struct itimerspec itimerspec_temp;
-}
-]
-
-dials
-[
-  enum_dial INTERVAL : 
-     INTERVAL_REALTIME,
-     INTERVAL_GETTIME,
-     INTERVAL_ZERO,
-     INTERVAL_NEG_ONE_NS,
-     INTERVAL_ILL, 
-     INTERVAL_NEG_ONE_SEC, 
-     INTERVAL_MIN, 
-     INTERVAL_MAX, 
-     INTERVAL_MIXED_1, 
-     INTERVAL_MIXED_2;
-
-  enum_dial VALUE :
-     VALUE_REALTIME,
-     VALUE_GETTIME,
-     VALUE_ZERO,
-     VALUE_NEG_ONE_NS,
-     VALUE_ILL,
-     VALUE_NEG_ONE_SEC,
-     VALUE_MIN,
-     VALUE_MAX,
-     VALUE_MIXED_1,
-     VALUE_MIXED_2;
-]
-
-access
-[
-  INTERVAL_GETTIME, VALUE_GETTIME
-  {
-    if ((timer_gettime ( TIMER_ABSTIME, &itimerspec_temp)) == -1)
-    {
-      FILE* logFile = NULL;
-      
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile, "b_ptr_itimerspec GETTIME - error encountered timer_gettime  - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-
-
-  INTERVAL_REALTIME   
-  {
-    if (clock_gettime(CLOCK_REALTIME, &(itimerspec_temp.it_interval)) == -1)
-    {
-      FILE* logFile = NULL;
-
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile, "b_ptr_itimerspec INTERVAL_REALTIME - error encountered with clock_gettime  - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  INTERVAL_ZERO   
-  {
-    itimerspec_temp.it_interval.tv_sec = 0;
-    itimerspec_temp.it_interval.tv_nsec = 0; 
-  }
-  INTERVAL_NEG_ONE_NS
-  {
-    itimerspec_temp.it_interval.tv_sec = 0; 
-    itimerspec_temp.it_interval.tv_nsec = -1;
-  }
-  INTERVAL_ILL
-  {
-    itimerspec_temp.it_interval.tv_sec = 0;
-    itimerspec_temp.it_interval.tv_nsec = (int) 10e10;
-  }
-  INTERVAL_NEG_ONE_SEC
-  {
-    itimerspec_temp.it_interval.tv_sec = -1;
-    itimerspec_temp.it_interval.tv_nsec = 0;
-  }
-  INTERVAL_MIN
-  {
-    itimerspec_temp.it_interval.tv_sec = -MAXLONG;
-    itimerspec_temp.it_interval.tv_nsec = -MAXINT;
-  }
-  INTERVAL_MAX
-  {
-    itimerspec_temp.it_interval.tv_sec = MAXLONG;
-    itimerspec_temp.it_interval.tv_nsec = MAXINT;
-  }
-  INTERVAL_MIXED_1
-  {
-    itimerspec_temp.it_interval.tv_sec = -1;
-    itimerspec_temp.it_interval.tv_nsec = 1;
-  }
-  INTERVAL_MIXED_2
-  {
-    itimerspec_temp.it_interval.tv_sec = 1; 
-    itimerspec_temp.it_interval.tv_nsec = -1;
-  }
-
-
-  VALUE_REALTIME
-  {
-    if (clock_gettime(CLOCK_REALTIME, &(itimerspec_temp.it_value)) == -1)
-    {
-      FILE* logFile = NULL;
-
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile, "b_ptr_itimerspec VALUE_REALTIME - error encountered with clock_gettime - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  VALUE_ZERO
-  {
-    itimerspec_temp.it_value.tv_sec = 0;
-    itimerspec_temp.it_value.tv_nsec = 0;
-  }
-  VALUE_NEG_ONE_NS
-  {
-    itimerspec_temp.it_value.tv_sec = 0;
-    itimerspec_temp.it_value.tv_nsec = -1;
-  }
-  VALUE_ILL
-  {
-    itimerspec_temp.it_value.tv_sec = 0;
-    itimerspec_temp.it_value.tv_nsec = (int) 10e10;
-  }
-  VALUE_NEG_ONE_SEC
-  {
-    itimerspec_temp.it_value.tv_sec = -1;
-    itimerspec_temp.it_value.tv_nsec = 0;
-  }
-  VALUE_MIN
-  {
-    itimerspec_temp.it_value.tv_sec = -MAXLONG;  
-    itimerspec_temp.it_value.tv_nsec = -MAXINT;
-  }  
-  VALUE_MAX
-  {
-    itimerspec_temp.it_value.tv_sec = MAXLONG;
-    itimerspec_temp.it_value.tv_nsec = MAXINT;
-  }
-  VALUE_MIXED_1
-  {
-    itimerspec_temp.it_value.tv_sec = -1;
-    itimerspec_temp.it_value.tv_nsec = 1;
-  }
-  VALUE_MIXED_2
-  {
-    itimerspec_temp.it_value.tv_sec = 1;      
-    itimerspec_temp.it_value.tv_nsec = -1;      
-  }
-
-{
-  _theVariable=&itimerspec_temp;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_long.tpl b/testcases/ballista/ballista/templates/b_ptr_long.tpl
deleted file mode 100644
index 07e36a1..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_long.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-// b_ptr_long.tpl : Ballista Datatype Template for a long pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name long* b_ptr_long;
-
-parent b_ptr_int;
-
-includes
-[
-{
-#include "b_ptr_int.h"
-}
-]
-
-global_defines
-[
- {
-   static long temp_long;
- }
-]
-
-dials
-[
-  enum_dial VALUE : MAXLONG, NEG_MAXLONG;
-]
-
-access
-[
-  MAXLONG
-  {
-    temp_long = MAXLONG;
-  }
-
-  NEG_MAXLONG
-  {
-    temp_long = - temp_long;
-  }
-
-{
-  _theVariable = &temp_long;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_ptr_aiocb.tpl b/testcases/ballista/ballista/templates/b_ptr_ptr_aiocb.tpl
deleted file mode 100644
index c7bdd76..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_ptr_aiocb.tpl
+++ /dev/null
@@ -1,431 +0,0 @@
-// b_ptr_ptr_aiocb.tpl : Ballista Datatype Template for a pointer to an aiocb pointer 
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structaiocbptrptr b_ptr_ptr_aiocb;
-
-parent b_ptr_void;
-// parent restricted as memory runs out 
-
-includes
-[
-{
-#include <aio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include "b_ptr_void.h"
-#define structaiocbptrptr struct aiocb**
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_aiocb"
-}
-]
-
-global_defines
-[
-{
-  static struct aiocb* aiocb_ptr = NULL;
-  static struct aiocb aiocb_temp;
-  static int fd;
-  static char* buf_ptr;
-  static char* cp_bufPtr;
-}
-]
-
-dials
-[
-  // it would be nice if all the b_fd values could be tested
-  enum_dial FD :   
-     FD_OPEN_READ,
-     FD_OPEN_WRITE,
-     FD_OPEN_APPEND_EMPTY,
-     FD_OPEN_APPEND_BEGIN,
-     FD_OPEN_APPEND_EOF,
-     FD_CLOSED,
-     FD_DELETED,
-     FD_ZERO,
-     FD_NEGONE,
-     FD_ONE,
-     FD_MAXINT,
-     FD_MININT,
-     FD_READ_ONLY;
-
-  enum_dial OFFSET :
-     OFFSET_ZERO,
-     OFFSET_ONE,
-     OFFSET_NEGONE,
-     OFFSET_MAXINT,
-     OFFSET_MININT;
-//     OFFSET_SIXTYFOUR
-
-  // it would be nice if all the b_ptr_buf values could be tested
-  enum_dial BUFFER : 
-     BUF_NULL,
-     BUF_FILLED_PAGE,
-     BUF_ONE_CHAR,
-     BUF_CONST;
-//     BUF_EMPTY_PAGE,
-
-  enum_dial NBYTES : 
-     NBYTE_ZERO,
-     NBYTE_ONE,
-     NBYTE_MAXULONG;
-//     NBYTE_SIXTYFOUR;
-
-  enum_dial REQPRIO :
-     PRI_ZERO,
-     PRI_ONE,
-     PRI_NEGONE,
-     PRI_MAXINT,
-     PRI_MININT;
-
-  enum_dial SIGEVENT : 
-     NONE_SIGSEGV,
-     SIGNAL_SIGSEGV,
-     ZERO_ZERO,
-     MAXINT_MAXINT;
-
-  enum_dial OPCODE :
-     OP_ZERO,
-     OP_NEGONE,
-     OP_MAXINT,
-     OP_READ,
-     OP_WRITE;
-//     OP_NOP;
-//     OP_ONE,
-//     OP_MININT,
-
-]
-
-access
-[
-{
-   mode_t permissionMode;
-   int oflag;
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-     exit(99);
-   }  
-
-   if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-   {
-     //if the directory already exists ignore the error
-     if (errno != EEXIST)
-     {
-       fprintf(logFile,"mkdir failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-   //remove the file, ignore error if already removed
-   if (unlink (TESTFILE) != 0 )
-   {
-     if (errno !=  ENOENT)
-     {
-       fprintf(logFile,"unlink failed. Function not tested\n");
-       fclose(logFile);
-       exit(99);
-     }
-   }
-
-   if((fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644))==-1)
-   {
-     fprintf(logFile,"b_ptr_aiocb datatype not setup properly - open failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-}
-
-  FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    write (fd, "I am a test file.\n", 18);
-  }
-
-
-{
-   if (close (fd)!=0)
-   {
-     fprintf(logFile,"b_ptr_aiocb datatype not setup properly - close failed. Function not tested\n");
-     fclose(logFile);
-     exit(99);
-   }
-   permissionMode = S_IRWXU | S_IRWXG | S_IRWXO;
-}
-
-  FD_OPEN_READ, FD_READ_ONLY
-  {
-    oflag = O_RDONLY;
-  }   
-  FD_OPEN_WRITE
-  {
-    oflag = O_WRONLY | O_CREAT | O_TRUNC;
-  }
-  FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF
-  {
-    oflag = O_RDWR | O_CREAT | O_APPEND;
-  }
-  FD_READ_ONLY
-  {
-    permissionMode = S_IRUSR;
-  }
-
-  FD_OPEN_READ, FD_OPEN_WRITE, FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    if ((fd  = open(TESTFILE, oflag,  permissionMode)) == -1)
-    {
-      fprintf(logFile,"b_ptr_aiocb datatype not setup properly - open failed\n");
-      fclose(logFile);
-      exit (99);
-    }
-    aiocb_temp.aio_fildes = fd;
-  }
-
-  FD_DELETED
-  {
-    aiocb_temp.aio_fildes = fd;    
-    char buffer[128];
-    if ((sprintf(buffer, "rm %s", TESTFILE)) <= 0)
-    {
-      fprintf(logFile,"b_fd datatype not setup properly - rm of the TESTFILE failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    system(buffer);
-  }
-
-  FD_OPEN_APPEND_EOF
-  {
-    int pos;
-    if ((pos = lseek(fd, 0L, SEEK_END)) == -1L)
-    {
-      fprintf(logFile,"b_ptr_aiocb datatype not setup properly - lseek to end of file failed.  Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-
-  FD_CLOSED
-  {
-    aiocb_temp.aio_fildes = fd;
-  }
-
-  FD_ZERO
-  {
-    aiocb_temp.aio_fildes = 0;
-  }
-  FD_NEGONE
-  {
-    aiocb_temp.aio_fildes = -1;
-  }
-  FD_ONE
-  {
-    aiocb_temp.aio_fildes = 1;
-  }
-  FD_MAXINT
-  {
-    aiocb_temp.aio_fildes = MAXINT;
-  }
-  FD_MININT
-  {
-    aiocb_temp.aio_fildes = -MAXINT;
-  }
-
-  //----------------------------------------------------------------------
-  OFFSET_ZERO
-  {
-    aiocb_temp.aio_offset = 0;
-  }
-  OFFSET_ONE
-  {
-    aiocb_temp.aio_offset = 1;
-  }
-  OFFSET_NEGONE
-  {
-    aiocb_temp.aio_offset = -1;
-  }
-  OFFSET_MAXINT
-  {
-    aiocb_temp.aio_offset = MAXINT;
-  }
-  OFFSET_MININT
-  {
-    aiocb_temp.aio_offset = -MAXINT;
-  }
-//  OFFSET_SIXTYFOUR
-//  {
-//    aiocb_temp.aio_offset = 64;
-//  }
-  //----------------------------------------------------------------------
-  BUF_NULL
-  {
-    aiocb_temp.aio_buf = NULL;
-  }
-  BUF_FILLED_PAGE
-  {
-    int pagesize = getpagesize();
-    cp_bufPtr = buf_ptr = (char*) malloc(pagesize);
-    int i;
-    for (i = 0; i < (pagesize-1); i++)
-    {
-      buf_ptr[i] = 'a';
-    }
-    buf_ptr[pagesize -1] = '\0';
-
-    aiocb_temp.aio_buf = (void*) buf_ptr;
-  }
-//  BUF_EMPTY_PAGE
-//  {
-//    int pagesize = getpagesize();
-//    aiocb_temp.aio_buf =  malloc(pagesize);
-//  }
-  BUF_ONE_CHAR
-  {
-    cp_bufPtr = buf_ptr = (char*) malloc(sizeof(char));
-    aiocb_temp.aio_buf = (void*) buf_ptr;
-  }
-  BUF_CONST
-  {
-    aiocb_temp.aio_buf =  (void*)"                                             ";
-  }  
-
-  //----------------------------------------------------------------------
-  NBYTE_ZERO
-  {
-    aiocb_temp.aio_nbytes = 0;
-  }
-  NBYTE_ONE
-  {
-    aiocb_temp.aio_nbytes = 1;
-  }
-  NBYTE_MAXULONG
-  {
-    aiocb_temp.aio_nbytes =  2*MAXLONG + 1;
-  }
-//  NBYTE_SIXTYFOUR
-//  {
-//    aiocb_temp.aio_nbytes = 64;
-//  }
-  
-  //----------------------------------------------------------------------
-  PRI_ZERO
-  {
-    aiocb_temp.aio_reqprio = 0;
-  }
-  PRI_ONE
-  {
-    aiocb_temp.aio_reqprio = 1;
-  }
-  PRI_NEGONE
-  {
-    aiocb_temp.aio_reqprio = -1;
-  }
-  PRI_MAXINT
-  {
-    aiocb_temp.aio_reqprio = MAXINT;
-  }
-  PRI_MININT
-  {
-    aiocb_temp.aio_reqprio = -MAXINT;
-  }
-  //----------------------------------------------------------------------
-  NONE_SIGSEGV
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = SIGEV_NONE;
-    aiocb_temp.aio_sigevent.sigev_signo = SIGSEGV;
-  }
-  SIGNAL_SIGSEGV
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-    aiocb_temp.aio_sigevent.sigev_signo = SIGSEGV;   
-  }
-  ZERO_ZERO
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = 0;
-    aiocb_temp.aio_sigevent.sigev_signo = 0;   
-  }
-  MAXINT_MAXINT
-  {
-    aiocb_temp.aio_sigevent.sigev_notify = MAXINT;
-    aiocb_temp.aio_sigevent.sigev_signo = MAXINT;   
-  }
-
-  //----------------------------------------------------------------------
-  OP_ZERO
-  {
-    aiocb_temp.aio_lio_opcode = 0;
-  }
-//  OP_ONE
-//  {
-//    aiocb_temp.aio_lio_opcode = 1;
-//  }
-  OP_NEGONE
-  {
-    aiocb_temp.aio_lio_opcode = -1;
-  }
-  OP_MAXINT
-  {
-    aiocb_temp.aio_lio_opcode = MAXINT;
-  }
-//  OP_MININT
-//  {
-//    aiocb_temp.aio_lio_opcode = -MAXINT;
-//  }
-  OP_READ
-  {
-    aiocb_temp.aio_lio_opcode = LIO_READ;
-  }
-  OP_WRITE
-  {
-    aiocb_temp.aio_lio_opcode = LIO_WRITE;
-  }
-//  OP_NOP
-//  {
-//    aiocb_temp.aio_lio_opcode = LIO_NOP;
-//  }
-{
-  fclose(logFile);
-  aiocb_ptr = &aiocb_temp;
-  _theVariable = &aiocb_ptr;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-  FD_OPEN_READ, FD_OPEN_WRITE, FD_OPEN_APPEND_EMPTY, FD_OPEN_APPEND_BEGIN, FD_OPEN_APPEND_EOF, FD_READ_ONLY
-  {
-    close(fd);
-  }
-
-{
-  system("rm -f testdir/testfile_aiocb");
-  system("rm -rf testdir"); 
-}
-
-  // BUF_EMPTY_PAGE
-  BUF_FILLED_PAGE, BUF_ONE_CHAR               
-  {
-    free(cp_bufPtr);
-  }
-
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_ptr_char.tpl b/testcases/ballista/ballista/templates/b_ptr_ptr_char.tpl
deleted file mode 100644
index a190b6c..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_ptr_char.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-// b_ptr_ptr_char.tpl : Ballista Datatype Template for a pointer to a char/string pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name char** b_ptr_ptr_char;
-
-parent b_ptr_buf;
-
-includes
-[
- {
-  #include "b_ptr_buf.h" //parent class include file
- }
-]
-
-global_defines
-[
- {
-  static char  *temp = NULL;
-  static char *cp_temp = NULL;
-  char  fillVar1;
-  int  size1;
-#define sup_fillstring(buf,len,fillChar)   for (int i=0; i<len; i++) buf[i] = fillChar
- }
-]
-
-dials
-[
-  enum_dial SIZE : S1,S4,S16,S8K;
-  enum_dial CONTENTS : NUM,NASTY,ESC,CHAR;
-  enum_dial FILL : EMPTY,SOME,FULL;
-]
-
-access
-[
-  S1
-    {
-      cp_temp = temp = (char *)malloc(1);
-    }
-  S4
-    {
-      cp_temp = temp = (char *)malloc(4);
-    }
-  S16
-    {
-      cp_temp = temp = (char *)malloc(16);
-    }
-  S8K
-    {
-      cp_temp = temp = (char *)malloc(8192);
-    }
-
-  CHAR
-    {
-      fillVar1 = 'A';
-    }
-  NUM
-    {
-      fillVar1 = '1';
-    }
-  NASTY
-    {
-      fillVar1 = char(22);
-    }
-  ESC
-    {
-      fillVar1 = char(27);
-    }
-  SOME
-    {
-      sup_fillstring(temp, (int)(size1/3), 'A');
-      temp[(int)(size1/3)+1]='\0';
-    }
-  FULL
-    {
-       sup_fillstring(temp, size1, fillVar1);
-    }
-  EMPTY
-    {
-      temp[0]='\0';
-    }
-{
-  _theVariable = &temp;
-}
-
-]
-
-commit
-[
- {
- }
-]
-
-cleanup
-[
- {
-   if (temp !=NULL)
-	free(cp_temp);
- }
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sched_param.tpl b/testcases/ballista/ballista/templates/b_ptr_sched_param.tpl
deleted file mode 100644
index 4a51ac7..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sched_param.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-// b_ptr_sched_param.tpl : Ballista Datatype Template for schedule parameter pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structschedparamptr b_ptr_sched_param;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structschedparamptr struct sched_param*
-#include <sys/types.h>
-#include <sched.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-  static struct sched_param sched_param_temp;
-}
-]
-
-dials
-[
-  enum_dial PRIORITY : 
-     CURRENT,
-     ZERO,
-     NEG_ONE,
-     MIN, 
-     MAX,
-     ONE;
-]
-
-access
-[
-  CURRENT
-  {
-    if ((sched_getparam(getpid(), &sched_param_temp)) == -1)
-    {
-      FILE* logFile = NULL;
-      
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile, "b_ptr_sched_param CURRENT - error getting sched_param  - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-
-  ZERO   
-  {
-    sched_param_temp.sched_priority = 0;
-  }
-  NEG_ONE
-  {
-    sched_param_temp.sched_priority = -1;
-  }
-  MIN
-  {
-    sched_param_temp.sched_priority = -MAXINT;
-  }
-  MAX
-  {
-    sched_param_temp.sched_priority = MAXINT;
-  }
-  ONE
-  {
-    sched_param_temp.sched_priority = 1;
-  }
-
-{
-  _theVariable=&sched_param_temp;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sem_t.tpl b/testcases/ballista/ballista/templates/b_ptr_sem_t.tpl
deleted file mode 100644
index 15a6f2f..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sem_t.tpl
+++ /dev/null
@@ -1,158 +0,0 @@
-// b_ptr_sem_t.tpl : Ballista Datatype Template for semaphore pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structsemtptr b_ptr_sem_t;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <semaphore.h>
-#define structsemtptr sem_t*
-#include <fcntl.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-  #define SEMAPHORE_NAME "/tmp/ballista_semaphore"
-  static sem_t sem;
-  static sem_t* temp_sem;
-}
-]
-
-dials
-[
-  enum_dial HVAL : 
-     OPEN,
-     CLOSED,
-     INIT,
-     DESTROYED,
-     UNLINKED; 
-
-]
-
-access
-[
-{
-  system("chmod 777 /tmp/ballista_semaphore");
-  system("rm /tmp/ballista_semaphore");
-}
-
-  OPEN, CLOSED, UNLINKED
-  {
-    // mode and value parameters are necessary
-    temp_sem = sem_open(SEMAPHORE_NAME, O_CREAT);
-    sem = *temp_sem;
-    _theVariable = temp_sem;
-  }
-
-//  CLOSED,UNLINKED
-  UNLINKED
-  {   
-    if ((sem_unlink(SEMAPHORE_NAME)) == -1)
-    {
-      FILE* logFile = NULL;
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sem_t CLOSED error closing semaphore - function not tested \n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = temp_sem;
-  }
- 
-  CLOSED
-  {
-    if ((sem_close(temp_sem)) == -1)
-    {
-      FILE* logFile = NULL;
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sem_t CLOSED error closing semaphore - function not tested \n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = temp_sem;
-  }
-
-  INIT, DESTROYED
-  {
-    temp_sem = &sem;
-    if ((sem_init(temp_sem, 1, 1)) == -1)
-    {
-      FILE* logFile = NULL;
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sem_t INIT/DESTROYED error initializing semaphore - function not tested \n");
-      fclose(logFile);
-      exit(99);   
-    }
-    _theVariable = temp_sem;
-  }
-
-  DESTROYED
-  {
-    if ((sem_destroy(temp_sem)) == -1)
-    {
-      FILE* logFile = NULL;
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sem_t DESTOYED error destroying semaphore - function not tested \n");
-      fclose(logFile);
-      exit(99);   
-    }
-    _theVariable = temp_sem;
-  }
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-  INIT
-  {
-    sem_destroy(temp_sem);
-  }
-  OPEN
-  {
-    sem_unlink(SEMAPHORE_NAME);
-  }
-  OPEN,UNLINKED
-  {
-    sem_close(temp_sem);
-  }
-{
-  system("chmod 777 /tmp/ballista_semaphore");
-  system("rm /tmp/ballista_semaphore");
-}
-
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigaction.tpl b/testcases/ballista/ballista/templates/b_ptr_sigaction.tpl
deleted file mode 100644
index fad7b3c..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigaction.tpl
+++ /dev/null
@@ -1,182 +0,0 @@
-// b_ptr_sigactionLINUX.tpl : Ballista Datatype Template for signal action pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structSigactionPtr b_ptr_sigaction;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structSigactionPtr struct sigaction*
-#include <signal.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-struct sigaction sigaction_temp;
-void foo_handler1(int a){
-}
-void foo_action1(int sig, siginfo_t * b, void * c){
-}
-}
-]
-
-dials
-[
-  enum_dial SA_HANDLER : NULL, SIG_DFL, SIG_IGN, USR_FUNC, SIG_ERR;
-  enum_dial SA_MASK : EMPTY, FULL, SIGABRT, SIGSEGV, SIGINT, SIGILL, ZERO, MAXINT;
-  enum_dial SA_FLAGS : SA_NOCLDSTOP_SET, SA_SIGINFO_SET, SA_ONSTACK, SA_RESTART, SA_ALL, NO_EXTRA, SA_ZERO, SA_MAXINT;
-  enum_dial SA_SIGACTION : ACTION_NULL, ACTION_USR_FUNC;
-]
-
-access
-[
-{
-  sigaction_temp.sa_flags = 0;
-  sigaction_temp.sa_mask.__val[0] = 0;
-}
-
-  NULL
-  {
-    sigaction_temp.sa_handler = NULL;
-  }
-  SIG_DFL
-  {
-    sigaction_temp.sa_handler = SIG_DFL;
-  }
-  SIG_IGN
-  {
-    sigaction_temp.sa_handler = SIG_IGN;
-  }
-  USR_FUNC
-  {
-    sigaction_temp.sa_handler = foo_handler1;
-  }
-  SIG_ERR
-  {
-    sigaction_temp.sa_handler = SIG_ERR;
-  }
- 
-  EMPTY
-  {//no signals blocked
-    if((sigemptyset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigemptyset at EMPTY failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  FULL
-  {//all signals blocked.
-    if((sigfillset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigfullset at FULL failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  SIGABRT
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGABRT;
-  }
-  SIGSEGV
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGSEGV;
-  }
-  SIGINT
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGINT;
-  }
-  SIGILL 
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGILL;
-  }
-  ZERO 
-  {
-    sigaction_temp.sa_mask.__val[0] = 0;
-  }
-  MAXINT 
-  {
-    sigaction_temp.sa_mask.__val[0] = MAXINT;
-  }
-
-  SA_NOCLDSTOP_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_NOCLDSTOP;
-  }
-  SA_SIGINFO_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_SIGINFO;
-  }
-  SA_ONSTACK, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_ONSTACK;
-  }
-  SA_RESTART, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART;
-  }
-  SA_ZERO
-  {
-    sigaction_temp.sa_flags |= 0;
-  }
-  SA_MAXINT
-  {
-    sigaction_temp.sa_flags |= MAXINT;
-  }
-  SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART | SA_NODEFER |  SA_RESETHAND |  SA_NOCLDWAIT;
-  }    
-
-  ACTION_NULL
-  {
-    sigaction_temp.sa_sigaction = NULL;
-  }	
-  ACTION_USR_FUNC
-  {
-    sigaction_temp.sa_sigaction = foo_action1;
-  }	
-
-{
-  _theVariable = &sigaction_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigactionDEFAULT.tpl b/testcases/ballista/ballista/templates/b_ptr_sigactionDEFAULT.tpl
deleted file mode 100644
index 5c60f5e..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigactionDEFAULT.tpl
+++ /dev/null
@@ -1,186 +0,0 @@
-// b_ptr_sigactionDEFAULT.tpl : Ballista Datatype Template for signal action pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structSigactionPtr b_ptr_sigaction;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structSigactionPtr struct sigaction*
-#include <signal.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-struct sigaction sigaction_temp;
-void foo_handler1(int a){
-}
-void foo_action1(int sig, siginfo_t * b, void * c){
-}
-}
-]
-
-dials
-[
-  enum_dial SA_HANDLER : NULL, SIG_DFL, SIG_IGN, USR_FUNC, SIG_HOLD, SIG_ERR;
-  enum_dial SA_MASK : EMPTY, FULL, SIGABRT, SIGSEGV, SIGINT, SIGILL, ZERO, MAXINT;
-  enum_dial SA_FLAGS : SA_NOCLDSTOP_SET, SA_SIGINFO_SET, SA_ONSTACK, SA_RESTART, SA_ALL, NO_EXTRA, SA_ZERO, SA_MAXINT;
-  enum_dial SA_SIGACTION : ACTION_NULL, ACTION_USR_FUNC;
-]
-
-access
-[
-{
-  sigaction_temp.sa_flags = 0;
-  sigaction_temp.sa_mask = 0;
-}
-
-  NULL
-  {
-    sigaction_temp.sa_handler = NULL;
-  }
-  SIG_DFL
-  {
-    sigaction_temp.sa_handler = SIG_DFL;
-  }
-  SIG_IGN
-  {
-    sigaction_temp.sa_handler = SIG_IGN;
-  }
-  USR_FUNC
-  {
-    sigaction_temp.sa_handler = foo_handler1;
-  }
-  SIG_HOLD
-  {
-    sigaction_temp.sa_handler = SIG_HOLD;
-  }
-  SIG_ERR
-  {
-    sigaction_temp.sa_handler = SIG_ERR;
-  }
- 
-  EMPTY
-  {//no signals blocked
-    if((sigemptyset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigemptyset at EMPTY failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  FULL
-  {//all signals blocked.
-    if((sigfillset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigfullset at FULL failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  SIGABRT
-  {
-    sigaction_temp.sa_mask = SIGABRT;
-  }
-  SIGSEGV
-  {
-    sigaction_temp.sa_mask = SIGSEGV;
-  }
-  SIGINT
-  {
-    sigaction_temp.sa_mask = SIGINT;
-  }
-  SIGILL 
-  {
-    sigaction_temp.sa_mask = SIGILL;
-  }
-  ZERO 
-  {
-    sigaction_temp.sa_mask = 0;
-  }
-  MAXINT 
-  {
-    sigaction_temp.sa_mask = MAXINT;
-  }
-
-  SA_NOCLDSTOP_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_NOCLDSTOP;
-  }
-  SA_SIGINFO_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_SIGINFO;
-  }
-  SA_ONSTACK, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_ONSTACK;
-  }
-  SA_RESTART, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART;
-  }
-  SA_ZERO
-  {
-    sigaction_temp.sa_flags |= 0;
-  }
-  SA_MAXINT
-  {
-    sigaction_temp.sa_flags |= MAXINT;
-  }
-  SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART | SA_NODEFER |  SA_RESETHAND |  SA_NOCLDWAIT | SA_CLDNOTIFY;
-  }    
-
-  ACTION_NULL
-  {
-    sigaction_temp.sa_sigaction = NULL;
-  }	
-  ACTION_USR_FUNC
-  {
-    sigaction_temp.sa_sigaction = foo_action1;
-  }	
-
-{
-  _theVariable = &sigaction_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigactionLINUX.tpl b/testcases/ballista/ballista/templates/b_ptr_sigactionLINUX.tpl
deleted file mode 100644
index fad7b3c..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigactionLINUX.tpl
+++ /dev/null
@@ -1,182 +0,0 @@
-// b_ptr_sigactionLINUX.tpl : Ballista Datatype Template for signal action pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structSigactionPtr b_ptr_sigaction;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structSigactionPtr struct sigaction*
-#include <signal.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-struct sigaction sigaction_temp;
-void foo_handler1(int a){
-}
-void foo_action1(int sig, siginfo_t * b, void * c){
-}
-}
-]
-
-dials
-[
-  enum_dial SA_HANDLER : NULL, SIG_DFL, SIG_IGN, USR_FUNC, SIG_ERR;
-  enum_dial SA_MASK : EMPTY, FULL, SIGABRT, SIGSEGV, SIGINT, SIGILL, ZERO, MAXINT;
-  enum_dial SA_FLAGS : SA_NOCLDSTOP_SET, SA_SIGINFO_SET, SA_ONSTACK, SA_RESTART, SA_ALL, NO_EXTRA, SA_ZERO, SA_MAXINT;
-  enum_dial SA_SIGACTION : ACTION_NULL, ACTION_USR_FUNC;
-]
-
-access
-[
-{
-  sigaction_temp.sa_flags = 0;
-  sigaction_temp.sa_mask.__val[0] = 0;
-}
-
-  NULL
-  {
-    sigaction_temp.sa_handler = NULL;
-  }
-  SIG_DFL
-  {
-    sigaction_temp.sa_handler = SIG_DFL;
-  }
-  SIG_IGN
-  {
-    sigaction_temp.sa_handler = SIG_IGN;
-  }
-  USR_FUNC
-  {
-    sigaction_temp.sa_handler = foo_handler1;
-  }
-  SIG_ERR
-  {
-    sigaction_temp.sa_handler = SIG_ERR;
-  }
- 
-  EMPTY
-  {//no signals blocked
-    if((sigemptyset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigemptyset at EMPTY failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  FULL
-  {//all signals blocked.
-    if((sigfillset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigfullset at FULL failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  SIGABRT
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGABRT;
-  }
-  SIGSEGV
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGSEGV;
-  }
-  SIGINT
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGINT;
-  }
-  SIGILL 
-  {
-    sigaction_temp.sa_mask.__val[0] = SIGILL;
-  }
-  ZERO 
-  {
-    sigaction_temp.sa_mask.__val[0] = 0;
-  }
-  MAXINT 
-  {
-    sigaction_temp.sa_mask.__val[0] = MAXINT;
-  }
-
-  SA_NOCLDSTOP_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_NOCLDSTOP;
-  }
-  SA_SIGINFO_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_SIGINFO;
-  }
-  SA_ONSTACK, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_ONSTACK;
-  }
-  SA_RESTART, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART;
-  }
-  SA_ZERO
-  {
-    sigaction_temp.sa_flags |= 0;
-  }
-  SA_MAXINT
-  {
-    sigaction_temp.sa_flags |= MAXINT;
-  }
-  SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART | SA_NODEFER |  SA_RESETHAND |  SA_NOCLDWAIT;
-  }    
-
-  ACTION_NULL
-  {
-    sigaction_temp.sa_sigaction = NULL;
-  }	
-  ACTION_USR_FUNC
-  {
-    sigaction_temp.sa_sigaction = foo_action1;
-  }	
-
-{
-  _theVariable = &sigaction_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigactionSUN.tpl b/testcases/ballista/ballista/templates/b_ptr_sigactionSUN.tpl
deleted file mode 100644
index 78a2e4e..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigactionSUN.tpl
+++ /dev/null
@@ -1,189 +0,0 @@
-// b_ptr_sigactionSUN.tpl : Ballista Datatype Template for signal action pointer - SunOS
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structSigactionPtr b_ptr_sigaction;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structSigactionPtr struct sigaction*
-#include <signal.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-struct sigaction sigaction_temp;
-void foo_handler1(int a){
-}
-void foo_action1(int sig, siginfo_t * b, void * c){
-}
-}
-]
-
-dials
-[
-  enum_dial SA_HANDLER : NULL, SIG_DFL, SIG_IGN, USR_FUNC, SIG_HOLD, SIG_ERR;
-  enum_dial SA_MASK : EMPTY, FULL, SIGABRT, SIGSEGV, SIGINT, SIGILL, ZERO, MAXINT;
-  enum_dial SA_FLAGS : SA_NOCLDSTOP_SET, SA_SIGINFO_SET, SA_ONSTACK, SA_RESTART, SA_ALL, NO_EXTRA, SA_ZERO, SA_MAXINT;
-  enum_dial SA_SIGACTION : ACTION_NULL, ACTION_USR_FUNC;
-]
-
-access
-[
-{
-  sigaction_temp.sa_flags = 0;
-  sigaction_temp.sa_mask.__sigbits[0] = 0;
-  sigaction_temp.sa_mask.__sigbits[1] = 0;
-  sigaction_temp.sa_mask.__sigbits[2] = 0;
-  sigaction_temp.sa_mask.__sigbits[3] = 0;
-}
-
-  NULL
-  {
-    sigaction_temp.sa_handler = NULL;
-  }
-  SIG_DFL
-  {
-    sigaction_temp.sa_handler = SIG_DFL;
-  }
-  SIG_IGN
-  {
-    sigaction_temp.sa_handler = SIG_IGN;
-  }
-  USR_FUNC
-  {
-    sigaction_temp.sa_handler = foo_handler1;
-  }
-  SIG_HOLD
-  {
-    sigaction_temp.sa_handler = SIG_HOLD;
-  }
-  SIG_ERR
-  {
-    sigaction_temp.sa_handler = SIG_ERR;
-  }
- 
-  EMPTY
-  {//no signals blocked
-    if((sigemptyset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigemptyset at EMPTY failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  FULL
-  {//all signals blocked.
-    if((sigfillset (&sigaction_temp.sa_mask))!=0)
-    {
-      FILE* logFile = NULL;
-   
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf (logFile, "b_ptr_sigaction - sigfullset at FULL failed. Function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  SIGABRT
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = SIGABRT;
-  }
-  SIGSEGV
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = SIGSEGV;
-  }
-  SIGINT
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = SIGINT;
-  }
-  SIGILL 
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = SIGILL;
-  }
-  ZERO 
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = 0;
-  }
-  MAXINT 
-  {
-    sigaction_temp.sa_mask.__sigbits[0] = MAXINT;
-  }
-
-  SA_NOCLDSTOP_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_NOCLDSTOP;
-  }
-  SA_SIGINFO_SET, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_SIGINFO;
-  }
-  SA_ONSTACK, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_ONSTACK;
-  }
-  SA_RESTART, SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART;
-  }
-  SA_ZERO
-  {
-    sigaction_temp.sa_flags |= 0;
-  }
-  SA_MAXINT
-  {
-    sigaction_temp.sa_flags |= MAXINT;
-  }
-  SA_ALL
-  {
-    sigaction_temp.sa_flags |= SA_RESTART | SA_NODEFER |  SA_RESETHAND |  SA_NOCLDWAIT;
-  }    
-
-  ACTION_NULL
-  {
-    sigaction_temp.sa_sigaction = NULL;
-  }	
-  ACTION_USR_FUNC
-  {
-    sigaction_temp.sa_sigaction = foo_action1;
-  }	
-
-{
-  _theVariable = &sigaction_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigevent.tpl b/testcases/ballista/ballista/templates/b_ptr_sigevent.tpl
deleted file mode 100644
index 809f20d..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigevent.tpl
+++ /dev/null
@@ -1,150 +0,0 @@
-// b_ptr_sigevent.tpl : Ballista Datatype Template for signal event pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structsigeventptr b_ptr_sigevent;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <signal.h>
-#include "b_ptr_buf.h"
-#define structsigeventptr struct sigevent*
-}
-]
-
-global_defines
-[
-{
-  static struct sigevent sigEvent;
-}
-]
-
-dials
-[
-  enum_dial NOTIFY :
-     NOTIFY_ZERO,
-     NOTIFY_MAXINT,
-     NOTIFY_MININT,
-     NOTIFY_NEGONE,
-     NOTIFY_ONE,
-     NOTIFY_NONE,
-     NOTIFY_SIGNAL;
-
-  enum_dial SIGNO :
-     SIGABRT,
-     SIGINT,
-     SIGILL,
-     SIGSEGV,
-     SIGRTMIN,
-     SIGRTMAX,
-     MAXINT,
-     MININT,
-     ZERO,
-     ONE,
-     NEGONE;
-]
-
-access
-[
-  NOTIFY_ZERO
-  {
-    sigEvent.sigev_notify = 0;
-  }
-  NOTIFY_MAXINT
-  {
-    sigEvent.sigev_notify = MAXINT;
-  }     
-  NOTIFY_MININT
-  {
-    sigEvent.sigev_notify = -MAXINT;
-  }
-  NOTIFY_NEGONE
-  {
-    sigEvent.sigev_notify = -1;
-  }
-  NOTIFY_ONE
-  {
-    sigEvent.sigev_notify = 1;
-  }
-  NOTIFY_NONE
-  {
-    sigEvent.sigev_notify = SIGEV_NONE;
-  }
-  NOTIFY_SIGNAL
-  {
-    sigEvent.sigev_notify = SIGEV_SIGNAL;
-  }
-
-  SIGABRT
-  {
-    sigEvent.sigev_signo = SIGABRT;
-  }
-  SIGINT
-  {
-    sigEvent.sigev_signo = SIGINT;
-  }
-  SIGILL
-  {
-    sigEvent.sigev_signo = SIGILL;
-  }
-  SIGSEGV
-  {
-    sigEvent.sigev_signo = SIGSEGV;
-  }
-  SIGRTMIN
-  {
-    sigEvent.sigev_signo = SIGRTMIN;
-  }
-  SIGRTMAX
-  {
-    sigEvent.sigev_signo = SIGRTMAX;
-  }
-  MAXINT
-  {
-    sigEvent.sigev_signo = MAXINT;
-  }
-  MININT
-  { 
-    sigEvent.sigev_signo = -MAXINT;
-  }
-  ZERO
-  {
-    sigEvent.sigev_signo = 0;
-  }
-  ONE
-  {
-    sigEvent.sigev_signo = 1;
-  }
-  NEGONE
-  {
-    sigEvent.sigev_signo = -1;
-  }
-{
-  _theVariable=&sigEvent;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_siginfo_t.tpl b/testcases/ballista/ballista/templates/b_ptr_siginfo_t.tpl
deleted file mode 100644
index 2086817..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_siginfo_t.tpl
+++ /dev/null
@@ -1,135 +0,0 @@
-// b_ptr_siginfo_t.tpl : Ballista Datatype Template for a signal info pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name siginfo_t* b_ptr_siginfo_t;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <signal.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-static siginfo_t siginfo_t_temp;
-}
-]
-
-dials
-[
-  enum_dial SI_SIGNO : SIGABRT, SIGILL, SIGUSR1, SIGUSR2, MAXINT, MININT,ZERO,ONE,NEG_ONE;
-  enum_dial SI_CODE : SI_USER, SI_QUEUE, SI_TIMER, SI_ASYNCIO, SI_MESGQ, C_MAXINT, C_MININT,C_ZERO,C_ONE,C_NEG_ONE;
-  // SI_VALUE intentionally excluded.
-]
-
-access
-[
-  SIGABRT
-  {
-    siginfo_t_temp.si_signo = SIGABRT ;
-  }
-  SIGILL
-  {
-    siginfo_t_temp.si_signo = SIGILL;
-  }
-  SIGUSR1
-  {
-    siginfo_t_temp.si_signo = SIGUSR1;
-  }
-  SIGUSR2
-  {
-    siginfo_t_temp.si_signo = SIGUSR2;
-  }
-  MAXINT
-  {
-    siginfo_t_temp.si_signo = MAXINT;
-  }
-  MININT
-  {
-    siginfo_t_temp.si_signo = -MAXINT;
-  }
-  ZERO
-  {
-    siginfo_t_temp.si_signo = 0;
-  }
-  ONE
-  {
-    siginfo_t_temp.si_signo = 1;
-  }
-  NEG_ONE
-  {
-    siginfo_t_temp.si_signo = -1;
-  }
-
-  SI_USER
-  {
-    siginfo_t_temp.si_code = SI_USER;
-  }
-  SI_QUEUE
-  {
-    siginfo_t_temp.si_code = SI_QUEUE;
-  }
-  SI_TIMER
-  {
-    siginfo_t_temp.si_code = SI_TIMER;
-  }
-  SI_ASYNCIO
-  {
-    siginfo_t_temp.si_code = SI_ASYNCIO;
-  }
-  SI_MESGQ
-  {
-    siginfo_t_temp.si_code = SI_MESGQ;
-  }
-  C_MAXINT
-  {
-    siginfo_t_temp.si_code = MAXINT;
-  }
-  C_MININT
-  {
-    siginfo_t_temp.si_code = -MAXINT;
-  }
-  C_ZERO
-  {
-    siginfo_t_temp.si_code = 0;
-  }
-  C_ONE
-  {
-    siginfo_t_temp.si_code = 1;
-  }
-  C_NEG_ONE
-  {
-    siginfo_t_temp.si_code = -1;
-  }
-
-{
-  _theVariable = &siginfo_t_temp;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_sigset_t.tpl b/testcases/ballista/ballista/templates/b_ptr_sigset_t.tpl
deleted file mode 100644
index 3ef6d23..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_sigset_t.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-// b_ptr_sigset_t.tpl : Ballista Datatype Template for a set signal pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name sigset_t* b_ptr_sigset_t;
-
-parent b_ptr_long;
-
-includes
-[
-{
-
-#include <signal.h>
-#include "b_ptr_long.h"
-
-}
-]
-
-global_defines
-[
-{
-static sigset_t sigset_tmp;   
-
-}
-]
-
-dials
-[
-  enum_dial SIGPTR : SIGSET_EMPTY,SIGSET_FULL,SIGSET_SIGINT,SIGSET_SIGSEGV,SIGSET_GARBAGE;
-]
-
-access
-[
-     SIGSET_EMPTY{
-       	if((sigemptyset (&sigset_tmp))!=0){
-		perror ("sigemptyset at SIGSET_EMPTY failed. Function not tested");
-		exit(99);
-	}
-      	_theVariable = &sigset_tmp;
-      }
-
-     SIGSET_FULL{
-       	if((sigfillset (&sigset_tmp))!=0){
-		perror ("sigemptyset at SIGSET_FULL failed. Function not tested");
-		exit(99);
-	}
-      _theVariable = &sigset_tmp;
-      }
-
-     SIGSET_SIGINT{
-      if((sigemptyset (&sigset_tmp))!=0){
-		perror ("sigemptyset at SIGSET_SIGINT failed. Function not tested");
-		exit(99);
-	}
-      if((sigaddset (&sigset_tmp, SIGINT))!=0){
-		perror ("sigaddset at SIGSET_SIGINT failed. Function not tested");
-		exit(99);
-	}
-       _theVariable = &sigset_tmp;
-      }
-
-     SIGSET_SIGSEGV{
-      if((sigemptyset (&sigset_tmp))!=0){
-		perror ("sigfillset at SIGSET_SIGSEGV failed. Function not tested");
-		exit(99);
-	}
-      if((sigaddset (&sigset_tmp, SIGSEGV))!=0){
-		perror ("sigaddset at SIGSET_SIGSEGV failed. Function not tested");
-		exit(99);
-	}
-      _theVariable = &sigset_tmp;
-      }
-
-     SIGSET_GARBAGE{
-	char *buf = (char *)&sigset_tmp;
-	for ( int i=0 ; i< sizeof (sigset_t); i++ ) *buf++ = 'a';
-      _theVariable = &sigset_tmp;
-      }
-
-
-]
-
-commit
-[
-{
-#ifdef DEBUG
-        printf("VALUE:%x %x in commit\n",_theVariable, *_theVariable);
-#endif
-}
-]
-
-cleanup
-[
-  {
-#ifdef DEBUG
-        printf("VALUE:%x %x in cleanup\n",_theVariable, *_theVariable);
-#endif
-  }
-
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_stat.tpl b/testcases/ballista/ballista/templates/b_ptr_stat.tpl
deleted file mode 100644
index 27ec3ea..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_stat.tpl
+++ /dev/null
@@ -1,182 +0,0 @@
-// b_ptr_stat.tpl : Ballista Datatype Template for stat pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structStatptr b_ptr_stat;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structStatptr struct stat *
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <errno.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-static struct stat stat_temp;
-
-#define TESTDIR "testdir"
-#define TESTFILE        "testdir/testfile_stat"
-}
-]
-
-dials
-[
-  enum_dial STAT : ZEROS, NEG1S, MAX, FILE_SH, FILE_PASSWD, FILE_TEST;
-]
-
-access
-[
-  ZEROS
-  {
-    stat_temp.st_mode = 0;
-    stat_temp.st_ino = 0;
-    stat_temp.st_dev = 0;
-    stat_temp.st_nlink = 0;
-    stat_temp.st_uid = 0;
-    stat_temp.st_gid = 0;
-    stat_temp.st_size = 0;
-    stat_temp.st_atime = 0;
-    stat_temp.st_mtime = 0;
-    stat_temp.st_ctime = 0;
-  }
-
-  NEG1S
-  {
-    stat_temp.st_mode = -1;
-    stat_temp.st_ino = -1;
-    stat_temp.st_dev = -1;
-    stat_temp.st_nlink = -1;
-    stat_temp.st_uid = -1;
-    stat_temp.st_gid = -1;
-    stat_temp.st_size = -1;
-    stat_temp.st_atime = -1;
-    stat_temp.st_mtime = -1;
-    stat_temp.st_ctime = -1;
-  }
-
-  MAX
-  {  // These are very system dependent - values used are the smallest MAX for the 3 supported systems
-    stat_temp.st_mode = 2*MAXINT +1;
-    stat_temp.st_ino = 2*MAXINT +1;
-    stat_temp.st_dev = MAXINT;  
-    stat_temp.st_nlink = 2*MAXSHORT +1;
-    stat_temp.st_uid = MAXINT;
-    stat_temp.st_gid = MAXINT; 
-    stat_temp.st_size = MAXLONG; 
-    stat_temp.st_atime = MAXINT;
-    stat_temp.st_mtime = MAXINT;
-    stat_temp.st_ctime = MAXINT;
-  }
-
-  FILE_SH
-  {
-    if((stat("/bin/sh", &stat_temp))!=0)
-    {
-      perror("stat(\"/bin/sh\")failed ");
-    }
-  }
-
-  FILE_PASSWD
-  {
-    if((stat("/etc/passwd", &stat_temp))!=0)
-    {
-      perror("stat(\"/etc/passwd\") failed");
-    }
-  }
-
-  FILE_TEST
-  {
-    int fd;
-
-    // Setup log file for template information
-
-    FILE* logFile = NULL;
-    if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-    {
-      exit(99);
-    }
-
-    if (mkdir(TESTDIR,S_IRWXU|S_IRWXG|S_IRWXO)!=0) /* create test directory, u+rwx */
-    {
-      //if the directory already exists ignore the error
-      if (errno != EEXIST) 
-      {
-         fprintf(logFile,"b_ptr_stat - FILE_TEST mkdir(\"testdir\")failed. Function not tested\n");
-         fclose(logFile);
-         exit(99);
-      }
-    }
-
-    //remove the file/directory, ignore error if already removed
-    chown(TESTFILE, getuid(), getgid()); //attempt to change ownership
-    chmod(TESTFILE, S_IRUSR|S_IWUSR|S_IROTH|S_IWOTH);
-    rmdir(TESTFILE);//may be a directory
-    remove(TESTFILE);
-
-    fd = open (TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-    if (fd == -1) 
-    {
-      fprintf (logFile, "b_ptr_stat - FILE_TEST open in stat_createfile\n");
-      fclose(logFile);
-      exit(99);
-    }
-
-    write (fd, "I am a test file.\n", 18);
-
-    if (close (fd)!=0)
-    {
-      fprintf (logFile, "b_ptr_stat - FILE_TEST close in stat_createfile\n");
-      fclose(logFile);
-      exit(99);
-    }
-
-    if((stat(TESTFILE, &stat_temp))!=0)
-    {
-      fprintf(logFile, "b_ptr_stat - FILE_TEST stat(TESTFILE failed)\n");
-      fclose(logFile);
-      exit(99);
-    }
-    fclose(logFile);
-  }
-
-{
-  _theVariable = &stat_temp;
-}
-	
-]
-
-commit
-[
-]
-
-cleanup
-[
-  FILE_TEST
-  {
-    remove(TESTFILE);  
-
-    rmdir(TESTDIR);
-  }
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_termios.tpl b/testcases/ballista/ballista/templates/b_ptr_termios.tpl
deleted file mode 100644
index 5c2663c..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_termios.tpl
+++ /dev/null
@@ -1,161 +0,0 @@
-// b_ptr_termios.tpl : Ballista Datatype Template for termios pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structTermiosPtr b_ptr_termios;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <termios.h>
-#include "b_ptr_buf.h"
-#define structTermiosPtr struct termios*
-}
-]
-
-global_defines
-[
-{
-static struct termios termios_temp;
-}
-]
-
-dials
-[
-  enum_dial C_IFLAG : BRKINT_SET, PARMRK_SET, I_MAXINT,I_NEGONE, I_ONE, I_ZERO;
-  enum_dial C_OFLAG : OPOST_SET, O_MAXINT, O_NEGONE, O_ONE, O_ZERO;
-  enum_dial C_CFLAG : CLOCAL_SET, PARENB_SET, PARODD_SET, C_MAXINT,C_NEGONE, C_ONE, C_ZERO;
-  enum_dial C_LFLAG : ECHOK_SET, ICANON_SET, IEXTEN_SET, L_MAXINT,L_NEGONE, L_ONE, L_ZERO;
-  enum_dial C_CC : CC_UNSET, CC_VKILL, CC_VMIN; 
-  enum_dial BAUD    : ZERO, THREE_HUNDRED, THREE8400, NEG1, UNSET;
-
-  // complete list too big for ballista - valid values were stripped
-//  enum_dial C_IFLAG : BRKINT_SET, ICRNL_SET, IGNBRK_SET, IGNCR_SET, IGNPAR_SET, INLCR_SET, INPCK_SET, ISTRIP_SET, IXOFF_SET, IXON_SET,PARMRK_SET,
-//                      I_MAXINT,I_NEGONE, I_ONE, I_ZERO;
-//  enum_dial C_OFLAG : OPOST_SET, O_MAXINT, O_NEGONE, O_ONE, O_ZERO;
-//  enum_dial C_CFLAG : CLOCAL_SET, CREAD_SET, CSIZE_SET, CS5_SET, CS6_SET, CS7_SET, CS8_SET, CSTOPB_SET, HUPCL_SET, PARENB_SET, PARODD_SET,
-//                      C_MAXINT,C_NEGONE, C_ONE, C_ZERO;
-//  enum_dial C_LFLAG : ECHO_SET, ECHOE_SET, ECHOK_SET, ECHONL_SET, ICANON_SET, IEXTEN_SET, ISIG_SET, NOFLSH_SET, TOSTOP_SET, L_MAXINT,L_NEGONE,
-//                      L_ONE, L_ZERO;
-//  enum_dial C_CC : CC_UNSET, CC_VKILL, CC_VMIN; 
-//  enum_dial BAUD    : ZERO, THREE_HUNDRED, THREE8400, NEG1, UNSET;
-
-]
-
-access
-[ 
-{
-termios_temp.c_iflag = 0;
-termios_temp.c_oflag = 0;
-termios_temp.c_cflag = 0;
-termios_temp.c_lflag = 0;
-}
-	BRKINT_SET	{termios_temp.c_iflag |=  BRKINT; }
-//	ICRNL_SET	{termios_temp.c_iflag |=  ICRNL; }
-//	IGNBRK_SET	{termios_temp.c_iflag |= IGNBRK; }
-//	IGNCR_SET	{termios_temp.c_iflag |= IGNCR; }
-//	IGNPAR_SET	{termios_temp.c_iflag |= IGNPAR; }
-//	INLCR_SET	{termios_temp.c_iflag |= INLCR; }
-//	INPCK_SET	{termios_temp.c_iflag |= INPCK; }
-//	ISTRIP_SET	{termios_temp.c_iflag |= ISTRIP; }
-//	IXOFF_SET	{termios_temp.c_iflag |=  IXOFF; }
-//	IXON_SET	{termios_temp.c_iflag |=  IXON;	}
-	PARMRK_SET	{termios_temp.c_iflag |=  PARMRK; }
-        I_MAXINT	{termios_temp.c_iflag == MAXINT; }
-        I_ZERO		{termios_temp.c_iflag == 0; }
-        I_ONE		{termios_temp.c_iflag == 1; }
-        I_NEGONE	{termios_temp.c_iflag == -1; }
-
-	OPOST_SET	{termios_temp.c_oflag |= OPOST;	}
-        O_MAXINT	{termios_temp.c_oflag == MAXINT; }
-        O_ZERO		{termios_temp.c_oflag == 0; }
-        O_ONE		{termios_temp.c_oflag == 1; }
-        O_NEGONE	{termios_temp.c_oflag == -1; }
-
-	CLOCAL_SET	{termios_temp.c_cflag |= CLOCAL; }
-//	CREAD_SET	{termios_temp.c_cflag |=CREAD ;	}
-//	CSIZE_SET	{termios_temp.c_cflag |= CSIZE;	}
-//	CS5_SET	{termios_temp.c_cflag |= CS5; }
-//	CS6_SET	{termios_temp.c_cflag |= CS6; }
-//	CS7_SET	{termios_temp.c_cflag |=CS7 ; }
-//	CS8_SET	{termios_temp.c_cflag |= CS8; }
-//	CSTOPB_SET	{termios_temp.c_cflag |= CSTOPB; }
-//	HUPCL_SET	{termios_temp.c_cflag |= HUPCL;	}
-	PARENB_SET	{termios_temp.c_cflag |= PARENB; }
-	PARODD_SET	{termios_temp.c_cflag |= PARODD; }
-        C_MAXINT	{termios_temp.c_cflag == MAXINT; }
-        C_ZERO		{termios_temp.c_cflag == 0; }
-        C_ONE		{termios_temp.c_cflag == 1; }
-        C_NEGONE	{termios_temp.c_cflag == -1; }
-
-//	ECHO_SET	{termios_temp.c_lflag |= ECHO;	}
-//	ECHOE_SET	{termios_temp.c_lflag |= ECHOE;	}
-	ECHOK_SET	{termios_temp.c_lflag |= ECHOK;	}
-//	ECHONL_SET	{termios_temp.c_lflag |= ECHONL; }
-	ICANON_SET	{termios_temp.c_lflag |= ICANON; }
-	IEXTEN_SET	{termios_temp.c_lflag |= IEXTEN; }
-//	ISIG_SET	{termios_temp.c_lflag |= ISIG; }
-//	NOFLSH_SET	{termios_temp.c_lflag |= NOFLSH; }
-//	TOSTOP_SET	{termios_temp.c_lflag |= TOSTOP; }
-        L_MAXINT	{termios_temp.c_lflag == MAXINT; }
-        L_ZERO		{termios_temp.c_lflag == 0; }
-        L_ONE		{termios_temp.c_lflag == 1; }
-        L_NEGONE	{termios_temp.c_lflag == -1; }
-	CC_VKILL	{termios_temp.c_cc[0] = VKILL; }
-	CC_VMIN		{termios_temp.c_cc[0] = VMIN; } 
-
-	ZERO	
-	{if ((cfsetospeed(&termios_temp, 0))!=0){
-		perror("set BAUD to 0 failed");
-		exit(99);
-		}
-	}
-	THREE_HUNDRED
-	{
-	if ((cfsetospeed(&termios_temp, 300))!=0){
-		perror("set BAUD to 300 failed");
-		exit(99);
-		}
-	}
-	THREE8400
-	{
-	if ((cfsetospeed(&termios_temp, 38400))!=0){
-		perror("set BAUD to 38400 failed");
-		exit(99);
-		}
-	}
-	NEG1
-	{
-	if ((cfsetospeed(&termios_temp, -1))!=0){
-		perror("set BAUD to -1 failed");
-		exit(99);
-		}
-	}
-{
-  _theVariable = &termios_temp;
-}
-]
-
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_time_t.tpl b/testcases/ballista/ballista/templates/b_ptr_time_t.tpl
deleted file mode 100644
index 7578e86..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_time_t.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-// b_ptr_time_t.tpl : Ballista Datatype Template for a time_t pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name time_t* b_ptr_time_t;
-
-parent b_ptr_long;
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_long.h"
-
-}
-]
-
-global_defines
-[
-{
-//need exact value for midnight_2000
-#define MIDNIGHT_2000 (2000-1970)*365*24*60*60   
-#define YEAR 365*24*60*60
-#define DAY 24*60*60
-#define HOUR 60*60
-#define MINUTE 60
-}
-]
-
-dials
-[
-  enum_dial SECONDS : 
-	NOW,
-	TOMORROW,	
-	NEXTWEEK, 
-	NEXTMONTH, 
-	NEXTYEAR, 
-	NEXTDECADE, 
-	NEXTCENTURY,
-	NEXTMILLENIUM,
-	Y2K,
-	Y2K_MINUS_ONE,
-	Y2K_PLUS_ONE;
-]
-
-access
-[
-{
-  time_t time_since_epoch = time(NULL);
-}
-  NOW
-  {
-    _theVariable= &time_since_epoch;
-  }
-  TOMORROW
-  {
-    time_since_epoch += DAY;
-    _theVariable = &time_since_epoch;
-  }
-  NEXTWEEK
-  {
-    time_since_epoch += (DAY*7);
-    _theVariable = &time_since_epoch;
-  }
-  NEXTMONTH
-  {
-    time_since_epoch += (DAY*30);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTYEAR
-  {
-    time_since_epoch += YEAR;
-    _theVariable= &time_since_epoch;
-  }  
-  NEXTDECADE
-  {
-    time_since_epoch += (YEAR*10);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTCENTURY
-  {
-    time_since_epoch += (YEAR*100);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTMILLENIUM
-  {
-    time_since_epoch += (YEAR*1000);
-    _theVariable=&time_since_epoch;
-  }
-  Y2K
-  {
-    time_since_epoch = MIDNIGHT_2000;
-    _theVariable=&time_since_epoch;
-  }
-  Y2K_MINUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000-1;
-    _theVariable=&time_since_epoch;
-
-  }
-  Y2K_PLUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000+1;
-    _theVariable=&time_since_epoch;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_time_tDEFAULT.tpl b/testcases/ballista/ballista/templates/b_ptr_time_tDEFAULT.tpl
deleted file mode 100644
index 4620251..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_time_tDEFAULT.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-// b_ptr_time_tDEFAULT.tpl : Ballista Datatype Template for a time_t pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name time_t* b_ptr_time_t;
-
-parent b_ptr_long;
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_long.h"
-
-}
-]
-
-global_defines
-[
-{
-//need exact value for midnight_2000
-#define MIDNIGHT_2000 (2000-1970)*365*24*60*60   
-#define YEAR 365*24*60*60
-#define DAY 24*60*60
-#define HOUR 60*60
-#define MINUTE 60
-}
-]
-
-dials
-[
-  enum_dial SECONDS : 
-	NOW,
-	TOMORROW,	
-	NEXTWEEK, 
-	NEXTMONTH, 
-	NEXTYEAR, 
-	NEXTDECADE, 
-	NEXTCENTURY,
-	NEXTMILLENIUM,
-	Y2K,
-	Y2K_MINUS_ONE,
-	Y2K_PLUS_ONE;
-]
-
-access
-[
-{
-  time_t time_since_epoch = time(NULL);
-}
-  NOW
-  {
-    _theVariable= &time_since_epoch;
-  }
-  TOMORROW
-  {
-    time_since_epoch += DAY;
-    _theVariable = &time_since_epoch;
-  }
-  NEXTWEEK
-  {
-    time_since_epoch += (DAY*7);
-    _theVariable = &time_since_epoch;
-  }
-  NEXTMONTH
-  {
-    time_since_epoch += (DAY*30);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTYEAR
-  {
-    time_since_epoch += YEAR;
-    _theVariable= &time_since_epoch;
-  }  
-  NEXTDECADE
-  {
-    time_since_epoch += (YEAR*10);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTCENTURY
-  {
-    time_since_epoch += (YEAR*100);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTMILLENIUM
-  {
-    time_since_epoch += (YEAR*1000);
-    _theVariable=&time_since_epoch;
-  }
-  Y2K
-  {
-    time_since_epoch = MIDNIGHT_2000;
-    _theVariable=&time_since_epoch;
-  }
-  Y2K_MINUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000-1;
-    _theVariable=&time_since_epoch;
-
-  }
-  Y2K_PLUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000+1;
-    _theVariable=&time_since_epoch;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_time_tDUNIX.tpl b/testcases/ballista/ballista/templates/b_ptr_time_tDUNIX.tpl
deleted file mode 100644
index 9af8059..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_time_tDUNIX.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-// b_ptr_time_tDUNIX.tpl : Ballista Datatype Template for time_t pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name time_t* b_ptr_time_t;
-
-parent b_ptr_int;
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_int.h"
-
-}
-]
-
-global_defines
-[
-{
-//need exact value for midnight_2000
-#define MIDNIGHT_2000 (2000-1970)*365*24*60*60   
-#define YEAR 365*24*60*60
-#define DAY 24*60*60
-#define HOUR 60*60
-#define MINUTE 60
-}
-]
-
-dials
-[
-  enum_dial SECONDS : 
-	NOW,
-	TOMORROW,	
-	NEXTWEEK, 
-	NEXTMONTH, 
-	NEXTYEAR, 
-	NEXTDECADE, 
-	NEXTCENTURY,
-	NEXTMILLENIUM,
-	Y2K,
-	Y2K_MINUS_ONE,
-	Y2K_PLUS_ONE;
-]
-
-access
-[
-{
-  time_t time_since_epoch = time(NULL);
-}
-  NOW
-  {
-    _theVariable= &time_since_epoch;
-  }
-  TOMORROW
-  {
-    time_since_epoch += DAY;
-    _theVariable = &time_since_epoch;
-  }
-  NEXTWEEK
-  {
-    time_since_epoch += (DAY*7);
-    _theVariable = &time_since_epoch;
-  }
-  NEXTMONTH
-  {
-    time_since_epoch += (DAY*30);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTYEAR
-  {
-    time_since_epoch += YEAR;
-    _theVariable= &time_since_epoch;
-  }  
-  NEXTDECADE
-  {
-    time_since_epoch += (YEAR*10);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTCENTURY
-  {
-    time_since_epoch += (YEAR*100);
-    _theVariable= &time_since_epoch;
-  }
-  NEXTMILLENIUM
-  {
-    time_since_epoch += (YEAR*1000);
-    _theVariable=&time_since_epoch;
-  }
-  Y2K
-  {
-    time_since_epoch = MIDNIGHT_2000;
-    _theVariable=&time_since_epoch;
-  }
-  Y2K_MINUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000-1;
-    _theVariable=&time_since_epoch;
-
-  }
-  Y2K_PLUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000+1;
-    _theVariable=&time_since_epoch;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_timespec.tpl b/testcases/ballista/ballista/templates/b_ptr_timespec.tpl
deleted file mode 100644
index fac8222..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_timespec.tpl
+++ /dev/null
@@ -1,123 +0,0 @@
-// b_ptr_timespec.tpl : Ballista Datatype Template for timespec pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structtimespecptr b_ptr_timespec;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_buf.h"
-#define structtimespecptr struct timespec*
-}
-]
-
-global_defines
-[
-{
-  static struct timespec timeout_tmp;
-}
-]
-
-dials
-[
-  enum_dial HVAL : 
-     REALTIME,
-     TIMEOUT_ZERO,
-     TIMEOUT_NEG_ONE_NS,
-     TIMEOUT_ILL, 
-     TIMEOUT_NEG_ONE_SEC, 
-     TIMEOUT_MIN, 
-     TIMEOUT_MAX, 
-     TIMEOUT_MIXED_1, 
-     TIMEOUT_MIXED_2;
-]
-
-access
-[
-  REALTIME
-  {
-    if (clock_gettime(CLOCK_REALTIME, &timeout_tmp) == -1)
-    {
-      FILE* logFile = NULL;
-
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile, "b_ptr_timespec REALTIME - error encountered getting timespec for REALTIME - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-  }
-  TIMEOUT_ZERO
-  {
-    timeout_tmp.tv_sec = 0;
-    timeout_tmp.tv_nsec = 0;
-  }
-  TIMEOUT_NEG_ONE_NS
-  {
-    timeout_tmp.tv_sec = 0;
-    timeout_tmp.tv_nsec = -1;
-  }
-  TIMEOUT_ILL
-  {
-    timeout_tmp.tv_sec = 0;
-    timeout_tmp.tv_nsec = (int) 10e10;
-  }
-  TIMEOUT_NEG_ONE_SEC
-  {
-    timeout_tmp.tv_sec = -1;
-    timeout_tmp.tv_nsec = 0;
-  }
-  TIMEOUT_MIN
-  {
-    timeout_tmp.tv_sec = -MAXLONG;  
-    timeout_tmp.tv_nsec = -MAXINT;
-  }  
-  TIMEOUT_MAX
-  {
-    timeout_tmp.tv_sec = MAXLONG;
-    timeout_tmp.tv_nsec = MAXINT;
-  }
-  TIMEOUT_MIXED_1
-  {
-    timeout_tmp.tv_sec = -1;
-    timeout_tmp.tv_nsec = 1;
-  }
-  TIMEOUT_MIXED_2
-  {
-    timeout_tmp.tv_sec = 1;      
-    timeout_tmp.tv_nsec = -1;      
-  }
-
-{
-  _theVariable=&timeout_tmp;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_tm.tpl b/testcases/ballista/ballista/templates/b_ptr_tm.tpl
deleted file mode 100644
index 7621f3a..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_tm.tpl
+++ /dev/null
@@ -1,159 +0,0 @@
-// b_ptr_tm.tpl : Ballista Datatype Template for tm pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name StructtmPtr b_ptr_tm;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-
-#include <time.h>
-#include "bTypes.h"
-#include "b_ptr_buf.h"
-#define StructtmPtr struct tm*
-}
-]
-
-global_defines
-[
-{
- static struct tm tm_struct;
-}
-]
-
-dials
-[
-enum_dial TM_STRUCT_PTR : 
-	LOCALTIME_R_NOW,
-	GMTIME_R_NOW,
-        ALL_ZERO,
-        ALL_TOP_RANGE,
-        ALL_OVERFLOW,
-        ALL_MAX,
-        ALL_MIN;
-]
-
-access
-[
-{  
-   time_t time_since_epoch = time(NULL);
-
-   FILE* logFile = NULL;
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-}
-
-   LOCALTIME_R_NOW
-    {
-	if((localtime_r(&time_since_epoch,&tm_struct))==NULL)
-        {
-	   fprintf(logFile, "LOCALTIME_R_NOW: localtime_r failed in b_ptr_tm. Function not tested\n");
-           fclose(logFile);
- 	   exit(99);
-	}
-    }
-   GMTIME_R_NOW
-    {
-	if((gmtime_r(&time_since_epoch,&tm_struct))==NULL)
-        {
-	   fprintf(logFile, "GMTIME_R_NOW: gmtime_r failed in b_ptr_tm. Function not tested\n");
-           fclose(logFile);
- 	   exit(99);
-	}
-    }
-   
-   ALL_ZERO
-    {  // some OSs add fields to the tm struct - these fields are stated in POSIX
-       tm_struct.tm_sec = 0; /* seconds after the minute [0-60] */
-       tm_struct.tm_min = 0;         /* minutes after the hour [0-59] */
-       tm_struct.tm_hour = 0;        /* hours since midnight [0-23] */
-       tm_struct.tm_mday = 0;        /* day of the month [1-31] */
-       tm_struct.tm_mon = 0;         /* months since January [0-11] */
-       tm_struct.tm_year = 0;        /* years since 1900 */
-       tm_struct.tm_wday = 0;        /* days since Sunday [0-6] */
-       tm_struct.tm_yday = 0;        /* days since January 1 [0-365] */
-       tm_struct.tm_isdst = 0;       /* Daylight Savings Time flag */
-    }
-  ALL_TOP_RANGE
-    {// some OSs add fields to the tm struct - these fields are stated in POSIX
-       tm_struct.tm_sec = 60; /* seconds after the minute [0-60] */
-       tm_struct.tm_min = 59;         /* minutes after the hour [0-59] */
-       tm_struct.tm_hour = 23;        /* hours since midnight [0-23] */
-       tm_struct.tm_mday = 31;        /* day of the month [1-31] */
-       tm_struct.tm_mon = 11;         /* months since January [0-11] */
-       tm_struct.tm_year = 9999;        /* years since 1900 */
-       tm_struct.tm_wday = 6;        /* days since Sunday [0-6] */
-       tm_struct.tm_yday = 365;        /* days since January 1 [0-365] */
-       tm_struct.tm_isdst = 1;       /* Daylight Savings Time flag */
-    }
-  ALL_OVERFLOW
-    {// some OSs add fields to the tm struct - these fields are stated in POSIX
-       tm_struct.tm_sec = 61; /* seconds after the minute [0-60] */
-       tm_struct.tm_min = 60;         /* minutes after the hour [0-59] */
-       tm_struct.tm_hour = 24;        /* hours since midnight [0-23] */
-       tm_struct.tm_mday = 32;        /* day of the month [1-31] */
-       tm_struct.tm_mon = 12;         /* months since January [0-11] */
-       tm_struct.tm_year = 0;        /* years since 1900 */
-       tm_struct.tm_wday = 7;        /* days since Sunday [0-6] */
-       tm_struct.tm_yday = 366;        /* days since January 1 [0-365] */
-       tm_struct.tm_isdst = -1;       /* Daylight Savings Time flag */
-    }
-  ALL_MAX
-    {// some OSs add fields to the tm struct - these fields are stated in POSIX
-       tm_struct.tm_sec = MAXINT; /* seconds after the minute [0-60] */   
-       tm_struct.tm_min = MAXINT;         /* minutes after the hour [0-59] */
-       tm_struct.tm_hour = MAXINT;        /* hours since midnight [0-23] */
-       tm_struct.tm_mday = MAXINT;        /* day of the month [1-31] */
-       tm_struct.tm_mon = MAXINT;         /* months since January [0-11] */
-       tm_struct.tm_year = MAXINT;        /* years since 1900 */
-       tm_struct.tm_wday = MAXINT;        /* days since Sunday [0-6] */
-       tm_struct.tm_yday = MAXINT;        /* days since January 1 [0-365] */
-       tm_struct.tm_isdst = MAXINT;       /* Daylight Savings Time flag */
-    }
-  ALL_MIN
-    {// some OSs add fields to the tm struct - these fields are stated in POSIX
-       tm_struct.tm_sec = -MAXINT; /* seconds after the minute [0-60] */   
-       tm_struct.tm_min = -MAXINT;         /* minutes after the hour [0-59] */
-       tm_struct.tm_hour = -MAXINT;        /* hours since midnight [0-23] */
-       tm_struct.tm_mday = -MAXINT;        /* day of the month [1-31] */
-       tm_struct.tm_mon = -MAXINT;         /* months since January [0-11] */
-       tm_struct.tm_year = -MAXINT;        /* years since 1900 */
-       tm_struct.tm_wday = -MAXINT;        /* days since Sunday [0-6] */
-       tm_struct.tm_yday = -MAXINT;        /* days since January 1 [0-365] */
-       tm_struct.tm_isdst = -MAXINT;       /* Daylight Savings Time flag */
-    }
-{
-  _theVariable=&tm_struct;
-  fclose(logFile);
-}
-]
-
-commit
-[
-{
-}
-]
-
-cleanup
-[
-{
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_tms.tpl b/testcases/ballista/ballista/templates/b_ptr_tms.tpl
deleted file mode 100644
index 79016a9..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_tms.tpl
+++ /dev/null
@@ -1,117 +0,0 @@
-// b_ptr_tms.tpl : Ballista Datatype Template for tms pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structtmsptr b_ptr_tms;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#include <sys/times.h>
-
-#include "bTypes.h"
-#include "b_ptr_buf.h"
-#define structtmsptr struct tms*
-}
-]
-
-global_defines
-[
-{
-   static struct tms tmp_tms;
-}
-]
-
-dials
-[
-  enum_dial TMSPTR : 
-        THIS,
-        ALL_ZERO,
-        ALL_ONE,
-        ALL_MAX,
-        ALL_NEGONE;
-]
-
-access
-[
-{
-   // Setup log file for template information
-
-   FILE* logFile = NULL;
-
-   if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-   {
-      exit(99);
-   }
-}
-
-  THIS
-  {
-     if((times(&tmp_tms)) == (clock_t)-1)
-     {
-        fprintf(logFile, "b_ptr_tms - THIS: times() failed. Function not tested\n");
-        fclose(logFile);
-        exit(99);
-     }
-  }
-
-  ALL_ZERO
-  {
-     tmp_tms.tms_utime=0;              /* user time */
-     tmp_tms.tms_stime=0;              /* system time */
-     tmp_tms.tms_cutime=0;             /* user time, children */
-     tmp_tms.tms_cstime=0;             /* system time, children */
-  }
-
-  ALL_ONE
-  { 
-     tmp_tms.tms_utime=1;              /* user time */
-     tmp_tms.tms_stime=1;              /* system time */
-     tmp_tms.tms_cutime=1;             /* user time, children */
-     tmp_tms.tms_cstime=1;             /* system time, children */
-  }  
-
-  ALL_MAX
-  { 
-     tmp_tms.tms_utime=MAXINT;              /* user time */
-     tmp_tms.tms_stime=MAXINT;              /* system time */
-     tmp_tms.tms_cutime=MAXINT;             /* user time, children */
-     tmp_tms.tms_cstime=MAXINT;             /* system time, children */
-  }
-  
-  ALL_NEGONE
-  { 
-     tmp_tms.tms_utime=-1;              /* user time */
-     tmp_tms.tms_stime=-1;              /* system time */
-     tmp_tms.tms_cutime=-1;             /* user time, children */
-     tmp_tms.tms_cstime=-1;             /* system time, children */
-  }  
-
-{
-   fclose(logFile);
-   _theVariable = &tmp_tms;
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_unsigned_int.tpl b/testcases/ballista/ballista/templates/b_ptr_unsigned_int.tpl
deleted file mode 100644
index 8f66aeb..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_unsigned_int.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-// b_ptr_unsigned_int.tpl : Ballista Datatype Template for an unsigned int pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name uintPtr b_ptr_unsigned_int;
-
-parent b_ptr_int;
-
-includes
-[
-{
-//for mq_send and mq_receive
-#include "b_ptr_int.h"
-#include <limits.h>
-#define uintPtr unsigned int*
-}
-]
-
-global_defines
-[
-{
-  static unsigned int temp;
-}
-]
-
-dials
-[
-  enum_dial VALUE : MAXUINT;
-]
-
-access
-[
-  
-  MAXUINT
-  {
-    temp = UINT_MAX;
-    _theVariable=&temp;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_utimbuf.tpl b/testcases/ballista/ballista/templates/b_ptr_utimbuf.tpl
deleted file mode 100644
index 2f42f4c..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_utimbuf.tpl
+++ /dev/null
@@ -1,177 +0,0 @@
-// b_ptr_utimbuf.tpl : Ballista Datatype Template for an utimbuf pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name structUtimbufPtr b_ptr_utimbuf;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define structUtimbufPtr struct utimbuf *
-#include <sys/types.h>
-#include <sys/time.h>
-#include <utime.h>
-#include "b_ptr_buf.h"
-
-}
-]
-
-global_defines
-[
-{
-#define MIDNIGHT_2000 (2000-1970)*365*24*60*60   
-#define YEAR 365*24*60*60
-#define DAY 24*60*60
-#define HOUR 60*60
-#define MINUTE 60
-static struct utimbuf tmp_utimbuf;
-}
-]
-
-dials
-[	
-  enum_dial ACTIME : A_NOW,A_TOMORROW,A_NEXTWEEK,A_NEXTMONTH, A_NEXTYEAR, A_NEXTDECADE,A_NEXTCENTURY,A_NEXTMILLENIUM,A_Y2K,A_Y2K_MINUS_ONE,A_Y2K_PLUS_ONE,A_MAX,A_MIN; 
-  enum_dial MODTIME : M_NOW,M_TOMORROW,M_NEXTWEEK,M_NEXTMONTH, M_NEXTYEAR, M_NEXTDECADE,M_NEXTCENTURY,M_NEXTMILLENIUM,M_Y2K,M_Y2K_MINUS_ONE,M_Y2K_PLUS_ONE,M_MAX,M_MIN;
-]
-
-access
-[ 
-{
-tmp_utimbuf.actime = time(NULL);//initialized to NOW
-tmp_utimbuf.modtime = time(NULL);
-}
-    A_NOW
-    {
-    }
-    A_TOMORROW
-    {
-	tmp_utimbuf.actime += DAY;
-    }
-    A_NEXTWEEK
-    {
-	tmp_utimbuf.actime += (DAY*7);
-    }
-    A_NEXTMONTH
-    {
-	tmp_utimbuf.actime += (DAY*30);
-    }
-    A_NEXTYEAR
-    {
-	tmp_utimbuf.actime += YEAR;
-    }  
-    A_NEXTDECADE
-    {
-	tmp_utimbuf.actime += (YEAR*10);
-    }
-    A_NEXTCENTURY
-    {
-	tmp_utimbuf.actime += (YEAR*100);
-    }
-    A_NEXTMILLENIUM
-    {
-	tmp_utimbuf.actime += (YEAR*1000);
-    }
-    A_Y2K
-     {
-	tmp_utimbuf.actime = MIDNIGHT_2000;
-    }
-    A_Y2K_MINUS_ONE
-    {
-	tmp_utimbuf.actime = MIDNIGHT_2000-1;
-    }
-    A_Y2K_PLUS_ONE
-    {
-	tmp_utimbuf.actime = MIDNIGHT_2000+1;
-    }
-    A_MAX
-    {
-         tmp_utimbuf.actime = MAXINT;
-    }
-    A_MIN 
-    {
-         tmp_utimbuf.actime = - MAXINT;
-    }
-
-
-    M_NOW
-    {
-    }
-    M_TOMORROW
-    {
-	tmp_utimbuf.modtime += DAY;
-    }
-    M_NEXTWEEK
-    {
-	tmp_utimbuf.modtime += (DAY*7);
-    }
-    M_NEXTMONTH
-    {
-	tmp_utimbuf.modtime += (DAY*30);
-    }
-    M_NEXTYEAR
-    {
-	tmp_utimbuf.modtime += YEAR;
-    }  
-    M_NEXTDECADE
-    {
-	tmp_utimbuf.modtime += (YEAR*10);
-    }
-    M_NEXTCENTURY
-    {
-	tmp_utimbuf.modtime += (YEAR*100);
-    }
-    M_NEXTMILLENIUM
-    {
-	tmp_utimbuf.modtime += (YEAR*1000);
-    }
-    M_Y2K
-     {
-	tmp_utimbuf.modtime = MIDNIGHT_2000;
-    }
-    M_Y2K_MINUS_ONE
-    {
-	tmp_utimbuf.modtime = MIDNIGHT_2000-1;
-    }
-    M_Y2K_PLUS_ONE
-    {
-	tmp_utimbuf.modtime = MIDNIGHT_2000+1;
-    }
-    M_MAX
-    {
-         tmp_utimbuf.modtime = MAXINT;
-    }
-    M_MIN
-    {
-         tmp_utimbuf.modtime = - MAXINT;
-    }
-{
-    _theVariable = &tmp_utimbuf;
-}
-]
-
-commit
-[
-{
-}
-]
-
-cleanup
-[
-{
-}
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_utsname.tpl b/testcases/ballista/ballista/templates/b_ptr_utsname.tpl
deleted file mode 100644
index eb482f9..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_utsname.tpl
+++ /dev/null
@@ -1,229 +0,0 @@
-// b_ptr_utsname.tpl : Ballista Datatype Template for an utsname pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name utsnamePtr b_ptr_utsname;
-
-parent b_ptr_buf;
-
-includes
-[
-{
-#define utsnamePtr struct utsname *
-#include <sys/utsname.h>
-#include "b_ptr_buf.h"
-}
-]
-
-global_defines
-[
-{
-static struct utsname utsname_temp  ;
-}
-]
-
-dials
-[
-  enum_dial SYSNAME : S_NULL, S_SIZE1, S_SYS_NMLN, S_SELF;
-  enum_dial NODENAME : N_NULL, N_SIZE1, N_SYS_NMLN, N_SELF;
-  enum_dial RELEASE : R_NULL, R_SIZE1, R_SYS_NMLN, R_SELF;
-  enum_dial VERSION : V_NULL, V_SIZE1, V_SYS_NMLN, V_SELF;
-  enum_dial MACHINE : M_NULL, M_SIZE1, M_SYS_NMLN, M_SELF;
-]
-
-access
-[
-{
-  // open logFile
-  FILE* logFile = NULL;
-  if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-  {
-    exit(99);
-  }
-}
-
-  S_SELF
-  {
-    struct utsname utsname_self;
-    if(!(uname(&utsname_self) ==0))
-    {
-      fprintf(logFile, "b_ptr_utsname - S_SELF error occurred in uname function not tested.\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy (utsname_temp.sysname, utsname_self.sysname);
-  }
-
-  S_NULL
-  {
-    utsname_temp.sysname[0] = '\0';
-  }
-
-  S_SIZE1
-  {
-    utsname_temp.sysname[0] = 'a';
-    utsname_temp.sysname[1] = '\0';
-  }
-
-  S_SYS_NMLN
-  { //ending null intentionally missing
-    int i;
-    for (i=0; i<SYS_NMLN; i++)
-    {
-      utsname_temp.sysname[i] = 'a'; 
-    }
-  }
-
-  N_SELF
-  {
-    struct utsname utsname_self;
-    if(!(uname(&utsname_self) ==0))   
-    {
-      fprintf(logFile, "b_ptr_utsname - N_SELF error occurred in uname function not tested.\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy (utsname_temp.nodename, utsname_self.nodename);
-  }
-
-  N_NULL
-  {
-    utsname_temp.nodename[0] = '\0';
-  }
-
-  N_SIZE1
-  {
-    utsname_temp.nodename[0] = 'a';
-    utsname_temp.nodename[1] = '\0';
-  }
-
-  N_SYS_NMLN
-  {
-    int i;
-    for (i=0; i<SYS_NMLN; i++)
-    {
-      utsname_temp.nodename[i] = 'a';
-    }
-  }
-
-  R_SELF
-  {
-    struct utsname utsname_self;
-    if(!(uname(&utsname_self) ==0))   
-    {
-      fprintf(logFile, "b_ptr_utsname - R_SELF error occurred in uname function not tested.\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy (utsname_temp.release, utsname_self.release);
-  }
-
-  R_NULL
-  {
-    utsname_temp.release[0] ='\0';
-  }
-
-  R_SIZE1
-  {
-    utsname_temp.release[0] ='a';
-    utsname_temp.release[1] ='\0';
-  }
-
-  R_SYS_NMLN
-  {
-    int i;
-    for (i=0; i<SYS_NMLN; i++)
-    {
-      utsname_temp.release[i] = 'a'; 
-    }
-  }
-
-  V_SELF
-  {
-    struct utsname utsname_self;
-    if(!(uname(&utsname_self) ==0))   
-    {
-      fprintf(logFile, "b_ptr_utsname - V_SELF error occurred in uname function not tested.\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy (utsname_temp.version, utsname_self.version);
-  }
-
-  V_NULL
-  {
-    utsname_temp.version[0] = '\0';
-  }
-
-  V_SIZE1
-  {
-    utsname_temp.version[0] = 'a';
-    utsname_temp.version[1] = '\0';
-  }
-
-  V_SYS_NMLN
-  {
-    int i;
-    for (i=0; i<SYS_NMLN; i++)
-    {
-      utsname_temp.version[i] = 'a'; 
-    }
-  }
-
-  M_SELF
-  {
-    struct utsname utsname_self;
-    if(!(uname(&utsname_self) ==0))   
-    {
-      fprintf(logFile, "b_ptr_utsname - M_SELF error occurred in uname function not tested.\n");
-      fclose(logFile);
-      exit(99);
-    }
-    strcpy (utsname_temp.machine, utsname_self.machine);
-  }
-
-  M_NULL
-  {
-    utsname_temp.machine[0] = '\0';
-  }
-
-  M_SIZE1
-  {
-    utsname_temp.machine[0] = 'a';
-    utsname_temp.machine[1] = '\0';
-  }
-
-  M_SYS_NMLN
-  {
-    int i;
-    for (i=0; i<SYS_NMLN; i++)
-    {
-      utsname_temp.machine[i] = 'a'; 
-    }
-  }
-{
-  _theVariable = &utsname_temp;
-  fclose(logFile);
-}
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_void.tpl b/testcases/ballista/ballista/templates/b_ptr_void.tpl
deleted file mode 100644
index 2a23050..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_void.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-// b_ptr_void.tpl : Ballista Datatype Template for a void pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name void* b_ptr_void;
-
-parent paramAccess;
-
-includes
-[
- {
-  #include "values.h"
-  #include "bTypes.h"
- }
-]
-
-global_defines
-[
- {
-  #define MaxBytes sizeof(void *);
-  static void *ptrRef = NULL;
-  static void *cp_ptrRef = NULL;
-  //void *saveloc;
- }
-]
-
-dials
-[
-  enum_dial POSITION : NULL, NEGONE, MAXINT, STATIC, DYNAMIC, CONST, FREED;
-]
-
-access
-[
- {
-  char stat[56];
- }
-
- NULL
-    {
-       _theVariable=(void *) NULL;
-    }
- NEGONE
-    {//Invalid pointer 
-       _theVariable=(void *) -1;
-    }
- MAXINT
-    {
-       _theVariable=(void *)MAXINT;
-    }
- STATIC
-    {
-       _theVariable=(void*)&stat;
-    }
- DYNAMIC
-    {
-       cp_ptrRef = ptrRef = malloc(16);
-       _theVariable = (void *) ptrRef;
-    }
- CONST
-    {
-       ptrRef =  (void*)"                                             ";
-       _theVariable = ptrRef;
-    }
- FREED
-    {
-       cp_ptrRef = ptrRef = malloc (10240); //allocate 10k block
-       _theVariable = (void *) ptrRef;
-    }
-]
-
-commit
-[
- FREED
-    {
-       free(ptrRef);
-    }
-]
-
-cleanup
-[
- DYNAMIC
-    {
-       if (cp_ptrRef)
-       {
-          free(cp_ptrRef);
-          ptrRef = NULL;
-       }
-    }
-]
diff --git a/testcases/ballista/ballista/templates/b_ptr_wchar.tpl b/testcases/ballista/ballista/templates/b_ptr_wchar.tpl
deleted file mode 100644
index 6bfd9bf..0000000
--- a/testcases/ballista/ballista/templates/b_ptr_wchar.tpl
+++ /dev/null
@@ -1,167 +0,0 @@
-// b_ptr_wchar.tpl : Ballista Datatype Template for a wide char pointer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name wchar_t* b_ptr_wchar;
-
-parent b_ptr_buf;
-
-includes
-[
- {
-  #include <wchar.h>
-  #include "b_ptr_buf.h" //parent class include file
- }
-]
-
-global_defines
-[
- {
-   static wchar_t  *save_b_ptr_char=NULL;
-#define sup_fillstring(buf,len,fillChar)   for (int i=0; i<len; i++) buf[i] = fillChar
- }
-]
-
-dials
-[
-  enum_dial SIZE : S1,S4,S16,S8K;
-  enum_dial CONTENTS : MAX,MIN,CHAR,NUM,TAB,ESC;
-  enum_dial FILL : EMPTY,SOME,FULL;
-]
-
-access
-[
-{
-  int sizeof_wchar_t = sizeof(wchar_t);
-  wchar_t  fillVar;
-  int   divisor;
-  int  size;
-  wchar_t  *temp_b_ptr_char=NULL;
-  FILE* logFile = NULL;
-
-  if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-  {
-    exit(99);
-  }
-}
-
-
-  S1
-  {
-    size = 1;
-    temp_b_ptr_char = (wchar_t *)malloc(size * sizeof_wchar_t);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S1 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S4
-  { 
-    size = 4;
-    temp_b_ptr_char = (wchar_t *)malloc(size * sizeof_wchar_t);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile, "b_ptr_char - S4 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S16
-  {
-    size = 16;
-    temp_b_ptr_char = (wchar_t *)malloc(size * sizeof_wchar_t);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S16 malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  S8K
-  {
-    size = 8192;
-    temp_b_ptr_char = (wchar_t *)malloc(size * sizeof_wchar_t);
-    if(temp_b_ptr_char == NULL)
-    {
-      fprintf(logFile,"b_ptr_char - S8K malloc failed, function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }	
-  }
-
-  CHAR
-  {
-    fillVar = 'A';
-  }
-  NUM
-  {
-    fillVar = '1';
-  }
-  TAB
-  {
-    fillVar = '\t';
-  }
-  ESC
-  {
-    fillVar = '\27';
-  }
-  MAX
-  {
-    fillVar = WCHAR_MAX;
-  }
-  MIN
-  {
-    fillVar = WCHAR_MIN;
-  }
-  SOME
-  {
-    sup_fillstring(temp_b_ptr_char, (int)(size/3), fillVar);
-    temp_b_ptr_char[(int)(size/3)+1]='\0';
-  }
-  FULL
-  {
-    sup_fillstring(temp_b_ptr_char, size, fillVar);
-  }
-  EMPTY
-  {
-    temp_b_ptr_char[0]='\0';
-  }
-{
-  fclose(logFile);
-  save_b_ptr_char = temp_b_ptr_char;
-  _theVariable = temp_b_ptr_char;
-}
-
-]
-
-commit
-[
-]
-
-cleanup
-[
- {
-   if (save_b_ptr_char !=NULL)
-   {
-     free(save_b_ptr_char);
-   }
- }
-]
diff --git a/testcases/ballista/ballista/templates/b_sched_policy.tpl b/testcases/ballista/ballista/templates/b_sched_policy.tpl
deleted file mode 100644
index 65160ae..0000000
--- a/testcases/ballista/ballista/templates/b_sched_policy.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-// b_sched_policy.tpl : Ballista Datatype Template for schedule policy
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_sched_policy;
-
-parent b_int;
-
-includes
-[
- {
-   #include <sched.h>
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : FIFO,RR,OTHER;
-]
-
-access
-[
-  FIFO
-  {
-    _theVariable= SCHED_FIFO;
-  }
-  RR
-  {
-    _theVariable= SCHED_RR;
-  }
-  OTHER
-  {
-    _theVariable= SCHED_OTHER;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_short.tpl b/testcases/ballista/ballista/templates/b_short.tpl
deleted file mode 100644
index 51473bf..0000000
--- a/testcases/ballista/ballista/templates/b_short.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-// b_short.tpl : Ballista Datatype Template for a short datatype
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name short b_short;
-
-parent b_short_int_common;
-
-includes
-[
- {
-   #include "b_short_int_common.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[ 
-  enum_dial VALUE : NEG_ONE, NEG_SIXTYFOUR, NEG_MAXSHORT;
-]
-
-access
-[
-  NEG_ONE
-  {
-    _theVariable = -1;
-  }
-  NEG_SIXTYFOUR
-  {
-    _theVariable = -64;
-  }
-  NEG_MAXSHORT
-  {
-    _theVariable= - MAXSHORT;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_short_int_common.tpl b/testcases/ballista/ballista/templates/b_short_int_common.tpl
deleted file mode 100644
index 9fca7f4..0000000
--- a/testcases/ballista/ballista/templates/b_short_int_common.tpl
+++ /dev/null
@@ -1,129 +0,0 @@
-// b_short_int_common.tpl : Ballista Datatype Template for common short integers
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name intBase b_short_int_common;
-
-parent paramAccess;
-
-includes
-[
- {
-  #include "values.h"  //for digital unix
-  #include "bTypes.h"
-  #define intBase unsigned short
-
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial VALUE : ZERO, ONE, TWO, FIFTEEN, SIXTEEN, SEVENTEEN, SC_PAGE, SIXTYFOUR,SIXTYFIVE, ONE27, ONE29, TWO55, TWO56, TWO57, I4K, I8K, I8193, I16383, MAXSHORT;
-]
-
-access
-[
-  ZERO
-  {
-     _theVariable=0;
-  }
-  ONE
-  {
-    _theVariable=1;
-  }
-  TWO
-  {
-    _theVariable=2;
-  }
-  FIFTEEN
-  {
-    _theVariable=15;
-  }
-  SIXTEEN
-  {
-    _theVariable=16;
-  }
-  SEVENTEEN
-  {
-    _theVariable=17;
-  }
-  SC_PAGE
-  {
-    _theVariable=_SC_PAGESIZE;
-  }
-  SIXTYFOUR
-  {
-    _theVariable=64;
-  }
-  SIXTYFIVE
-  {
-    _theVariable=65;
-  }
-  ONE27
-  {
-    _theVariable=127;
-  }
-  ONE29
-  {
-    _theVariable=129;
-  }
-  TWO55
-  {
-    _theVariable=255;
-  }
-  TWO56
-  {
-    _theVariable=256;
-  }
-  TWO57
-  {
-    _theVariable=257;
-  }
-  I4K
-  {
-    _theVariable=4096;
-  }
-  I8K
-  {
-    _theVariable=8192;
-  }
-  I8193
-  {
-    _theVariable=8193;
-  }
-  I16383
-  {
-    _theVariable=16383;
-  }
-  MAXSHORT
-  {   
-    _theVariable=MAXSHORT;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_sig_how.tpl b/testcases/ballista/ballista/templates/b_sig_how.tpl
deleted file mode 100644
index 538240e..0000000
--- a/testcases/ballista/ballista/templates/b_sig_how.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-// b_sig_how.tpl : Ballista Datatype Template for a signal processing flag
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_sig_how;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <signal.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : SIGBLOCK, SIGUNBLOCK, SIGSETMASK;
-]
-
-access
-[
-  SIGBLOCK
-  {
-    _theVariable= SIG_BLOCK;
-  }
-  SIGUNBLOCK
-  {  
-    _theVariable= SIG_UNBLOCK;    
-  } 
-  SIGSETMASK
-  {  
-    _theVariable= SIG_SETMASK;    
-  } 
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_signal.tpl b/testcases/ballista/ballista/templates/b_signal.tpl
deleted file mode 100644
index 9803540..0000000
--- a/testcases/ballista/ballista/templates/b_signal.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-// b_signal.tpl : Ballista Datatype Template for a signal
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_signal;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <signal.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : SIGILL, SIGABRT, SIGSEGV, SIGINT, SIGCHLD, SIGRTMIN, SIGRTMAX;
-]
-
-access
-[
-  SIGILL
-  {
-    _theVariable= SIGILL;
-  }
-  SIGABRT
-  {  
-    _theVariable= SIGABRT;    
-  } 
-  SIGSEGV
-  {  
-    _theVariable= SIGSEGV;    
-  } 
-  SIGINT
-  {  
-    _theVariable= SIGINT;    
-  } 
-  SIGCHLD
-  {  
-    _theVariable= SIGCHLD;    
-  } 
-  SIGRTMIN
-  {  
-    _theVariable= SIGRTMIN;    
-  } 
-  SIGRTMAX
-  {  
-    _theVariable= SIGRTMAX;    
-  } 
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_size.tpl b/testcases/ballista/ballista/templates/b_size.tpl
deleted file mode 100644
index 8cd1a2a..0000000
--- a/testcases/ballista/ballista/templates/b_size.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_size.tpl : Ballista Datatype Template for size
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_size;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
- }
-]
-
-global_defines
-[
- {
-  #define bm_PAGESIZE getpagesize()
- }
-]
-
-dials
-[
-  enum_dial SIZE : SIZE_PAGEx16,SIZE_PAGEx16p1;
-]
-
-access
-[
-  SIZE_PAGEx16
-    {
-       _theVariable=16*bm_PAGESIZE; 
-    }
-  SIZE_PAGEx16p1
-    {
-       _theVariable=16*bm_PAGESIZE+1; 
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_time_t.tpl b/testcases/ballista/ballista/templates/b_time_t.tpl
deleted file mode 100644
index 252e59b..0000000
--- a/testcases/ballista/ballista/templates/b_time_t.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-// b_time_t.tpl : Ballista Datatype Template for a time_t datatype
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name time_t b_time_t;
-
-parent b_int;
-// the parent could be b_long for some operating systems
-
-includes
-[
-{
-#include <time.h>
-#include "bTypes.h"
-#include "b_int.h"
-}
-]
-
-global_defines
-[
-{
-//need exact value for midnight_2000
-#define MIDNIGHT_2000 (2000-1970)*365*24*60*60   
-#define YEAR 365*24*60*60
-#define DAY 24*60*60
-#define HOUR 60*60
-#define MINUTE 60
-}
-]
-
-dials
-[
-  enum_dial SECONDS : 
-	NOW,
-	TOMORROW,	
-	NEXTWEEK, 
-	NEXTMONTH, 
-	NEXTYEAR, 
-	NEXTDECADE, 
-	NEXTCENTURY,
-	NEXTMILLENIUM,
-	Y2K,
-	Y2K_MINUS_ONE,
-	Y2K_PLUS_ONE;
-]
-
-access
-[
-{
-  time_t time_since_epoch = time(NULL);
-}
-  NOW
-  {
-    _theVariable= time_since_epoch;
-  }
-  TOMORROW
-  {
-    time_since_epoch += DAY;
-    _theVariable = time_since_epoch;
-  }
-  NEXTWEEK
-  {
-    time_since_epoch += (DAY*7);
-    _theVariable = time_since_epoch;
-  }
-  NEXTMONTH
-  {
-    time_since_epoch += (DAY*30);
-    _theVariable= time_since_epoch;
-  }
-  NEXTYEAR
-  {
-    time_since_epoch += YEAR;
-    _theVariable= time_since_epoch;
-  }  
-  NEXTDECADE
-  {
-    time_since_epoch += (YEAR*10);
-    _theVariable= time_since_epoch;
-  }
-  NEXTCENTURY
-  {
-    time_since_epoch += (YEAR*100);
-    _theVariable= time_since_epoch;
-  }
-  NEXTMILLENIUM
-  {
-    time_since_epoch += (YEAR*1000);
-    _theVariable= time_since_epoch;
-  }
-  Y2K
-  {
-    time_since_epoch = MIDNIGHT_2000;
-    _theVariable= time_since_epoch;
-  }
-  Y2K_MINUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000-1;
-    _theVariable= time_since_epoch;
-
-  }
-  Y2K_PLUS_ONE
-  {
-    time_since_epoch = MIDNIGHT_2000+1;
-    _theVariable= time_since_epoch;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_timer.tpl b/testcases/ballista/ballista/templates/b_timer.tpl
deleted file mode 100644
index a5fcf1d..0000000
--- a/testcases/ballista/ballista/templates/b_timer.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-// b_timer.tpl : Ballista Datatype Template for timer_t
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name timer_t b_timer;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <time.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : ABS, LOCAL;
-]
-
-access
-[
-  ABS
-  {
-    _theVariable= TIMER_ABSTIME;
-  }
-  LOCAL
-  {
-    timer_t tempTimer;
-    if (timer_create (CLOCK_REALTIME, NULL, &tempTimer) == -1)
-    {
-      FILE* logFile = NULL;
-      if ((logFile = fopen ("/tmp/templateLog.txt","a+")) == NULL)
-      {
-        exit(99);
-      }
-      fprintf(logFile,"b_timer LOCAL - error creating timer - function not tested\n");
-      fclose(logFile);
-      exit(99);
-    }
-    _theVariable = tempTimer;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_unsigned_int.tpl b/testcases/ballista/ballista/templates/b_unsigned_int.tpl
deleted file mode 100644
index b6aad8e..0000000
--- a/testcases/ballista/ballista/templates/b_unsigned_int.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-// b_unsigned_int.tpl : Ballista Datatype Template for an unsigned integer
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name Uint b_unsigned_int;
-
-parent b_unsigned_short;
-
-includes
-[
- {
-   #include "b_unsigned_short.h"
-   #include <limits.h>
-   #define Uint unsigned int
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : MAXUINT;
-]
-
-access
-[
-  MAXUINT
-    {
-       _theVariable= UINT_MAX;
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_unsigned_long.tpl b/testcases/ballista/ballista/templates/b_unsigned_long.tpl
deleted file mode 100644
index b88e458..0000000
--- a/testcases/ballista/ballista/templates/b_unsigned_long.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-// b_unsigned_long.tpl : Ballista Datatype Template for an unsigned long
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name Ulong b_unsigned_long;
-
-parent b_unsigned_int;
-
-includes
-[
- {
-   #define Ulong unsigned long
-   #include "limits.h"
-   #include "b_unsigned_int.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : MAXULONG;
-]
-
-access
-[
-  MAXULONG
-    {
-       _theVariable= ULONG_MAX;
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_unsigned_short.tpl b/testcases/ballista/ballista/templates/b_unsigned_short.tpl
deleted file mode 100644
index 802eabd..0000000
--- a/testcases/ballista/ballista/templates/b_unsigned_short.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-// b_unsigned_short.tpl : Ballista Datatype Template for an unsigned short
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name Ushort b_unsigned_short;
-
-parent b_short_int_common;
-
-includes
-[
- {
-   #include "b_short_int_common.h"
-   #define Ushort unsigned short
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial VALUE : MAXSHORTPLUS1, MAXUSHORT;
-]
-
-access
-[
-  MAXSHORTPLUS1
-    {
-      _theVariable = MAXSHORT + 1;
-    }
-  MAXUSHORT
-    {
-       _theVariable= MAXSHORT * 2 +1;
-    }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_waitopt.tpl b/testcases/ballista/ballista/templates/b_waitopt.tpl
deleted file mode 100644
index 28579e3..0000000
--- a/testcases/ballista/ballista/templates/b_waitopt.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-// b_waitopt.tpl : Ballista Datatype Template for wait options
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name int b_waitopt;
-
-parent b_int;
-
-includes
-[
- {
-   #include "b_int.h"
-   #include <sys/wait.h>
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : NOHANG, UNTRACED, BOTH;
-]
-
-access
-[
-{
-  _theVariable = 0;
-}
-  NOHANG, BOTH
-  {
-    _theVariable |= WNOHANG;
-  }
-  UNTRACED, BOTH
-  {
-    _theVariable |= WUNTRACED;
-  }
-]
-
-commit
-[
-]
-
-cleanup
-[
-]
diff --git a/testcases/ballista/ballista/templates/b_wchar.tpl b/testcases/ballista/ballista/templates/b_wchar.tpl
deleted file mode 100644
index 96cb6ea..0000000
--- a/testcases/ballista/ballista/templates/b_wchar.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-// b_wchar.tpl : Ballista Datatype Template for wide character
-// Copyright (C) 1998-2001  Carnegie Mellon University
-//
-// This program 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 Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-name wchar_t b_wchar;
-
-parent b_char;
-includes
-[
- {
-  #include <wchar.h>
-  #include "b_char.h"
-  #include "values.h"  //for digital unix
-  #include "bTypes.h"
- }
-]
-
-global_defines
-[
- {
- }
-]
-
-dials
-[
-  enum_dial HVAL : WCHAR_MAX,WCHAR_MIN,WCHAR_SPACE;
-]
-
-access
-[
-  WCHAR_MAX
-  {
-    _theVariable=WCHAR_MAX;
-  }
-  WCHAR_MIN
-  {
-    _theVariable=WCHAR_MIN;
-  }
-  WCHAR_SPACE
-  {
-    _theVariable= ' ';
-  }
-]
-
-commit
-[
-{
-}
-]
-
-cleanup
-[
-{
-}
-]
diff --git a/testcases/ballista/ballista/templates/paramAccess.param b/testcases/ballista/ballista/templates/paramAccess.param
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/templates/paramAccess.param
+++ /dev/null
diff --git a/testcases/ballista/ballista/testCaseIterator.cpp b/testcases/ballista/ballista/testCaseIterator.cpp
deleted file mode 100644
index eb53c47..0000000
--- a/testcases/ballista/ballista/testCaseIterator.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/* testCaseIterator.cpp: class that will iterate through all test cases
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <vector>
-
-#include "ballista.h"
-#include "testCaseIterator.h"
-
-using namespace std;
-
-/************************
- *
- * Function: Test_case_iterator
- * Description:constructor for the class
- * Function Inputs: server_comm - a server communication object
-                    sample_size_val - the percent of tests to be run 
-		    number_arguments - number of arguments to the MuT
-		    vec - param file data
- * Global Inputs:
- * Return Values:
- * Global Outputs: prints server name to be consistent with old code
- * Errors:
- * Pre-Conditions:
- * Post-Conditions: get_array_1 is allocated, all member variables initialized
- * Design: setup get_array_1.  Then ask the server for the tests.
- * Notes:
- *
- ************************/
-
-Test_case_iterator::Test_case_iterator(Server_communication *server_comm,
-				       double sample_size_val,
-				       int number_arguments,
-				       vector<line> vec[MAXP])
-{
-  char server_name[255];
-  int i;
-  int j;
-
-  server = server_comm;
-  sample_size = sample_size_val;
-  // here we print out the server name.  This is only done to keep the output
-  // of BallistIC the same as Ballista
-  server->get_name(server_name,sizeof(server_name));
-  cout<<server_name<<endl;
-
-
-  //even though RPC is supposed to be beautiful.... its not so
-  //therefore I must change c++ and multidimensonial things into
-  //something XDR understands
-  
-  get_array_1_arg.NumArg=number_arguments;
-  get_array_1_arg.sample_size=sample_size;
-
-  
-  get_array_1_arg.mvl.my_arr_vec_line_len=MAXP;
-  get_array_1_arg.mvl.my_arr_vec_line_val = 
-    (my_vector_lines *)calloc(MAXP,sizeof(my_vector_lines));
-  
-  for(i=0;i<MAXP;i++){
-    get_array_1_arg.mvl.my_arr_vec_line_val[i].my_vector_lines_len = 
-      vec[i].size();
-    if(vec[i].size()==0){
-      get_array_1_arg.mvl.my_arr_vec_line_val[i].my_vector_lines_val=NULL;
-    } 
-    else {
-      get_array_1_arg.mvl.my_arr_vec_line_val[i].my_vector_lines_val = 
-	(my_line *)calloc(vec[i].size(),sizeof(my_line));
-      for(j=0;j<vec[i].size();j++) {
-	if(vec[i][j].p==NULL) {
-	  get_array_1_arg.mvl.my_arr_vec_line_val[i].my_vector_lines_val[j] = 
-	    "NULL";
-	} 
-	else {
-	  get_array_1_arg.mvl.my_arr_vec_line_val[i].my_vector_lines_val[j] = 
-	    strdup(vec[i][j].p);
-	}
-      }
-    }
-  }
-
-  send_request_to_server(&get_array_1_arg);
-}
-
-
-/************************
- *
- * Function: send_request_to_server
- * Description: send a request to the server to get a test set
- * Function Inputs: data - param file info in the proper format for RPC
- * Global Inputs:
- * Return Values:
- * Global Outputs: message to user that test results were asked for 
-                   and received
- * Errors:
- * Pre-Conditions: data is initialized
- * Post-Conditions: result_temp, result_1, total are set up
-                    index is reset to 0
- * Design: ask the server object for the tests.  Adjust total and index
- * Notes:
- *
- ************************/
-void Test_case_iterator::send_request_to_server(info *data)
-{
-  return_info *result_temp;
-
-  cout<<"Fetching tests to do from server...."<<endl;
-  result_temp = server->get_test_set(data);
-
-  cout<<"Got the data"<<endl;
-  cout.flush();
-
-  result_1=&(result_temp->my_three_dim);
-  total=result_temp->total;
-  index = 0;
-
-#ifdef UNIT_TEST
-  FILE *fptr = fopen("iterator.txt","a");
-  if(fptr) {
-    char server_name[255];
-    server->get_name(server_name,sizeof(server_name));
-    fprintf(fptr,"received tests from %s\n",server_name);
-    fprintf(fptr,"total = %d\n",total);
-    fclose(fptr);
-  }
-#endif
-}
-
-
-/************************
- *
- * Function: next
- * Description: return the next two_dim to test
- * Function Inputs: 
- * Global Inputs:
- * Return Values: two_dim representing the next test to run
- * Global Outputs:
- * Errors: an exception may be thrown from the server object when it
-           tries to get a new test set
- * Pre-Conditions: at least one set of tests has been requested from the server
- * Post-Conditions: index = index + 1 or 0 if a new test set was requested
-                    if necessary a new test set may be requested
- * Design:  if there are no tests in this test set 
-            (total == -1) return NULL marking the
-	    end of the tests.
-	    else if there are more tests in the current test set, 
-	    then return the next one.  Finally if we have done all the tests 
-	    in the current test set ask for a new one with the stall_args
- * Notes:   The strangeness here comes from the existing ballista code.  
-            For some reason you have to ask for another set of tests after 
-	    finishing one.  It is not entirely clear when -1 is
-            return from the server as total.  We are assuming that eventually 
-	    -1 will be returned from the server.  Otherwise this will be an
-	    endless recursive loop.  From the original code, it appears that
-	    -1 will be returned.
-	    
-	    total represents the total number of tests that are to be run
-	    from the current set returned by the server
-	    sample_size is the percentage of these tests that will actually
-	    be run. It is an integer between 1 and 100.
- *
- ************************/
-two_dim *Test_case_iterator::next()
-{
-  if(total == -1) {
-    return NULL; // end of the list
-  }
-  else {
-    if(index < total*(sample_size)/100.0) {
-      two_dim *return_value = &result_1->three_dim_val[index];
-      index++;
-
-#ifdef UNIT_TEST
-      FILE *fptr = fopen("iterator.txt","a");
-      if(fptr) {
-	int j;
-	int k;
-	for(j=0;j<return_value->two_dim_len;j++) {
-	  for(k=0;k<return_value->two_dim_val[j].one_dim_len;k++) {
-	    fprintf(fptr,"%s\t",return_value->two_dim_val[j].one_dim_val[k]);
-	  }
-	  fprintf(fptr,"\n");
-	}
-	fprintf(fptr,"---\n");
-      }
-      fclose(fptr);
-#endif
-
-      return return_value;
-    }
-    else {
-      // we have used up all the tests given to us by the server
-      // now ask for a new set of tests
-      // after we get them, call next() again to get the first test or
-      // to determine that we are done
-      info stall_arg;
-      stall_arg.NumArg=0;
-      stall_arg.sample_size=0;
-      stall_arg.mvl.my_arr_vec_line_len=0;
-      send_request_to_server(&stall_arg);
-      return next();
-    }
-  }
-}
-
-
-/************************
- *
- * Function: ~Test_case_iterator
- * Description: destructor for the class
- * Function Inputs:
- * Global Inputs:
- * Return Values:
- * Global Outputs:
- * Errors:
- * Pre-Conditions: get_array_1_arg is allocated
- * Post-Contidions: get_array_1_arg is deallocated
- * Design:  free memory allocated in get_array_1_arg
- * Notes:
- *
- ************************/
-Test_case_iterator::~Test_case_iterator()
-{
-  int il;
-
-  // free up the memory needed to send the info to the server
-  // check that the pointer is not null before freeing it
-  for(il=0;il<MAXP;il++) {
-    if(get_array_1_arg.mvl.my_arr_vec_line_val[il].my_vector_lines_val)
-      free(get_array_1_arg.mvl.my_arr_vec_line_val[il].my_vector_lines_val);
-  }
-  free(get_array_1_arg.mvl.my_arr_vec_line_val);
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testcases/ballista/ballista/testCaseIterator.h b/testcases/ballista/ballista/testCaseIterator.h
deleted file mode 100644
index f1ea89d..0000000
--- a/testcases/ballista/ballista/testCaseIterator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* testCaseIterator.h: class that will iterate through all test cases
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-
-#ifndef _TEST_CASE_ITERATOR_
-#define _TEST_CASE_ITERATOR_
-
-
-#include "ballistaRPC.h"
-#include <vector>
-#include "line.h"
-#include "serverCommunication.h"
-
-using namespace std;
-
-class Test_case_iterator {
-  three_dim  *result_1;
-  info get_array_1_arg;
-  int total;
-  int index;
-  double sample_size;
-  Server_communication *server;
- public:
-  Test_case_iterator(Server_communication *server_com, double sample_size_val, 
-		     int NumArg, vector<line> vec[MAXP]);
-  two_dim *next();
-  virtual ~Test_case_iterator();
- private:
-
-  void send_request_to_server(info *data);
-};
-
-
-
-#endif // _TEST_CASE_ITERATOR_
diff --git a/testcases/ballista/ballista/testManager.h b/testcases/ballista/ballista/testManager.h
deleted file mode 100644
index 3394027..0000000
--- a/testcases/ballista/ballista/testManager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* testManager.h: Class definitions for virtual class Test_manager
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _TESTMANAGER_H
-#define _TESTMANAGER_H
-
-#include "ballista.h"
-
-
-/************************
- *
- * Function:        class Test_manager
- * Description:     Test_manager class definition - base class for all
- *                  Test_manager classes for different Ballista client
- *                  implementations
- * Function Inputs: N/A
- * Global Inputs:   N/A
- * Return Values:   N/A
- * Global Outputs:  N/A
- * Errors:          N/A
- * Pre-Conditions:  N/A
- * Post-Contidions: N/A
- * Design:          N/A
- * Notes:           N/A
- *
- ************************/
-
-class Test_manager {
-    public:
-
-    virtual int manage_test(MARSHAL_DATA_TYPE arguments,
-			    long timeout_value,
-			    char *pass_status, int max_pass_status,
-			    int *call_ret,
-			    char *sys_err, int max_sys_err,
-			    char *mut_return,
-			    int max_mut_return) = 0;
-
-};
-
-#endif // _TESTMANAGER_H
diff --git a/testcases/ballista/ballista/testpl.pl b/testcases/ballista/ballista/testpl.pl
deleted file mode 100644
index 04eedb9..0000000
--- a/testcases/ballista/ballista/testpl.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-
-
-my $option1default = "n"; # default answer for question 1
-my $option1; # the final answer for question1
-my $timeoutdefault = "5"; # seconds to wait
- 
-  
-# start
-$SIG{ALRM} = sub { die "timeout" };
- print "Enter \n";
- eval {
-
- alarm( $timeoutdefault );
-
-# get the input
-
- $option1 = <STDIN>;
-
-alarm( 0 );
-
- };
-
- if ( $@ ) {
-
- if ( $@ =~ /timeout/i ) {
-
- $option1 = $option1default;
- print "\n";
-
- } else {
-
- alarm( 0 );
- die;
-
- }
-
- }
-
- chomp( $option1 );
- print "Answer to question 1: $option1\n";
-
- exit;
diff --git a/testcases/ballista/ballista/unmarshal.cpp b/testcases/ballista/ballista/unmarshal.cpp
deleted file mode 100644
index 0c8bd4d..0000000
--- a/testcases/ballista/ballista/unmarshal.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* unmarshal.cpp Handle the marshalling and demarshalling of dial settings
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include "ballista.h"
-#include "unmarshal.h"
-#include "marshal.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h> // for testing only
-
-/************************
- *
- * Function:        unmarshal
- * Description:     unmarshal a string into dial settings
- * Function Inputs: string:  string to store marshalled dial settings,
- *                  data: two-dimensial array of dial settings
- * Global Inputs:   - N.A.
- * 
- * Return Values:   0 : success
- * Errors           -1 : exceeded the number of max dial settings error
- *                  -2 : exceeded the number of max parameters error
- * Global Outputs:  N.A.
- *         
- * Pre-Conditions:  dial settings is correctly allocated,
- *                  string string contains correctly marshalled data
- *
- * Post-Contidions: data contains the extracted dial settings in the string
- *
- * Design:          This should be the reverse process of marshal() function.
- *                  The outer loop extract the dial settings for one parameter.
- *                  The inner loop copy the individual dial setting into the array
- *                  as indicated by data[param_idx][dial_idx] for each parameter.
- *                  
- *                  
- * Notes:           An additional Null string is added after the last dial setting  
- *                  (end of each row) to replicate the original data[][] structure.
- *
- ************************/
-
-int unmarshal(MARSHAL_DATA_TYPE data, const char string[])
-{
-  int param_idx = 0; // index into Parameters
-  int dial_idx = 0;   // index into Dial Settings
-  const char *param_ptr;      // point to the beginning of a set of dial setting for a parameter
-  const char *dial_start_ptr;  // use to signify the beginning of a dial setting
-  const char *dial_end_ptr;    // use to signify the end of a dial setting
-    
-  // initialize to the dial settings for the first parameter.
-  param_ptr = string;
-
-  // Exit the while loop if at null string
-  while ( *param_ptr )
-  {
-    // Abnormal exit if the index into the Parameters exceeded max
-    if (param_idx >= MAXP)
-      return -2;
-
-    //Initialize the pointer to the beginning of a set of dial settings
-    dial_start_ptr = param_ptr;
-    dial_idx=0;
-
-    //Exit the while loop if the dial start pointer is after the end of the dial settings.
-    while (dial_start_ptr < strchr(param_ptr, DIAL_SETTINGS_END))
-    {
-
-      // Abnormal exit if the index into the Dial Settings exceeded max
-      if (dial_idx >= MAXD)
-	return -1;
-
-      //Copy a dial setting to the proper cell in data array.
-      dial_end_ptr = strchr(dial_start_ptr, DIAL_END);
-      strncpy(data[param_idx][dial_idx], dial_start_ptr, dial_end_ptr-dial_start_ptr);
-      data[param_idx][dial_idx][dial_end_ptr-dial_start_ptr]='\0';  //terminate the string
-           
-      // Change index and pointer to the next dial setting.
-      dial_idx++;
-      dial_start_ptr = dial_end_ptr + 1;
-    }
-
-    //Add a null string after the end of the last dial setting for a parameter list
-    data[param_idx][dial_idx][0] = '\0';
-    
-    // Change pointer to the next set of dial settings for the next parameter
-    param_ptr = strchr(param_ptr,DIAL_SETTINGS_END) + 1;
-    param_idx++;
-  }
-
-  //Add a null string after the end of all parameter lists.
-  data[param_idx][dial_idx][0] = '\0';
-	
-  // return success
-  return 0;
-}
diff --git a/testcases/ballista/ballista/unmarshal.h b/testcases/ballista/ballista/unmarshal.h
deleted file mode 100644
index 9c25b35..0000000
--- a/testcases/ballista/ballista/unmarshal.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* unmarshal.h: Handle the marshalling and demarshalling of dial settings
-   Copyright (C) 1998-2001  Carnegie Mellon University  
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _UNMARSHAL_H
-#define _UNMARSHAL_H
-
-#include "ballista.h"
-
-int unmarshal(MARSHAL_DATA_TYPE data, const char *string);
-
-#endif // _UNMARSHAL_H
diff --git a/testcases/ballista/ballista/userCatches.cpp b/testcases/ballista/ballista/userCatches.cpp
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/userCatches.cpp
+++ /dev/null
diff --git a/testcases/ballista/ballista/userIncludes.h b/testcases/ballista/ballista/userIncludes.h
deleted file mode 100644
index aeb7728..0000000
--- a/testcases/ballista/ballista/userIncludes.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <signal.h>
\ No newline at end of file
diff --git a/testcases/ballista/ballista/userLibs b/testcases/ballista/ballista/userLibs
deleted file mode 100644
index 8b13789..0000000
--- a/testcases/ballista/ballista/userLibs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/testcases/ballista/ballista/userSetup.cpp b/testcases/ballista/ballista/userSetup.cpp
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/userSetup.cpp
+++ /dev/null
diff --git a/testcases/ballista/ballista/userShutdown.cpp b/testcases/ballista/ballista/userShutdown.cpp
deleted file mode 100644
index e69de29..0000000
--- a/testcases/ballista/ballista/userShutdown.cpp
+++ /dev/null
diff --git a/testcases/ballista/ballista/vardefs.cpp b/testcases/ballista/ballista/vardefs.cpp
deleted file mode 100644
index 1be73fb..0000000
--- a/testcases/ballista/ballista/vardefs.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int	rval;
-b_ptr_sigset_t param1;
-b_ptr_siginfo_t param2;
-b_ptr_timespec param3;
-b_ptr_timespec param4;
diff --git a/testcases/ballista/ballista/vxworks.cpp b/testcases/ballista/ballista/vxworks.cpp
deleted file mode 100644
index 0388418..0000000
--- a/testcases/ballista/ballista/vxworks.cpp
+++ /dev/null
@@ -1,1192 +0,0 @@
-/* vxworks.cpp: Implementation of Vxworks_test_manager class
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <termios.h>
-#include <assert.h>
-
-#include "ballista.h"
-#include "ballistaUtil.h"
-#include "marshal.h"
-#include "vxworks.h"
-#include "match.h"  // required for the match_file() function
-
-
-/************************
- *
- * Function:        Vxworks_test_manager
- * Description:     Constructor for class Vxworks_test_manager
- * Function Inputs: char *file_name,
- *                  char *target,
- *                  char *ip_address,
- *                  int max_number_reboots,
- *                  int do_reboot_after_each_test
- * Global Inputs:   
- * Return Values:   
- * Global Outputs:  
- * Errors:          
- * Pre-Conditions:  
- * Post-Contidions: All corresponding member variables are set
- * Design:
- * Notes:           
- *
- ************************/
-
-Vxworks_test_manager::Vxworks_test_manager(const char *file_name, 
-					   const char *target,
-					   const char *ip_address,
-					   const int max_number_reboots,
-					   const int do_reboot_after_each_test)
-{
-  // Abort if null pointers
-  assert(file_name != NULL);
-  assert(target != NULL);
-  assert(ip_address != NULL);
-
-  safe_strncpy(target_file_name, file_name, MAX_TARGET_FILE_NAME);
-  safe_strncpy(target_name, target, MAX_TARGET_NAME);
-  safe_strncpy(target_ip_address, ip_address, MAX_IP_ADDRESS);
-  reboot_after_each_test = do_reboot_after_each_test;
-  target_max_number_reboots = max_number_reboots;
-  number_reboots = 0;
-  passed_diagnose = 0;
-  redirected_flag = BOOL_FALSE;
-  pid = 0;
-  child_exists_flag = BOOL_FALSE;
-  need_to_unload = BOOL_FALSE;
-
-  if (do_reboot_after_each_test != 0 && max_number_reboots == 0) {
-    fprintf(stderr, "Error: In constructor for Vxworks_test_manager\n");
-    fprintf(stderr, "Cannot reboot after each test if\n");
-    fprintf(stderr, "max_number_reboots is set to zero\n");
-    exit(-1);
-  }
-
-}
-
-/************************
- *
- * Function:        ~Vxworks_test_manager
- * Description:     Destructor for class Vxworks_test_manager
- * Function Inputs: N/A
- * Global Inputs:   N/A
- * Return Values:   N/A
- * Global Outputs:  N/A
- * Errors:          N/A
- * Pre-Conditions:  Object must have been constructed previously
- * Post-Contidions: Object does not exist; standard in, out, error of
- *                  target will be un-redirected; leftover child process will
- *                  be reaped.
- * Design:          N/A
- * Notes:           Author: Mina Atanacio
- *
- ************************/
-Vxworks_test_manager::~Vxworks_test_manager() {
-  // Status of forked process, dummy variable
-  int status;
-
-  fprintf(stderr, "Cleaning up test manager.\n");
-
-
-  if (unredirect() != 0) {
-    fprintf(stderr, 
-	    "Error in test manager: Cannot unredirect target stdin, stdout, or");
-    fprintf(stderr, " stderr.\n");
-  }
-  
-  if (child_exists_flag == BOOL_TRUE) {
-    // clean up child process
-    kill (-pid, SIGTERM);
-    waitpid (pid, &status, 0);
-  }
-  
-  if (unload() != 0) {
-    fprintf(stderr,"Error: unable to unload mut from target.\n");
-  }
-  
-}
-
-/************************
- *
- * Function:        manage_test
- * Description:     VxWorks specific implementation of the virtual
- *                  function derived from the base class Test_manager
- *                  This function controls all the Ballista testing on the
- *                  target.
- * Function Inputs: MARSHAL_DATA_TYPE arguments,
- *                  long timeout_value,
- *                  char *pass_status,
- *                  int max_pass_status,
- *                  int *call_ret,
- *                  char *sys_err,
- *                  int max_sys_err,
- *                  char *mut_return,
- *                  int max_mut_return
- * Global Inputs:   
- * Return Values:   Integer 0 if function is successful, nonzero integer
- *                  otherwise
- * Global Outputs:  
- * Errors:          
- * Pre-Conditions:  
- * Post-Contidions: One test case will be completed.  All the output variables
- *                  will be set.
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::manage_test(MARSHAL_DATA_TYPE arguments,
-				      long timeout_value,
-				      char *pass_status,
-				      int max_pass_status,
-				      int *call_ret,
-				      char *sys_err, int max_sys_err,
-				      char *mut_return, 
-				      int max_mut_return)
-{
-  // String to hold windsh command for calling execute_test_case
-  char execute_mut_command[MAX_COMMAND_STRING];
-  // Loop control variable
-  int i;
-  // Status of forked process
-  int status;
-  // Variable to hold return value of get_last_windsh_result
-  int windsh_return;
-  // Variable to hold return value of function to read rval
-  int rval_return;
-  // Return value of execute_test_case
-  int return_value;
-  // Return value of waitpid
-  int wait_pid_return;
-  // Flag for clean up operations
-  hrtime_t start_time;
-  hrtime_t timeout_nanosec;
-
-  //signal-handling struct
-  struct sigaction action;
-
-  // Abort if null pointer
-  assert(arguments != NULL);
-  assert(pass_status != NULL);
-  assert(call_ret != NULL);
-  assert(sys_err != NULL);
-  assert(mut_return != NULL);
-
-  // Initialize mut_return to be an empty string
-  if(max_mut_return) {
-    mut_return[0] = 0;
-  }
-  
-  // Perform diagnose function if this is the first test to be run
-  // Otherwise don't do it
-  if (passed_diagnose != 1) {
-    if (diagnose(sys_err, max_sys_err) != 0) {
-      return -1;
-    } else {
-      passed_diagnose = 1;
-    }
-  }
-  
-  // Load execute_test_case module onto the target
-  if (load() != 0) {
-    return -1;
-  }
-  
-  // Create windsh script command string to run test case
-  if (create_script_command(arguments, execute_mut_command) != 0) {
-    return -1;
-  }
-  
-  // Fork off a process to execute the windsh script command
-  if ( (pid=fork()) == 0) {
-
-    // remove signal handlers that were installed
-    sigemptyset (&action.sa_mask);
-    action.sa_handler = SIG_DFL;
-    (void) sigaction (SIGINT, &action, NULL);
-    (void) sigaction (SIGQUIT, &action, NULL);
-    (void) sigaction (SIGTERM, &action, NULL);
-    (void) sigaction (SIGABRT, &action, NULL);
-        
-    // set up a process group so that children processes can
-    //  all be killed off easily
-    setpgid(0, 0);
-    
-    if (windsh(execute_mut_command,".*") != 0) {
-      // Not sure what to do here
-    }
-    exit(0);
-  }
-  
-  //Set flag indicating a child process exists.
-  child_exists_flag = BOOL_TRUE;
-
-  // do this in two stages to avoid type casting problems from int to hrtime_t
-  timeout_nanosec = timeout_value;
-  timeout_nanosec = timeout_nanosec * 1000;
-
-  start_time = gethrtime();
-  i = 0;
-  wait_pid_return = 0;
-  while(start_time + timeout_nanosec > gethrtime())  {
-    
-    //?????????????????/
-    // can wait_pid_return be -1????
-    wait_pid_return = waitpid (pid, &status, WNOHANG);
-    
-    // check if process terminated
-    if(wait_pid_return > 0) {
-      child_exists_flag = BOOL_FALSE;
-      break;
-    }
-    // sleep for 500 microseconds before checking again
-    usleep(500);
-    
-    // On the second iteration try pinging, in case the machine
-    // crashed right away.  This may avoid a lengthy timeout.
-    if (i == 1) {
-      if (ping(PING_TIMEOUT_VAL) != 0) {
-	break;
-      }
-    }
-    i++;
-  }
-  
-  // check that the loop terminated because the process terminated
-  if (wait_pid_return > 0) {
-    // process has terminated
-    // either a Pass or an Abort has occurred
-    child_exists_flag = BOOL_FALSE;
-    windsh_return = get_last_windsh_result(&return_value);
-    rval_return = get_last_rval(mut_return, max_mut_return);
-    
-    if ( (windsh_return == WINDSH_RETURN_ABORT) ||
-	 (rval_return != 0) 
-	 ) {
-      safe_strncpy(pass_status, "Done - Abort", max_pass_status);
-    } else {
-      *call_ret = return_value;
-      safe_strncpy(pass_status, "Done - Pass", max_pass_status);
-    }
-  } else if (ping(PING_TIMEOUT_VAL) == 0) { 
-    // did not terminate and still alive
-
-    // clean up child processes
-    kill (-pid, SIGTERM);
-    waitpid (pid, &status, 0);
-    child_exists_flag = BOOL_FALSE;
-    
-    safe_strncpy(pass_status, "Done - Restart", max_pass_status);
-  } else {  
-    // did not terminate and not alive
-
-    // clean up child processes
-    kill (-pid, SIGTERM);
-    waitpid (pid, &status, 0);
-    child_exists_flag = BOOL_FALSE;
-    
-    safe_strncpy(pass_status, "Done - Catastrophic",
-		 max_pass_status);
-    // We must reboot because there is a catastrophic, but we should skip
-    // this if we are already rebooting after each test.
-    if (!reboot_after_each_test) {
-      // Not rebooting after each test, therefore reboot for catastrophic
-      if (reboot() != 0) {
-	return -2;
-      }
-    }
-  }
-  
-  // If flag is set, then reboot after each test case
-  if (reboot_after_each_test) {
-    if (reboot() != 0) {
-      return -2;
-    }
-  }
-
-  // If target was not rebooted we need to unload the execute_test_case module
-  if (unload() != 0) {
-    safe_strncpy(sys_err,"Error: unable to unload mut from target.",
-		   max_sys_err);
-    return -1;
-  }
-  
-  return 0;
-}
-
-
-/************************
- *
- * Function:        diagnose
- * Description:     This function will check that testing can proceed.
- * Function Inputs: char *error_message,
- *                  int max_error_message_len
- * Global Inputs:   
- * Return Values:   integer 0 if function is successful, nonzero integer
- *                  otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions: standard out, in, and error on target machine will be
- *                  redirected.
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::diagnose(char *error_message,
-				   int max_error_message_len)
-{
-
-  //Abort if null pointer
-  assert(error_message != NULL);
-
-
-  if (target_max_number_reboots != 0 && reboot() != 0) {
-    safe_strncpy(error_message, "Error: target could not be rebooted",
-		 max_error_message_len);
-    return -1;
-  }
-
-  if (ping(PING_TIMEOUT_VAL) != 0) {
-    safe_strncpy(error_message, "Error: target is unreachable",
-		 max_error_message_len);
-    return -1;
-  }
-  if (load() != 0) {
-    safe_strncpy(error_message,
-		 "Error: test module could not be loaded onto target",
-		 max_error_message_len);
-    return -1;
-  }
-
-  if (unload() != 0) {
-    safe_strncpy(error_message,
-		 "Error: test module could not be unloaded from target",
-		 max_error_message_len);
-    return -1;
-  }
-
-  // Redirect stdin, stdout, and stderr to windsh interpreter
-  // to get return value of test MuT
-  if(redirect() != 0) {
-    safe_strncpy(error_message,
-		 "Error: unable to redirect standard output on target.",
-		 max_error_message_len);
-    return -1;
-  }
-
-
-  return 0;
-}
-
-
-/************************
- *
- * Function:        ping
- * Description:     Ping will launch the UNIX ping() command, passing
- *                  the target_ip_address member variable and the
- *                  timeout value in seconds, and returns
- *                  whether or not the machine is alive.
- * Function Inputs: int time_out
- * Global Inputs:   Vxworks_test_manager class member target_ip_address
- * Return Values:   integer 0 if function is successful and machine is
- *                  reachable, nonzero integer otherwise
- * Global Outputs:  
- * Errors:          
- * Pre-Conditions:  
- * Post-Contidions: 
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::ping(int time_out)
-{
-  char system_command_string[MAX_COMMAND_STRING];
-
-  // Create command string to make system call ping
-  // and execute it
-  sprintf(system_command_string, "ping %s %d > /dev/null 2>&1",
-	  target_ip_address, time_out);
-  if (system(system_command_string) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-
-/************************
- *
- * Function:        reboot
- * Description:     This function will reboot the target machine
- *                  through the use of a hardware device, regardless
- *                  of the state the target is in.
- * Function Inputs: none
- * Global Inputs:   
- * Return Values:   integer 0 if target is successfully rebooted,
- *                  nonzero integer otherwise
- * Global Outputs:  none
- * Errors:
- * Pre-Conditions:  TRUE (none)
- * Post-Contidions: target will be in initial "clean" state after
- *                  it is rebooted, need_to_unload and redirected_flag variables
- *                  will both be set to BOOL_FALSE.
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::reboot(void)
-{
-  int serial_port_fd;
-  char buffer[MAX_COMMAND_STRING];
-  struct termios termios_p;
-  int val;
-  int success = 0;
-  int i = 0;
-
-  // Exit if not unlimited reboots and exceeded the max number of reboots 
-  if (target_max_number_reboots != -1 &&
-      number_reboots >= target_max_number_reboots) {
-    fprintf(stderr, "Error: maximum number of target reboots exceeded\n");
-    exit(-1);
-  }
-
-  //printf("Starting to reboot...\n");
-  number_reboots++;
-
-  serial_port_fd = open(REBOOT_DEVICE_SERIAL_PORT, O_RDWR | O_NOCTTY);
-  if (serial_port_fd == -1) {
-    fprintf(stderr, "open_port: Unable to open %s - %s\n",
-	    REBOOT_DEVICE_SERIAL_PORT, strerror(errno));
-    return -1;
-  }
-    
-  tcgetattr(serial_port_fd, &termios_p);
-  termios_p.c_cflag |= B9600 | CS8;
-  tcsetattr(serial_port_fd, 0, &termios_p);
-    
-  // Send command to power cycle Vxworks target
-  tcflush(serial_port_fd, TCIOFLUSH);
-    
-  write(serial_port_fd, "///0,05;\r", 9);
-  close(serial_port_fd);
-
-  //After rebooting, set redirected and unload flags to false.
-  redirected_flag = BOOL_FALSE;
-  need_to_unload = BOOL_FALSE;
-
-  // Sleep long enough to allow system to completely reboot
-  sleep(VXWORKS_REBOOT_TIME);
-
-  // Send a simple windsh command (like print hello) to make sure machine is alive
-  // Try 20 times before giving up
-  while(i < 20) {
-    if (windsh("printf(\"hello\")","^printf\\(\"hello\"\\)\n" VALUE_QUIT) == 0) 
-    {
-      if (get_last_windsh_result(&val) == WINDSH_RETURN_OK) {
-	if (val == 5) { //hello has 5 characters
-	  success = 1;
-	  break;
-	}
-      }
-    }
-    sleep(1);
-    i++;
-  }
-
-  if (!success) {
-    fprintf(stderr, "Target system failed to recover after reboot. \n");
-    return -1; //was exit, changed to return.  **MINA**
-  }
-
-  // Redirect stdin, stdout, and stderr to windsh interpreter
-  // to get return value of test MuT
-  if(redirect() != 0) {
-    fprintf(stderr, 
-	    "Error: unable to redirect standard output on target.");
-    return -1;
-  }
-
-  return 0;
-}
-
-
-/************************
- *
- * Function:        redirect
- * Description:     redirect will save the original file descriptors
- *                  for stdin, stdout, and sterr on the target, then
- *                  redirect them to the windsh script window for
- *                  I/O purposes.
- * Function Inputs: N/A
- * Global Inputs:   int *fd_stdin
- *                  int *fd_stdout
- *                  int *fd_stderr
- * Return Values:   integer 0 if command is successful, nozero integer
- *                  otherwise
- * Global Outputs:  int *fd_stdin
- *                  int *fd_stdout
- *                  int *fd_stderr
- * Errors:
- * Pre-Conditions: 
- * Post-Contidions: redirected_flag = BOOL_TRUE
- * Design:
- * Notes:           This function and unredirect were added during
- *                  implementation to remove dependancy on reading
- *                  data from the serial console during tests
- *
- ************************/
-
-int Vxworks_test_manager::redirect()
-{
-  // File descriptor for I/O redirection on target
-  int vf0;
-  // Variable to hold return value from get_last_windsh_result
-  int result;
-    
-  if (redirected_flag == BOOL_FALSE)
-  {
-    // Read original file descriptors and save them in input parameters
-    if (windsh("ioGlobalStdGet(0)", "^ioGlobalStdGet\\(0\\)\n" VALUE_QUIT) != 0) 
-    {
-      return -1;
-    }
-    if (get_last_windsh_result(&fd_stdin) != 0) {
-      return -1;
-    }
-    if (windsh("ioGlobalStdGet(1)", "^ioGlobalStdGet\\(1\\)\n" VALUE_QUIT) != 0) {
-      return -1;
-    }
-    if (get_last_windsh_result(&fd_stdout) != 0) {
-      return -1;
-    }
-    if (windsh("ioGlobalStdGet(2)", "^ioGlobalStdGet\\(2\\)\n" VALUE_QUIT) != 0) {
-      return -1;
-    }
-    if (get_last_windsh_result(&fd_stderr) != 0) {
-      return -1;
-    }
-
-    // Redirect stdin, stdout, and stderr to windsh window
-    if(windsh("vf0=open(\"/vio/0\",2,0)", 
-    		"^vf0=open\\(\"/vio/0\",2,0\\)\n"
-		"new symbol \"vf0\" added to symbol table.\n"
-		"vf0 = 0x.[0-9A-Fa-f]*: " VALUE_QUIT
-    		 ) != 0) 
-    {
-      return -1;
-    } 
-    if(get_last_windsh_result(&vf0) != 0) {
-      return -1;
-    }
-    // could not open the file descriptor on target
-    if(vf0 == -1) {
-      return -1;
-    }
-    
-    if(windsh("ioGlobalStdSet(0,vf0);"
-	      "ioGlobalStdSet(1,vf0);"
-	      "ioGlobalStdSet(2,vf0);"
-	      "logFdAdd(vf0)",
-	      
-	      "^ioGlobalStdSet\\(0,vf0\\);"
-	      "ioGlobalStdSet\\(1,vf0\\);"
-	      "ioGlobalStdSet\\(2,vf0\\);"
-	      "logFdAdd\\(vf0\\)\n"
-    	       VALUE VALUE VALUE VALUE
-    	       "quit\n$") == 0) 
-    {
-      if(get_last_windsh_result(&result) != 0) {
-	return -1;
-      }
-      if(result != 0) {
-	return -1;
-      }
-    }
-    else {
-      return -1;
-    }
-
-    redirected_flag = BOOL_TRUE;
-  }
-
-  return 0;
-}
-
-
-/************************
- *
- * Function:        unredirect
- * Description:     unredirect will restore the original file descriptors
- *                  for stdin, stdout, and sterr on the target from
- *                  the windsh window to console, given the correct
- *                  input parameters.
- * Function Inputs: N/A
- * Global Inputs:   int fd_stdin
- *                  int fd_stdout
- *                  int fd_stderr
- * Return Values:   integer 0 if command is successful, nozero integer
- *                  otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions: 
- * Post-Contidions: redirected_flag = BOOL_FALSE if no errors occur
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::unredirect()
-{
-  // Variable to hold command string to be executed
-  // on the target
-  char command[MAX_COMMAND_STRING];
-  // Variable to hold return value from get_last_windsh_result
-  int result;
-
-  if (redirected_flag == BOOL_TRUE) {    
-    if(windsh("logFdDelete(vf0)", "^logFdDelete\\(vf0\\)\n" VALUE_QUIT )) {
-      return -1;
-    }
-    
-    sprintf(command,
-	    "ioGlobalStdSet(0,%d);"
-	    "ioGlobalStdSet(1,%d);"
-	    "ioGlobalStdSet(2,%d);"
-	    "close(vf0)",
-	    fd_stdin, fd_stdout, fd_stderr);
-
-    if(windsh(command,
-    	      "^ioGlobalStdSet\\(0,.[0-9]*\\);"
-	      "ioGlobalStdSet\\(1,.[0-9]*\\);"
-	      "ioGlobalStdSet\\(2,.[0-9]*\\);"
-	      "close\\(.[0-9]*\\)\n"
-    	       VALUE VALUE VALUE VALUE
-	      "quit\n$" )) {
-      return -1;
-    }
-
-    if(get_last_windsh_result(&result)) {
-      return -1;
-    }
-    
-    if(result) {
-      return -1;
-    }
-    
-    redirected_flag = BOOL_FALSE;
-  }
-
-  return 0;
-}
-
-
-/************************
- *
- * Function:        windsh
- * Description:     windsh executes a command in the windsh interface
- *                  to the target.  It writes the command into the file
- *                  "windsh_input".  It will append "quit" to the end of
- *                  the file to force the windsh process to terminate
- *                  after processing the command.
- *                  command is put into int *result_value*
- * 
- *                  windsh also accepts an regular expression that is
- *                  used to match against the content of the output file
- *                  from executing the windshell script.  If the content
- *                  doesn't match the expression, the execution of the command
- *                  is assumed to be unsuccessful.
- *
- * Function Inputs: char *command
- * Global Inputs:   Vxworks_test_manager class member target_name
- * Return Values:   integer 0 if command is successful, nozero integer
- *                  otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::windsh(char *command, char* reg_expression)
-{
-  // File pointer for windsh script input file
-  FILE *windsh_input_fptr;
-  // String to call windsh script command
-  char system_command_string[MAX_COMMAND_STRING];
-  int good_match = 0;
-
-  //Abort if null pointer
-  assert( command != NULL);
-
-  // Remove the output file, if any exists.  
-  // This is required because we can potentially have a situation where
-  // two processes are both sending their standard output to the file.
-  // In the case of a restart, the child process is still writing to the file
-  // however, the parent will wake up, kill the child and then try to 
-  // unload the mut.  If the parent tries to unload the mut before the child
-  // has actually terminated, then the windsh command for unld could be running
-  // in the parent at the same time as the windsh command for 
-  // execute_test_case in the child.
-  // Both of these windsh commands are redirected to this file.  At times
-  // the file can contain data from both processes.  
-
-  // To fix this situation, we unlink the file before starting any windsh
-  // command.  This makes sure that the file has been wiped out before starting
-  // another windsh.  In the case of the restart described above, we might
-  // lose the data from the child process, but we never read it anyway.
-
-  // Ideally we would like to use pipes instead of files.  This would eliminate
-  // this problem.  However, we do not have time for such a change right now.
-  unlink(WINDSH_OUTPUT_FILE_NAME);
-
-  // Open file "windsh_input" and write the command string
-  // to the file along with the quit command
-  if ((windsh_input_fptr = fopen(WINDSH_INPUT_FILE_NAME, "w")) == NULL) {
-    return -1;
-  }
-  fprintf(windsh_input_fptr, "%s\n", command);
-  fprintf(windsh_input_fptr, "quit\n");
-  fclose(windsh_input_fptr);
-
-    // Execute the windsh commands via a system call
-  sprintf(system_command_string, "windsh %s < %s > %s 2>&1",
-	  target_name, WINDSH_INPUT_FILE_NAME,WINDSH_OUTPUT_FILE_NAME);
-  if (system(system_command_string) == -1) {
-    return -1;
-  }
-
-  // Delete the windsh script input file
-  unlink(WINDSH_INPUT_FILE_NAME);
-
-  // Check if the content of the output file matches the expected regular
-  // expression.	    
-  if ( match_file(WINDSH_OUTPUT_FILE_NAME,reg_expression, &good_match) < 0) 
-  {
-    return -3;	  // Error in executing match_file
-  }
-  else if ( good_match ==  0)
-  {
-    return -4;  // The content of file did not match reg_expression
-  }
-
-  return 0;
-}
-
-/************************
- *
- * Function:        get_last_rval
- * Description:     This function will read the results of the
- *                  last windsh command from the file "windsh_output"
- *                  and extract the rval.  The actual rval will be delimited
- *                  by the words "rval:" at the beginning and "value =" at the
- *                  end
- * Function Inputs: char *value
- *                  int max_value_length
- * Global Inputs:   
- * Return Values:   integer 0 if command is successful, nozero integer
- *                  otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::get_last_rval(char *value, 
-					int max_value_length)
-{
-  // File pointer for windsh script output file
-  FILE *windsh_output_fptr = NULL;
-  // String for reading contents of the output file
-  // line by line
-  char *line_string = NULL;
-  // Variable for holding location of identifier
-  // in line_string
-  char *ptr = NULL;
-
-  char *start_delimiter = "rval:";
-  char *end_delimiter = "value =";
-  
-  int value_strlen = 0;
-
-  // Abort if null pointer
-  assert( value != NULL );
-
-  // allocate this to be as big as the return value.  That's as big as we
-  // ever need to support on one line.
-  line_string = (char *)malloc(max_value_length);
-  if(line_string == NULL) {
-    return -1;
-  }
-
-    // Open windsh output file for reading
-  if ((windsh_output_fptr = fopen(WINDSH_OUTPUT_FILE_NAME, "r"))
-      == NULL) {
-    free(line_string);
-    return -1;
-  }
-  
-  // this will ensure that value is null terminated
-  // in case strncat tries to copy too much, this last null will be there
-  value[max_value_length-1] = '\0';
-
-  // loop over the input until we find the start delimiter or run
-  //  out of input to process
-  while (1) {
-    if (!fgets(line_string, max_value_length, windsh_output_fptr)) {
-      // end of file was reached before we found the start delimiter
-      //  complain, bitterly
-      fclose(windsh_output_fptr);
-      free(line_string);
-      return -1;
-    }
-
-    if (ptr = strstr(line_string, start_delimiter)) {
-      // found the start delimiter; break out of the loop so we
-      //  can read in the rest of the value
-      break;
-    }
-  }
-
-  // start building up the value string
-  ptr += strlen(start_delimiter);
-  safe_strncpy(value, ptr, max_value_length);
-  
-  // set this to NULL, so that we can track if we really did find the 
-  // end delimiter
-  ptr = NULL;
-
-  // now read line by line until we find the end delimiter
-  while (fgets(line_string, max_value_length, windsh_output_fptr)) {
-    
-    // quit when we find the end delimiter
-    if(ptr = strstr(line_string, end_delimiter)) {
-      *ptr = '\0'; // null terminate over the end delimiter
-    }
-    // keep building up the string
-    strncat(value,line_string,max_value_length - 1 - strlen(value));
-
-    if(ptr) { // since we found the end delimiter, we can break;
-      break;
-    }
-  }
-  
-  // clean up
-  fclose(windsh_output_fptr);
-  free(line_string);
-  
-  // take out last '\n' put in by execute_test_case
-  value_strlen = strlen(value);
-  if(value_strlen > 0) {
-    if(value[value_strlen - 1] == '\n') {
-      value[value_strlen - 1] = '\0';
-    }
-  }
-
-  if(ptr) {  // we successfully found the end delimiter
-    return 0;
-  }
-  else {  // we did not find the end delimiter
-    return -1;
-  }
-}
-
-
-/************************
- *
- * Function:        get_last_identifier_value
- * Description:     This function will read the results of the
- *                  last windsh command from the file "windsh_output"
- *                  and search for the last string that starts
- *                  with the string indentifier.  It returns the
- *                  remainder of this string in value
- * Function Inputs: char *identifier
- *                  char *value
- *                  int max_value_length
- * Global Inputs:   
- * Return Values:   integer 0 if command is successful, nozero integer
- *                  otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::get_last_identifier_value(char *identifier, 
-						    char *value, 
-						    int max_value_length)
-{
-  // File pointer for windsh script output file
-  FILE *windsh_output_fptr;
-  // String for reading contents of the output file
-  // line by line
-  char line_string[MAX_COMMAND_STRING];
-  // Return value being passed back
-  int function_return_val = -1;
-  // Variable for holding location of identifier
-  // in line_string
-  char *ptr;
-
-  // Abort if null pointer
-  assert( identifier != NULL );
-  assert( value != NULL );
-
-    // Open windsh output file for reading
-  if ((windsh_output_fptr = fopen(WINDSH_OUTPUT_FILE_NAME, "r"))
-      == NULL) {
-    return -1;
-  }
-
-  // Keep reading until end of file is reached
-  while (fgets(line_string, MAX_COMMAND_STRING, windsh_output_fptr)) {
-    ptr = strstr(line_string, identifier);
-    if (ptr) {
-      ptr += strlen(identifier);
-      safe_strncpy(value, ptr, max_value_length);
-      function_return_val = 0;
-    }
-  }
-
-  // Close output file
-  fclose(windsh_output_fptr);
-    
-  return function_return_val;
-}
-
-
-/************************
- *
- * Function:        get_last_windsh_result
- * Description:     This function will read the results of the
- *                  last windsh command from the file "windsh_output"
- *                  and put the return value into the return_value
- *                  argument.
- * Function Inputs: int *last_result
- * Global Inputs:   
- * Return Values:   WINDSH_RETURN_OK,
- *                  WINDSH_RETURN_ABORT, or
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::get_last_windsh_result(int *last_result)
-{
-  // String to hold value returned from get_last_identifier_value
-  char line_string[MAX_COMMAND_STRING];
-
-  // Abort if null pointer
-  assert( last_result != NULL );
-
-  if(get_last_identifier_value("value = ",
-			       line_string,
-			       sizeof(line_string)) != 0)
-  {
-    return WINDSH_RETURN_ABORT;
-  }
-
-  sscanf(line_string, "%d", last_result);
-  return WINDSH_RETURN_OK;
-}
-
-
-/************************
- *
- * Function:        load
- * Description:     This function will load the execute test module
- *                  into memory on the target.
- * Function Inputs: 
- * Global Inputs:   Vxworks_test_manager class member target_file_name
- * Return Values:   integer 0 if successful, nonzero integer otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions: 
- * Post-Contidions: need_to_unload == BOOL_TRUE if not error occurs
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::load(void)
-{
-  // String to hold windsh script command
-  char command_string[MAX_COMMAND_STRING]; 
-
-  //String to hold regular expression for load
-  char reg_expression[MAX_COMMAND_STRING*2];
-
-  // Return value read from ld call
-  int return_val = -1;
-
-  if (need_to_unload == BOOL_FALSE)
-  {
-    // Construct windsh command for loading object file to target
-    sprintf(command_string, "ld < %s", target_file_name);
-
-    // Construct the expected return expression for load
-    sprintf(reg_expression, "^%s\n%s",command_string, VALUE_QUIT); 
-    
-    // Execute command and verify result
-    if (windsh(command_string, reg_expression) != 0) {
-      return -1;
-    }
-
-    if (get_last_windsh_result(&return_val) != WINDSH_RETURN_OK) {
-      return -1;
-    }
-    
-    // Return what ld passed back; should be -1 if unsuccessful
-    if (return_val < 0) {
-      return return_val;
-    }
-
-    need_to_unload = BOOL_TRUE;
-  }
-
-  return 0;
-
-}
-
-
-/************************
- *
- * Function:        unload
- * Description:     This function will unload the execute test module
- *                  from the target's memory.  It will parse out the actual
- *                  object file from the target_file_name
- * Function Inputs: 
- * Global Inputs:   Vxworks_test_manager class member target_file_name
- * Return Values:   integer 0 if successful, nonzero integer otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions: need_to_unload == BOOL_FALSE
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::unload(void)
-{
-  // String to hold windsh script command
-  char command_string[MAX_COMMAND_STRING];
-
-  //String to hold regular expression for unload
-  char reg_expression[MAX_COMMAND_STRING*2];
-
-  // String to hold object filename
-  char *object_file_name;
-  // Return value read from unld call
-  int return_val=0;
-
-  if (need_to_unload == BOOL_TRUE)
-  {
-    // Parse target_file_name to get object_file_name
-    if (rindex(target_file_name, '/') != NULL) {
-      object_file_name = rindex(target_file_name, '/') + 1;
-    } else {
-      object_file_name = target_file_name;
-    }
-    
-    // Construct windsh command for unloading object file from target
-    sprintf(command_string, "unld(\"%s\")", object_file_name);
-
-    // Construct the expected return expression for load
-    sprintf(reg_expression, "^unld\\(\"%s\"\\)\n%s",object_file_name, VALUE_QUIT);
-    
-    // Execute command and verify result
-    if (windsh(command_string, reg_expression) != 0) {
-      return -1;
-    }
-
-    if (get_last_windsh_result(&return_val) != WINDSH_RETURN_OK) {
-      return -1;
-    }
-
-    need_to_unload = BOOL_FALSE;
-  }
-
-  // Return what unld passed back; should be zero if successful
-  return return_val;
-}
-
-
-/************************
- *
- * Function:        create_script_command
- * Description:     This function will construct windsh command string
- *                  that can be used to run the execute test module on
- *                  the target for the parameter list defined by arguments
- * Function Inputs: MARSHAL_DATA_TYPE arguments,
- *                  char *command
- * Global Inputs:   
- * Return Values:   integer 0 if successful, nonzero integer otherwise
- * Global Outputs:
- * Errors:
- * Pre-Conditions:
- * Post-Contidions:
- * Design:
- * Notes:
- *
- ************************/
-
-int Vxworks_test_manager::create_script_command(MARSHAL_DATA_TYPE arguments,
-						char *command)
-{
-  // String to hold marshaled arguments
-  char argument_string[MAX_MARSHAL_STRING];
-  // Return value from marshal function call
-  int marshal_return_value;
-
-    // Marshal parameter list
-  if ((marshal_return_value = marshal(arguments, argument_string)) != 0) {
-    return marshal_return_value;
-  }
-
-  // Construct command
-  sprintf(command, "execute_test_case(\"%s\")", argument_string);
-
-  return 0;
-}
diff --git a/testcases/ballista/ballista/vxworks.h b/testcases/ballista/ballista/vxworks.h
deleted file mode 100644
index 2d752de..0000000
--- a/testcases/ballista/ballista/vxworks.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* vxworks.h: Implementation of Vxworks_test_manager class
-   Copyright (C) 1998-2001  Carnegie Mellon University
-
-   This program 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 Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _B_VXWORKS_H
-#define _B_VXWORKS_H
-
-#include "ballista.h"
-#include "testManager.h"
-
-
-// Constant definitions for maximum string lengths of member variables
-#define MAX_TARGET_FILE_NAME 257
-#define MAX_TARGET_NAME      257
-#define MAX_IP_ADDRESS       257
-
-// Constant definitons for retrun values from windsh method
-#define WINDSH_RETURN_OK       0
-#define WINDSH_RETURN_ABORT    1
-
-// Constant for maximum length of the marshaled dial settings
-// Enough space to hold all the the b_param fields
-// PLUS a single character seperator between the dials in each list
-// PLUS a single character terminator for each list
-#define MAX_MARSHAL_STRING ((MAXP * MAXD) * sizeof(b_param)+(MAXD -1) * MAXP + MAXP)
-
-// Maximum length of a command string passed to windsh script 
-#define MAX_COMMAND_STRING (MAX_MARSHAL_STRING + 257)
-
-// Serial port for standard output from target
-#define TARGET_OUTPUT_SERIAL_PORT "/dev/cua/a"
-
-// Serial port for accessing the reboot device
-#define REBOOT_DEVICE_SERIAL_PORT "/dev/cua/b"
-
-// Time to sleep in reboot function before reestablishing a connection
-#define VXWORKS_REBOOT_TIME 20
-
-// Timeout value in seconds for issuing a ping command
-#define PING_TIMEOUT_VAL 5
-
-// Input filename for windsh script commands
-#define WINDSH_INPUT_FILE_NAME "windsh_input"
-
-// Output filename for windsh script commands
-#define WINDSH_OUTPUT_FILE_NAME "windsh_output"
-
-// Regular expressions commonly used to compare output in the VxWorks test managers
-#define VALUE "value = [0-9]+ = 0x[0-9A-Fa-f]+\n"
-#define VALUE_QUIT "value = [0-9]+ = 0x[0-9A-Fa-f]+( = .*)?\nquit\n$"
-
-
-
-/************************
- *
- * Function:        class Vxworks_test_manager
- * Description:     Class definition for VxWorks specific Test_manager
- *                  implementation
- * Function Inputs: N/A
- * Global Inputs:   N/A
- * Return Values:   N/A
- * Global Outputs:  N/A
- * Errors:          N/A
- * Pre-Conditions:  N/A
- * Post-Contidions: N/A
- * Design:          N/A
- * Notes:           N/A
- *
- ************************/
-
-class Vxworks_test_manager : public Test_manager {
-
- public:
-
-  // Constructor
-  Vxworks_test_manager(const char *file_name, const char *target, 
-		       const char *ip_address, const int max_number_reboots,
-		       const int do_reboot_after_each_test);
-
-  //Destructor
-  virtual ~Vxworks_test_manager();
-  
-  virtual int manage_test(MARSHAL_DATA_TYPE arguments,
-			  long timeout_value,
-			  char *pass_status, int max_pass_status,
-			  int *call_ret,
-			  char *sys_err, int max_sys_err,
-			  char *mut_return, int max_mut_return);
-  
- private:
-  // Private member variables
-  
-  // Path and file name of object file to be loaded onto the
-  // VxWorks target
-  char target_file_name[MAX_TARGET_FILE_NAME];
-  
-  // Target server name to be passed with windsh script command
-  char target_name[MAX_TARGET_NAME];
-  
-  // IP address or network name of target machine
-  char target_ip_address[MAX_IP_ADDRESS];
-  
-  // Maximum number of reboots allowed for the target
-  int target_max_number_reboots;
-  
-  // Number of times the target has been rebooted for
-  // this instantiation
-  int number_reboots;
-  
-  // This variable is set when the diagnose functionis completed
-  // successfully before the first test
-  int passed_diagnose;
-  
-  // This flag tells whether or not the target will be rebooted
-  // after running each test case
-  int reboot_after_each_test;
-  
-  // These variables contain the file descriptors for stdin, stdout, 
-  // and stderr on Vxworks target
-  int fd_stdin;
-  int fd_stdout;
-  int fd_stderr;
-  
-  //Flag to keep state of whether we have already redirected output
-  BOOL_TYPE redirected_flag;
-  
-  // Variable to hold process id number of child for test
-  int pid;
-  
-  //Flag to keep state of whether we have child processes to clean up
-  BOOL_TYPE child_exists_flag;
-  
-  BOOL_TYPE need_to_unload;
-  
- protected:
-  // Protected member methods
-  
-  int diagnose(char *error_message, int max_error_message_len);
-  
-  int ping(int time_out);
-  
-  int reboot(void);
-  
-  int redirect();
-  
-  int unredirect();
-  
-  int windsh(char *command, char* reg_expression);
-  
-  int get_last_rval(char *value, int max_value_length);
-
-  int get_last_identifier_value(char *identifier, char *value,
-				int max_value_length);
-  
-  int get_last_windsh_result(int *last_result);
-  
-  int load(void);
-  
-  int unload(void);
-  
-  int create_script_command(MARSHAL_DATA_TYPE arguments,
-			    char *command);
-  
-};
-
-#endif // _B_VXWORKS_H
diff --git a/testcases/ballista/create.sh b/testcases/ballista/create.sh
deleted file mode 100755
index d9c21ee..0000000
--- a/testcases/ballista/create.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/perl -w
-# This scripts checks your system to ensure it has the correct rpm's installed
-# to run Ballista. 
-# If the correct RPMs are installed ballista will be uncompressed and complied
-
-if (system("rpm -h") == -1)
-{
-	print("Your system lacks rpm, please double check ballista requirements\n");
-	exit 0;
-}
-
-@libs = ("'gcc version 3.3.3'","libg++-2.8.1-2","libg++-devel-2.8.1-2","libstdc++5-3.3.1-2mdk","libstdc++5-devel-3.3.1-2mdk","libstdc++5-static-devel-3.3.1-2mdk");
-my @notfound;
-system("touch temp_cmd_file.txt ");
-system("gcc -v 2> temp_cmd_file.txt ");
-system("rpm -qa | grep g++ >> temp_cmd_file.txt ");
-system("rpm -qa | grep libstdc >> temp_cmd_file.txt");
-
-$missing=0;
-$num=0;
-
-      foreach(@libs)
-      {
- 
-	  $grep="grep -q ";
-	  $grep.="$_ temp_cmd_file.txt";
-
-
-	  if ((system("$grep")/256) == 1)
-	  {
-	      $missing++;
-              $nf{$_}=$num;
-	    #  push @notfound , $_;
-	  }
-	$num++;
-      }
-
-
-       system("rm temp_cmd_file.txt");
-
-       if(-e "not_found.txt" )
-       {
-	       system("rm not_found.txt");
-       }
-
-        if($missing > 0)
-        {
-          $outfile="not_found.txt";
-          open OUTFILE,">$outfile" or die "Cannot open $outfile for write :$!";
-
-           $n=0;
-	   print "\nThe following dependencie\(s\) are missing: \n\n";
-	   print OUTFILE "\nThe following dependencie\(s\) are missing: \n\n";
-
-            foreach(keys %nf)
-            {
-		$name=$_;
-
-		if($_ eq "'gcc version 3.3.3'")
-                {
-		    $name="g++-3.3.3-59756cl.i386.rpm for gcc 3.3.3";
-                }
-		elsif($nf{$_} < 3 && $nf{$_} > 0)
-	        {
-		   $ext=".i386.rpm";	
-		   $name.=$ext;
-	        }
-	         elsif($nf{$_} > 2)
-	        {
-		   $ext=".i586.rpm";
-		   $name.=$ext;
-	        }
-		$n++;
-
-		#$name.=$ext;
-		print "$name \n";
-		print OUTFILE "$name \n";
-	    }
-	    
-
-	   print "\nThe rpms can be downloaded at www.rpmfind.net\n";
-	   print "Install these rpms and re-run this script\n";
-
-	   print OUTFILE "\nThe rpms can be downloaded at www.rpmfind.net\n";
-	   print OUTFILE "Install these rpms and re-run this script\n";
-	   
-	   close OUTFILE;
-
-	   exit 0;
-       }
-       else
-       {
-	   if(chdir('ballista') == 1)
-            {
-
-              if ((system("./configure")/256) == 0)
-              {
-		  print "configuration for Ballista done \n";
-	      }
-	      else
-	      {
-		  exit 0;
-	      }
-	    }  
-       }
diff --git a/testcases/ballista/do_nothing.sh b/testcases/ballista/do_nothing.sh
deleted file mode 100755
index cea3df0..0000000
--- a/testcases/ballista/do_nothing.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/usr/bin/perl -w
diff --git a/testcases/commands/ade/size/test.c b/testcases/commands/ade/size/test.c
index 22ab3fe..1072333 100644
--- a/testcases/commands/ade/size/test.c
+++ b/testcases/commands/ade/size/test.c
@@ -3,11 +3,11 @@
 int main(void)
 {
 
-	int i=0;
+	int i;
 
-	for (i=0; i<10; i++)
+	for (i = 0; i < 10; i++)
 	{
-		if (i %2)
+		if ((i % 2) != 0)
 			printf(" Hello \n ");
 		else
 			printf("World \n");
diff --git a/testcases/kdump/lib/kprobes/kprobes.c b/testcases/kdump/lib/kprobes/kprobes.c
index 0547611..d9f1afb 100644
--- a/testcases/kdump/lib/kprobes/kprobes.c
+++ b/testcases/kdump/lib/kprobes/kprobes.c
@@ -19,7 +19,7 @@
          clone_flags, stack_size, regs);
   /* Always end with a call to jprobe_return(). */
   jprobe_return();
-  /*NOTREACHED*/
+  
   return 0;
 }
 
diff --git a/testcases/kernel/containers/pidns/pidns01.c b/testcases/kernel/containers/pidns/pidns01.c
index 809b905..ad5ab1f 100644
--- a/testcases/kernel/containers/pidns/pidns01.c
+++ b/testcases/kernel/containers/pidns/pidns01.c
@@ -126,7 +126,7 @@
         /* cleanup and exit */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 
 }	/* End main */
diff --git a/testcases/kernel/containers/pidns/pidns04.c b/testcases/kernel/containers/pidns/pidns04.c
index 15e2812..e6102d9 100644
--- a/testcases/kernel/containers/pidns/pidns04.c
+++ b/testcases/kernel/containers/pidns/pidns04.c
@@ -82,7 +82,11 @@
        	close(fd[0]);
 
 	/* Comparing the values to make sure pidns is created correctly */
+<<<<<<< HEAD
 	if (( cpid == CHILD_PID) && ( ppid == PARENT_PID )) {
+=======
+	if (( cpid == CHILD_PID) && ( ppid == PARENT_PID ) ) {
+>>>>>>> master
 		tst_resm(TINFO, "PIDNS test is running inside container");
 		kill(INIT_PID, SIGKILL);
 		/* Verifying whether the container init is not killed, "
diff --git a/testcases/kernel/containers/pidns/pidns05.c b/testcases/kernel/containers/pidns/pidns05.c
index 14e1bfb..e5e83fc 100644
--- a/testcases/kernel/containers/pidns/pidns05.c
+++ b/testcases/kernel/containers/pidns/pidns05.c
@@ -250,7 +250,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/containers/pidns/pidns06.c b/testcases/kernel/containers/pidns/pidns06.c
index dad5528..5e90bd6 100644
--- a/testcases/kernel/containers/pidns/pidns06.c
+++ b/testcases/kernel/containers/pidns/pidns06.c
@@ -156,7 +156,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/containers/pidns/pidns17.c b/testcases/kernel/containers/pidns/pidns17.c
index c7bbea8..3ac6a7c 100644
--- a/testcases/kernel/containers/pidns/pidns17.c
+++ b/testcases/kernel/containers/pidns/pidns17.c
@@ -152,5 +152,5 @@
 	/* Clean the test testcase as LTP wants*/
 	TEST_CLEANUP;
 	tst_exit();
-	/* NOTREACHED */
+	
 }
diff --git a/testcases/kernel/device-drivers/rtc/rtc-test.c b/testcases/kernel/device-drivers/rtc/rtc-test.c
index a62b033..df93f85 100644
--- a/testcases/kernel/device-drivers/rtc/rtc-test.c
+++ b/testcases/kernel/device-drivers/rtc/rtc-test.c
@@ -203,7 +203,7 @@
        rtc_fd = open(rtc_dev, O_RDONLY);
 
        if (rtc_fd < 0)
-               tst_brkm(TBROK | TERRNO, tst_exit, "couldn't open %s", rtc_dev);
+               tst_brkm(TBROK | TERRNO, NULL, "couldn't open %s", rtc_dev);
 
        /*Read and alarm tests*/
        read_alarm_test();
@@ -214,5 +214,5 @@
        close(rtc_fd);
 
        tst_resm(TINFO, "RTC Tests Done!");
-       return 0;
+     tst_exit();
 }
diff --git a/testcases/kernel/device-drivers/tbio/kernel_space/tbio.c b/testcases/kernel/device-drivers/tbio/kernel_space/tbio.c
index 0a9f38b..d1c8884 100644
--- a/testcases/kernel/device-drivers/tbio/kernel_space/tbio.c
+++ b/testcases/kernel/device-drivers/tbio/kernel_space/tbio.c
@@ -498,7 +498,7 @@
 
 static int tbio_open(struct inode *inode , struct file *filep)
 {
-	if (! Device.bdev) {
+	if (!Device.bdev) {
 		Device.bdev = inode->i_bdev;
 		//atomic_inc((atomic_t)&Device.bdev->bd_part_count);
 	}
diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
index 450d557..92554cb 100644
--- a/testcases/kernel/fs/doio/doio.c
+++ b/testcases/kernel/fs/doio/doio.c
@@ -2466,9 +2466,9 @@
 	if (errbuf == NULL) {
 		errbuf = (char *)malloc(32768);
 		if (errbuf == NULL) {
-		doio_fprintf(stderr, "malloc failed, %s/%d\n",
-			__FILE__, __LINE__);
-			return NULL;
+			doio_fprintf(stderr, "malloc failed, %s/%d\n",
+				__FILE__, __LINE__);
+				return NULL;
 		}
 	}
 
@@ -3275,7 +3275,7 @@
 			}
 #endif /* CRAY */
 #ifdef sgi
-			for (i=0; s->aioid[i] != -1; i++) {
+			for (i = 0; s->aioid[i] != -1; i++) {
 				if (s->aioid == NULL) {
 					doio_fprintf(stderr,
 						     "aioid == NULL!\n");
@@ -4068,7 +4068,7 @@
 			     nbytes, cp, ip, ip & 0x3f);
 
 		free(cp);
-		if ((cp = malloc_space = malloc( nbytes + 0x40 )) == NULL) {
+		if ((cp = malloc_space = malloc(nbytes + 0x40)) == NULL) {
 		    doio_fprintf(stderr, "malloc(%d) failed:  %s (%d)\n",
 				 nbytes, SYSERR, errno);
 		    return -1;
@@ -4358,7 +4358,7 @@
 			break;
 		}
 
-		if (! haveit) {
+		if (!haveit) {
 			if ((info->si_signo == SIGSEGV) ||
 			   (info->si_signo == SIGBUS) ) {
 				doio_fprintf(stderr, "signal_info  si_signo %d si_errno %d si_code = %d  si_addr=%p  active_mmap_rw=%d havesigint=%d\n",
diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
index 7d81986..7231d34 100644
--- a/testcases/kernel/fs/doio/growfiles.c
+++ b/testcases/kernel/fs/doio/growfiles.c
@@ -2310,7 +2310,7 @@
 	ret=trunc(fd);
 #else
 	ret=ftruncate(fd, new_offset );
-	if ((ret == 0) && (Debug > 3)) {
+	if (ret == 0 && Debug > 3) {
                 printf("%s: %d DEBUG4 %s/%d: ftruncated to offset %d, %d bytes from end\n",
                     Progname, Pid, __FILE__, __LINE__, new_offset, trunc_incr);
 	}
@@ -2678,7 +2678,7 @@
 	    /*
 	     * Read the whole file in a single read
 	     */
-	    if ((buf=(char *)malloc(fsize)) == NULL) {
+	    if ((buf = (char *)malloc(fsize)) == NULL) {
 			fprintf(stderr, "%s%s: %s/%d: malloc(%d) failed: %s\n", Progname, TagName,
 				__FILE__, __LINE__, fsize, strerror(errno));
 			fflush(stderr);
diff --git a/testcases/kernel/fs/doio/iogen.c b/testcases/kernel/fs/doio/iogen.c
index e781bc4..a3b6e4f 100644
--- a/testcases/kernel/fs/doio/iogen.c
+++ b/testcases/kernel/fs/doio/iogen.c
@@ -1157,7 +1157,7 @@
 		   fd, f.l_whence, (long long)f.l_start, (long long)f.l_len);*/
 
 	    /* non-zeroing reservation */
-	    if (fcntl( fd, F_RESVSP, &f ) == -1) {
+	    if (fcntl(fd, F_RESVSP, &f) == -1) {
 		fprintf(stderr,
 			"iogen%s:  Could not fcntl(F_RESVSP) %d bytes in file %s: %s (%d)\n",
 			TagName, nbytes, path, SYSERR, errno);
@@ -1631,31 +1631,31 @@
      * Supply defaults
      */
 
-    if (! L_opt) {
+    if (!L_opt) {
 	    Minstrides = 1;
 	    Maxstrides = 255;
     }
 
-    if (! m_opt)
+    if (!m_opt)
 	Offset_Mode = str_lookup(Omode_Map, "sequential");
 
-    if (! i_opt)
+    if (!i_opt)
 	Iterations = 0;
 
-    if (! t_opt)
+    if (!t_opt)
 	Mintrans = 1;
 
-    if (! T_opt)
+    if (!T_opt)
 	Maxtrans = 256 * BSIZE;
 
-    if (! O_opt)
+    if (!O_opt)
 	Oflags = Ocbits = Ocblks = 0;
 
     /*
      * Supply default async io completion strategy types.
      */
 
-    if (! a_opt) {
+    if (!a_opt) {
 	    for (mp = Aio_Strat_Map; mp->m_string != NULL; mp++) {
 		    Aio_Strat_List[Naio_Strat_Types++] = mp;
 	    }
@@ -1665,7 +1665,7 @@
      * Supply default syscalls.  Default is read,write,reada,writea,listio.
      */
 
-    if (! s_opt) {
+    if (!s_opt) {
 	Nsyscalls = 0;
 	Syscall_List[Nsyscalls++] = str_lookup(Syscall_Map, "read");
 	Syscall_List[Nsyscalls++] = str_lookup(Syscall_Map, "write");
@@ -1704,7 +1704,7 @@
      * Supply default file io flags - defaut is 'buffered,raw,sync,ldraw'.
      */
 
-    if (! f_opt && Fileio) {
+    if (!f_opt && Fileio) {
 	    Nflags = 0;
 	    Flag_List[Nflags++] = str_lookup(Flag_Map, "buffered");
 	    Flag_List[Nflags++] = str_lookup(Flag_Map, "sync");
diff --git a/testcases/kernel/fs/fs_perms/fs_perms.c b/testcases/kernel/fs/fs_perms/fs_perms.c
index 9fbe9ec..984c352 100644
--- a/testcases/kernel/fs/fs_perms/fs_perms.c
+++ b/testcases/kernel/fs/fs_perms/fs_perms.c
@@ -169,7 +169,7 @@
 	long i = strtol(str, &end, 10);
 
 	if (*end != '\0')
-		tst_brkm(TBROK, tst_exit, "Invalid parameter '%s' passed. (%s)",
+		tst_brkm(TBROK, NULL, "Invalid parameter '%s' passed. (%s)",
 		         name, str);
 
 	return i;
diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
index 0c587f0..194f2fb 100644
--- a/testcases/kernel/fs/fsstress/fsstress.c
+++ b/testcases/kernel/fs/fsstress/fsstress.c
@@ -530,7 +530,7 @@
 		fprintf(stderr, "fsstress: append_pathname failure\n");
 		chdir(homedir);
 		abort();
-		/* NOTREACHED */
+		
 	}
 #endif
 	name->path = realloc(name->path, name->len + 1 + len);
@@ -612,7 +612,7 @@
 	chdir(homedir);
 	fprintf(stderr, "fsstress: check_cwd failure\n");
 	abort();
-	/* NOTREACHED */
+	
 #endif
 }
 
@@ -873,7 +873,7 @@
 	abort();
 #endif
 	return -1;
-	/* NOTREACHED */
+	
 }
 
 void
diff --git a/testcases/kernel/fs/fsx-linux/fsx-linux.c b/testcases/kernel/fs/fsx-linux/fsx-linux.c
index 7397df3..143d5b2 100644
--- a/testcases/kernel/fs/fsx-linux/fsx-linux.c
+++ b/testcases/kernel/fs/fsx-linux/fsx-linux.c
@@ -1303,7 +1303,7 @@
 
 		default:
 			usage();
-			/* NOTREACHED */
+			
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/testcases/kernel/fs/mongo/mongo_compare.c b/testcases/kernel/fs/mongo/mongo_compare.c
index 549854a..36902af 100644
--- a/testcases/kernel/fs/mongo/mongo_compare.c
+++ b/testcases/kernel/fs/mongo/mongo_compare.c
@@ -75,22 +75,22 @@
     strcpy(out2,argv[3]);
     strcat(out2,".html");
 
-    if ((f1=fopen(argv[1],"r")) == NULL) {
+    if ((f1 = fopen(argv[1], "r")) == NULL) {
 	fprintf(stderr, "%s: can't open %s\n", argv[0], argv[1] );
     	return 1;
     }
 
-    if ((f2=fopen(argv[2],"r")) == NULL) {
+    if ((f2 = fopen(argv[2], "r")) == NULL) {
 	fprintf(stderr, "%s: can't open %s\n", argv[0], argv[2] );
     	return 1;
     }
 
-    if ((f3=fopen(out1,"wr")) == NULL) {
+    if ((f3 = fopen(out1,"wr")) == NULL) {
 	fprintf(stderr, "%s: can't open %s\n", argv[0], out1 );
     	return 1;
     }
 
-    if ((f4=fopen(out2,"wr")) == NULL) {
+    if ((f4 = fopen(out2,"wr")) == NULL) {
 	fprintf(stderr, "%s: can't open %s\n", argv[0], out2 );
     	return 1;
     }
@@ -132,7 +132,7 @@
 	     else {
 	         k=0; p=line3;
 	         while (*p++ != 0) {
-	             if ((*p != ' ') && (*p != '\n')) k++;
+	             if (*p != ' ' && *p != '\n') k++;
 	         }
 	         if (k > 0) {
 	             fprintf(f4, "<tt>%s</tt><br>\n", line3);
diff --git a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
index d6e4cca..166f022 100644
--- a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
+++ b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
@@ -5563,7 +5563,7 @@
         printf("%s ", devices[k]);
         close(fd);
     };
-    printf("\n"); // <<<<<<<<<<<<<<<<<<<<<
+    printf("\n");
     for (k = 0; k < MAX_SG_DEVS; k++) {
         make_dev_name(name, NULL, k, do_numeric);
         fd = open(name, O_RDWR | O_NONBLOCK);
diff --git a/testcases/kernel/fs/stream/stream01.c b/testcases/kernel/fs/stream/stream01.c
index e4b721d..1887514 100644
--- a/testcases/kernel/fs/stream/stream01.c
+++ b/testcases/kernel/fs/stream/stream01.c
@@ -42,6 +42,7 @@
 #define PASSED 1
 #define FAILED 0
 
+/* XXX: add setup and cleanup. */
 
 char progname[] = "stream01()" ;
 char tempfile1[40]="";
@@ -59,11 +60,8 @@
          /*
           * parse standard options
           */
-        if ((msg = parse_opts(ac, av, NULL) {
-                        tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
-                 tst_exit();
-                 /*NOTREACHED*/
-         }
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
         local_flag = PASSED;
 	tst_tmpdir();
@@ -79,16 +77,14 @@
 		}
 		fwrite("a",1,1,stream);
 		if ((stream=freopen(tempfile2,"a+",stream)) == NULL) {
-			tst_resm(TFAIL,"freopen(%s) a+ failed: %s", tempfile2, strerror(errno));
-			tst_exit();
+			tst_brkm(TFAIL|TERRNO, NULL, "freopen(%s) a+ failed", tempfile2);
 		}
 		fwrite("a",1,1,stream);
 		fclose(stream);
 
 		/* now check that a single "a" is in each file */
 		if ((stream=fopen(tempfile1,"r")) == NULL) {
-			tst_resm(TFAIL,"fopen(%s) r failed: %s", tempfile1, strerror(errno));
-			tst_exit();
+			tst_brkm(TFAIL|TERRNO, NULL, "fopen(%s) r failed", tempfile1);
 		}
 		else {
 			for (i=0; i<10; i++) buf[i]=0;
@@ -100,8 +96,7 @@
 			fclose(stream);
 		}
 		if ((stream=fopen(tempfile2,"r")) == NULL) {
-			tst_resm(TFAIL,"fopen(%s) r failed: %s", tempfile2, strerror(errno));
-			tst_exit();
+			tst_brkm(TFAIL|TERRNO, NULL, "fopen(%s) r failed", tempfile2);
 		}
 		else {
 			for (i=0; i<10; i++) buf[i]=0;
@@ -112,13 +107,13 @@
 			}
 			fclose(stream);
 		}
-		 if (local_flag == PASSED) {
+		if (local_flag == PASSED) {
 			tst_resm(TPASS, "Test passed.");
-		 } else {
+		} else {
 			tst_resm(TFAIL, "Test failed.");
-		 }
+		}
 
-		 local_flag = PASSED;
+		local_flag = PASSED;
 
 	/*--------------------------------------------------------------------*/
 		unlink(tempfile1);
@@ -127,5 +122,4 @@
 	} /* end for */
 	tst_rmdir();
 	tst_exit();
-	return 0;
 }
diff --git a/testcases/kernel/fs/stream/stream02.c b/testcases/kernel/fs/stream/stream02.c
index 8003253..1013472 100644
--- a/testcases/kernel/fs/stream/stream02.c
+++ b/testcases/kernel/fs/stream/stream02.c
@@ -47,6 +47,8 @@
 char progname[] = "stream02()" ;
 char tempfile1[40]="";
 
+/* XXX: add cleanup + setup. */
+
 /*--------------------------------------------------------------------*/
 int main(int ac, char *av[])
 {
@@ -58,11 +60,8 @@
          /*
           * parse standard options
           */
-        if ((msg = parse_opts(ac, av, NULL) {
-                         tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
-                 tst_exit();
-                 /*NOTREACHED*/
-         }
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
         local_flag = PASSED;
 	tst_tmpdir();
@@ -99,11 +98,11 @@
 
 	/*--------------------------------------------------------------------*/
 	block1 :
-		if (( fd = open("/dev/tty",O_WRONLY)) >= 0)
+		if ((fd = open("/dev/tty", O_WRONLY)) >= 0)
 		{
 			close(fd);
 			if (( stream = fopen("/dev/tty","w"))==NULL) {
-				tst_resm(TFAIL,"fopen(/dev/tty) write failed: %s", strerror(errno));
+				tst_resm(TFAIL|TERRNO,"fopen(/dev/tty) write failed");
 				local_flag = FAILED;
 			} else {
 				fclose(stream);
@@ -119,5 +118,4 @@
 	} /* end for */
 	tst_rmdir();
 	tst_exit();
-        return 0;
 }
diff --git a/testcases/kernel/fs/stream/stream04.c b/testcases/kernel/fs/stream/stream04.c
index 7e47ec6..3ee654b 100644
--- a/testcases/kernel/fs/stream/stream04.c
+++ b/testcases/kernel/fs/stream/stream04.c
@@ -51,6 +51,8 @@
 char tempfile1[40]="";
 long ftell();
 
+/* XXX: add setup and cleanup */
+
 /*--------------------------------------------------------------------*/
 int main(int ac, char *av[])
 {
@@ -65,11 +67,8 @@
          /*
           * parse standard options
           */
-        if ((msg = parse_opts(ac, av, NULL) {
-                         tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
-                 tst_exit();
-                 /*NOTREACHED*/
-         }
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+                 tst_resm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	tst_tmpdir();
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
@@ -79,7 +78,7 @@
 	/*--------------------------------------------------------------------*/
 	//block0:
 		if ((stream=fopen(tempfile1,"a+")) == NULL) {
-			tst_resm(TFAIL,"fopen(%s) a+ failed: %s", tempfile1, strerror(errno));
+			tst_resm(TFAIL|TERRNO,"fopen(%s) a+ failed: %s", tempfile1);
 			tst_rmdir();
 			tst_exit();
 		}
diff --git a/testcases/kernel/fs/stream/stream05.c b/testcases/kernel/fs/stream/stream05.c
index 5945d5b..ca4814e 100644
--- a/testcases/kernel/fs/stream/stream05.c
+++ b/testcases/kernel/fs/stream/stream05.c
@@ -66,11 +66,8 @@
          /*
           * parse standard options
           */
-        if ((msg = parse_opts(ac, av, NULL) {
-                         tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
-                 tst_exit();
-                 /*NOTREACHED*/
-        }
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+                 tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	tst_tmpdir();
         local_flag = PASSED;
 
@@ -220,6 +217,6 @@
 	} /* end for */
 	tst_rmdir();
 	tst_exit();
-	/* NOTREACHED */
+	
 	return 0;
 }
diff --git a/testcases/kernel/hotplug/memory_hotplug/commands.c b/testcases/kernel/hotplug/memory_hotplug/commands.c
index 32dbbb8..1b03cdd 100644
--- a/testcases/kernel/hotplug/memory_hotplug/commands.c
+++ b/testcases/kernel/hotplug/memory_hotplug/commands.c
@@ -271,7 +271,11 @@
 	pol = args;
 	args += strcspn(args, " 	+");
 
+<<<<<<< HEAD
 	for (polp = policies; polp->pol_name != NULL; ++polp) {
+=======
+	for ( polp = policies; polp->pol_name != NULL; ++polp) {
+>>>>>>> master
 		size_t plen = args - pol;
 
 		if (strncmp(pol, polp->pol_name, plen))
@@ -1200,7 +1204,11 @@
 		cmdlen = 0;
 	}
 
+<<<<<<< HEAD
 	for (cmdp = cmd_table; cmdp->cmd_name != NULL; ++cmdp) {
+=======
+	for ( cmdp = cmd_table; cmdp->cmd_name != NULL; ++cmdp) {
+>>>>>>> master
 		if (cmd == NULL ||
 				!strncmp(cmd, cmdp->cmd_name, cmdlen)) {
 			printf("%s\n", cmdp->cmd_help);
@@ -1243,7 +1251,11 @@
 
 	cmd = strtok_r(cmdline, whitespace, &args);
 
+<<<<<<< HEAD
 	for (cmdp = cmd_table; cmdp->cmd_name != NULL; ++cmdp) {
+=======
+	for ( cmdp = cmd_table; cmdp->cmd_name != NULL; ++cmdp) {
+>>>>>>> master
 		size_t clen = strlen(cmd);
 		int ret;
 
diff --git a/testcases/kernel/hotplug/memory_hotplug/memtoy.c b/testcases/kernel/hotplug/memory_hotplug/memtoy.c
index 16f9454..de27f1b 100644
--- a/testcases/kernel/hotplug/memory_hotplug/memtoy.c
+++ b/testcases/kernel/hotplug/memory_hotplug/memtoy.c
@@ -435,7 +435,7 @@
 		case 'h':
 		case 'x':
 			usage(NULL);
-			/*NOTREACHED*/
+			
 			break;
 
 		case 'V':
@@ -490,7 +490,7 @@
 
 	if (error /* || argc==1 */) {
 		usage(NULL);
-		/*NOTREACHED*/
+		
 	}
 
 	/*
diff --git a/testcases/kernel/io/aio/aio02/main.c b/testcases/kernel/io/aio/aio02/main.c
index 80d375b..e869835 100644
--- a/testcases/kernel/io/aio/aio02/main.c
+++ b/testcases/kernel/io/aio/aio02/main.c
@@ -29,8 +29,8 @@
 #else
 int main(void)
 {
-	tst_brkm(TCONF, tst_exit, "libaio missing");
-	/* NOTREACHED */
+	tst_brkm(TCONF, NULL, "libaio missing");
+	
 	return 0;
 }
 #endif
diff --git a/testcases/kernel/io/direct_io/diotest_routines.c b/testcases/kernel/io/direct_io/diotest_routines.c
index a6f0da3..5e17045 100644
--- a/testcases/kernel/io/direct_io/diotest_routines.c
+++ b/testcases/kernel/io/direct_io/diotest_routines.c
@@ -190,7 +190,11 @@
 			killchldrn(pidlst, i, SIGTERM);
 			return(-1);
 		}
+<<<<<<< HEAD
 		if (cpid == 0 ) exit((*chldfunc)(i, action));
+=======
+		if ( cpid == 0 ) exit((*chldfunc)(i, action));
+>>>>>>> master
 		else *(*pidlst+i) = cpid;
 	}
 	return 0;
diff --git a/testcases/kernel/io/disktest/parse.c b/testcases/kernel/io/disktest/parse.c
index 9ffa2ac..45aee6c 100644
--- a/testcases/kernel/io/disktest/parse.c
+++ b/testcases/kernel/io/disktest/parse.c
@@ -730,7 +730,11 @@
 		/* use stat to get file properties, and use to set -I */
 		rv = stat(args->device, &stat_buf);
 		if (0 == rv) {
+<<<<<<< HEAD
 			if (IS_FILE(stat_buf.st_mode)) {
+=======
+			if (IS_FILE(stat_buf.st_mode) ) {
+>>>>>>> master
 				strncat(args->argstr, "(-I f) ", (MAX_ARG_LEN-1)-strlen(args->argstr));
 				args->flags |= CLD_FLG_FILE;
 			} else if (IS_BLK(stat_buf.st_mode)) {
@@ -949,7 +953,11 @@
 	rv = stat(args->device, &stat_buf);
 	if (0 == rv) { /* no error on call to stat, compare against -I option */
 		/* files are usually file type */
+<<<<<<< HEAD
 		if ((args->flags & CLD_FLG_FILE) && !IS_FILE(stat_buf.st_mode)) {
+=======
+		if ((args->flags & CLD_FLG_FILE) && !IS_FILE(stat_buf.st_mode) ) {
+>>>>>>> master
 			pMsg(ERR, args, "Can't open non-file filespec with file device type, -If.\n");
 			return(-1);
 		}
diff --git a/testcases/kernel/io/ltp-aiodio/aio-stress.c b/testcases/kernel/io/ltp-aiodio/aio-stress.c
index 5d3dcb1..d48612a 100644
--- a/testcases/kernel/io/ltp-aiodio/aio-stress.c
+++ b/testcases/kernel/io/ltp-aiodio/aio-stress.c
@@ -704,7 +704,11 @@
     if ((oper->started_ios + num_ios) > oper->total_ios)
         num_ios = oper->total_ios - oper->started_ios;  
 
+<<<<<<< HEAD
     for (i = 0 ; i < num_ios ; i++) {
+=======
+    for ( i = 0 ; i < num_ios ; i++) {
+>>>>>>> master
 	io = build_iocb(t, oper);
 	if (!io) {
 	    return -1;   
diff --git a/testcases/kernel/io/ltp-aiodio/aiodio_append.c b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
index ec8747e..969e2f3 100644
--- a/testcases/kernel/io/ltp-aiodio/aiodio_append.c
+++ b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
@@ -143,7 +143,11 @@
                 if (n > 0) {
 		  iocbp = (struct iocb *)event.obj;
 
+<<<<<<< HEAD
 		if (n > 0) {
+=======
+		if ( n > 0) {
+>>>>>>> master
 		io_prep_pwrite(iocbp, fd, iocbp->u.c.buf, AIO_SIZE, offset);
 		offset += AIO_SIZE;
 		if ((w = io_submit(myctx, 1, &iocbp)) < 0) {
diff --git a/testcases/kernel/io/writetest/writetest.c b/testcases/kernel/io/writetest/writetest.c
index f8308c0..36db58b 100644
--- a/testcases/kernel/io/writetest/writetest.c
+++ b/testcases/kernel/io/writetest/writetest.c
@@ -60,7 +60,11 @@
 void buf_init(void )
 {
     static int seed = 0;
+<<<<<<< HEAD
     if (seed == 0)
+=======
+    if ( seed == 0 )
+>>>>>>> master
         seed = DefaultSeed;
     srand(seed);
 }
@@ -82,7 +86,11 @@
     uint8_t buf[BLOCKSIZE];
 
     fd = open(filename, O_RDWR|O_CREAT|O_TRUNC|O_LARGEFILE, FILE_MODE);
+<<<<<<< HEAD
     if (fd < 0) {
+=======
+    if ( fd < 0 ) {
+>>>>>>> master
         perror(TCID);
         return(-1);
     }
@@ -92,7 +100,11 @@
 			tst_resm(TINFO, "Block: %lld/%lld  (%3lld%%)\r", (long long int)block, (long long int)num_blocks, (long long int)(block*100/num_blocks));
         buf_fill(buf);
         rv = write(fd, buf, BLOCKSIZE);
+<<<<<<< HEAD
         if (rv != BLOCKSIZE) {
+=======
+        if ( rv != BLOCKSIZE ) {
+>>>>>>> master
             ret = -1;
             break;
         }
@@ -112,7 +124,11 @@
     char buf_read[BLOCKSIZE];
 
     fd = open(filename, O_RDONLY);
+<<<<<<< HEAD
     if (fd < 0) {
+=======
+    if ( fd < 0 ) {
+>>>>>>> master
         perror(TCID);
         return(-1);
     }
@@ -123,7 +139,11 @@
         	tst_resm(TINFO, "Block: %lld/%lld  (%3lld%%)\r", (long long int)block, (long long int)num_blocks, (long long int)(block*100/num_blocks));
         buf_fill(buf_actual);
         rv = read(fd, buf_read, BLOCKSIZE);
+<<<<<<< HEAD
         if (rv != BLOCKSIZE) {
+=======
+        if ( rv != BLOCKSIZE ) {
+>>>>>>> master
             ret = -1;
             break;
         }
@@ -131,7 +151,11 @@
             int ba, br;
             ba = buf_actual[n] & 0xff;
             br = buf_read[n] & 0xff;
+<<<<<<< HEAD
             if (ba != br) {
+=======
+            if ( ba != br ) {
+>>>>>>> master
                 if (Verbosity > 2)
                 	tst_resm(TINFO, "Mismatch: block=%lld +%d bytes offset=%lld read: %02xh actual: %02xh\n",
                     (long long int)block, n, (long long int)((block*BLOCKSIZE)+n), br, ba);
@@ -173,7 +197,11 @@
             { 0, 0, 0, 0 }
         };
         c = getopt_long(argc, argv, "hvb:o:s:", long_options, &option_index);
+<<<<<<< HEAD
         if (c == -1)
+=======
+        if ( c == -1 )
+>>>>>>> master
             break;
         switch(c) {
             case 'b':
@@ -223,7 +251,11 @@
     tst_resm(TINFO, "Writing %lld blocks of %d bytes to '%s'\n", (long long int)NumBlocks, BLOCKSIZE, Filename);
     buf_init();
     rv = write_file(NumBlocks, Filename);
+<<<<<<< HEAD
     if (rv == 0) {
+=======
+    if ( rv == 0 ) {
+>>>>>>> master
         tst_resm(TPASS, "Write: Success");
     } else {
         tst_resm(TFAIL, "Write: Failure");
@@ -232,7 +264,11 @@
     tst_resm(TINFO, "Verifying %lld blocks in '%s'\n", (long long int)NumBlocks, Filename);
     buf_init();
     rv = verify_file(NumBlocks, Filename);
+<<<<<<< HEAD
     if (rv == 0) {
+=======
+    if ( rv == 0 ) {
+>>>>>>> master
         tst_resm(TPASS ,"Verify: Success\n");
     } else {
         tst_resm(TFAIL, "Verify: Failure");
diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
index bd12f7e..9871f92 100644
--- a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
@@ -309,7 +309,7 @@
 	cleanup(0);
 
 	return 0;
-	/*NOTREACHED*/
+	
 }
 
 static void cleanup (int rc)
diff --git a/testcases/kernel/ipc/pipeio/pipeio.c b/testcases/kernel/ipc/pipeio/pipeio.c
index 3e78e25..18b2fe8 100644
--- a/testcases/kernel/ipc/pipeio/pipeio.c
+++ b/testcases/kernel/ipc/pipeio/pipeio.c
@@ -68,7 +68,7 @@
     tst_resm (TFAIL, "Test failed");
   else
     tst_resm (TPASS, "Test passed");
-  tst_exit();
+ tst_exit();
 }
 
 #if defined(__linux__)
@@ -167,8 +167,13 @@
 	dir[0] = '\0';
 	sprintf(pname,"%s.%d",PPATH,getpid());
 
+<<<<<<< HEAD
 	if ((toutput=getenv("TOUTPUT")) != NULL) {
 	    if (strcmp( toutput, "NOPASS") == 0) {
+=======
+	if ( (toutput=getenv("TOUTPUT")) != NULL ) {
+	    if ( strcmp( toutput, "NOPASS") == 0 ) {
+>>>>>>> master
 		quiet=1;
 	    }
 	}
@@ -282,7 +287,11 @@
 			break;
 
     		case 'I':
+<<<<<<< HEAD
      			if ((iotype=lio_parse_io_arg1(optarg)) == -1) {
+=======
+     			if ((iotype=lio_parse_io_arg1(optarg)) == -1 ) {
+>>>>>>> master
          		    fprintf(stderr,
              			"%s: --I arg is invalid, must be s, p, f, a, l, L or r.\n",
              			TCID);
@@ -446,14 +455,18 @@
 	writebuf[size-1] = 'A';	/* to detect partial read/write problem */
 
 	if ((sem_id = semget(IPC_PRIVATE, 1, IPC_CREAT|S_IRWXU)) == -1) {
-		tst_brkm(TBROK, tst_exit, "Couldn't allocate semaphore: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "Couldn't allocate semaphore: %s", strerror(errno));
 	}
 
 	if (semctl(sem_id, 0, SETVAL, u) == -1)
-		tst_brkm(TBROK, tst_exit, "Couldn't initialize semaphore value: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "Couldn't initialize semaphore value: %s", strerror(errno));
 
 	if (background) {
+<<<<<<< HEAD
 	    if ((n=fork()) == -1) {
+=======
+	    if ((n=fork() ) == -1) {
+>>>>>>> master
 		tst_resm (TFAIL, "fork() failed: %s", strerror(errno));
 		exit(1);
 	    }
@@ -527,7 +540,7 @@
 				exit(1);
 			}
 			if (ndelay && fcntl(write_fd, F_SETFL, O_NONBLOCK) == -1) {
-				tst_brkm(TBROK, tst_exit, "Failed setting the pipe to nonblocking mode: %s", strerror(errno));
+				tst_brkm(TBROK, NULL, "Failed setting the pipe to nonblocking mode: %s", strerror(errno));
 			}
 		}
 		else {
@@ -541,7 +554,7 @@
 		};
 
 		if (semop(sem_id, &sem_op, 1) == -1)
-			tst_brkm(TBROK, tst_exit, "Couldn't raise the semaphore: %s", strerror(errno));
+			tst_brkm(TBROK, NULL, "Couldn't raise the semaphore: %s", strerror(errno));
 
 
 		pid_word = (int *)&writebuf[0];
@@ -598,7 +611,7 @@
 				exit(1);
 			}
 			if (ndelay && fcntl(read_fd, F_SETFL, O_NONBLOCK) == -1) {
-				tst_brkm(TBROK, tst_exit, "Failed setting the pipe to nonblocking mode: %s", strerror(errno));
+				tst_brkm(TBROK, NULL, "Failed setting the pipe to nonblocking mode: %s", strerror(errno));
 			}
 		}
 		else {
@@ -615,7 +628,7 @@
 			if (errno == EINTR) {
 				continue;
 			}
-			tst_brkm(TBROK, tst_exit, "Couldn't wait on semaphore: %s", strerror(errno));
+			tst_brkm(TBROK, NULL, "Couldn't wait on semaphore: %s", strerror(errno));
 		}
 
 		for (i=num_wrters*num_writes; i > 0 || loop; --i) {
@@ -693,7 +706,11 @@
 			tst_resm (TFAIL, "1 FAIL %d data errors on pipe, read size = %d, %s %s",
 			          error,size,pipe_type,blk_type);
 		else
+<<<<<<< HEAD
 			if (!quiet)
+=======
+			if ( !quiet )
+>>>>>>> master
 				tst_resm (TPASS, "1 PASS %d pipe reads complete, read size = %d, %s %s",
 				          count+1,size,pipe_type,blk_type);
 
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c
index 966e826..2086b8a 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -79,7 +79,7 @@
 
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	setup();
 	testcpuset();
 	cleanup();
@@ -179,7 +179,7 @@
 void setup(void)
 {
 	if (count_numa() == 1)
-		tst_brkm(TCONF, tst_exit, "required a NUMA system.");
+		tst_brkm(TCONF, NULL, "required a NUMA system.");
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 	TEST_PAUSE;
 	if (mkdir(CPATH, 0777) == -1)
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
index 3676f1b..59e60f5 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
@@ -182,7 +182,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 1;
 }	/* End main */
 
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
index 53d219d..f13c9e7 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
@@ -200,7 +200,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 1;
 }	/* End main */
 
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
index a07b9aa..40c21a2 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
@@ -80,7 +80,7 @@
 #if __WORDSIZE==32  /* 32-bit compiled */
       	tst_resm(TCONF,"This test is only for 64bit");
 	tst_exit();
-       	/*NOTREACHED*/
+       	
        	return 1;
 #else	/* 64-bit compiled */
 	int lc;			/* loop counter */
@@ -139,7 +139,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 1;
 #endif
 }	/* End main */
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
index c3b7af2..3c43aed 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
@@ -197,7 +197,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 1;
 }	/* End main */
 
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
index bce9fe6..35c85a3 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
@@ -81,7 +81,6 @@
 #endif
 
 char *TCID = "hugemmap05";
-char *TESTDIR;
 int TST_TOTAL = 1, Tst_count;
 static char nr_hugepages[BUFSIZ], nr_overcommit_hugepages[BUFSIZ];
 static char buf[BUFSIZ], line[BUFSIZ], path[BUFSIZ], pathover[BUFSIZ];
@@ -114,7 +113,7 @@
 
 	msg = parse_opts(argc, argv, options, usage);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	if (opt_sysfs) {
 		strncpy(path, _PATH_SYS_2M_HUGE,
 			strlen(_PATH_SYS_2M_HUGE) + 1);
@@ -155,7 +154,7 @@
 		if (shmid == -1)
 			tst_brkm(TBROK|TERRNO, cleanup, "shmget");
 	} else {
-		snprintf(s, BUFSIZ, "%s/hugemmap05/file", TESTDIR);
+		snprintf(s, BUFSIZ, "%s/hugemmap05/file", get_tmp_tstdir());
 		fd = open(s, O_CREAT | O_RDWR, 0755);
 		if (fd == -1)
 			tst_brkm(TBROK|TERRNO, cleanup, "open");
@@ -279,7 +278,7 @@
 		tst_resm(TWARN|TERRNO, "write");
 	close(fd);
 	
-	snprintf(buf, BUFSIZ, "%s/hugemmap05", TESTDIR);
+	snprintf(buf, BUFSIZ, "%s/hugemmap05", get_tst_tmpdir());
 	if (umount(buf) == -1)
 		tst_resm(TWARN|TERRNO, "umount");
 	if (shmid != -1) {
@@ -363,7 +362,7 @@
 			"failed to change nr_hugepages.");
 	close(fd);
 
-	snprintf(buf, BUFSIZ, "%s/hugemmap05", TESTDIR);
+	snprintf(buf, BUFSIZ, "%s/hugemmap05", get_tst_tmpdir());
 	if (mkdir(buf, 0700) == -1)
 		tst_brkm(TBROK|TERRNO, cleanup, "mkdir");
 	if (mount(NULL, buf, "hugetlbfs", 0, NULL) == -1)
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
index 38c4b7e..46914e8 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
@@ -100,12 +100,11 @@
 	void check_functionality(int);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -153,7 +152,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
index cc8fe1d..094415a 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
@@ -97,12 +97,11 @@
 	int i;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -146,7 +145,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
index da76cef..248ae6d 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
@@ -81,9 +81,8 @@
 	void do_child(void);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
              tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
index a020d01..30aa01c 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
@@ -125,12 +125,11 @@
 	void check_functionality(void);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -199,7 +198,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
index 1b2e0e2..6bbc4ce 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
@@ -97,12 +97,11 @@
 	int i;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -143,7 +142,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
index c7cc3a0..f498656 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
@@ -100,9 +100,8 @@
 	void do_child(void);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
              tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
diff --git a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
index 8ca406b..30db201 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
@@ -82,12 +82,11 @@
 	void check_functionality(void);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -129,7 +128,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
index 65c878b..4b790a7 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
@@ -74,13 +74,12 @@
         unsigned long huge_pages_shm_to_be_allocated;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* The following loop checks looping state if -i option given */
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
               huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
         
@@ -149,8 +148,8 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
-        return 0;
+	
+      tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
index a9d124c..a297d38 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
@@ -79,12 +79,11 @@
 	int i;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
   
@@ -139,7 +138,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 
 	return 0;
 }
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
index f5c7f58..7b26057 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
@@ -79,13 +79,12 @@
         unsigned long huge_pages_shm_to_be_allocated;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* The following loop checks looping state if -i option given */
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-             tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
+             tst_brkm(TCONF, NULL, "Not enough available Hugepages");
         else             
              huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
 
@@ -124,7 +123,7 @@
 
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
index ee1d9ef..3d598a0 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
@@ -82,9 +82,8 @@
 	void do_child(void);
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
 
         if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
              tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
@@ -107,7 +106,7 @@
 		do_child();
 
 		tst_exit();
-		/*NOTREACHED*/
+		
 	} else {		/* parent */
 		/* wait for the child to return */
 		if (waitpid(pid, &status, 0) == -1) {
@@ -121,7 +120,7 @@
 
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/mem/ksm/ksm01.c b/testcases/kernel/mem/ksm/ksm01.c
index 1143791..6d28488 100644
--- a/testcases/kernel/mem/ksm/ksm01.c
+++ b/testcases/kernel/mem/ksm/ksm01.c
@@ -103,7 +103,7 @@
 
 	msg = parse_opts(argc, argv, options, usage);
 	if (msg != (char *)NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	setup();
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 		Tst_count = 0;
@@ -121,30 +121,30 @@
 	if (opt_size) {
 		size = atoi(opt_sizestr);
 		if (size < 1)
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				"size cannot be less than 1.");
 	}
 	if (opt_num) {
 		num = atoi(opt_numstr);
 		if (num < 3)
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				"process number cannot be less 3.");
 	}
 	child = malloc(num);
 	if (child == NULL)
-		tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+		tst_brkm(TBROK|TERRNO, NULL, "malloc");
 
 	memory = malloc(num * sizeof(**memory));
 	if (memory == NULL)
-		tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+		tst_brkm(TBROK|TERRNO, NULL, "malloc");
 
 	switch (child[0] = fork()) {
 	case -1:
-		tst_brkm(TBROK|TERRNO, tst_exit, "fork");
+		tst_brkm(TBROK|TERRNO, NULL, "fork");
 	case 0:
 		tst_resm(TINFO, "child 0 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 
 		tst_resm(TINFO, "child 0 continues...");
 
@@ -154,20 +154,20 @@
 			size);
 		memory[0] = malloc(size * sizeof(*memory));
 		if (memory[0] == NULL)
-			tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+			tst_brkm(TBROK|TERRNO, NULL, "malloc");
 		for (j = 0; j < size; j++) {
 			memory[0][j] = mmap(NULL, MB, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 			if (memory[0][j] == MAP_FAILED)
-				tst_brkm(TBROK|TERRNO, tst_exit, "mmap");
+				tst_brkm(TBROK|TERRNO, NULL, "mmap");
 			if (madvise(memory[0][j], MB, MADV_MERGEABLE) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "madvise");
+				tst_brkm(TBROK|TERRNO, NULL, "madvise");
 			for (i = 0; i < MB; i++)
 				memory[0][j][i] = 'c';
 		}
 		tst_resm(TINFO, "child 0 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 
 		tst_resm(TINFO, "child 0 continues...");
 		verify('c', 0, 0, size, 0, MB);
@@ -179,44 +179,44 @@
 		/* Unmerge. */
 		tst_resm(TINFO, "child 0 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 
 		tst_resm(TINFO, "child 0 continues...");
 		verify('d', 0, 0, size, 0, MB);
 		/* Stop. */
 		tst_resm(TINFO, "child 0 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 0 continues...");
 		exit(0);
 	}
 	switch (child[1] = fork()) {
 	case -1:
-		tst_brkm(TBROK|TERRNO, tst_exit, "fork");
+		tst_brkm(TBROK|TERRNO, NULL, "fork");
 	case 0:
 		tst_resm(TINFO, "child 1 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 1 continues...");
 		tst_resm(TINFO, "child 1 allocates %d MB filled with 'a'.",
 			size);
 		memory[1] = malloc(size * sizeof(*memory));
 		if (memory[1] == NULL)
-			tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+			tst_brkm(TBROK|TERRNO, NULL, "malloc");
 		for (j = 0; j < size; j++) {
 			memory[1][j] = mmap(NULL, MB, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 			if (memory[1][j] == MAP_FAILED)
-				tst_brkm(TBROK|TERRNO, tst_exit, "mmap");
+				tst_brkm(TBROK|TERRNO, NULL, "mmap");
 			if (madvise(memory[1][j], MB, MADV_MERGEABLE) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "madvise");
+				tst_brkm(TBROK|TERRNO, NULL, "madvise");
 			for (i = 0; i < MB; i++)
 				memory[1][j][i] = 'a';
 		}
 
 		tst_resm(TINFO, "child 1 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 1 continues...");
 		verify('a', 1, 0, size, 0, MB);
 		tst_resm(TINFO, "child 1 changes memory content to 'b'.");
@@ -227,7 +227,7 @@
 
 		tst_resm(TINFO, "child 1 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 1 continues...");
 		verify('b', 1, 0, size, 0, MB);
 		tst_resm(TINFO, "child 1 changes memory content to 'd'");
@@ -236,7 +236,7 @@
 				memory[1][j][i] = 'd';
 		}
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 
 		tst_resm(TINFO, "child 1 continues...");
 		verify('d', 1, 0, size, 0, MB);
@@ -246,7 +246,7 @@
 		/* Unmerge. */
 		tst_resm(TINFO, "child 1 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 1 continues...");
 		verify('e', 1, size - 1, size, MB - 1, MB);
 		verify('d', 1, 0, size - 1, 0, MB - 1);
@@ -254,42 +254,42 @@
 		/* Stop. */
 		tst_resm(TINFO, "child 1 stops.");
 		if (raise(SIGSTOP) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+			tst_brkm(TBROK|TERRNO, NULL, "kill");
 		tst_resm(TINFO, "child 1 continues...");
 		exit(0);
 	}
 	for (k = 2; k < num; k++) {
 		switch (child[k] = fork()) {
 		case -1:
-			tst_brkm(TBROK|TERRNO, tst_exit, "fork");
+			tst_brkm(TBROK|TERRNO, NULL, "fork");
 		case 0:
 			tst_resm(TINFO, "child %d stops.", k);
 			if (raise(SIGSTOP) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+				tst_brkm(TBROK|TERRNO, NULL, "kill");
 			tst_resm(TINFO, "child %d continues...", k);
 			tst_resm(TINFO, "child %d allocates %d "
 				"MB filled with 'a'.", k, size);
 			memory[k] = malloc(size * sizeof(*memory));
 			if (memory[k] == NULL)
-				tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+				tst_brkm(TBROK|TERRNO, NULL, "malloc");
 			for (j = 0; j < size; j++) {
 				memory[k][j] = mmap(NULL, MB,
 						PROT_READ|PROT_WRITE,
 						MAP_ANONYMOUS
 						|MAP_PRIVATE, -1, 0);
 				if (memory[k][j] == MAP_FAILED)
-					tst_brkm(TBROK|TERRNO, tst_exit,
+					tst_brkm(TBROK|TERRNO, NULL,
 						"mmap");
 				if (madvise(memory[k][j], MB,
 						MADV_MERGEABLE) == -1)
-					tst_brkm(TBROK|TERRNO, tst_exit,
+					tst_brkm(TBROK|TERRNO, NULL,
 						"madvise");
 				for (i = 0; i < MB; i++)
 					memory[k][j][i] = 'a';
 			}
 			tst_resm(TINFO, "child %d stops.", k);
 			if (raise(SIGSTOP) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+				tst_brkm(TBROK|TERRNO, NULL, "kill");
 			tst_resm(TINFO, "child %d continues...", k);
 			tst_resm(TINFO, "child %d changes memory content to "
 				"'d'", k);
@@ -300,13 +300,13 @@
 			/* Unmerge. */
 			tst_resm(TINFO, "child %d stops.", k);
 			if (raise(SIGSTOP) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+				tst_brkm(TBROK|TERRNO, NULL, "kill");
 			tst_resm(TINFO, "child %d continues...", k);
 
 			/* Stop. */
 			tst_resm(TINFO, "child %d stops.", k);
 			if (raise(SIGSTOP) == -1)
-				tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+				tst_brkm(TBROK|TERRNO, NULL, "kill");
 			tst_resm(TINFO, "child %d continues...", k);
 			exit(0);
 		}
@@ -315,120 +315,120 @@
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, "run");
 	fd = open(buf, O_WRONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (write(fd, "1", 1) != 1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "write");
+		tst_brkm(TBROK|TERRNO, NULL, "write");
 	close(fd);
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, "pages_to_scan");
 	snprintf(buf2, BUFSIZ, "%d", size * 256 * num);
 	fd = open(buf, O_WRONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (write(fd, buf2, strlen(buf2)) != strlen(buf2))
-		tst_brkm(TBROK|TERRNO, tst_exit, "write");
+		tst_brkm(TBROK|TERRNO, NULL, "write");
 	close(fd);
 
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, "sleep_millisecs");
 	fd = open(buf, O_WRONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (write(fd, "0", 1) != 1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "write");
+		tst_brkm(TBROK|TERRNO, NULL, "write");
 	close(fd);
 
 	tst_resm(TINFO, "wait for all children to stop.");
 	for (k = 0; k < num; k++) {
 		if (waitpid(child[k], &status, WUNTRACED) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+			tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 		if (!WIFSTOPPED(status))
-			tst_brkm(TBROK, tst_exit, "child %d was not stopped.",
+			tst_brkm(TBROK, NULL, "child %d was not stopped.",
 				k);
 	}
 	tst_resm(TINFO, "resume all children.");
 	for (k = 0; k < num; k++) {
 		if (kill(child[k], SIGCONT) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill child[%d]", k);
+			tst_brkm(TBROK|TERRNO, NULL, "kill child[%d]", k);
 	}
 	group_check(1, 2, size * num * 256 - 2, 0, 0, 0, size * 256 * num);
 
 	tst_resm(TINFO, "wait for child 1 to stop.");
 	if (waitpid(child[1], &status, WUNTRACED) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+		tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 	if (!WIFSTOPPED(status))
-		tst_brkm(TBROK, tst_exit, "child 1 was not stopped.");
+		tst_brkm(TBROK, NULL, "child 1 was not stopped.");
 
 	/* Child 1 changes all pages to 'b'. */
 	tst_resm(TINFO, "resume child 1.");
 	if (kill(child[1], SIGCONT) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+		tst_brkm(TBROK|TERRNO, NULL, "kill");
 	group_check(1, 3, size * num * 256 - 3, 0, 0, 0, size * 256 * num);
 
 	tst_resm(TINFO, "wait for child 1 to stop.");
 	if (waitpid(child[1], &status, WUNTRACED) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+		tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 	if (!WIFSTOPPED(status))
-		tst_brkm(TBROK, tst_exit, "child 1 was not stopped.");
+		tst_brkm(TBROK, NULL, "child 1 was not stopped.");
 
 	/* All children change pages to 'd'. */
 	tst_resm(TINFO, "resume all children.");
 	for (k = 0; k < num; k++) {
 		if (kill(child[k], SIGCONT) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill child[%d]", k);
+			tst_brkm(TBROK|TERRNO, NULL, "kill child[%d]", k);
 	}
 	group_check(1, 1, size * num * 256 - 1, 0, 0, 0, size * 256 * num);
 
 	tst_resm(TINFO, "wait for all children to stop.");
 	for (k = 0; k < num; k++) {
 		if (waitpid(child[k], &status, WUNTRACED) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+			tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 		if (!WIFSTOPPED(status))
-			tst_brkm(TBROK, tst_exit, "child %d was not stopped.",
+			tst_brkm(TBROK, NULL, "child %d was not stopped.",
 				k);
 	}
 	/* Child 1 changes pages to 'e'. */
 	tst_resm(TINFO, "resume child 1.");
 	if (kill(child[1], SIGCONT) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "kill");
+		tst_brkm(TBROK|TERRNO, NULL, "kill");
 	group_check(1, 1, size * num * 256 - 2, 0, 1, 0, size * 256 * num);
 
 	tst_resm(TINFO, "wait for child 1 to stop.");
 	if (waitpid(child[1], &status, WUNTRACED) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+		tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 	if (!WIFSTOPPED(status))
-		tst_brkm(TBROK, tst_exit, "child 1 was not stopped.");
+		tst_brkm(TBROK, NULL, "child 1 was not stopped.");
 
 	tst_resm(TINFO, "resume all children.");
 	for (k = 0; k < num; k++) {
 		if (kill(child[k], SIGCONT) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill child[%d]", k);
+			tst_brkm(TBROK|TERRNO, NULL, "kill child[%d]", k);
 	}
 	tst_resm(TINFO, "KSM unmerging...");
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, "run");
 	fd = open(buf, O_WRONLY);
 	if (fd == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "open");
+		tst_brkm(TBROK|TERRNO, NULL, "open");
 	if (write(fd, "2", 1) != 1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "write");
+		tst_brkm(TBROK|TERRNO, NULL, "write");
 	group_check(2, 0, 0, 0, 0, 0, size * 256 * num);
 
 	tst_resm(TINFO, "wait for all children to stop.");
 	for (k = 0; k < num; k++) {
 		if (waitpid(child[k], &status, WUNTRACED) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "waitpid");
+			tst_brkm(TBROK|TERRNO, NULL, "waitpid");
 		if (!WIFSTOPPED(status))
-			tst_brkm(TBROK, tst_exit, "child %d was not stopped.",
+			tst_brkm(TBROK, NULL, "child %d was not stopped.",
 				k);
 	}
 	tst_resm(TINFO, "resume all children.");
 	for (k = 0; k < num; k++) {
 		if (kill(child[k], SIGCONT) == -1)
-			tst_brkm(TBROK|TERRNO, tst_exit, "kill child[%d]", k);
+			tst_brkm(TBROK|TERRNO, NULL, "kill child[%d]", k);
 	}
 	tst_resm(TINFO, "stop KSM.");
 	if (lseek(fd, 0, SEEK_SET) == -1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "lseek");
+		tst_brkm(TBROK|TERRNO, NULL, "lseek");
 	if (write(fd, "0", 1) != 1)
-		tst_brkm(TBROK|TERRNO, tst_exit, "write");
+		tst_brkm(TBROK|TERRNO, NULL, "write");
 	close(fd);
 	group_check(0, 0, 0, 0, 0, 0, size * 256 * num);
 	while (waitpid(-1, &status, WUNTRACED | WCONTINUED) > 0)
@@ -445,9 +445,9 @@
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, "run");
 	if (stat(buf, &new) == -1) {
 		if (errno == ENOENT)
-			tst_brkm(TCONF, tst_exit, "no KSM.");
+			tst_brkm(TCONF, NULL, "no KSM.");
 		else
-			tst_brkm(TBROK, tst_exit, "stat");
+			tst_brkm(TBROK, NULL, "stat");
 	}
 	/*
 	 * setup a default signal hander and a
@@ -477,9 +477,9 @@
 	snprintf(buf, BUFSIZ, "%s%s", _PATH_KSM, path);
 	fp = fopen(buf, "r");
 	if (fp == NULL)
-		tst_brkm(TBROK|TERRNO, tst_exit, "fopen");
+		tst_brkm(TBROK|TERRNO, NULL, "fopen");
 	if (fgets(buf, BUFSIZ, fp) == NULL)
-		tst_brkm(TBROK|TERRNO, tst_exit, "fgets");
+		tst_brkm(TBROK|TERRNO, NULL, "fgets");
 	fclose(fp);
 
 	tst_resm(TINFO, "%s is %ld.", path, atol(buf));
@@ -487,9 +487,9 @@
 		snprintf(buf2, BUFSIZ, "%s%s", _PATH_KSM, path2);
 		fp = fopen(buf2, "r");
 		if (fp == NULL)
-			tst_brkm(TBROK|TERRNO, tst_exit, "fopen");
+			tst_brkm(TBROK|TERRNO, NULL, "fopen");
 		if (fgets(buf2, BUFSIZ, fp) == NULL)
-			tst_brkm(TBROK|TERRNO, tst_exit, "fgets");
+			tst_brkm(TBROK|TERRNO, NULL, "fgets");
 		fclose(fp);
 
 		tst_resm(TINFO, "%s is %ld.", path2, atol(buf2));
@@ -508,7 +508,7 @@
 
 	s = malloc((end - start) * (end2 - start2));
 	if (s == NULL)
-		tst_brkm(TBROK|TERRNO, tst_exit, "malloc");
+		tst_brkm(TBROK|TERRNO, NULL, "malloc");
 
 	tst_resm(TINFO, "child %d verifies memory content.", proc);
 	memset(s, value, (end - start) * (end2 - start2));
diff --git a/testcases/kernel/mem/mbind/mbind01.c b/testcases/kernel/mem/mbind/mbind01.c
index 5c9c955..6f32529 100644
--- a/testcases/kernel/mem/mbind/mbind01.c
+++ b/testcases/kernel/mem/mbind/mbind01.c
@@ -67,11 +67,11 @@
 	pagesize = getpagesize();
 	msg = parse_opts(argc, argv, options, usage);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	if (opt_node) {
 		node = atoi(optarg);
 		if (node < 1)
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				"Number of NUMA nodes cannot be less that 1.");
 		numa_bitmask_setbit(nmask, node);
 	} else
@@ -82,7 +82,7 @@
 		addr = mmap(NULL, pagesize*3, PROT_READ|PROT_WRITE,
 			MAP_ANON|MAP_PRIVATE, 0, 0);
 		if (addr == MAP_FAILED)
-			tst_brkm(TBROK|TERRNO, tst_exit, "mmap");
+			tst_brkm(TBROK|TERRNO, NULL, "mmap");
 
 		tst_resm(TINFO, "pid = %d addr = %p", getpid(), addr);
 		/* make page populate */
@@ -92,19 +92,19 @@
 		err = mbind(addr+pagesize, pagesize, MPOL_BIND, nmask->maskp,
 			nmask->size, MPOL_MF_MOVE_ALL);
 		if (err != 0)
-			tst_brkm(TBROK|TERRNO, tst_exit, "mbind1");
+			tst_brkm(TBROK|TERRNO, NULL, "mbind1");
 
 		/* second mbind */
 		err = mbind(addr, pagesize*3, MPOL_DEFAULT, NULL, 0, 0);
 		if (err != 0)
-			tst_brkm(TBROK|TERRNO, tst_exit, "mbind2");
+			tst_brkm(TBROK|TERRNO, NULL, "mbind2");
 
 		/* /proc/self/maps in the form of
 		   "00400000-00406000 r-xp 00000000". */
 		sprintf(string, "%p", addr);
 		fp = fopen("/proc/self/maps", "r");
 		if (fp == NULL)
-			tst_brkm(TBROK|TERRNO, tst_exit, "fopen");
+			tst_brkm(TBROK|TERRNO, NULL, "fopen");
 
 		while (fgets(buf, BUFSIZ, fp) != NULL) {
 			/* Find out the 1st VMAs. */
@@ -124,7 +124,7 @@
 		}
 		fclose(fp);
 		if (munmap(addr, pagesize*3) == -1)
-			tst_brkm(TWARN|TERRNO, tst_exit, "munmap");
+			tst_brkm(TWARN|TERRNO, NULL, "munmap");
 	}
 	return 0;
 }
diff --git a/testcases/kernel/mem/mmapstress/mmap-corruption01.c b/testcases/kernel/mem/mmapstress/mmap-corruption01.c
index d97b05f..560432d 100644
--- a/testcases/kernel/mem/mmapstress/mmap-corruption01.c
+++ b/testcases/kernel/mem/mmapstress/mmap-corruption01.c
@@ -57,7 +57,6 @@
 
 /* Extern Global Variables */
 extern int  Tst_count;               /* counter for tst_xxx routines.         */
-extern char *TESTDIR;                /* temporary dir created by tst_tmpdir() */
 
 /* Global Variables */
 char *TCID     = "mmap-corruption01"; /* test program identifier.          */
diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c
index c581340..eab2bf0 100644
--- a/testcases/kernel/mem/mtest01/mtest01.c
+++ b/testcases/kernel/mem/mtest01/mtest01.c
@@ -157,49 +157,55 @@
     pid_list[i]=pid;
 
 #if defined (_s390_) /* s390's 31bit addressing requires smaller chunks */
-  while ((pid!=0) && (maxbytes > 500*1024*1024))
+#define FIVE_HUNDRED_KB	(500*1024*1024)
+#define ONE_MEGABYTE	(1024*1024*1024)
+#define THREE_MEGABYTES	(3*ONE_MEGABYTE)
+  while (pid != 0 && maxbytes > FIVE_HUNDRED_KB)
   {
     i++;
-    maxbytes=maxbytes-(500*1024*1024);
-    pid=fork();
-    if (pid != 0)
+    maxbytes -= FIVE_HUNDRED_KB;
+    pid = fork();
+    if (pid != 0) {
       pid_cntr++;
-      pid_list[i]=pid;
+      pid_list[i] = pid;
+    }
   }
-  if (maxbytes > 500*1024*1024)
-    alloc_bytes=500*1024*1024;
+  if (maxbytes > FIVE_HUNDRED_KB)
+    alloc_bytes FIVE_HUNDRED_KB;
   else
-    alloc_bytes=(unsigned long)maxbytes;
+    alloc_bytes = (unsigned long) maxbytes;
 
 #elif __WORDSIZE==32
-  while ((pid!=0) && (maxbytes > 1024*1024*1024))
+  while (pid != 0 && maxbytes > ONE_MEGABYTE) 
   {
     i++;
-    maxbytes=maxbytes-(1024*1024*1024);
-    pid=fork();
-    if (pid != 0)
+    maxbytes -= ONE_MEGABYTE;
+    pid = fork();
+    if (pid != 0) {
       pid_cntr++;
       pid_list[i]=pid;
+    }
   }
-  if (maxbytes > 1024*1024*1024)
-    alloc_bytes=1024*1024*1024;
+  if (maxbytes > ONE_MEGABYTE)
+    alloc_bytes = ONE_MEGABYTE;
   else
-    alloc_bytes=(unsigned long)maxbytes;
+    alloc_bytes = (unsigned long)maxbytes;
 
 #elif __WORDSIZE==64
-  while ((pid!=0) && (maxbytes > (unsigned long long)3*1024*1024*1024))
+  while (pid!=0 && maxbytes > THREE_MEGABYTES)
   {
     i++;
-    maxbytes=maxbytes-(unsigned long long)3*1024*1024*1024;
+    maxbytes -= THREE_MEGABYTES;
     pid=fork();
-    if (pid != 0)
+    if (pid != 0) {
       pid_cntr++;
-      pid_list[i]=pid;
+      pid_list[i] = pid;
+    }
   }
-  if (maxbytes > (unsigned long long)3*1024*1024*1024)
-    alloc_bytes=(unsigned long long)3*1024*1024*1024;
+  if (maxbytes > THREE_MEGABYTES)
+    alloc_bytes = THREE_MEGABYTES;
   else
-    alloc_bytes=(unsigned long)maxbytes;
+    alloc_bytes = maxbytes;
 #endif
  
   if (pid == 0)			/** CHILD **/
diff --git a/testcases/kernel/mem/vmtests/data_space.c b/testcases/kernel/mem/vmtests/data_space.c
index e67bb9f..12b0312 100644
--- a/testcases/kernel/mem/vmtests/data_space.c
+++ b/testcases/kernel/mem/vmtests/data_space.c
@@ -85,6 +85,11 @@
 char	*prog;				/* invoked name */
 int	chld_flag = 0;
 
+void cleanup(void)
+{
+	tst_rmdir();
+}
+
 int usage(prog)
 	char	*prog;
 {
@@ -122,8 +127,7 @@
 			bd_arg(argv[i-1]);
 		if (nchild > MAXCHILD)
 		{
-			tst_resm(TBROK,"FAILURE, %d children exceeded maximum allowed\n", nchild);
-			tst_exit();
+			tst_brkm(TBROK, NULL, "FAILURE, %d children exceeded maximum allowed", nchild);
 		}
 	} else
 		usage(prog);
@@ -134,26 +138,21 @@
 
 	if (sigset(SIGTERM, (void (*)())term) == SIG_ERR)
 	{
-		tst_resm(TBROK,"first sigset failed");
-		tst_exit();
+		tst_brkm(TBROK, NULL, "first sigset failed");
 	}
 	if (sigset(SIGUSR1, (void (*)())chld) == SIG_ERR)
 	{
-		tst_resm(TBROK,"sigset shichld");
-		tst_exit();
+		tst_brkm(TBROK, NULL, "sigset shichld");
 	}
 
 	runtest();
-	/**NOT REACHED**/
-        return 0;
+	tst_exit();
 }
 
 int bd_arg(str)
 	char *str;
 {
-	tst_resm(TCONF,"Bad argument - %s - could not parse as number.\n", str);
-	tst_exit();
-	return 0;
+	tst_brkm(TCONF, NULL, "Bad argument - %s - could not parse as number.\n", str);
 }
 
 int runtest()
@@ -174,11 +173,7 @@
 		}
 		if (child < 0)
 		{
-			tst_resm(TBROK,"Fork failed (may be OK if under stress)");
-                        tst_resm(TINFO, "System resource may be too low.\n");
-                        tst_resm(TBROK, "Reason: %s\n", strerror(errno));
-                        tst_rmdir();
-                        tst_exit();
+			tst_resm(TBROK|TERRNO, cleanup, "fork failed");
 		}
 		allchild[i]=child;
 		while (!chld_flag)
@@ -216,11 +211,6 @@
         (local_flag == FAILED) ? tst_resm(TFAIL, "Test failed")
                 : tst_resm(TPASS, "Test passed");
 	sync();				/* safeness */
-        tst_rmdir();
-        tst_exit();
-
-        /**NOT REACHED**/
-	return 0;
 }
 
 /*
@@ -501,7 +491,7 @@
 int massmurder()
 {
 	int i;
-	for (i=0 ; i < MAXCHILD ; i++)
+	for (i = 0 ; i < MAXCHILD ; i++)
 	{
 		if (allchild[i])
 		{
diff --git a/testcases/kernel/module/create_module/create_module01.c b/testcases/kernel/module/create_module/create_module01.c
index 8ccfac0..ab6a65b 100644
--- a/testcases/kernel/module/create_module/create_module01.c
+++ b/testcases/kernel/module/create_module/create_module01.c
@@ -92,7 +92,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 			(char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
@@ -115,7 +115,7 @@
 			tst_resm(TPASS, "create_module() returned 0x%x",
 				TEST_RETURN);
 			if (delete_module(modname) != 0) {
-				tst_brkm(TBROK, tst_exit, "Failed to delete"
+				tst_brkm(TBROK, NULL, "Failed to delete"
 					"loadable module entry for %s",
 					modname);
 			}
@@ -125,7 +125,7 @@
 	/* perform global cleanup and exit */
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 
 }	/* End main */
@@ -137,14 +137,10 @@
 	/* capture signals */
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-	/* Check whether we are root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
-	}
+	tst_require_root(NULL);
 
 	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 				"kernels after 2.5.48");
 
 	/* Pause if that option was specified
@@ -154,7 +150,7 @@
 
 	/* Initialize unique module name for each child process */
 	if (sprintf(modname, "%s_%d",BASEMODNAME, getpid()) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to initialize module name");
+		tst_brkm(TBROK, NULL, "Failed to initialize module name");
 	}
 }
 
@@ -188,6 +184,6 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
-	/*NOTREACHED*/
+	
 }
 
diff --git a/testcases/kernel/module/create_module/create_module02.c b/testcases/kernel/module/create_module/create_module02.c
index 4468699..5d291af 100644
--- a/testcases/kernel/module/create_module/create_module02.c
+++ b/testcases/kernel/module/create_module/create_module02.c
@@ -167,7 +167,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -204,9 +204,7 @@
 		}
 	}
 	cleanup();
-
-	/*NOTREACHED*/
-	return 0;
+	tst_exit();
 }
 
 int
@@ -226,7 +224,7 @@
 {
 	 /* Change effective user id to root */
          if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "seteuid failed to set the effective"
+		tst_brkm(TBROK, NULL, "seteuid failed to set the effective"
 			" uid to root");
          }
 }
@@ -248,7 +246,7 @@
 {
 	 /* Remove loadable module entry */
 	if (delete_module(modname) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to delete module entry"
+		tst_brkm(TBROK, NULL, "Failed to delete module entry"
 			" for %s", modname);
 	}
 }
@@ -263,21 +261,16 @@
 	/* capture signals */
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-	/* Check whether it is root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
-	}
+	tst_require_root(NULL);
 
 	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 				"kernels after 2.5.48");
 
         /* Check for nobody_uid user id */
 	 if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Required user %s doesn't exists",
+		tst_brkm(TBROK, NULL, "Required user %s doesn't exists",
 				nobody_uid);
-		/*NOTREACHED*/
 	 }
 
 	/* Initialize longmodname to LONGMODNAMECHAR character */
@@ -293,7 +286,7 @@
 
 	/* Get unique module name for each child process */
 	if (sprintf(modname, "%s_%d",BASEMODNAME, getpid()) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to initialize module name");
+		tst_brkm(TBROK, NULL, "Failed to initialize module name");
 	}
 }
 
@@ -310,8 +303,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
 }
diff --git a/testcases/kernel/module/delete_module/delete_module01.c b/testcases/kernel/module/delete_module/delete_module01.c
index fc190be..9e1856f 100644
--- a/testcases/kernel/module/delete_module/delete_module01.c
+++ b/testcases/kernel/module/delete_module/delete_module01.c
@@ -91,7 +91,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 		(char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
@@ -135,7 +135,7 @@
 	/* perform global cleanup and exit */
 EXIT:
 	cleanup();
-	/*NOTREACHED*/
+	
 	return 0;
 
 }		/* End main */
@@ -149,13 +149,13 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+		
 	}
 
 	/*
 	 * if (tst_kvercmp(2,5,48) >= 0)
-	 * tst_brkm(TCONF, tst_exit, "This test will not work on "
+	 * tst_brkm(TCONF, NULL, "This test will not work on "
 	 *				"kernels after 2.5.48");
 	 */
 	/* Pause if that option was specified
@@ -181,5 +181,5 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
-	/*NOTREACHED*/
+	
 }
diff --git a/testcases/kernel/module/delete_module/delete_module02.c b/testcases/kernel/module/delete_module/delete_module02.c
index 4f1cd89..b5e7edf 100644
--- a/testcases/kernel/module/delete_module/delete_module02.c
+++ b/testcases/kernel/module/delete_module/delete_module02.c
@@ -156,10 +156,8 @@
 	char *msg; 		 /* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
-	     (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 	setup();
 
@@ -198,9 +196,7 @@
 		}
 	}
 	cleanup();
-
-	/*NOTREACHED*/
-	return 0;
+	tst_exit();
 }
 
 int
@@ -220,7 +216,7 @@
 {
 	/* Change effective user id to root */
 	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "seteuid failed to set the effective"
+		tst_brkm(TBROK, NULL, "seteuid failed to set the effective"
 					  " uid to root");
 	}
 }
@@ -238,20 +234,19 @@
 
 	/* Check whether it is root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+		
 	}
 
 	/*if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 					  "kernels after 2.5.48");
 	 */
 
 	/* Check for nobody_uid user id */
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Required user %s doesn't exists",
+		tst_brkm(TBROK, NULL, "Required user %s doesn't exists",
 			 nobody_uid);
-		/*NOTREACHED*/
 	}
 
 	/* Initialize longmodname to LONGMODNAMECHAR character */
@@ -267,7 +262,7 @@
 
 	/* Get unique module name for each child process */
 	if (sprintf(modname, "%s_%d", BASEMODNAME, getpid()) <= 0) {
-		tst_brkm(TBROK, tst_exit, "Failed to initialize module name");
+		tst_brkm(TBROK, NULL, "Failed to initialize module name");
 	}
         bad_addr = mmap(0, 1, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
         if (bad_addr == MAP_FAILED) {
@@ -290,8 +285,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
 }
diff --git a/testcases/kernel/module/delete_module/delete_module03.c b/testcases/kernel/module/delete_module/delete_module03.c
index 979ab91..45b57e8 100644
--- a/testcases/kernel/module/delete_module/delete_module03.c
+++ b/testcases/kernel/module/delete_module/delete_module03.c
@@ -99,7 +99,7 @@
 static int exp_enos[] = {EWOULDBLOCK, 0};
 int TST_TOTAL = 1;
 
-static int setup(void);
+static void setup(void);
 static void cleanup(void);
 
 int
@@ -110,10 +110,8 @@
 	char cmd[50];
 
 	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t*) NULL, NULL)) !=
-	    (char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 	if (STD_COPIES != 1) {
 		tst_resm(TINFO, "-c option has no effect for this testcase - "
@@ -144,10 +142,7 @@
 		goto END;
         }
 
-	tst_tmpdir();
-	if (setup() != 0) {
-		return 1;
-	}
+	setup();
 
 	/* check looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -176,31 +171,22 @@
 		return 1;
 	}
 
-	/*NOTREACHED*/
-	return 0;
+	tst_exit();
 }
 
 /*
  * setup()
  *	performs all ONE TIME setup for this test
  */
-int
+void
 setup(void)
 {
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
-	/* Check whether it is root  */
-	if (geteuid() != 0) {
-		tst_resm(TBROK, "Must be root for this test!");
-		return 1;
-	}
+	tst_require_root(NULL);
 
-	/*
-	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
-					  "kernels after 2.5.48");
-	*/
+	tst_tmpdir();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
@@ -209,8 +195,6 @@
 	 * TEST_PAUSE contains the code to fork the test with the -c option.
 	 */
 	TEST_PAUSE;
-	return 0;
-
 }
 
 /*
@@ -236,7 +220,4 @@
 	 */
 	TEST_CLEANUP;
 	tst_rmdir();
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
 }
diff --git a/testcases/kernel/module/query_module/query_module01.c b/testcases/kernel/module/query_module/query_module01.c
index 93c1535..0eac89f 100644
--- a/testcases/kernel/module/query_module/query_module01.c
+++ b/testcases/kernel/module/query_module/query_module01.c
@@ -164,7 +164,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	if (STD_COPIES != 1) {
@@ -210,9 +210,7 @@
 		}
 	}
 	cleanup();
-
-	/*NOTREACHED*/
-	return 0;
+	tst_exit();
 }
 
 int
@@ -264,7 +262,7 @@
 			 * Find entry for atleast one symbol, checking for
 			 * EXP_FUNC_NAME symbol, if found return SUCCESS.
 			 */
-			for (i = 0; i < ret; i++, vals +=2) {
+			for (i = 0; i < ret; i++, vals += 2) {
 
 				/* buf + vals[1] - address of symbol name */
 				if (!strcmp(buf + vals[1], EXP_FUNC_NAME)) {
@@ -379,14 +377,10 @@
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
-	/* Check whether we are root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
-	}
+	tst_require_root(NULL);
 
 	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 				"kernels after 2.5.48");
 
 	/* Initialize longmodname to LONGMODNAMECHAR character */
@@ -413,7 +407,4 @@
 
 	TEST_CLEANUP;
 	tst_rmdir();
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
 }
diff --git a/testcases/kernel/module/query_module/query_module02.c b/testcases/kernel/module/query_module/query_module02.c
index 509438d..0b24452 100644
--- a/testcases/kernel/module/query_module/query_module02.c
+++ b/testcases/kernel/module/query_module/query_module02.c
@@ -144,7 +144,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -175,7 +175,7 @@
 	}
 	cleanup();
 
-	/*NOTREACHED*/
+	
 	return 0;
 }
 
@@ -191,7 +191,7 @@
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
 	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 				"kernels after 2.5.48");
 
 	/* Initialize longmodname to LONGMODNAMECHAR character */
@@ -222,5 +222,5 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
-	/*NOTREACHED*/
+	
 }
diff --git a/testcases/kernel/module/query_module/query_module03.c b/testcases/kernel/module/query_module/query_module03.c
index 44dc7ed..e5af9ae 100644
--- a/testcases/kernel/module/query_module/query_module03.c
+++ b/testcases/kernel/module/query_module/query_module03.c
@@ -157,7 +157,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	if (STD_COPIES != 1) {
@@ -202,9 +202,7 @@
 		}
 	}
 	cleanup();
-
-	/*NOTREACHED*/
-	return 0;
+	tst_exit();
 }
 
 int
@@ -257,14 +255,10 @@
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
-	/* Check whether we are root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-		/*NOTREACHED*/
-	}
+	tst_require_root(NULL);
 
 	if (tst_kvercmp(2,5,48) >= 0)
-		tst_brkm(TCONF, tst_exit, "This test will not work on "
+		tst_brkm(TCONF, NULL, "This test will not work on "
 				"kernels after 2.5.48");
 
 	/* set the expected errnos... */
@@ -298,7 +292,4 @@
 	 */
 	TEST_CLEANUP;
 	tst_rmdir();
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
 }
diff --git a/testcases/kernel/numa/support_numa.c b/testcases/kernel/numa/support_numa.c
index b75e82a..dd49626 100644
--- a/testcases/kernel/numa/support_numa.c
+++ b/testcases/kernel/numa/support_numa.c
@@ -107,7 +107,11 @@
                 sa.sa_handler = sigfunc;
                 sa.sa_flags = SA_RESTART;
                 sigemptyset(&sa.sa_mask);
+<<<<<<< HEAD
                 if (sigaction(SIGINT, &sa, 0) < 0)
+=======
+                if ( sigaction(SIGINT, &sa, 0) < 0 )
+>>>>>>> master
 		{
 			tst_brkm(TBROK, NULL, "#Sigaction SIGINT failed\n");
 			tst_exit();
diff --git a/testcases/kernel/pty/hangup01.c b/testcases/kernel/pty/hangup01.c
index dd38f6c..f6c0c67 100644
--- a/testcases/kernel/pty/hangup01.c
+++ b/testcases/kernel/pty/hangup01.c
@@ -145,7 +145,7 @@
 			default:
 				tst_brkm(TFAIL, cleanup,
 					"unexpected data message");
-				/*NOTREACHED*/
+				
 			}
 		}
 	}
@@ -250,6 +250,6 @@
 	}
 /*--------------------------------------------------------------------*/
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
diff --git a/testcases/kernel/pty/ptem01.c b/testcases/kernel/pty/ptem01.c
index 1b7be1a..cee1049 100644
--- a/testcases/kernel/pty/ptem01.c
+++ b/testcases/kernel/pty/ptem01.c
@@ -532,6 +532,6 @@
  	 * all done
 	 */
 	tst_exit();
-	/*NOTREACHED*/
+	
 	return 0;
 }
diff --git a/testcases/kernel/sched/process_stress/process.c b/testcases/kernel/sched/process_stress/process.c
index 9401061..bab2ae6 100644
--- a/testcases/kernel/sched/process_stress/process.c
+++ b/testcases/kernel/sched/process_stress/process.c
@@ -1217,5 +1217,5 @@
 	doit(); 		/* spawn off processes */
 	prtln();
 	return 0;
-	/* NOTREACHED */
+	
 }
diff --git a/testcases/kernel/security/cap_bound/exec_without_inh.c b/testcases/kernel/security/cap_bound/exec_without_inh.c
index 8d99883..0e43610 100644
--- a/testcases/kernel/security/cap_bound/exec_without_inh.c
+++ b/testcases/kernel/security/cap_bound/exec_without_inh.c
@@ -59,7 +59,7 @@
 			tst_exit();
 		}
 	} else if (ret) {
-		tst_brkm(TBROK | TERRNO, tst_exit, "Failed to add \
+		tst_brkm(TBROK | TERRNO, NULL, "Failed to add \
 			CAP_SYS_ADMIN to pI");
 	}
 	cap_free(cur);
diff --git a/testcases/kernel/security/filecaps/verify_caps_exec.c b/testcases/kernel/security/filecaps/verify_caps_exec.c
index 605f0f6..40c9798 100644
--- a/testcases/kernel/security/filecaps/verify_caps_exec.c
+++ b/testcases/kernel/security/filecaps/verify_caps_exec.c
@@ -78,17 +78,17 @@
 		prctl(PR_SET_KEEPCAPS, 1);
 	ret = setresuid(1000, 1000, 1000);
 	if (ret) {
-		tst_brkm(TFAIL | TERRNO, tst_exit, "Error dropping root privs\n");
+		tst_brkm(TFAIL | TERRNO, NULL, "Error dropping root privs\n");
 		tst_exit();
 	}
 	if (keep_perms) {
 		cap_t cap = cap_from_text("=eip");
 		int ret;
 		if (!cap)
-			tst_brkm(TBROK | TERRNO, tst_exit, "cap_from_text failed\n");
+			tst_brkm(TBROK | TERRNO, NULL, "cap_from_text failed\n");
 		ret = cap_set_proc(cap);
 		if (ret < 0)
-			tst_brkm(TBROK | TERRNO, tst_exit, "cap_set_proc failed\n");
+			tst_brkm(TBROK | TERRNO, NULL, "cap_set_proc failed\n");
 		cap_free(cap);
 	}
 }
@@ -124,7 +124,7 @@
 
 	ret = mkfifo(FIFOFILE, S_IRWXU | S_IRWXG | S_IRWXO);
 	if (ret == -1 && errno != EEXIST)
-		tst_brkm(TFAIL | TERRNO, tst_exit, "failed creating %s\n", FIFOFILE);
+		tst_brkm(TFAIL | TERRNO, NULL, "failed creating %s\n", FIFOFILE);
 }
 
 void write_to_fifo(char *buf)
@@ -143,7 +143,7 @@
 	memset(buf, 0, 200);
 	fd = open(FIFOFILE, O_RDONLY);
 	if (fd < 0)
-		tst_brkm(TFAIL | TERRNO, tst_exit, "Failed opening fifo\n");
+		tst_brkm(TFAIL | TERRNO, NULL, "Failed opening fifo\n");
 	read(fd, buf, 199);
 	close(fd);
 }
@@ -160,7 +160,7 @@
 
 	pid = fork();
 	if (pid < 0)
-		tst_brkm(TFAIL | TERRNO, tst_exit, "%s: failed fork\n", __FUNCTION__);
+		tst_brkm(TFAIL | TERRNO, NULL, "%s: failed fork\n", __FUNCTION__);
 	if (pid == 0) {
 		drop_root(keepperms);
 		print_my_caps();
@@ -170,7 +170,7 @@
 		snprintf(buf, 200, "failed to run as %s\n", capstxt);
 		cap_free(capstxt);
 		write_to_fifo(buf);
-		tst_brkm(TFAIL, tst_exit, "%s: exec failed\n", __FUNCTION__);
+		tst_brkm(TFAIL, NULL, "%s: exec failed\n", __FUNCTION__);
 	} else {
 		p = buf;
 		while (1) {
@@ -184,7 +184,7 @@
 		}
 		p = index(buf, '.');
 		if (!p)
-			tst_brkm(TFAIL, tst_exit, "got a bad message from print_caps\n");
+			tst_brkm(TFAIL, NULL, "got a bad message from print_caps\n");
 		p += 1;
 		actual_caps = cap_from_text(p);
 		if (cap_compare(actual_caps, expected_caps) != 0) {
diff --git a/testcases/kernel/syscalls/abort/abort01.c b/testcases/kernel/syscalls/abort/abort01.c
index d2f2c43..6121af6 100644
--- a/testcases/kernel/syscalls/abort/abort01.c
+++ b/testcases/kernel/syscalls/abort/abort01.c
@@ -38,13 +38,13 @@
  *
  */
 
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 /*****	LTP Port	*****/
 #include "test.h"
@@ -53,21 +53,27 @@
 #define FAILED 0
 #define PASSED 1
 
-//char progname[]= "abort1()";
 char *TCID = "abort01";
 
 int local_flag = PASSED;
 int block_number;
 FILE *temp;
 int TST_TOTAL = 1;
-extern int Tst_count;
 
-int anyfail();
+void setup(void)
+{
+	temp = stderr;
+	tst_tmpdir();
+}
+
+void cleanup(void)
+{
+	unlink("core");
+	tst_rmdir();
+}
+
 int instress();
 void setup();
-void terror();
-void fail_exit();
-void ok_exit();
 int forkfail();
 void do_child();
 
@@ -81,85 +87,75 @@
 	int core, sig, ex;
 	char *msg;
 
-	if ((msg =
-	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+	core = sig = ex = 0;
+
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
 #endif
 
-	setup();		/* temp file is now open */
-/*--------------------------------------------------------------*/
+	setup();
 
 	for (i = 0; i < ITER; i++) {
 
 		if ((kidpid = FORK_OR_VFORK()) == 0) {
 #ifdef UCLINUX
 			if (self_exec(argv[0], "")) {
-				terror("self_exec failed (may be OK if under stress)");
-				if (instress())
-					ok_exit();
-				forkfail();
+				if (!instress())
+					perror("fork failed");
+					exit(1);
+				}
 			}
 #else
 			do_child();
 #endif
 		}
 		if (kidpid < 0) {
-			terror("Fork failed (may be OK if under stress)");
-			if (instress())
-				ok_exit();
-			forkfail();
+			if (!instress())
+				tst_brkm(TBROK|TERRNO, cleanup, "fork failed");
 		}
 		count = 0;
 		while ((child = wait(&status)) > 0) {
 			count++;
 		}
 		if (count != 1) {
-			fprintf(temp, "\twrong # children waited on.\n");
-			fprintf(temp, "\tgot %d, expected %d\n", count, 1);
-			fail_exit();
+			tst_brkm(TBROK, cleanup,
+			    "wrong # children waited on; got %d, expected 1",
+			    count);
 		}
-		/*
-		   sig = status & 0177;
-		   core = status & 0200;
-		   ex = (status & 0xFF00) >> 8;
-		 */
-		/*****	LTP Port	*****/
-		sig = WTERMSIG(status);
+		if (WIFSIGNALED(status)) {
+
 #ifdef WCOREDUMP
-		core = WCOREDUMP(status);
+			core = WCOREDUMP(status);
 #endif
-		ex = WIFEXITED(status);
+			sig = WTERMSIG(status);
+
+		}
+		if (WIFEXITED(status))
+			ex = WIFEXITED(status);
+
 		/**************/
-		if (!core) {
-			fprintf(temp, "\tChild did not return core bit set!\n");
-			fprintf(temp, "\t  iteration %d, exit stat = 0x%x\n",
-				i, status);
-			fprintf(temp, "\tCore = %d, sig = %d, ex = %d\n",
-				core, sig, ex);
-			local_flag = FAILED;
+		if (core == 0) {
+			tst_brkm(TFAIL, cleanup,
+			    "Child did not dump core; exit code = %d, "
+			    "signal = %d", ex, sig);
+		} else {
+			tst_resm(TPASS, "abort dumped core");
 		}
-		if (sig != SIGIOT) {
-			fprintf(temp, "\tChild did not exit with SIGIOT (%d)\n",
-				SIGIOT);
-			fprintf(temp, "\t  iteration %d, exit stat = 0x%x\n",
-				i, status);
-			fprintf(temp, "\tCore = %d, sig = %d, ex = %d\n",
-				core, sig, ex);
-			local_flag = FAILED;
+
+		if (sig == SIGIOT) {
+			tst_resm(TPASS, "abort raised SIGIOT");
+		} else {
+			tst_brkm(TFAIL, cleanup,
+			    "Child did not raise SIGIOT (%d); exit code = %d, "
+			    "signal = %d", SIGIOT, ex, sig);
 		}
-		if (local_flag == FAILED)
-			break;
+
 	}
 
-/*--------------------------------------------------------------*/
-/* Clean up any files created by test before call to anyfail.	*/
-
-	unlink("core");
-	anyfail();		/* THIS CALL DOES NOT RETURN - EXITS!!  */
-	return 0;
+	cleanup();
+	tst_exit();
 }
 
 /*--------------------------------------------------------------*/
@@ -167,24 +163,8 @@
 void do_child()
 {
 	abort();
-	fprintf(temp, "\tchild - abort failed.\n");
-	exit(0);
-}
-
-/******	LTP Port	*****/
-int anyfail()
-{
-	(local_flag == FAILED) ? tst_resm(TFAIL, "Test failed") :
-				tst_resm(TPASS, "Test passed");
-	tst_rmdir();
-	tst_exit();
-	return 0;
-}
-
-void setup()
-{
-	temp = stderr;
-	tst_tmpdir();
+	fprintf(stderr, "\tchild - abort failed.\n");
+	exit(1);
 }
 
 int instress()
@@ -193,30 +173,3 @@
 		 "System resources may be too low; fork(), select() etc are likely to fail.");
 	return 1;
 }
-
-void terror(char *message)
-{
-	tst_resm(TBROK, "Reason: %s:%s", message, strerror(errno));
-}
-
-void fail_exit()
-{
-	local_flag = FAILED;
-	anyfail();
-
-}
-
-void ok_exit()
-{
-	local_flag = PASSED;
-	tst_resm(TINFO, "Test passed");
-}
-
-int forkfail()
-{
-	fprintf(temp, "\t\tFORK FAILED - terminating test.\n");
-	tst_exit();
-	return 0;
-}
-
-/*****************/
diff --git a/testcases/kernel/syscalls/accept/accept01.c b/testcases/kernel/syscalls/accept/accept01.c
index 5f62f01..352f9e0 100644
--- a/testcases/kernel/syscalls/accept/accept01.c
+++ b/testcases/kernel/syscalls/accept/accept01.c
@@ -111,10 +111,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	setup();
 
@@ -145,7 +150,7 @@
 		}
 	}
 	cleanup();
-	return 0;
+	tst_exit();
 }				/* End main */
 
 void setup(void)
@@ -164,7 +169,6 @@
 void cleanup(void)
 {
 	TEST_CLEANUP;
-	tst_exit();
 }
 
 void setup0(void)
@@ -172,8 +176,7 @@
 	if (tdat[testno].experrno == EBADF)
 		s = 400;	/* anything not an open file */
 	else if ((s = open("/dev/null", O_WRONLY)) == -1)
-		tst_brkm(TBROK, cleanup, "error opening /dev/null - "
-			 "errno: %s", strerror(errno));
+		tst_brkm(TBROK|TERRNO, cleanup, "error opening /dev/null");
 }
 
 void cleanup0(void)
diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c
index 23ce226..1da34ab 100644
--- a/testcases/kernel/syscalls/access/access01.c
+++ b/testcases/kernel/syscalls/access/access01.c
@@ -32,65 +32,65 @@
 /* $Id: access01.c,v 1.8 2009/11/09 05:56:58 yaberauneya Exp $ */
 /**********************************************************
  *
- *    OS Test - Silicon Graphics, Inc.
+ *	OS Test - Silicon Graphics, Inc.
  *
- *    TEST IDENTIFIER	: access01
+ *	TEST IDENTIFIER	: access01
  *
- *    EXECUTED BY	: anyone
+ *	EXECUTED BY	: anyone
  *
- *    TEST TITLE	: Basic test for access(2) using F_OK,
- *                        R_OK, W_OK and X_OK arguments.
+ *	TEST TITLE	: Basic test for access(2) using F_OK,
+ *						R_OK, W_OK and X_OK arguments.
  *
- *    PARENT DOCUMENT	: usctpl01
+ *	PARENT DOCUMENT	: usctpl01
  *
- *    TEST CASE TOTAL	: 6
+ *	TEST CASE TOTAL	: 6
  *
- *    WALL CLOCK TIME	: 1
+ *	WALL CLOCK TIME	: 1
  *
- *    CPU TYPES		: ALL
+ *	CPU TYPES		: ALL
  *
- *    AUTHOR		: William Roske
+ *	AUTHOR		: William Roske
  *
- *    CO-PILOT		: Dave Fenner
+ *	CO-PILOT		: Dave Fenner
  *
- *    DATE STARTED	: 03/30/92
+ *	DATE STARTED	: 03/30/92
  *
- *    INITIAL RELEASE	: UNICOS 7.0
+ *	INITIAL RELEASE	: UNICOS 7.0
  *
- *    TEST CASES
+ *	TEST CASES
  *
  *	1.) access(2) returns 0 for F_OK...(See Description)
  *	2.) access(2) returns 0 for R_OK...(See Description)
  *	3.) access(2) returns 0 for W_OK...(See Description)
  *	4.) access(2) returns 0 for X_OK...(See Description)
  *
- *    INPUT SPECIFICATIONS
+ *	INPUT SPECIFICATIONS
  *	The standard options for system call tests are accepted.
  *	(See the parse_opts(3) man page).
  *
- *    OUTPUT SPECIFICATIONS
+ *	OUTPUT SPECIFICATIONS
  *
- *    DURATION
+ *	DURATION
  *	Terminates - with frequency and infinite modes.
  *
- *    SIGNALS
+ *	SIGNALS
  *	Uses SIGUSR1 to pause before test if option set.
  *	(See the parse_opts(3) man page).
  *
- *    RESOURCES
+ *	RESOURCES
  *	None
  *
- *    ENVIRONMENTAL NEEDS
+ *	ENVIRONMENTAL NEEDS
  *	The libcuts.a and libsys.a libraries must be included in
  *	the compilation of this test.
  *
- *    SPECIAL PROCEDURAL REQUIREMENTS
+ *	SPECIAL PROCEDURAL REQUIREMENTS
  *	None
  *
- *    INTERCASE DEPENDENCIES
+ *	INTERCASE DEPENDENCIES
  *	None
  *
- *    DETAILED DESCRIPTION
+ *	DETAILED DESCRIPTION
  *	This is a Phase I test for the access(2) system call.  It is intended
  *	to provide a limited exposure of the system call, for now.  It
  *	should/will be extended when full functional tests are written for
@@ -130,7 +130,7 @@
 void setup();
 void cleanup();
 
-char *TCID = "access01";	/* Test program identifier.    */
+char *TCID = "access01";	/* Test program identifier.	*/
 int TST_TOTAL = 4;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
 
@@ -161,22 +161,27 @@
 
 	TST_TOTAL = Ntc;
 
+<<<<<<< HEAD
     /***************************************************************
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+=======
+	/***************************************************************
+	 * parse standard options
+	 ***************************************************************/
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) 
+>>>>>>> master
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
+	/***************************************************************
+	 * perform global setup for test
+	 ***************************************************************/
 	setup();
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
+	/***************************************************************
+	 * check looping state if -c option given
+	 ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -191,22 +196,20 @@
 			/* check return code */
 			if (TEST_RETURN == -1 && Test_cases[tc].experrno == 0) {
 				tst_resm(TFAIL|TTERRNO,
-					 "access(%s, %s) failed",
-					 Test_cases[tc].file,
-					 Test_cases[tc].string);
+				    "access(%s, %s) failed",
+				    Test_cases[tc].file,
+				    Test_cases[tc].string);
 
 			} else if (TEST_RETURN != -1
 				   && Test_cases[tc].experrno != 0) {
 				tst_resm(TFAIL,
-					 "access(%s, %s) returned %ld, exp -1, errno:%d",
-					 Test_cases[tc].file,
-					 Test_cases[tc].string, TEST_RETURN,
-					 Test_cases[tc].experrno);
+				    "access(%s, %s) returned %ld, "
+				    "exp -1, errno:%d",
+				    Test_cases[tc].file,
+				    Test_cases[tc].string, TEST_RETURN,
+				    Test_cases[tc].experrno);
 			} else {
 
-		/***************************************************************
-	         * only perform functional verification if flag set (-f not given)
-	         ***************************************************************/
 				if (STD_FUNCTIONAL_TEST) {
 					/* No Verification test, yet... */
 					tst_resm(TPASS,
@@ -220,12 +223,11 @@
 
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
+	/***************************************************************
+	 * cleanup and exit
+	 ***************************************************************/
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* End main */
 
 /***************************************************************
@@ -253,7 +255,7 @@
 	 */
 	if (chown(".", -1, getegid()) < 0) {
 		tst_brkm(TBROK|TERRNO, cleanup,
-			 "chown(\".\", -1, %d) failed", getegid());
+		    "chown(\".\", -1, %d) failed", getegid());
 	}
 
 	sprintf(Fname, "accessfile");
@@ -269,7 +271,8 @@
 	 * force the mode to be set to 6777
 	 */
 	if (chmod(Fname, 06777) == -1)
-		tst_brkm(TBROK|TERRNO, cleanup, "chmod(%s, 06777) failed", Fname);
+		tst_brkm(TBROK|TERRNO, cleanup, "chmod(%s, 06777) failed",
+		    Fname);
 
 	stat(Fname, &stbuf);
 
@@ -279,7 +282,7 @@
 		 */
 	}
 
-}				/* End setup() */
+}
 
 /***************************************************************
  * cleanup() - performs all ONE TIME cleanup for this test at
@@ -294,8 +297,4 @@
 
 	/* remove the temp dir */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
-}				/* End cleanup() */
+}
diff --git a/testcases/kernel/syscalls/access/access02.c b/testcases/kernel/syscalls/access/access02.c
index 4490522..580d758 100644
--- a/testcases/kernel/syscalls/access/access02.c
+++ b/testcases/kernel/syscalls/access/access02.c
@@ -134,7 +134,11 @@
 	char *test_desc;	/* test specific message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -195,7 +199,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -212,7 +216,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/access/access03.c b/testcases/kernel/syscalls/access/access03.c
index bc31f9d..cd99086 100644
--- a/testcases/kernel/syscalls/access/access03.c
+++ b/testcases/kernel/syscalls/access/access03.c
@@ -33,53 +33,53 @@
 /* $Id: access03.c,v 1.8 2009/03/23 13:35:39 subrata_modak Exp $ */
 /**********************************************************
  *
- *    OS Test - Silicon Graphics, Inc.
+ *	OS Test - Silicon Graphics, Inc.
  *
- *    TEST IDENTIFIER	: access03
+ *	TEST IDENTIFIER	: access03
  *
- *    EXECUTED BY	: anyone
+ *	EXECUTED BY	: anyone
  *
- *    TEST TITLE	: EFAULT error testing for access(2)
+ *	TEST TITLE	: EFAULT error testing for access(2)
  *
- *    PARENT DOCUMENT	: acstds01
+ *	PARENT DOCUMENT	: acstds01
  *
- *    TEST CASE TOTAL	: 8
+ *	TEST CASE TOTAL	: 8
  *
- *    WALL CLOCK TIME	: 1
+ *	WALL CLOCK TIME	: 1
  *
- *    CPU TYPES		: ALL
+ *	CPU TYPES		: ALL
  *
- *    AUTHOR		: Kathy Olmsted
+ *	AUTHOR		: Kathy Olmsted
  *
- *    CO-PILOT		: Tom Hampson
+ *	CO-PILOT		: Tom Hampson
  *
- *    DATE STARTED	: 05/13/92
+ *	DATE STARTED	: 05/13/92
  *
- *    INITIAL RELEASE	: UNICOS 7.0
+ *	INITIAL RELEASE	: UNICOS 7.0
  *
- *    TEST CASES
+ *	TEST CASES
  *
  *	access(2) test for errno(s) EFAULT.
  *
- *    INPUT SPECIFICATIONS
+ *	INPUT SPECIFICATIONS
  *	The standard options for system call tests are accepted.
  *	(See the parse_opts(3) man page).
  *
- *    DURATION
+ *	DURATION
  *	Terminates - with frequency and infinite modes.
  *
- *    SIGNALS
+ *	SIGNALS
  *	Uses SIGUSR1 to pause before test if option set.
  *	(See the parse_opts(3) man page).
  *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
+ *	ENVIRONMENTAL NEEDS
+ *	  No run-time environmental needs.
  *
- *    DETAILED DESCRIPTION
+ *	DETAILED DESCRIPTION
  *
  *	Setup:
  *	  Setup signal handling.
- *        Make and change to a temporary directory.
+ *		Make and change to a temporary directory.
  *	  Pause for SIGUSR1 if option specified.
  *
  *	Test:
@@ -87,12 +87,12 @@
  *	  Execute system call
  *	  Check return code, if system call failed (return=-1)
  *		Log the errno.
- *        If doing functional test
- *            check the errno returned and print result message
+ *		If doing functional test
+ *			check the errno returned and print result message
  *
  *	Cleanup:
  *	  Print errno log and/or timing stats if options given
- *        Remove the temporary directory and exit.
+ *		Remove the temporary directory and exit.
  *
  *
  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
@@ -106,12 +106,10 @@
 #include "test.h"
 #include "usctest.h"
 
-void setup();
-void cleanup();
+static void setup(void);
+static void cleanup(void);
 
-char *get_high_address();
-
-char *TCID = "access03";	/* Test program identifier.    */
+char *TCID = "access03";	/* Test program identifier.	*/
 int TST_TOTAL = 8;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
 
@@ -126,23 +124,20 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
+<<<<<<< HEAD
     /***************************************************************
      * parse standard options
      ***************************************************************/
+=======
+>>>>>>> master
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos. */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -161,9 +156,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -197,9 +189,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -233,9 +222,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -269,9 +255,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -305,9 +288,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -341,9 +321,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -377,9 +354,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -395,8 +369,8 @@
 				}
 			} else {
 				tst_resm(TFAIL,
-					 "access(high_address,X_OK) succeeded unexpectedly.");
-
+				    "access(high_address, X_OK) succeeded "
+				    "unexpectedly.");
 			}
 		}
 
@@ -405,52 +379,44 @@
 		 *  F_OK on high pointer (sbrk(0)+1) for path
 		 */
 
-		/* Call access(2) */
 		TEST(access(get_high_address(), F_OK));
 
-		/* check return code */
 		if (TEST_RETURN == -1) {
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
-					tst_resm(TPASS,
-						 "access((char*)sbrk(0)+1,F_OK) failed as expected with errno %d (EFAULT) : %s",
-						 TEST_ERRNO,
-						 strerror(TEST_ERRNO));
+					tst_resm(TPASS|TTERRNO,
+					    "access((char*)sbrk(0)+1,F_OK) "
+					    "failed as expected with EFAULT");
 				} else {
-					tst_resm(TFAIL,
-						 "access((char*)sbrk(0)+1,F_OK) failed with errno %d : %s but expected %d (EFAULT)",
-						 TEST_ERRNO,
-						 strerror(TEST_ERRNO), EFAULT);
+					tst_resm(TFAIL|TTERRNO,
+					    "access((char*)sbrk(0)+1,F_OK) "
+					    " did not fail with EFAULT");
 				}
 			} else {
 				tst_resm(TFAIL,
-					 "access((char*)sbrk(0)+1,F_OK) succeeded unexpectedly.");
-
+					 "access((char*)sbrk(0)+1,F_OK) "
+					 "succeeded unexpectedly.");
 			}
 		}
 
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
+	/***************************************************************
+	 * cleanup and exit
+	 ***************************************************************/
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* End main */
 
 #else
 
 int main()
 {
-	tst_resm(TINFO, "test is not available on uClinux");
+	tst_resm(TCONF, "test is not available on uClinux");
 	return 0;
 }
 
@@ -471,12 +437,12 @@
 	tst_tmpdir();
 
 	bad_addr =
-	    mmap(0, 1, PROT_NONE, MAP_PRIVATE_EXCEPT_UCLINUX | MAP_ANONYMOUS, 0,
-		 0);
+		mmap(0, 1, PROT_NONE,
+		    MAP_PRIVATE_EXCEPT_UCLINUX|MAP_ANONYMOUS, 0, 0);
 	if (bad_addr == MAP_FAILED) {
 		tst_brkm(TBROK, cleanup, "mmap failed");
 	}
-}				/* End setup() */
+}
 
 /***************************************************************
  * cleanup() - performs all ONE TIME cleanup for this test at
@@ -493,5 +459,4 @@
 	/* remove the temporary directory and exit with
 	   return code appropriate for results */
 	tst_rmdir();
-	tst_exit();
-}				/* End cleanup() */
+}
diff --git a/testcases/kernel/syscalls/access/access04.c b/testcases/kernel/syscalls/access/access04.c
index 4019db0..e9d232e 100644
--- a/testcases/kernel/syscalls/access/access04.c
+++ b/testcases/kernel/syscalls/access/access04.c
@@ -100,9 +100,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -151,7 +157,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -169,7 +175,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/access/access05.c b/testcases/kernel/syscalls/access/access05.c
index 3fc424e..1ee7ec3 100644
--- a/testcases/kernel/syscalls/access/access05.c
+++ b/testcases/kernel/syscalls/access/access05.c
@@ -161,9 +161,15 @@
 	int ind;		/* counter for testcase looping */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -223,7 +229,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -240,7 +246,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/add_key/add_key01.c b/testcases/kernel/syscalls/add_key/add_key01.c
index e3b6ea8..1501f8c 100644
--- a/testcases/kernel/syscalls/add_key/add_key01.c
+++ b/testcases/kernel/syscalls/add_key/add_key01.c
@@ -78,9 +78,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -113,39 +110,42 @@
 	char *msg;	      /* message returned from parse_opts */
 	
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	} else {
 
 		setup();
+=======
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
-		/* Check looping state if -i option given */
-		for (lc = 0; TEST_LOOPING(lc); ++lc) {
+	setup();
 
-			Tst_count = 0;
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
 
-			for (testno = 0; testno < TST_TOTAL; ++testno) {
+		Tst_count = 0;
 
-				/* Call add_key. */
-				TEST(syscall(__NR_add_key, "keyring", "wjkey",
-						NULL, 0,
-						KEY_SPEC_THREAD_KEYRING));
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
 
-				if (TEST_RETURN != -1) {
-					tst_resm(TPASS, "add_key call succeeded");
-					cleanup();
-				} else {
-					tst_resm(TFAIL | TTERRNO, "%s failed", TCID);
-				}
-
+			/* Call add_key. */
+			TEST(syscall(__NR_add_key, "keyring", "wjkey",
+					NULL, 0,
+					KEY_SPEC_THREAD_KEYRING));
+			if (TEST_RETURN != -1) {
+				tst_brkm(TPASS, cleanup,
+				    "add_key call succeeded");
+			} else {
+				tst_resm(TFAIL|TTERRNO, "%s failed", TCID);
 			}
 
 		}
 
-		cleanup();
+	}
 
-	}	
-
+	cleanup();
 	tst_exit();
 
 }
diff --git a/testcases/kernel/syscalls/add_key/add_key02.c b/testcases/kernel/syscalls/add_key/add_key02.c
index 3622328..cd6d06c 100644
--- a/testcases/kernel/syscalls/add_key/add_key02.c
+++ b/testcases/kernel/syscalls/add_key/add_key02.c
@@ -78,9 +78,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -122,72 +119,65 @@
 
 
 int main(int ac, char **av) {
-	int i, succeed=0, fail=0;
+	int i;
 	int lc;		 /* loop counter */
 	char *msg;	      /* message returned from parse_opts */
 	
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	} else {
+=======
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
-		setup();
+	setup();
 
-		/* Check looping state if -i option given */
-		for (lc = 0; TEST_LOOPING(lc); ++lc) {
-			Tst_count = 0;
-			for (testno = 0; testno < TST_TOTAL; ++testno) {
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+		Tst_count = 0;
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
 
+<<<<<<< HEAD
 				for (i=0; i<test_count; i++) {
+=======
+			for (i=0; i<test_count; i++) {
+>>>>>>> master
 
-					/* Call add_key. */
-					TEST(syscall(__NR_add_key, test_cases[i].type,
-							test_cases[i].desc,
-							test_cases[i].payload,
-							test_cases[i].plen,
-							KEY_SPEC_USER_KEYRING));
+				/* Call add_key. */
+				TEST(syscall(__NR_add_key, test_cases[i].type,
+						test_cases[i].desc,
+						test_cases[i].payload,
+						test_cases[i].plen,
+						KEY_SPEC_USER_KEYRING));
 
-					if (TEST_RETURN != -1) {
-						tst_resm(TINFO,"call add_key() with wrong args succeed, but should fail");
-						fail++;
+				if (TEST_RETURN != -1) {
+					tst_resm(TINFO,
+					    "add_key passed unexpectedly");
+				} else {
+
+					if (errno == test_cases[i].exp_errno) {
+						tst_resm(TINFO|TTERRNO,
+							"called add_key() "
+							"with wrong args got "
+							"EXPECTED errno");
 					} else {
-
-						if (errno == test_cases[i].exp_errno) {
-							tst_resm(TINFO | TTERRNO,
-								"called "
-								"add_key() "
-								"with wrong "
-								"args got "
-								"EXPECTED "
-								"errno");
-							succeed++;
-						} else {
-							tst_resm(TINFO | TTERRNO,
-								"called "
-								"add_key() "
-								"with wrong "
-								"args got "
-								"UNEXPECTED "
-								"errno");
-							fail++;
-						}
-
+						tst_resm(TFAIL|TTERRNO,
+							"called add_key() "
+							"with wrong args got "
+							"UNEXPECTED errno");
 					}
 
 				}
 
 			}
-	
-			if (fail != 0) {
-			 	tst_resm(TFAIL | TTERRNO, "%s failed", TCID);
-			} else {
-				tst_resm(TPASS, "add_key call succeeded");
-			}
 
 		}
 
-		cleanup();
+	}
 
-	}	
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex01.c b/testcases/kernel/syscalls/adjtimex/adjtimex01.c
index 162f622..8b231bf 100644
--- a/testcases/kernel/syscalls/adjtimex/adjtimex01.c
+++ b/testcases/kernel/syscalls/adjtimex/adjtimex01.c
@@ -93,10 +93,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -123,7 +121,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -132,7 +130,7 @@
 {
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	tim_save.modes = 0;
@@ -160,7 +158,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex02.c b/testcases/kernel/syscalls/adjtimex/adjtimex02.c
index 24a4db7..01d4dc2 100644
--- a/testcases/kernel/syscalls/adjtimex/adjtimex02.c
+++ b/testcases/kernel/syscalls/adjtimex/adjtimex02.c
@@ -144,10 +144,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -201,7 +199,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -213,7 +211,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
@@ -225,7 +223,7 @@
 	/* set the HZ from sysconf */
 	hz = sysconf(_SC_CLK_TCK);
 	if (hz == -1) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			 "Failed to read the HZ from sysconf\n");
 	}
 
@@ -234,7 +232,7 @@
 
 	/* Save current parameters in tim_save */
 	if ((adjtimex(&tim_save)) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to save current parameters");
+		tst_brkm(TBROK, NULL, "Failed to save current parameters");
 	}
 }				/* End setup() */
 
@@ -255,9 +253,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 int setup2()
@@ -288,7 +283,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "\"nobody\" user not present");
+		tst_brkm(TBROK, NULL, "\"nobody\" user not present");
 	}
 	if (seteuid(ltpuser->pw_uid) == -1) {
 		tst_resm(TWARN|TERRNO, "seteuid(%d) failed", ltpuser->pw_uid);
diff --git a/testcases/kernel/syscalls/alarm/alarm01.c b/testcases/kernel/syscalls/alarm/alarm01.c
index 50edd8e..02f6bbe 100644
--- a/testcases/kernel/syscalls/alarm/alarm01.c
+++ b/testcases/kernel/syscalls/alarm/alarm01.c
@@ -127,22 +127,11 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -158,9 +147,6 @@
 			tst_resm(TFAIL|TTERRNO, "alarm(1) failed");
 		} else {
 
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS, "alarm(1) returned %ld",
@@ -170,17 +156,10 @@
 
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* End main */
 
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
 void setup()
 {
 	void trapper();
@@ -205,13 +184,9 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
-void trapper(sig)
-int sig;
+void trapper(int sig)
 {
 	signal(SIGALRM, trapper);
 }
diff --git a/testcases/kernel/syscalls/alarm/alarm02.c b/testcases/kernel/syscalls/alarm/alarm02.c
index 1353774..8621dd4 100644
--- a/testcases/kernel/syscalls/alarm/alarm02.c
+++ b/testcases/kernel/syscalls/alarm/alarm02.c
@@ -120,23 +120,11 @@
 	int exp[] = { 0, 0, 0 };
 	int i;
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 
 	setup();
 
-   /***************************************************************
-    * check looping state
-    ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -157,11 +145,7 @@
 					 "alarm(%lu) returned %ld, when %u was expected for value %s",
 					 sec[i], TEST_RETURN, exp[i], buf[i]);
 
-			}
-	    /***************************************************************
-             * only perform functional verification if flag set (-f not given)
-             ***************************************************************/
-			else if (STD_FUNCTIONAL_TEST) {
+			} else if (STD_FUNCTIONAL_TEST) {
 				if (received_alarm == 1) {
 					tst_resm(TFAIL,
 						 "alarm(%lu) returned %ldu but an alarm signal was received for value %s",
@@ -183,14 +167,10 @@
 	}			/* End for TEST_LOOPING */
 
 	cleanup();
+	tst_exit();
 
-	return 0;
 }
 
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-
 void setup()
 {
 
@@ -204,11 +184,6 @@
 
 }
 
-/***********************************************************
- * Cleanup:
- *  exit using tst_exit.
- ***********************************************************/
-
 void cleanup()
 {
 	/*
@@ -216,10 +191,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-
-	tst_exit();
 }
 
 void alarm_received()
diff --git a/testcases/kernel/syscalls/alarm/alarm03.c b/testcases/kernel/syscalls/alarm/alarm03.c
index a3ba0d5..cc8ee18 100644
--- a/testcases/kernel/syscalls/alarm/alarm03.c
+++ b/testcases/kernel/syscalls/alarm/alarm03.c
@@ -112,24 +112,13 @@
 {
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
-	int e_code, status, retval = 0;
+	int status, retval = 0;
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -178,9 +167,7 @@
 			}
 			/* wait for the child to finish */
 			wait(&status);
-			/* make sure the child returned a good exit status */
-			e_code = status >> 8;
-			if ((e_code != 0) || (retval != 0)) {
+			if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 				tst_resm(TFAIL, "Failures reported above");
 			}
 
@@ -189,8 +176,7 @@
 	}			/* End for TEST_LOOPING */
 
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* End main */
 
 void setup()
@@ -211,9 +197,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 void trapper(int sig)
diff --git a/testcases/kernel/syscalls/alarm/alarm05.c b/testcases/kernel/syscalls/alarm/alarm05.c
index 0a32a26..e05bbc6 100644
--- a/testcases/kernel/syscalls/alarm/alarm05.c
+++ b/testcases/kernel/syscalls/alarm/alarm05.c
@@ -79,7 +79,7 @@
 char *TCID = "alarm05";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-int almreceived = 0;		/* flag to indicate SIGALRM received or not */
+int alarms_received = 0;		/* flag to indicate SIGALRM received or not */
 
 void setup();			/* Main setup function of test */
 void cleanup();			/* cleanup function for the test */
@@ -97,10 +97,8 @@
 	int sleep_time2 = 6;	/* waiting time for the signal */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* Perform global setup for test */
 	setup();
@@ -110,10 +108,10 @@
 		/* Reset Tst_count in case we are looping. */
 		Tst_count = 0;
 
-		/* Reset almreceived for every iteration, since it has
+		/* Reset alarms_received for every iteration, since it has
 		 * old values from previous iterations (if any) and not
 		 * a value of zero */
-		almreceived = 0;
+		alarms_received = 0;
 
 		/*
 		 * Call First alarm() with non-zero time parameter
@@ -140,10 +138,10 @@
 		 * the amount of time previously remaining in the
 		 * alarm clock of the calling process, and
 		 * sigproc() executed when SIGALRM received by the
-		 * process, the variable almreceived is set.
+		 * process, the variable alarms_received is set.
 		 */
 		if (STD_FUNCTIONAL_TEST) {
-			if ((almreceived == 1) &&
+			if ((alarms_received == 1) &&
 			    (ret_val2 == (time_sec1 - sleep_time1))) {
 
 				/*
@@ -163,19 +161,17 @@
 				}
 			} else {
 				tst_resm(TFAIL, "alarm(%u) fails, returned %d, "
-					 "almreceived:%d",
-					 time_sec2, ret_val2, almreceived);
+					 "alarms_received:%d",
+					 time_sec2, ret_val2, alarms_received);
 			}
 		} else {
 			tst_resm(TPASS, "call succeeded");
 		}
 	}			/* End for TEST_LOOPING */
 
-	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-
-	return 0;
- /*NOTREACHED*/}
+	tst_exit(); 
+}
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -204,7 +200,7 @@
  */
 void sigproc(int sig)
 {
-	almreceived = almreceived + 1;
+	alarms_received++;
 }
 
 /*
@@ -219,7 +215,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/alarm/alarm06.c b/testcases/kernel/syscalls/alarm/alarm06.c
index d26ee2f..a117b7c 100644
--- a/testcases/kernel/syscalls/alarm/alarm06.c
+++ b/testcases/kernel/syscalls/alarm/alarm06.c
@@ -77,7 +77,7 @@
 char *TCID = "alarm06";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-int almreceived = 0;		/* flag to indicate SIGALRM received or not */
+int alarms_received = 0;		/* flag to indicate SIGALRM received or not */
 
 void setup();			/* Main setup function of test */
 void cleanup();			/* cleanup function for the test */
@@ -94,10 +94,8 @@
 	int sleep_time2 = 10;	/* waiting time for the 2nd signal */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* Perform global setup for test */
 	setup();
@@ -132,17 +130,17 @@
 		 * the amount of time (seconds) previously remaining in the
 		 * alarm clock of the calling process, and
 		 * sigproc() never executed as SIGALRM was not received by the
-		 * process, the variable almreceived remains unset.
+		 * process, the variable alarms_received remains unset.
 		 */
 		if (STD_FUNCTIONAL_TEST) {
-			if ((almreceived == 0) &&
+			if ((alarms_received == 0) &&
 			    (ret_val2 == (time_sec1 - sleep_time1))) {
 				tst_resm(TPASS, "Functionality of alarm(%u) "
 					 "successful", time_sec2);
 			} else {
 				tst_resm(TFAIL, "alarm(%u) fails, returned %d, "
-					 "almreceived:%d",
-					 time_sec2, ret_val2, almreceived);
+					 "alarms_received:%d",
+					 time_sec2, ret_val2, alarms_received);
 			}
 		} else {
 			tst_resm(TPASS, "last call returned %d", ret_val2);
@@ -151,9 +149,8 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-
-	return 0;
- /*NOTREACHED*/}
+	tst_exit();
+}
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -182,7 +179,7 @@
  */
 void sigproc(int sig)
 {
-	almreceived = almreceived + 1;
+	alarms_received++;
 }
 
 /*
@@ -196,7 +193,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/alarm/alarm07.c b/testcases/kernel/syscalls/alarm/alarm07.c
index 99c51e0..6d506bb 100644
--- a/testcases/kernel/syscalls/alarm/alarm07.c
+++ b/testcases/kernel/syscalls/alarm/alarm07.c
@@ -76,7 +76,7 @@
 char *TCID = "alarm07";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-int almreceived = 0;		/* flag to indicate SIGALRM received or not */
+int alarms_received = 0;		/* flag to indicate SIGALRM received or not */
 
 void setup();			/* Main setup function of test */
 void cleanup();			/* cleanup function for the test */
@@ -86,15 +86,14 @@
 {
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
-	int time_sec = 3;	/* time for which alarm is set */
 	int sleep_time = 5;	/* waiting time for the SIGALRM signal */
+	int status;
+	int time_sec = 3;	/* time for which alarm is set */
 	pid_t cpid;		/* child process id */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* Perform global setup for test */
 	setup();
@@ -122,20 +121,26 @@
 		if (STD_FUNCTIONAL_TEST) {
 			if (cpid == 0) {	/* Child process */
 				/*
-				 * For child process if almreceived is 0
+				 * For child process if alarms_received is 0
 				 * means alarm request is cleared.
 				 */
-				if (almreceived == 0) {
-					printf("Functionality of alarm(%u) "
-					    "successful\n", time_sec);
+				if (alarms_received == 0) {
+					exit(0);
 				} else {
 					printf("alarm request not cleared in "
-					    "child, almreceived:%d\n",
-					    almreceived);
+					    "child; alarms received:%d\n",
+					    alarms_received);
+					exit(1);
 				}
 			} else {	/* Parent process */
 				/* Wait for child to complete execution */
-				wait(0);
+				if (wait(&status) == -1)
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				if (!WIFEXITED(status) ||
+				    WEXITSTATUS(status) != 0)
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "child exited abnormally");
 			}
 		} else {
 			tst_resm(TPASS, "call returned %ld", TEST_RETURN);
@@ -145,8 +150,8 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	return 0;
- /*NOTREACHED*/}		/* End main */
+	tst_exit();
+}		/* End main */
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -162,8 +167,7 @@
 
 	/* Set the signal catching function */
 	if (signal(SIGALRM, sigproc) == SIG_ERR) {
-		tst_brkm(TFAIL|TERRNO, cleanup,
-			 "signal() fails to catch SIGALARM");
+		tst_brkm(TFAIL|TERRNO, cleanup, "signal(SIGALRM, ..) failed");
 	}
 }
 
@@ -175,7 +179,7 @@
  */
 void sigproc(int sig)
 {
-	almreceived = almreceived + 1;
+	alarms_received++;
 }
 
 /*
@@ -189,7 +193,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/asyncio/asyncio02.c b/testcases/kernel/syscalls/asyncio/asyncio02.c
index 8497fb3..a4b371c 100644
--- a/testcases/kernel/syscalls/asyncio/asyncio02.c
+++ b/testcases/kernel/syscalls/asyncio/asyncio02.c
@@ -154,22 +154,19 @@
 	Num_flags = sizeof(Flags) / sizeof(int);
 	TST_TOTAL = 3 * Num_flags;
 
+<<<<<<< HEAD
     /***************************************************************
      * parse standard options, and exit if there is an error
      ***************************************************************/
+=======
+>>>>>>> master
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
 	}
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -224,24 +221,13 @@
 		}
 	}
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* end main() */
 
-/***********************************************************
- *
- *	This function does the actual running of the tests.
- *
- ***********************************************************/
 int testrun(int flag, int bytes, int ti)
 {
 
-	void cleanup();
-
-	int fildes,		/* temporary file's descriptor */
-	 i;			/* counter */
-
-	int ret;
+	int fildes, i, ret;
 
 	struct stat buffer;	/* buffer of memory required for stat command */
 
@@ -339,8 +325,4 @@
 
 	/* remove temporary directory and all files in it. */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/bdflush/bdflush01.c b/testcases/kernel/syscalls/bdflush/bdflush01.c
index 042f0aa..7873b0b 100644
--- a/testcases/kernel/syscalls/bdflush/bdflush01.c
+++ b/testcases/kernel/syscalls/bdflush/bdflush01.c
@@ -1,31 +1,31 @@
 /******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007                                   */
-/*                                                                            */
+/* Copyright (c) Crackerjack Project., 2007				   */
+/*									    */
 /* This program 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 Software Foundation; either version 2 of the License, or          */
-/* (at your option) any later version.                                        */
-/*                                                                            */
-/* This program is distributed in the hope that it will be useful,            */
-/* but WITHOUT ANY WARRANTY;  without even the implied warranty of            */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See                  */
-/* the GNU General Public License for more details.                           */
-/*                                                                            */
-/* You should have received a copy of the GNU General Public License          */
-/* along with this program;  if not, write to the Free Software               */
+/* the Free Software Foundation; either version 2 of the License, or	  */
+/* (at your option) any later version.					*/
+/*									    */
+/* This program is distributed in the hope that it will be useful,	    */
+/* but WITHOUT ANY WARRANTY;  without even the implied warranty of	    */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See		  */
+/* the GNU General Public License for more details.			   */
+/*									    */
+/* You should have received a copy of the GNU General Public License	  */
+/* along with this program;  if not, write to the Free Software	       */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA    */
-/*                                                                            */
+/*									    */
 /******************************************************************************/
 /******************************************************************************/
-/*                                                                            */
-/* File:        bdflush01.c                                            */
-/*                                                                            */
+/*									    */
+/* File:	bdflush01.c					    */
+/*									    */
 /* Description: bdflush() starts, flushes, or tunes the buffer-dirty-flush    */
 /*		daemon. Only a privileged process (one with the CAP_SYS_ADMIN */
 /*		capability) may call bdflush().				      */
 /*									      */
 /*		If func is negative or 0, and no daemon has been started,     */
-/*	        then bdflush() enters the daemon code and never returns.      */	
+/*		then bdflush() enters the daemon code and never returns.      */	
 /*									      */	
 /*		If func is 1, some dirty buffers are written to disk.	      */
 /*		If func is 2 or more and is even (low bit is 0), then address */
@@ -59,20 +59,20 @@
 /*			EPERM						      */		
 /*			    Caller does not have the CAP_SYS_ADMIN capability.*/
 /*									      */
-/* Usage:  <for command-line>                                                 */
-/* bdflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                      */
-/*      where,  -c n : Run n copies concurrently.                             */
-/*              -e   : Turn on errno logging.                                 */
-/*              -i n : Execute test n times.                                  */
-/*              -I x : Execute test for x seconds.                            */
-/*              -P x : Pause for x seconds between iterations.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   bdflush01                                              */
-/* History:     Porting from Crackerjack to LTP is done by                    */
-/*              Manas Kumar Nayak maknayak@in.ibm.com>                        */
+/* Usage:  <for command-line>						 */
+/* bdflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t]		      */
+/*      where,  -c n : Run n copies concurrently.			     */
+/*	      -e   : Turn on errno logging.				 */
+/*	      -i n : Execute test n times.				  */
+/*	      -I x : Execute test for x seconds.			    */
+/*	      -P x : Pause for x seconds between iterations.		*/
+/*	      -t   : Turn on syscall timing.				*/
+/*									    */
+/* Total Tests: 1							     */
+/*									    */
+/* Test Name:   bdflush01					      */
+/* History:     Porting from Crackerjack to LTP is done by		    */
+/*	      Manas Kumar Nayak maknayak@in.ibm.com>			*/
 /******************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,65 +89,72 @@
 #include "linux_syscall_numbers.h"
 
 /* Extern Global Variables */
-extern int Tst_count;           /* counter for tst_xxx routines.         */
-extern char *TESTDIR;           /* temporary dir created by tst_tmpdir() */
+extern int Tst_count;	   /* counter for tst_xxx routines.	 */
+extern char *TESTDIR;	   /* temporary dir created by tst_tmpdir() */
 
 /* Global Variables */
 char *TCID = "bdflush01";  /* Test program identifier.*/
 int  testno;
-int  TST_TOTAL = 1;                   /* total number of tests in this file.   */
+int  TST_TOTAL = 1;		   /* total number of tests in this file.   */
 
 /* Extern Global Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    cleanup                                                       */
-/*                                                                            */
+/*									    */
+/* Function:    cleanup						       */
+/*									    */
 /* Description: Performs all one time clean up for this test on successful    */
-/*              completion,  premature exit or  failure. Closes all temporary */
-/*              files, removes all temporary directories exits the test with  */
-/*              appropriate return code by calling tst_exit() function.       */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
+/*	      completion,  premature exit or  failure. Closes all temporary */
+/*	      files, removes all temporary directories exits the test with  */
+/*	      appropriate return code by calling tst_exit() function.       */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
 /* Return:      On failure - Exits calling tst_exit(). Non '0' return code.   */
-/*              On success - Exits calling tst_exit(). With '0' return code.  */
-/*                                                                            */
+/*	      On success - Exits calling tst_exit(). With '0' return code.  */
+/*									    */
 /******************************************************************************/
 extern void cleanup() {
+<<<<<<< HEAD
         /* Remove tmp dir and all files in it */
         TEST_CLEANUP;
         tst_rmdir();
+=======
+	/* Remove tmp dir and all files in it */
+	TEST_CLEANUP;
+	tst_rmdir();
+>>>>>>> master
 }
 
 /* Local  Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    setup                                                         */
-/*                                                                            */
+/*									    */
+/* Function:    setup							 */
+/*									    */
 /* Description: Performs all one time setup for this test. This function is   */
-/*              typically used to capture signals, create temporary dirs      */
-/*              and temporary files that may be used in the course of this    */
-/*              test.                                                         */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits by calling cleanup().                      */
-/*              On success - returns 0.                                       */
-/*                                                                            */
+/*	      typically used to capture signals, create temporary dirs      */
+/*	      and temporary files that may be used in the course of this    */
+/*	      test.							 */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
+/* Return:      On failure - Exits by calling cleanup().		      */
+/*	      On success - returns 0.				       */
+/*									    */
 /******************************************************************************/
 void setup() {
-        /* Capture signals if any */
-        /* Create temporary directories */
-        TEST_PAUSE;
-        tst_tmpdir();
+	/* Capture signals if any */
+	/* Create temporary directories */
+	TEST_PAUSE;
+	tst_tmpdir();
 }
 
 int main(int ac, char **av) {
 	long data;
+<<<<<<< HEAD
         char *msg;              /* message returned from parse_opts */
 	
         /* parse standard options */
@@ -156,16 +163,36 @@
 
         setup();
 
+=======
+	int lc;		 /* loop counter */
+	char *msg;	      /* message returned from parse_opts */
+	
+	/* parse standard options */
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+
+	setup();
+
+	/* Check looping state if -i option given */
+>>>>>>> master
 	Tst_count = 1;
 	for (testno = 0; testno < TST_TOTAL; ++testno) {
 		TEST(syscall(__NR_bdflush, 0, data));
 		if (TEST_RETURN < 0) {
+<<<<<<< HEAD
 			tst_brkm(TFAIL|TTERRNO, cleanup, "bdflush() failed");
 		} else {
 			tst_resm(TPASS, "test PASSED; %ld was returned",
 			    TEST_RETURN);
                 }
         }
+=======
+			tst_brkm(TFAIL|TTERRNO, cleanup, "bdflush failed");
+		} else {
+			tst_resm(TPASS, "bdflush() = %ld", TEST_RETURN);
+		}
+	}
+>>>>>>> master
 	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/bind/bind01.c b/testcases/kernel/syscalls/bind/bind01.c
index ed88e69..2df6b8c 100644
--- a/testcases/kernel/syscalls/bind/bind01.c
+++ b/testcases/kernel/syscalls/bind/bind01.c
@@ -114,7 +114,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, 0, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c
index fe40234..60bab0b 100644
--- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c
+++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c
@@ -139,7 +139,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
         }
 
diff --git a/testcases/kernel/syscalls/capget/capget01.c b/testcases/kernel/syscalls/capget/capget01.c
index 6629076..164c274 100644
--- a/testcases/kernel/syscalls/capget/capget01.c
+++ b/testcases/kernel/syscalls/capget/capget01.c
@@ -98,9 +98,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -127,7 +133,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/capget/capget02.c b/testcases/kernel/syscalls/capget/capget02.c
index f7c9139..a582f92 100644
--- a/testcases/kernel/syscalls/capget/capget02.c
+++ b/testcases/kernel/syscalls/capget/capget02.c
@@ -128,9 +128,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -162,7 +168,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/capset/capset01.c b/testcases/kernel/syscalls/capset/capset01.c
index fb43878..b794144 100644
--- a/testcases/kernel/syscalls/capset/capset01.c
+++ b/testcases/kernel/syscalls/capset/capset01.c
@@ -104,10 +104,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -132,7 +130,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -155,7 +153,7 @@
 	header.version = _LINUX_CAPABILITY_VERSION;
 	header.pid = 0;
 	if ((capget(&header, &data)) == -1) {
-		tst_brkm(TBROK|TTERRNO, tst_exit, "capget() failed");
+		tst_brkm(TBROK|TTERRNO, NULL, "capget() failed");
 	}
 
 }				/* End setup() */
@@ -171,8 +169,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/* End cleanup() */
 }
diff --git a/testcases/kernel/syscalls/capset/capset02.c b/testcases/kernel/syscalls/capset/capset02.c
index 3fcc641..151197a 100644
--- a/testcases/kernel/syscalls/capset/capset02.c
+++ b/testcases/kernel/syscalls/capset/capset02.c
@@ -137,10 +137,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 #ifdef UCLINUX
 	maybe_run_child(&child_func, "");
 #endif
@@ -175,7 +173,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -198,7 +196,7 @@
 	 */
 	header.version = _LINUX_CAPABILITY_VERSION;
 	if ((capget(&header, &data)) == -1) {
-		tst_brkm(TBROK|TERRNO, tst_exit, "capget() failed");
+		tst_brkm(TBROK|TERRNO, NULL, "capget() failed");
 	}
 
 }				/* End setup() */
@@ -216,9 +214,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 void child_func()
diff --git a/testcases/kernel/syscalls/chdir/chdir01.c b/testcases/kernel/syscalls/chdir/chdir01.c
index 0cf4605..b75ef3d 100644
--- a/testcases/kernel/syscalls/chdir/chdir01.c
+++ b/testcases/kernel/syscalls/chdir/chdir01.c
@@ -81,7 +81,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -97,13 +101,13 @@
 
 		if ((ret = chdir(testdir)) != 0) {
 			tst_brkm(TBROK|TERRNO, cleanup, "chdir(%s) failed", testdir);
-		 /*NOTREACHED*/}
+		 }
 		if ((fd = creat(filname, 0000)) == -1) {
 			tst_brkm(TBROK|TERRNO, cleanup, "creat(%s) failed", filname);
-		 /*NOTREACHED*/}
+		 }
 		if ((ddir = opendir(".")) == NULL) {
 			tst_brkm(TBROK|TERRNO, cleanup, "opendir(.) failed");
-		 /*NOTREACHED*/}
+		 }
 
 		filenames[0] = ".";
 		filenames[1] = "..";
@@ -136,7 +140,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test
diff --git a/testcases/kernel/syscalls/chdir/chdir02.c b/testcases/kernel/syscalls/chdir/chdir02.c
index b7d1fde..49a0bf3 100644
--- a/testcases/kernel/syscalls/chdir/chdir02.c
+++ b/testcases/kernel/syscalls/chdir/chdir02.c
@@ -135,7 +135,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/chdir/chdir03.c b/testcases/kernel/syscalls/chdir/chdir03.c
index f8d8c4e..2341cc5 100644
--- a/testcases/kernel/syscalls/chdir/chdir03.c
+++ b/testcases/kernel/syscalls/chdir/chdir03.c
@@ -88,7 +88,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -165,7 +169,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -176,7 +180,7 @@
 
 	/* make sure the process ID is root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root.");
+		tst_brkm(TBROK, NULL, "Test must be run as root.");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/chdir/chdir04.c b/testcases/kernel/syscalls/chdir/chdir04.c
index c279566..7caee85 100644
--- a/testcases/kernel/syscalls/chdir/chdir04.c
+++ b/testcases/kernel/syscalls/chdir/chdir04.c
@@ -115,7 +115,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -151,7 +155,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
diff --git a/testcases/kernel/syscalls/chmod/chmod01.c b/testcases/kernel/syscalls/chmod/chmod01.c
index 7e656cc..4e82b27 100644
--- a/testcases/kernel/syscalls/chmod/chmod01.c
+++ b/testcases/kernel/syscalls/chmod/chmod01.c
@@ -101,7 +101,11 @@
 	TST_TOTAL = sizeof(Modes) / sizeof(int);
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -170,7 +174,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
diff --git a/testcases/kernel/syscalls/chmod/chmod03.c b/testcases/kernel/syscalls/chmod/chmod03.c
index c93d264..10148c6 100644
--- a/testcases/kernel/syscalls/chmod/chmod03.c
+++ b/testcases/kernel/syscalls/chmod/chmod03.c
@@ -106,7 +106,11 @@
 	mode_t file_mode;	/* mode permissions set on testfile */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -167,7 +171,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
@@ -184,7 +188,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/chmod/chmod04.c b/testcases/kernel/syscalls/chmod/chmod04.c
index 0ebb0cd..6c4f72d 100644
--- a/testcases/kernel/syscalls/chmod/chmod04.c
+++ b/testcases/kernel/syscalls/chmod/chmod04.c
@@ -106,7 +106,11 @@
 	mode_t dir_mode;	/* mode permissions set on testdirectory */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -168,7 +172,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
@@ -183,7 +187,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/chmod/chmod05.c b/testcases/kernel/syscalls/chmod/chmod05.c
index 82ef9b3..0982e11 100644
--- a/testcases/kernel/syscalls/chmod/chmod05.c
+++ b/testcases/kernel/syscalls/chmod/chmod05.c
@@ -125,7 +125,11 @@
 	mode_t dir_mode;	/* mode permissions set on test directory */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -191,7 +195,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
@@ -210,7 +214,7 @@
 //wjh Improper comment! This makes sure we _are_ "root" not "nobody"
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/chmod/chmod06.c b/testcases/kernel/syscalls/chmod/chmod06.c
index 7ef0b7d..2ec580d 100644
--- a/testcases/kernel/syscalls/chmod/chmod06.c
+++ b/testcases/kernel/syscalls/chmod/chmod06.c
@@ -109,8 +109,6 @@
 int setup3();		/* setup function to test chmod for ENOTDIR */
 int longpath_setup();	/* setup function to test chmod for ENAMETOOLONG */
 
-char *get_high_address();	/* Function from ltp-Lib */
-
 char *test_home;		/* variable to hold TESTHOME env. */
 char Longpathname[PATH_MAX + 2];
 char High_address_node[64];
@@ -160,7 +158,11 @@
 	struct passwd *ltpuser;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -232,7 +234,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
@@ -253,7 +255,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/chmod/chmod07.c b/testcases/kernel/syscalls/chmod/chmod07.c
index 9738140..d67d23a 100644
--- a/testcases/kernel/syscalls/chmod/chmod07.c
+++ b/testcases/kernel/syscalls/chmod/chmod07.c
@@ -106,7 +106,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -165,7 +169,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c
index ce48657..7134333 100644
--- a/testcases/kernel/syscalls/chown/chown01.c
+++ b/testcases/kernel/syscalls/chown/chown01.c
@@ -139,7 +139,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/chown/chown02.c b/testcases/kernel/syscalls/chown/chown02.c
index 00dd07b..03324ad 100644
--- a/testcases/kernel/syscalls/chown/chown02.c
+++ b/testcases/kernel/syscalls/chown/chown02.c
@@ -117,14 +117,18 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 	int ind;		/* counter variable for chmod(2) tests */
-	uid_t User_id;		/* user id of the user set for testfile */
-	gid_t Group_id;		/* group id of the user set for testfile */
+	uid_t user_id;		/* user id of the user set for testfile */
+	gid_t group_id;		/* group id of the user set for testfile */
 	int test_flag;		/* test condition specific flag variable */
 	char *file_name;	/* ptr. for test file name */
 	char *test_desc;	/* test specific message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -142,15 +146,15 @@
 
 			file_name = Test_cases[ind].pathname;
 			test_desc = Test_cases[ind].desc;
-			User_id = Test_cases[ind].user_id;
-			Group_id = Test_cases[ind].group_id;
+			user_id = Test_cases[ind].user_id;
+			group_id = Test_cases[ind].group_id;
 			test_flag = Test_cases[ind].test_flag;
 
 			/*
 			 * Call chown(2) with different user id and
 			 * group id (numeric values) to set it on testfile.
 			 */
-			TEST(chown(file_name, User_id, Group_id));
+			TEST(chown(file_name, user_id, group_id));
 
 			/* check return code of chown(2) */
 			if (TEST_RETURN == -1) {
@@ -178,12 +182,12 @@
 				 * Check for expected Ownership ids
 				 * set on testfile.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id)) {
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id)) {
 					tst_brkm(TFAIL, cleanup, "%s: Incorrect"
 						 " ownership set, Expected %d "
 						 "%d", file_name,
-						 User_id, Group_id);
+						 user_id, group_id);
 				}
 
 				/*
@@ -219,7 +223,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c
index cd0f724..19ebb4c 100644
--- a/testcases/kernel/syscalls/chown/chown03.c
+++ b/testcases/kernel/syscalls/chown/chown03.c
@@ -101,11 +101,15 @@
 	struct stat stat_buf;	/* stat(2) struct contents */
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
-	uid_t User_id;		/* Owner id of the test file. */
-	gid_t Group_id;		/* Group id of the test file. */
+	uid_t user_id;		/* Owner id of the test file. */
+	gid_t group_id;		/* Group id of the test file. */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -120,15 +124,15 @@
 		Tst_count = 0;
 
 		/* Get the euid/egid of the process */
-		User_id = geteuid();
-		Group_id = getegid();
+		user_id = geteuid();
+		group_id = getegid();
 
 		/*
 		 * Call chown(2) with different user id and
 		 * group id (numeric values) to set it on testfile.
 		 */
 
-		TEST(chown(TESTFILE, -1, Group_id));
+		TEST(chown(TESTFILE, -1, group_id));
 
 		/* check return code of chown(2) */
 		if (TEST_RETURN == -1) {
@@ -153,12 +157,12 @@
 			/*
 			 * Check for expected Ownership ids set on testfile.
 			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id)) {
+			if ((stat_buf.st_uid != user_id) ||
+			    (stat_buf.st_gid != group_id)) {
 				tst_resm(TFAIL, "%s: Incorrect ownership"
 					 "set to %d %d, Expected %d %d",
 					 TESTFILE, stat_buf.st_uid,
-					 stat_buf.st_gid, User_id, Group_id);
+					 stat_buf.st_gid, user_id, group_id);
 			}
 
 			/*
@@ -183,7 +187,7 @@
 	cleanup();
 
 	return 0;
-/*NOTREACHED*/
+
 }		/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c
index bed3c41..c32f0dc 100644
--- a/testcases/kernel/syscalls/chown/chown04.c
+++ b/testcases/kernel/syscalls/chown/chown04.c
@@ -149,11 +149,15 @@
 	char *file_name;	/* ptr. for file name whose mode is modified */
 	char *test_desc;	/* test specific error message */
 	int ind;		/* counter to test different test conditions */
-	uid_t User_id;		/* Effective user id of a test process */
-	gid_t Group_id;		/* Effective group id of a test process */
+	uid_t user_id;		/* Effective user id of a test process */
+	gid_t group_id;		/* Effective group id of a test process */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -169,8 +173,8 @@
 	TEST_EXP_ENOS(exp_enos);
 
 	/* Set uid/gid values to that of test process */
-	User_id = geteuid();
-	Group_id = getegid();
+	user_id = geteuid();
+	group_id = getegid();
 
 	/* Check looping state if -c option given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -190,7 +194,7 @@
 			 * verify that it fails with -1 return value and
 			 * sets appropriate errno.
 			 */
-			TEST(chown(file_name, User_id, Group_id));
+			TEST(chown(file_name, user_id, group_id));
 
 			/* Check return code from chown(2) */
 			if (TEST_RETURN != -1) {
@@ -221,7 +225,7 @@
 	cleanup();
 
 	return 0;
-/*NOTREACHED*/
+
 }		/* End main */
 
 /*
@@ -245,7 +249,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/chown/chown05.c b/testcases/kernel/syscalls/chown/chown05.c
index 0fbeaec..1252abe 100644
--- a/testcases/kernel/syscalls/chown/chown05.c
+++ b/testcases/kernel/syscalls/chown/chown05.c
@@ -108,12 +108,16 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 	int ind;		/* counter variable for chmod(2) tests */
-	uid_t User_id;		/* user id of the user set for testfile */
-	gid_t Group_id;		/* group id of the user set for testfile */
+	uid_t user_id;		/* user id of the user set for testfile */
+	gid_t group_id;		/* group id of the user set for testfile */
 	char *test_desc;	/* test specific message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -129,15 +133,15 @@
 
 		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
 			test_desc = Test_cases[ind].desc;
-			User_id = Test_cases[ind].user_id;
-			Group_id = Test_cases[ind].group_id;
+			user_id = Test_cases[ind].user_id;
+			group_id = Test_cases[ind].group_id;
 
 			/*
 			 * Call chwon(2) with different user id and
 			 * group id (numeric values) to set it on
 			 * testfile.
 			 */
-			TEST(chown(TESTFILE, User_id, Group_id));
+			TEST(chown(TESTFILE, user_id, group_id));
 
 			/* check return code of chown(2) */
 			if (TEST_RETURN == -1) {
@@ -160,23 +164,23 @@
 						 "%s failed, errno:%d",
 						 TESTFILE, TEST_ERRNO);
 				}
-				if (User_id == -1) {
-					User_id = Test_cases[ind - 1].user_id;
+				if (user_id == -1) {
+					user_id = Test_cases[ind - 1].user_id;
 				}
-				if (Group_id == -1) {
-					Group_id = Test_cases[ind - 1].group_id;
+				if (group_id == -1) {
+					group_id = Test_cases[ind - 1].group_id;
 				}
 
 				/*
 				 * Check for expected Ownership ids
 				 * set on testfile.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id)) {
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id)) {
 					tst_resm(TFAIL, "%s: Incorrect "
 						 "ownership set, Expected %d "
-						 "%d", TESTFILE, User_id,
-						 Group_id);
+						 "%d", TESTFILE, user_id,
+						 group_id);
 				} else {
 					tst_resm(TPASS,
 						 "chown() succeeds to %s of %s",
@@ -192,7 +196,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 /*
  * void
diff --git a/testcases/kernel/syscalls/chroot/chroot01.c b/testcases/kernel/syscalls/chroot/chroot01.c
index a90e3c0..a46837b 100644
--- a/testcases/kernel/syscalls/chroot/chroot01.c
+++ b/testcases/kernel/syscalls/chroot/chroot01.c
@@ -70,7 +70,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -99,7 +103,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -109,7 +113,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/chroot/chroot02.c b/testcases/kernel/syscalls/chroot/chroot02.c
index 9cb2928..6d76552 100644
--- a/testcases/kernel/syscalls/chroot/chroot02.c
+++ b/testcases/kernel/syscalls/chroot/chroot02.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -125,7 +129,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
diff --git a/testcases/kernel/syscalls/chroot/chroot03.c b/testcases/kernel/syscalls/chroot/chroot03.c
index a4bf087..c503df5 100644
--- a/testcases/kernel/syscalls/chroot/chroot03.c
+++ b/testcases/kernel/syscalls/chroot/chroot03.c
@@ -125,7 +125,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -164,7 +168,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
diff --git a/testcases/kernel/syscalls/chroot/chroot04.c b/testcases/kernel/syscalls/chroot/chroot04.c
index 1ab612e..1fe336d 100644
--- a/testcases/kernel/syscalls/chroot/chroot04.c
+++ b/testcases/kernel/syscalls/chroot/chroot04.c
@@ -70,7 +70,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -100,7 +104,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -132,12 +136,12 @@
 		tst_resm(TFAIL, "mkdir() failed to create"
 			 " a testing directory");
 		exit(1);
-		/* NOTREACHED */
+		
 	}
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
@@ -162,7 +166,7 @@
 		tst_resm(TFAIL, "rmdir() failed to removed"
 			 " a testing directory");
 		exit(1);
-		/* NOTREACHED */
+		
 	}
 	/*
 	 * print timing stats if that option was specified.
diff --git a/testcases/kernel/syscalls/clock_getres/clock_getres01.c b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
index fd1835e..c7f8b04 100644
--- a/testcases/kernel/syscalls/clock_getres/clock_getres01.c
+++ b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
@@ -278,7 +278,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
@@ -297,7 +301,7 @@
 					break;
 				default:
 					usage(progname);
-					/* NOTREACHED */
+					
 				}
 			}
 
@@ -305,7 +309,7 @@
 			if (ac != optind) {
 				tst_resm(TINFO,"Options are not match.");
 				usage(progname);
-				// NOTREACHED
+				
 			}
 
 			/*
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index fe29f63..9ae9e9b 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -79,7 +79,7 @@
 {
 	if (sig == SIGINT)
 		return;
-	// NOTREACHED
+	
 	return;
 }
 
@@ -372,6 +372,7 @@
 
 int main(int ac, char **av) {
 	int result = RESULT_OK;
+<<<<<<< HEAD
 	int i;
 	int lc;		 /* loop counter */
 	char *msg;	      /* message returned from parse_opts */
@@ -396,6 +397,63 @@
 					i, (ret == 0) ? "OK" : "NG");
 				result |= ret;
 			}
+=======
+        int c;
+        int i;
+        int lc;                 /* loop counter */
+        char *msg;              /* message returned from parse_opts */
+
+	struct option long_options[] = {
+                { "debug", no_argument, 0, 'd' },
+                { "help",  no_argument, 0, 'h' },
+                { NULL, 0, NULL, 0 }
+        };
+
+	progname = strchr(av[0], '/');
+        progname = progname ? progname + 1 : av[0];	
+	
+        /* parse standard options */
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+             tst_exit();
+           }
+
+        setup();
+
+        /* Check looping state if -i option given */
+        for (lc = 0; TEST_LOOPING(lc); ++lc) {
+                Tst_count = 0;
+                for (testno = 0; testno < TST_TOTAL; ++testno) {
+			 TEST(c = getopt_long(ac, av, "dh", long_options, NULL));
+			 while (TEST_RETURN != -1) {
+		                switch (c) {
+                		case 'd':
+		                        opt_debug = 1;
+                		        break;
+		                default:
+                		        usage(progname);
+                        		
+                		}
+		        }
+
+
+		if (ac != optind) {
+        	        tst_resm(TINFO,"Options are not match.");
+                	usage(progname);
+                	
+	        }
+
+		/*
+		* Execute test
+         	*/
+	        for (i = 0; i < (int)(sizeof(tcase) / sizeof(tcase[0])); i++) {
+        	        int ret;
+	                tst_resm(TINFO,"(case%02d) START", i);
+	                ret = do_test(&tcase[i]);
+	                tst_resm(TINFO,"(case%02d) END => %s", i, (ret == 0) ? "OK" : "NG");
+	                result |= ret;
+        	}
+>>>>>>> master
 		
 			switch (result) {
 			case RESULT_OK:
diff --git a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
index f48c7b8..9300ba3 100644
--- a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
@@ -126,7 +126,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/clone/clone01.c b/testcases/kernel/syscalls/clone/clone01.c
index 9a4e72c..b9c71b7 100644
--- a/testcases/kernel/syscalls/clone/clone01.c
+++ b/testcases/kernel/syscalls/clone/clone01.c
@@ -98,9 +98,15 @@
 	int status, child_pid;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -142,7 +148,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/clone/clone02.c b/testcases/kernel/syscalls/clone/clone02.c
index 2ae77b4..c313cd8 100644
--- a/testcases/kernel/syscalls/clone/clone02.c
+++ b/testcases/kernel/syscalls/clone/clone02.c
@@ -163,7 +163,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -237,7 +241,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/clone/clone03.c b/testcases/kernel/syscalls/clone/clone03.c
index 5b087f3..367b91c 100644
--- a/testcases/kernel/syscalls/clone/clone03.c
+++ b/testcases/kernel/syscalls/clone/clone03.c
@@ -100,7 +100,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -164,7 +168,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/clone/clone04.c b/testcases/kernel/syscalls/clone/clone04.c
index 3ca8cb7..bfa0cf6 100644
--- a/testcases/kernel/syscalls/clone/clone04.c
+++ b/testcases/kernel/syscalls/clone/clone04.c
@@ -106,9 +106,15 @@
 	void *test_stack;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -151,7 +157,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/clone/clone05.c b/testcases/kernel/syscalls/clone/clone05.c
index 9c7098e..5d40574 100644
--- a/testcases/kernel/syscalls/clone/clone05.c
+++ b/testcases/kernel/syscalls/clone/clone05.c
@@ -97,9 +97,15 @@
 	void *child_stack;	/* stack for child */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -138,7 +144,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/clone/clone06.c b/testcases/kernel/syscalls/clone/clone06.c
index fb73e30..77f8e4f 100644
--- a/testcases/kernel/syscalls/clone/clone06.c
+++ b/testcases/kernel/syscalls/clone/clone06.c
@@ -105,9 +105,15 @@
 	char buff[MAX_LINE_LENGTH];
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -170,7 +176,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/clone/clone07.c b/testcases/kernel/syscalls/clone/clone07.c
index abc0b25..86ed479 100644
--- a/testcases/kernel/syscalls/clone/clone07.c
+++ b/testcases/kernel/syscalls/clone/clone07.c
@@ -104,9 +104,15 @@
 	void *child_stack;	/* stack for child */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
diff --git a/testcases/kernel/syscalls/close/close01.c b/testcases/kernel/syscalls/close/close01.c
index 6ab8558..84e4ad1 100644
--- a/testcases/kernel/syscalls/close/close01.c
+++ b/testcases/kernel/syscalls/close/close01.c
@@ -95,8 +95,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -148,7 +152,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test
diff --git a/testcases/kernel/syscalls/close/close02.c b/testcases/kernel/syscalls/close/close02.c
index 5a44b75..465e5bd 100644
--- a/testcases/kernel/syscalls/close/close02.c
+++ b/testcases/kernel/syscalls/close/close02.c
@@ -75,8 +75,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -108,7 +112,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test
diff --git a/testcases/kernel/syscalls/close/close08.c b/testcases/kernel/syscalls/close/close08.c
index ca3732b..7a4444a 100644
--- a/testcases/kernel/syscalls/close/close08.c
+++ b/testcases/kernel/syscalls/close/close08.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/connect/connect01.c b/testcases/kernel/syscalls/connect/connect01.c
index 85db92f..819c5b4 100644
--- a/testcases/kernel/syscalls/connect/connect01.c
+++ b/testcases/kernel/syscalls/connect/connect01.c
@@ -128,7 +128,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -171,7 +175,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}		/* End main */
+ }		/* End main */
 
 pid_t pid;
 
diff --git a/testcases/kernel/syscalls/creat/creat01.c b/testcases/kernel/syscalls/creat/creat01.c
index 98f7497..a8b15ff 100644
--- a/testcases/kernel/syscalls/creat/creat01.c
+++ b/testcases/kernel/syscalls/creat/creat01.c
@@ -94,7 +94,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* set "tstdir", and "testfile" variables */
@@ -126,7 +130,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * functest1() - check the functionality of the first test by making sure
@@ -151,7 +155,7 @@
 
 	if (stat(filename, &buf) < 0) {
 		tst_brkm(TBROK, cleanup, "failed to stat test file");
-	 /*NOTREACHED*/}
+	 }
 	if (buf.st_size != 0) {
 		tst_resm(TFAIL, "creat() FAILED to truncate "
 			 "file to zero bytes");
@@ -167,7 +171,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/creat/creat03.c b/testcases/kernel/syscalls/creat/creat03.c
index 9ffc076..0a63b8d 100644
--- a/testcases/kernel/syscalls/creat/creat03.c
+++ b/testcases/kernel/syscalls/creat/creat03.c
@@ -70,8 +70,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -86,7 +90,7 @@
 		if (TEST_RETURN == -1) {
 			tst_resm(TFAIL, "Cannot creat %s", pfilname);
 			continue;
-		 /*NOTREACHED*/}
+		 }
 
 		if (STD_FUNCTIONAL_TEST) {
 			if (fstat(TEST_RETURN, &statbuf) == -1) {
@@ -112,7 +116,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test
diff --git a/testcases/kernel/syscalls/creat/creat04.c b/testcases/kernel/syscalls/creat/creat04.c
index 6de10da..620f82f 100644
--- a/testcases/kernel/syscalls/creat/creat04.c
+++ b/testcases/kernel/syscalls/creat/creat04.c
@@ -98,7 +98,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -194,7 +198,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -203,7 +207,7 @@
 {
 	/* The test must be run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/creat/creat05.c b/testcases/kernel/syscalls/creat/creat05.c
index f3dc65b..6ae3ad4 100644
--- a/testcases/kernel/syscalls/creat/creat05.c
+++ b/testcases/kernel/syscalls/creat/creat05.c
@@ -78,7 +78,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -112,7 +116,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -148,7 +152,7 @@
 	max_open = getdtablesize();
 	/* Allocate memory for stat and ustat structure variables */
 	if ((buf = (int *)malloc(sizeof(int) * max_open - first)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	/* now open as many files as we can up to max_open */
diff --git a/testcases/kernel/syscalls/creat/creat06.c b/testcases/kernel/syscalls/creat/creat06.c
index 30d5e10..30c3892 100644
--- a/testcases/kernel/syscalls/creat/creat06.c
+++ b/testcases/kernel/syscalls/creat/creat06.c
@@ -135,7 +135,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -172,7 +176,7 @@
 
 	return 0;
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -183,7 +187,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/creat/creat07.c b/testcases/kernel/syscalls/creat/creat07.c
index a02d95a..03db086 100644
--- a/testcases/kernel/syscalls/creat/creat07.c
+++ b/testcases/kernel/syscalls/creat/creat07.c
@@ -84,7 +84,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	if (!Fflag) {
@@ -164,7 +168,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * help() - Prints out the help message for the -F option defined
@@ -198,12 +202,12 @@
 		path = dname;
 	else {
 		if ((pwd = getcwd(NULL, 0)) == NULL) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "Could not get current directory");
 		}
 		path = malloc(strlen(pwd) + strlen(dname) + 2);
 		if (path == NULL) {
-			tst_brkm(TBROK, tst_exit, "Cannot alloc path string");
+			tst_brkm(TBROK, NULL, "Cannot alloc path string");
 		}
 		sprintf(path, "%s/%s", pwd, dname);
 	}
@@ -215,14 +219,14 @@
 	 */
 	cmd = malloc(strlen(path) + strlen(bname) + 15);
 	if (cmd == NULL) {
-		tst_brkm(TBROK, tst_exit, "Cannot alloc command string");
+		tst_brkm(TBROK, NULL, "Cannot alloc command string");
 	}
 
 	sprintf(cmd, "cp -p %s/%s .", path, bname);
 	res = system(cmd);
 	free(cmd);
 	if (res == -1) {
-		tst_brkm(TBROK, tst_exit, "Cannot copy file %s", fname);
+		tst_brkm(TBROK, NULL, "Cannot copy file %s", fname);
 	}
 
 	fname = bname;
diff --git a/testcases/kernel/syscalls/creat/creat08.c b/testcases/kernel/syscalls/creat/creat08.c
index 4a7bbad..cc502d7 100644
--- a/testcases/kernel/syscalls/creat/creat08.c
+++ b/testcases/kernel/syscalls/creat/creat08.c
@@ -97,7 +97,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (issu() != 0) {
 		tst_resm(TINFO, "Must be root to run this test.");
diff --git a/testcases/kernel/syscalls/creat/creat09.c b/testcases/kernel/syscalls/creat/creat09.c
index b02f1a4..a96ef11 100644
--- a/testcases/kernel/syscalls/creat/creat09.c
+++ b/testcases/kernel/syscalls/creat/creat09.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/dup/dup06.c b/testcases/kernel/syscalls/dup/dup06.c
index 46ee87f..2a884e0 100644
--- a/testcases/kernel/syscalls/dup/dup06.c
+++ b/testcases/kernel/syscalls/dup/dup06.c
@@ -77,7 +77,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* pick up the nofiles */
 	min = getdtablesize();
diff --git a/testcases/kernel/syscalls/dup/dup07.c b/testcases/kernel/syscalls/dup/dup07.c
index 5e14457..e16b6b4 100644
--- a/testcases/kernel/syscalls/dup/dup07.c
+++ b/testcases/kernel/syscalls/dup/dup07.c
@@ -70,7 +70,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	local_flag = PASSED;
 
diff --git a/testcases/kernel/syscalls/dup2/dup201.c b/testcases/kernel/syscalls/dup2/dup201.c
index f59377f..55b6305 100644
--- a/testcases/kernel/syscalls/dup2/dup201.c
+++ b/testcases/kernel/syscalls/dup2/dup201.c
@@ -110,7 +110,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -160,7 +164,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/dup2/dup202.c b/testcases/kernel/syscalls/dup2/dup202.c
index 3e8cc77..f7d0479 100644
--- a/testcases/kernel/syscalls/dup2/dup202.c
+++ b/testcases/kernel/syscalls/dup2/dup202.c
@@ -158,7 +158,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/dup2/dup203.c b/testcases/kernel/syscalls/dup2/dup203.c
index c1516b1..363f5d6 100644
--- a/testcases/kernel/syscalls/dup2/dup203.c
+++ b/testcases/kernel/syscalls/dup2/dup203.c
@@ -69,7 +69,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -90,31 +94,31 @@
 
 		if ((fd0 = creat(filename0, 0666)) == -1) {
 			tst_brkm(TBROK, cleanup, "cannot create first file");
-		 /*NOTREACHED*/}
+		 }
 		if (write(fd0, filename0, strlen(filename0)) == -1) {
 			tst_brkm(TBROK, cleanup, "filename0: write(2) failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd1 = creat(filename1, 0666)) == -1) {
 			tst_brkm(TBROK, cleanup, "Cannot create second file");
-		 /*NOTREACHED*/}
+		 }
 		if (write(fd1, filename1, strlen(filename1)) == -1) {
 			tst_brkm(TBROK, cleanup, "filename1: write(2) failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (close(fd0) == -1) {
 			tst_brkm(TBROK, cleanup, "close(2) fd0 failed");
-		 /*NOTREACHED*/}
+		 }
 		if ((fd0 = open(filename0, O_RDONLY)) == -1) {
 			tst_brkm(TBROK, cleanup, "open(2) on filename0 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (close(fd1) == -1) {
 			tst_brkm(TBROK, cleanup, "close(2) fd1 failed");
-		 /*NOTREACHED*/}
+		 }
 		if ((fd1 = open(filename1, O_RDONLY)) == -1) {
 			tst_brkm(TBROK, cleanup, "open(2) on filename1 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		TEST(dup2(fd0, fd1));
 
@@ -129,7 +133,7 @@
 			memset(buf, 0, sizeof(buf));
 			if (read(fd2, buf, sizeof(buf)) == -1) {
 				tst_brkm(TBROK, cleanup, "read(2) failed");
-			 /*NOTREACHED*/}
+			 }
 			if (strcmp(buf, filename0) != 0) {
 				tst_resm(TFAIL, "read from file got bad data");
 			}
@@ -155,19 +159,19 @@
 
 		if ((fd0 = creat(filename0, 0666)) == -1) {
 			tst_brkm(TBROK, cleanup, "Cannot create first file");
-		 /*NOTREACHED*/}
+		 }
 		if (fcntl(fd0, F_SETFD, 1) == -1) {
 			tst_brkm(TBROK, cleanup, "setting close on exec flag "
 				 "on fd0 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd2 = creat(filename1, 0666)) == -1) {
 			tst_brkm(TBROK, cleanup, "Cannot create second file");
-		 /*NOTREACHED*/}
+		 }
 
 		if (close(fd2) == -1) {
 			tst_brkm(TBROK, cleanup, "close(2) fd_closed failed");
-		 /*NOTREACHED*/}
+		 }
 
 		TEST(dup2(fd0, fd2));
 
@@ -183,11 +187,11 @@
 				tst_resm(TFAIL, "fcntl F_GETFD on fd1 failed - "
 					 "Expected rval of 0, got %d", rval);
 				break;
-			 /*NOTREACHED*/}
+			 }
 			if (!((rval = fcntl(fd0, F_GETFL, 0)) && O_WRONLY)) {
 				tst_resm(TFAIL, "fctnl F_GETFL bad rval on fd0 "
 					 "Expected 1 got %#x", rval);
-			 /*NOTREACHED*/}
+			 }
 			tst_resm(TPASS, "dup2 test 2 functionality is correct");
 		} else {
 			tst_resm(TPASS, "call succeeded");
@@ -201,7 +205,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/dup2/dup204.c b/testcases/kernel/syscalls/dup2/dup204.c
index 246edf9..aadfdb4 100644
--- a/testcases/kernel/syscalls/dup2/dup204.c
+++ b/testcases/kernel/syscalls/dup2/dup204.c
@@ -67,7 +67,11 @@
 	struct stat oldbuf, newbuf;
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -116,7 +120,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/dup2/dup205.c b/testcases/kernel/syscalls/dup2/dup205.c
index b731d59..9846bac 100644
--- a/testcases/kernel/syscalls/dup2/dup205.c
+++ b/testcases/kernel/syscalls/dup2/dup205.c
@@ -67,7 +67,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 /*--------------------------------------------------------------------*/
 	local_flag = PASSED;
diff --git a/testcases/kernel/syscalls/dup3/dup3_01.c b/testcases/kernel/syscalls/dup3/dup3_01.c
index f19dc27..4146aaf 100644
--- a/testcases/kernel/syscalls/dup3/dup3_01.c
+++ b/testcases/kernel/syscalls/dup3/dup3_01.c
@@ -73,7 +73,6 @@
 
 /* Global Variables */
 char *TCID = "dup3_01";		/* test program identifier.              */
-int testno;
 int TST_TOTAL = 1;		/* total number of tests in this file.   */
 
 /* Extern Global Functions */
@@ -99,9 +98,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -133,66 +129,42 @@
 int main(int argc, char *argv[])
 {
 	int fd, coe;
-	int lc;			/* loop counter */
-	char *msg;		/* message returned from parse_opts */
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
-		tst_resm(TCONF,
+		tst_brkm(TCONF, cleanup,
 			 "This test can only run on kernels that are 2.6.27 and higher");
-		tst_exit();
 	}
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			fd = syscall(__NR_dup3, 1, 4, 0);
-			if (fd == -1) {
-				tst_resm(TFAIL, "dup3(0) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if (coe & FD_CLOEXEC) {
-				tst_resm(TFAIL,
-					 "dup3(0) set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-
-			fd = syscall(__NR_dup3, 1, 4, O_CLOEXEC);
-			if (fd == -1) {
-				tst_resm(TFAIL, "dup3(O_CLOEXEC) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if ((coe & FD_CLOEXEC) == 0) {
-				tst_resm(TFAIL,
-					 "dup3(O_CLOEXEC) set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-			tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
-			cleanup();
-		}
+	fd = syscall(__NR_dup3, 1, 4, 0);
+	if (fd == -1) {
+		tst_brkm(TFAIL|TERRNO, cleanup, "dup3(0) failed");
 	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK|TERRNO, cleanup, "fcntl failed");
+	}
+	if (coe & FD_CLOEXEC) {
+		tst_brkm(TFAIL, cleanup,
+			 "dup3(0) set close-on-exec flag");
+	}
+	close(fd);
+
+	fd = syscall(__NR_dup3, 1, 4, O_CLOEXEC);
+	if (fd == -1) {
+		tst_brkm(TFAIL|TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
+	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK|TERRNO, cleanup, "fcntl failed");
+	}
+	if ((coe & FD_CLOEXEC) == 0) {
+		tst_brkm(TFAIL, cleanup,
+			 "dup3(O_CLOEXEC) set close-on-exec flag");
+	}
+	close(fd);
+	tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
+
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/epoll/epoll-ltp.c b/testcases/kernel/syscalls/epoll/epoll-ltp.c
index dc07fb1..909b226 100644
--- a/testcases/kernel/syscalls/epoll/epoll-ltp.c
+++ b/testcases/kernel/syscalls/epoll/epoll-ltp.c
@@ -220,16 +220,14 @@
 	num_epoll_create_test_calls++;
 	epoll_fd = epoll_create(fd_set_size);
 	if (epoll_fd >= 0) {
-		tst_resm(TFAIL,
-			 "epoll_create with negative set size returned a valid fd (errno = %d:%s)",
-			 errno, strerror(errno));
+		tst_resm(TFAIL|TERRNO,
+			 "epoll_create with negative set size succeeded unexpectedly");
 		num_epoll_create_test_fails++;
 		close(epoll_fd);
 	} else {
 		if (errno != EINVAL) {
-			tst_resm(TFAIL,
-				 "epoll_create with negative set size failed to set errno to EINVAL (%d:%s)",
-				 errno, strerror(errno));
+			tst_resm(TFAIL|TERRNO,
+				 "epoll_create with negative set size didn't set errno to EINVAL");
 			num_epoll_create_test_fails++;
 		} else {
 			tst_resm(TPASS, "epoll_create with negative set size");
@@ -618,7 +616,7 @@
 						/* Now test the result */
 						if (!((result == RES_PASS)
 						      || (result == RES_PASS_RETV_MAT_ERRNO_IGN))) {
-							if (result > sizeof(result_strings) / sizeof(const char *)) {
+							if (result > (sizeof(result_strings) / sizeof(const char *))) {
 							/* Returned a result which has no corresponding text description */
 								EPOLL_CTL_TEST_FAIL
 								    ("FIXME FIX ME BUG in Test Program itself!");
@@ -660,8 +658,7 @@
 
 	/* Get the current time */
 	if (gettimeofday(&tv, NULL) != 0) {
-		tst_brkm(TBROK, NULL, "gettimeofday failed");
-		tst_exit();
+		tst_brkm(TBROK|TERRNO, NULL, "gettimeofday failed");
 	} else {
 		tst_resm(TINFO, "gettimeofday() works");
 	}
@@ -680,7 +677,7 @@
 	/* Create an epoll_fd for testing epoll_ctl */
 	epoll_fd = epoll_create(BACKING_STORE_SIZE_HINT);
 	if (epoll_fd < 0) {
-		return -1;
+		tst_brkm(TFAIL|TERRNO, NULL, "epoll_create failed");
 	}
 
 	tst_resm(TINFO, "Testing epoll_ctl");
@@ -689,15 +686,14 @@
 		/* ctl test(s) failed */
 	}
 
-	return 0;
+	tst_exit();
 }
 
 #else
 
 int main(void)
 {
-	tst_resm(TCONF, "No epoll support found.");
-	tst_exit();
+	tst_brkm(TCONF, NULL, "No epoll support found.");
 }
 
 #endif
diff --git a/testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c b/testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c
index 601376f..e8e0f5c 100644
--- a/testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c
+++ b/testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c
@@ -77,7 +77,6 @@
 
 /* Global Variables */
 char *TCID = "epoll_create1_01";	/* test program identifier.              */
-int testno;
 int TST_TOTAL = 1;		/* total number of tests in this file.   */
 
 /* Extern Global Functions */
@@ -103,9 +102,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -137,66 +133,44 @@
 int main(int argc, char *argv[])
 {
 	int fd, coe;
-	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
-		tst_resm(TCONF,
+		tst_brkm(TCONF, NULL,
 			 "This test can only run on kernels that are 2.6.27 and higher");
-		tst_exit();
 	}
 	setup();
 
 	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			fd = syscall(__NR_epoll_create1, 0);
-			if (fd == -1) {
-				tst_resm(TFAIL, "epoll_create1(0) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if (coe & FD_CLOEXEC) {
-				tst_resm(TFAIL,
-					 "epoll_create1(0) set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-			fd = syscall(__NR_epoll_create1, EPOLL_CLOEXEC);
-			if (fd == -1) {
-				tst_resm(TFAIL,
-					 "epoll_create1(EPOLL_CLOEXEC) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if ((coe & FD_CLOEXEC) == 0) {
-				tst_resm(TFAIL,
-					 "epoll_create1(EPOLL_CLOEXEC) set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-			tst_resm(TPASS, "epoll_create1(EPOLL_CLOEXEC) PASSED");
-			cleanup();
-		}
+	fd = syscall(__NR_epoll_create1, 0);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup, "epoll_create1(0) failed");
 	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if (coe & FD_CLOEXEC) {
+		tst_brkm(TFAIL, cleanup,
+			 "epoll_create1(0) set close-on-exec flag");
+	}
+	close(fd);
+	fd = syscall(__NR_epoll_create1, EPOLL_CLOEXEC);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup,
+			 "epoll_create1(EPOLL_CLOEXEC) failed");
+	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if ((coe & FD_CLOEXEC) == 0) {
+		tst_brkm(TFAIL, cleanup,
+			 "epoll_create1(EPOLL_CLOEXEC) set close-on-exec flag");
+	}
+	close(fd);
+	tst_resm(TPASS, "epoll_create1(EPOLL_CLOEXEC) PASSED");
+
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/eventfd/eventfd01.c b/testcases/kernel/syscalls/eventfd/eventfd01.c
index 4135481..ab4eb5a 100644
--- a/testcases/kernel/syscalls/eventfd/eventfd01.c
+++ b/testcases/kernel/syscalls/eventfd/eventfd01.c
@@ -675,7 +675,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -729,7 +729,7 @@
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
 	if (tst_kvercmp(2, 6, 22) < 0)
-		tst_brkm(TCONF, tst_exit, "2.6.22 or greater kernel required");
+		tst_brkm(TCONF, NULL, "2.6.22 or greater kernel required");
 
 	/* Create a temporary directory & chdir there */
 	tst_tmpdir();
diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
index f04ec57..059d345 100644
--- a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
+++ b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
@@ -102,9 +102,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -136,66 +133,40 @@
 int main(int argc, char *argv[])
 {
 	int fd, coe;
-	int lc;			/* loop counter */
-	char *msg;		/* message returned from parse_opts */
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
-		tst_resm(TCONF,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-		tst_exit();
+		tst_brkm(TCONF, cleanup,
+		    "This test can only run on kernels that are 2.6.27 and higher");
 	}
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			fd = syscall(__NR_eventfd2, 1, 0);
-			if (fd == -1) {
-				tst_resm(TFAIL, "eventfd2(0) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if (coe & FD_CLOEXEC) {
-				tst_resm(TFAIL,
-					 "eventfd2(0) set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-
-			fd = syscall(__NR_eventfd2, 1, EFD_CLOEXEC);
-			if (fd == -1) {
-				tst_resm(TFAIL, "eventfd2(EFD_CLOEXEC) failed");
-				cleanup();
-				tst_exit();
-			}
-			coe = fcntl(fd, F_GETFD);
-			if (coe == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if ((coe & FD_CLOEXEC) == 0) {
-				tst_resm(TFAIL,
-					 "eventfd2(EFD_CLOEXEC) does not set close-on-exec flag");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-			tst_resm(TPASS, "eventfd2(EFD_CLOEXEC) Passed");
-			cleanup();
-		}
+	fd = syscall(__NR_eventfd2, 1, 0);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup, "eventfd2(0) failed");
 	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if (coe & FD_CLOEXEC) {
+		tst_brkm(TFAIL, cleanup, "eventfd2(0) set close-on-exec flag");
+	}
+	close(fd);
+
+	fd = syscall(__NR_eventfd2, 1, EFD_CLOEXEC);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup, "eventfd2(EFD_CLOEXEC) failed");
+	}
+	coe = fcntl(fd, F_GETFD);
+	if (coe == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if ((coe & FD_CLOEXEC) == 0) {
+		tst_brkm(TFAIL, cleanup,
+			 "eventfd2(EFD_CLOEXEC) does not set close-on-exec flag");
+	}
+	close(fd);
+	tst_resm(TPASS, "eventfd2(EFD_CLOEXEC) Passed");
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2_02.c b/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
index 16ca383..5fb5259 100644
--- a/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
+++ b/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
@@ -99,9 +99,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -133,67 +130,43 @@
 int main(int argc, char *argv[])
 {
 	int fd, fl;
-	int lc;			/* loop counter */
-	char *msg;		/* message returned from parse_opts */
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
-		tst_resm(TCONF,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-		tst_exit();
+		tst_brkm(TCONF, NULL,
+		    "This test can only run on kernels that are 2.6.27 and higher");
 	}
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			fd = syscall(__NR_eventfd2, 1, 0);
-			if (fd == -1) {
-				tst_resm(TFAIL, "eventfd2(0) failed");
-				cleanup();
-				tst_exit();
-			}
-			fl = fcntl(fd, F_GETFL);
-			if (fl == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if (fl & O_NONBLOCK) {
-				tst_resm(TFAIL,
-					 "eventfd2(0) sets non-blocking mode");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-
-			fd = syscall(__NR_eventfd2, 1, EFD_NONBLOCK);
-			if (fd == -1) {
-				tst_resm(TFAIL,
-					 "eventfd2(EFD_NONBLOCK) failed");
-				cleanup();
-				tst_exit();
-			}
-			fl = fcntl(fd, F_GETFL);
-			if (fl == -1) {
-				tst_brkm(TBROK, cleanup, "fcntl failed");
-				tst_exit();
-			}
-			if ((fl & O_NONBLOCK) == 0) {
-				tst_resm(TFAIL,
-					 "eventfd2(EFD_NONBLOCK) does not set non-blocking mode");
-				cleanup();
-				tst_exit();
-			}
-			close(fd);
-			tst_resm(TPASS, "eventfd2(EFD_NONBLOCK) PASSED");
-			cleanup();
-		}
+	Tst_count = 0;
+	fd = syscall(__NR_eventfd2, 1, 0);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup, "eventfd2(0) failed");
 	}
+	fl = fcntl(fd, F_GETFL);
+	if (fl == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if (fl & O_NONBLOCK) {
+		tst_brkm(TFAIL, cleanup,
+		    "eventfd2(0) sets non-blocking mode");
+	}
+	close(fd);
+
+	fd = syscall(__NR_eventfd2, 1, EFD_NONBLOCK);
+	if (fd == -1) {
+		tst_brkm(TFAIL, cleanup, "eventfd2(EFD_NONBLOCK) failed");
+	}
+	fl = fcntl(fd, F_GETFL);
+	if (fl == -1) {
+		tst_brkm(TBROK, cleanup, "fcntl failed");
+	}
+	if ((fl & O_NONBLOCK) == 0) {
+		tst_brkm(TFAIL, cleanup,
+			 "eventfd2(EFD_NONBLOCK) didn't set non-blocking mode");
+	}
+	close(fd);
+	tst_resm(TPASS, "eventfd2(EFD_NONBLOCK) PASSED");
+
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/execl/execl01.c b/testcases/kernel/syscalls/execl/execl01.c
index 2119745..cd97588 100644
--- a/testcases/kernel/syscalls/execl/execl01.c
+++ b/testcases/kernel/syscalls/execl/execl01.c
@@ -144,7 +144,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/execle/execle01.c b/testcases/kernel/syscalls/execle/execle01.c
index b2ca6b3..e7305a4 100644
--- a/testcases/kernel/syscalls/execle/execle01.c
+++ b/testcases/kernel/syscalls/execle/execle01.c
@@ -145,7 +145,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/execlp/execlp01.c b/testcases/kernel/syscalls/execlp/execlp01.c
index 2e9bae3..6a41247 100644
--- a/testcases/kernel/syscalls/execlp/execlp01.c
+++ b/testcases/kernel/syscalls/execlp/execlp01.c
@@ -144,7 +144,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/execv/execv01.c b/testcases/kernel/syscalls/execv/execv01.c
index 1a36abf..ff6dab3 100644
--- a/testcases/kernel/syscalls/execv/execv01.c
+++ b/testcases/kernel/syscalls/execv/execv01.c
@@ -145,7 +145,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/execve/execve01.c b/testcases/kernel/syscalls/execve/execve01.c
index 8f8674a..efe31ee 100644
--- a/testcases/kernel/syscalls/execve/execve01.c
+++ b/testcases/kernel/syscalls/execve/execve01.c
@@ -146,7 +146,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/execve/execve02.c b/testcases/kernel/syscalls/execve/execve02.c
index a01b3f2..8aa0ce5 100644
--- a/testcases/kernel/syscalls/execve/execve02.c
+++ b/testcases/kernel/syscalls/execve/execve02.c
@@ -95,8 +95,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	if (!Fflag) {
 		tst_resm(TWARN, "You must specify a test executable with"
@@ -164,7 +168,7 @@
 		}
 	}
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -185,7 +189,7 @@
 	int res;
 
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
@@ -207,12 +211,12 @@
 		path = dname;
 	else {
 		if ((pwd = getcwd(NULL, 0)) == NULL) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "Could not get current directory");
 		}
 		path = malloc(strlen(pwd) + strlen(dname) + 2);
 		if (path == NULL) {
-			tst_brkm(TBROK, tst_exit, "Cannot alloc path string");
+			tst_brkm(TBROK, NULL, "Cannot alloc path string");
 		}
 		sprintf(path, "%s/%s", pwd, dname);
 	}
@@ -224,14 +228,14 @@
 	 */
 	cmd = malloc(strlen(path) + strlen(bname) + 15);
 	if (cmd == NULL) {
-		tst_brkm(TBROK, tst_exit, "Cannot alloc command string");
+		tst_brkm(TBROK, NULL, "Cannot alloc command string");
 	}
 
 	sprintf(cmd, "cp -p %s/%s .", path, bname);
 	res = system(cmd);
 	free(cmd);
 	if (res == -1) {
-		tst_brkm(TBROK, tst_exit, "Cannot copy file %s", fname);
+		tst_brkm(TBROK, NULL, "Cannot copy file %s", fname);
 	}
 
 	fname = bname;
diff --git a/testcases/kernel/syscalls/execve/execve03.c b/testcases/kernel/syscalls/execve/execve03.c
index 6e3f07e..575eb2f 100644
--- a/testcases/kernel/syscalls/execve/execve03.c
+++ b/testcases/kernel/syscalls/execve/execve03.c
@@ -132,7 +132,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -171,7 +175,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/execve/execve04.c b/testcases/kernel/syscalls/execve/execve04.c
index 1e9b166..729c8fd 100644
--- a/testcases/kernel/syscalls/execve/execve04.c
+++ b/testcases/kernel/syscalls/execve/execve04.c
@@ -101,7 +101,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_1, "nS", 1, &test_name);
@@ -199,7 +203,7 @@
 		}
 	}
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -235,12 +239,12 @@
 		path = dname;
 	else {
 		if ((pwd = getcwd(NULL, 0)) == NULL) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "Could not get current directory");
 		}
 		path = malloc(strlen(pwd) + strlen(dname) + 2);
 		if (path == NULL) {
-			tst_brkm(TBROK, tst_exit, "Cannot alloc path string");
+			tst_brkm(TBROK, NULL, "Cannot alloc path string");
 		}
 		sprintf(path, "%s/%s", pwd, dname);
 	}
@@ -252,14 +256,14 @@
 	 */
 	cmd = malloc(strlen(path) + strlen(bname) + 15);
 	if (cmd == NULL) {
-		tst_brkm(TBROK, tst_exit, "Cannot alloc command string");
+		tst_brkm(TBROK, NULL, "Cannot alloc command string");
 	}
 
 	sprintf(cmd, "cp -p %s/%s .", path, bname);
 	res = system(cmd);
 	free(cmd);
 	if (res == -1) {
-		tst_brkm(TBROK, tst_exit, "Cannot copy file %s", test_name);
+		tst_brkm(TBROK, NULL, "Cannot copy file %s", test_name);
 	}
 
 	test_name = bname;
diff --git a/testcases/kernel/syscalls/execve/execve05.c b/testcases/kernel/syscalls/execve/execve05.c
index fffa634..5e9dc56 100644
--- a/testcases/kernel/syscalls/execve/execve05.c
+++ b/testcases/kernel/syscalls/execve/execve05.c
@@ -80,14 +80,18 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 	setup();
 
 	if (ac != 5) {
 		tst_resm(TINFO, "Wrong number of arguments");
 		usage();
-	 /*NOTREACHED*/}
+	 }
 
 	/* check looping state if -i option given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -207,7 +211,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/execvp/execvp01.c b/testcases/kernel/syscalls/execvp/execvp01.c
index a323fdb..d81a702 100644
--- a/testcases/kernel/syscalls/execvp/execvp01.c
+++ b/testcases/kernel/syscalls/execvp/execvp01.c
@@ -145,7 +145,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/exit/exit01.c b/testcases/kernel/syscalls/exit/exit01.c
index 37f870b..8221415 100644
--- a/testcases/kernel/syscalls/exit/exit01.c
+++ b/testcases/kernel/syscalls/exit/exit01.c
@@ -63,7 +63,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, cleanup, "OPTION PARSIkNG ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	setup();		/* global setup for test */
 
@@ -126,7 +126,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/exit/exit02.c b/testcases/kernel/syscalls/exit/exit02.c
index f0e8020..cb9ce48 100644
--- a/testcases/kernel/syscalls/exit/exit02.c
+++ b/testcases/kernel/syscalls/exit/exit02.c
@@ -79,8 +79,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup for test */
 
@@ -178,7 +182,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/exit_group/exit_group01.c b/testcases/kernel/syscalls/exit_group/exit_group01.c
index 3c23ece..9616819 100644
--- a/testcases/kernel/syscalls/exit_group/exit_group01.c
+++ b/testcases/kernel/syscalls/exit_group/exit_group01.c
@@ -79,9 +79,6 @@
         /* Remove tmp dir and all files in it */
         TEST_CLEANUP;
         tst_rmdir();
-
-        /* Exit with appropriate return code. */
-        tst_exit();
 }
 
 /* Local  Functions */
@@ -112,45 +109,28 @@
 int main(int ac, char **av) {
         int status;
         pid_t cpid, w;
-        int lc;                 /* loop counter */
-        char *msg;              /* message returned from parse_opts */
-	
-        /* parse standard options */
-        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-             tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-             tst_exit();
-           }
 
         setup();
 
         /* Check looping state if -i option given */
-        for (lc = 0; TEST_LOOPING(lc); ++lc) {
-                Tst_count = 0;
-                for (testno = 0; testno < TST_TOTAL; ++testno) {
-                     
-		     TEST(cpid = fork());     //call exit_group()
-                     if (TEST_RETURN == -1) {
-        			tst_resm(TFAIL, "fork() error ...errno %d",TEST_ERRNO);
-                        	cleanup();
-				tst_exit();
-                     } else if (TEST_RETURN == 0) {
-	                 	tst_resm(TINFO, "In the child process");
-                           	sleep(5);
-				TEST(syscall(__NR_exit_group,4));
-                     }else {
-				tst_resm(TINFO,"in the parent process");
-				TEST(w = wait(&status));
-				if (WIFEXITED(status) && (WEXITSTATUS(status) == 4)) {
-		                       tst_resm(TPASS,"exit_group call Succeed");
-		                        cleanup();
-		                }
-			  }
-			tst_resm(TFAIL, "%s failed - errno = %d : %s", TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-                        cleanup();
-                        tst_exit();
-
+	cpid = fork();     //call exit_group()
+	if (cpid == -1) {
+        	tst_brkm(TFAIL|TERRNO, cleanup, "fork failed");
+	} else if (TEST_RETURN == 0) {
+		sleep(5);
+		TEST(syscall(__NR_exit_group,4));
+	} else {
+		w = wait(&status);
+		if (w == -1)
+			tst_brkm(TBROK|TERRNO, cleanup, "wait failed");
+		if (WIFEXITED(status) && (WEXITSTATUS(status) == 4))
+			tst_resm(TPASS, "exit_group succeeded");
+		else {
+			tst_resm(TFAIL|TERRNO,
+			    "exit_group failed (wait status = %d)", w);
                 }
         }	
+	cleanup();
         tst_exit();
 }
 
diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
index 9cb276c..907dd16 100644
--- a/testcases/kernel/syscalls/faccessat/faccessat01.c
+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
@@ -99,7 +99,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
index 06edfac..a040903 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
@@ -96,7 +96,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/*
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
index d5f14a7..311175d 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
@@ -96,7 +96,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/*
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
index 35680aa..92f3e92 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
@@ -116,7 +116,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/*
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
index 6ba6ddd..bfa554c 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
@@ -102,7 +102,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/*
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
index 000c9e5..f456c33 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate01.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
@@ -226,7 +226,11 @@
 	* parse standard options
 	***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/* perform global test setup, call setup() function. */
 	setup();
diff --git a/testcases/kernel/syscalls/fallocate/fallocate02.c b/testcases/kernel/syscalls/fallocate/fallocate02.c
index b353cc4..74b5787 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate02.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate02.c
@@ -275,7 +275,11 @@
 	     * parse standard options
      	***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/* perform global test setup, call setup() function. */
 	setup();
diff --git a/testcases/kernel/syscalls/fallocate/fallocate03.c b/testcases/kernel/syscalls/fallocate/fallocate03.c
index 663476d..dcbeada 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate03.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate03.c
@@ -261,7 +261,11 @@
 	 * parse standard options
 	***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/* perform global test setup, call setup() function */
 	setup();
diff --git a/testcases/kernel/syscalls/fchdir/fchdir01.c b/testcases/kernel/syscalls/fchdir/fchdir01.c
index a5659bc..0a92b28 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir01.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir01.c
@@ -58,9 +58,10 @@
 #include "test.h"
 #include "usctest.h"
 
-#include <errno.h>
 #include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <string.h>
 
 void cleanup(void);
@@ -84,9 +85,8 @@
 	int r_val;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
@@ -98,8 +98,7 @@
 
 		/* get the name of the test dirctory */
 		if ((temp_dir = (getcwd(temp_dir, 0))) == NULL) {
-			tst_brkm(TBROK, cleanup, "%s - getcwd() in main() "
-				 "failed", TCID);
+			tst_brkm(TBROK, cleanup, "getcwd failed");
 		}
 
 		/*
@@ -107,8 +106,7 @@
 		 */
 
 		if ((r_val = mkdir(TEST_DIR, MODES)) == -1) {
-			tst_brkm(TBROK, cleanup, "%s - mkdir() in main() "
-				 "failed", TCID);
+			tst_brkm(TBROK, cleanup, "mkdir failed");
 		}
 
 		if ((fd = open(TEST_DIR, O_RDONLY)) == -1) {
@@ -122,8 +120,7 @@
 		TEST(fchdir(fd));
 
 		if (TEST_RETURN == -1) {
-			tst_brkm(TFAIL, cleanup, "%s call failed - errno = %d :"
-				 " %s", TCID, TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_brkm(TFAIL|TTERRNO, cleanup, "fchdir call failed");
 		} else {
 			if (STD_FUNCTIONAL_TEST) {
 				check_functionality();
@@ -162,8 +159,7 @@
 	}
 
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -172,35 +168,29 @@
 void check_functionality(void)
 {
 	char *buf = NULL;
-	char **bufptr = &buf;
 	char *dir;
 
 	/*
 	 * Get the current directory path.
 	 */
 	if ((buf = (getcwd(buf, 0))) == NULL) {
-		tst_brkm(TBROK, cleanup, "%s - getcwd() in "
-			 "check_functionality() failed", TCID);
+		tst_brkm(TBROK, cleanup, "getcwd failed");
 	}
 
 	/*
 	 * strip off all but the last directory name in the
 	 * current working directory.
 	 */
-	do {
-		if ((dir = strsep(bufptr, "/")) == NULL) {
-			tst_brkm(TBROK, cleanup, "%s - strsep() in "
-				 "check_functionality() failed", TCID);
-		}
-	} while (*bufptr != NULL);
+	if ((dir = basename(buf)) == NULL)
+		tst_brkm(TBROK, cleanup, "basename failed");
 
 	/*
 	 * Make sure we are in the right place.
 	 */
 	if (strcmp(TEST_DIR, dir) == 0) {
-		tst_resm(TPASS, "%s call succeeded", TCID);
+		tst_resm(TPASS, "fchdir call succeeded");
 	} else {
-		tst_resm(TFAIL, "%s functionality test failed", TCID);
+		tst_resm(TFAIL, "fchdir call failed");
 	}
 }
 
@@ -233,7 +223,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/fchdir/fchdir02.c b/testcases/kernel/syscalls/fchdir/fchdir02.c
index 5ce8477..cf10a6b 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir02.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir02.c
@@ -76,9 +76,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
@@ -103,19 +102,17 @@
 
 		switch (TEST_ERRNO) {
 		case EBADF:
-			tst_resm(TPASS, "expected failure - errno = %d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TPASS, "failed with EBADF");
 			break;
 		default:
-			tst_brkm(TFAIL, cleanup, "call failed with an "
-				 "unexpected error - %d : %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_brkm(TFAIL|TTERRNO, cleanup,
+			    "call failed with an unexpected error");
 		}
 	}
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -150,7 +147,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/fchdir/fchdir03.c b/testcases/kernel/syscalls/fchdir/fchdir03.c
index a8ce3a3..7f89137 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir03.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir03.c
@@ -90,9 +90,8 @@
 	int status;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();
 
@@ -115,42 +114,47 @@
 			 * TEST call is made.
 			 */
 			if (seteuid(ltpuser1->pw_uid) != 0) {
-				tst_resm(TINFO, "setreuid failed in child #1");
+				perror("setreuid failed in child #1");
 				exit(1);
 			}
 			if (mkdir(good_dir, 00400) != 0) {
-				tst_resm(TINFO, "mkdir failed in child #1");
+				perror("mkdir failed in child #1");
 				exit(1);
 			}
 			if ((fd = open(good_dir, O_RDONLY)) == -1) {
-				tst_brkm(TBROK, cleanup,
-					 "open of directory failed");
+				perror("opening directory failed");
 			}
 
 			TEST(fchdir(fd));
 
 			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "call succeeded unexpectedly");
+				printf("Call succeeded unexpectedly\n");
+				exit(1);
 			} else if (TEST_ERRNO != EACCES) {
-				tst_resm(TFAIL, "expected EACCES - got %d",
-					 TEST_ERRNO);
+				printf("Expected %d - got %d\n",
+				    EACCES, TEST_ERRNO);
+				exit(1);
 			} else {
 				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_resm(TPASS, "expected failure - errno = %d"
-					 " : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
+				printf("Got EACCES\n");
 			}
 
 			/* reset the process ID to the saved ID (root) */
 			if (setuid(0) == -1) {
-				tst_resm(TINFO, "setuid(0) failed");
+				perror("setuid(0) failed");
 			}
 
-		} else {	/* parent */
-			wait(&status);
-
-			/* let the child carry on */
-			exit(0);
+		} else {
+			if (wait(&status) == -1)
+				tst_brkm(TBROK|TERRNO, cleanup, "wait failed");
+			else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+				tst_brkm(TBROK, cleanup,
+				    "child exited abnormally (wait status = "
+				    "%d", status);
+			else {
+				/* let the child carry on */
+				exit(0);
+			}
 		}
 
 		/* clean up things in case we are looping */
@@ -161,7 +165,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -173,7 +177,7 @@
 
 	/* make sure the process ID is root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root.");
+		tst_brkm(TBROK, NULL, "Test must be run as root.");
 	}
 
 	/* capture signals */
@@ -211,7 +215,4 @@
 	 * Delete the test directory created in setup().
 	 */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/fchmod/fchmod01.c b/testcases/kernel/syscalls/fchmod/fchmod01.c
index e6bc01b..f2b2398 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod01.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fchmod/fchmod02.c b/testcases/kernel/syscalls/fchmod/fchmod02.c
index 93abd8f..5e34816 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod02.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod02.c
@@ -107,7 +107,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -165,7 +169,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchmod/fchmod03.c b/testcases/kernel/syscalls/fchmod/fchmod03.c
index bed17e3..77cf4ca 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod03.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod03.c
@@ -108,7 +108,11 @@
 	mode_t file_mode;	/* mode permissions set on testfile */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -166,7 +170,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -182,7 +186,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/fchmod/fchmod04.c b/testcases/kernel/syscalls/fchmod/fchmod04.c
index 5d6174f..216b936 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod04.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod04.c
@@ -108,7 +108,11 @@
 	mode_t dir_mode;	/* mode permissions set on testdirectory */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -167,7 +171,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -184,7 +188,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/fchmod/fchmod05.c b/testcases/kernel/syscalls/fchmod/fchmod05.c
index 770e458..b8c94f4 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod05.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod05.c
@@ -109,7 +109,11 @@
 	mode_t dir_mode;	/* mode permissions set on test directory */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -167,7 +171,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchmod/fchmod06.c b/testcases/kernel/syscalls/fchmod/fchmod06.c
index 75faa24..feebc7f 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod06.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod06.c
@@ -135,7 +135,11 @@
 	int mode;		/* creation mode for the node created */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -202,7 +206,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -222,7 +226,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/fchmod/fchmod07.c b/testcases/kernel/syscalls/fchmod/fchmod07.c
index 7b15b3e..48935c3 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod07.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod07.c
@@ -100,7 +100,11 @@
 	TST_TOTAL = sizeof(Modes) / sizeof(int);
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -171,7 +175,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
index b19ff4b..9d53286 100644
--- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
@@ -99,7 +99,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fchown/fchown01.c b/testcases/kernel/syscalls/fchown/fchown01.c
index ce1f7b2..151d9ef 100644
--- a/testcases/kernel/syscalls/fchown/fchown01.c
+++ b/testcases/kernel/syscalls/fchown/fchown01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fchown/fchown02.c b/testcases/kernel/syscalls/fchown/fchown02.c
index 451569b..64e0d37 100644
--- a/testcases/kernel/syscalls/fchown/fchown02.c
+++ b/testcases/kernel/syscalls/fchown/fchown02.c
@@ -121,15 +121,19 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 	int ind;		/* counter variable for chmod(2) tests */
-	uid_t User_id;		/* user id of the user set for testfile */
-	gid_t Group_id;		/* group id of the user set for testfile */
+	uid_t user_id;		/* user id of the user set for testfile */
+	gid_t group_id;		/* group id of the user set for testfile */
 	int fildes;		/* File descriptor for testfile */
 	int test_flag;		/* test condition specific flag variable */
 	char *file_name;	/* ptr. for test file name */
 	char *test_desc;	/* test specific message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -147,8 +151,8 @@
 			fildes = Test_cases[ind].fd;
 			file_name = Test_cases[ind].pathname;
 			test_desc = Test_cases[ind].desc;
-			User_id = Test_cases[ind].user_id;
-			Group_id = Test_cases[ind].group_id;
+			user_id = Test_cases[ind].user_id;
+			group_id = Test_cases[ind].group_id;
 			test_flag = Test_cases[ind].test_flag;
 
 			if (fildes == 1) {
@@ -162,7 +166,7 @@
 			 * group id (numeric values) to set it on
 			 * testfile.
 			 */
-			TEST(fchown(fildes, User_id, Group_id));
+			TEST(fchown(fildes, user_id, group_id));
 
 			/* check return code of fchown(2) */
 			if (TEST_RETURN == -1) {
@@ -190,12 +194,12 @@
 				 * Check for expected Ownership ids
 				 * set on testfile.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id)) {
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id)) {
 					tst_resm(TFAIL, "%s: Incorrect"
 						 " ownership set, Expected %d "
 						 "%d", file_name,
-						 User_id, Group_id);
+						 user_id, group_id);
 				}
 
 				/*
@@ -232,7 +236,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchown/fchown03.c b/testcases/kernel/syscalls/fchown/fchown03.c
index 863fdd9..d7b3fe1 100644
--- a/testcases/kernel/syscalls/fchown/fchown03.c
+++ b/testcases/kernel/syscalls/fchown/fchown03.c
@@ -103,11 +103,15 @@
 	struct stat stat_buf;	/* stat(2) struct contents */
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
-	uid_t User_id;		/* Owner id of the test file. */
-	gid_t Group_id;		/* Group id of the test file. */
+	uid_t user_id;		/* Owner id of the test file. */
+	gid_t group_id;		/* Group id of the test file. */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -122,15 +126,15 @@
 		Tst_count = 0;
 
 		/* Get the euid/egid of the process */
-		User_id = geteuid();
-		Group_id = getegid();
+		user_id = geteuid();
+		group_id = getegid();
 
 		/*
 		 * Call fchwon(2) with different user id and
 		 * group id (numeric values) to set it on
 		 * testfile.
 		 */
-		TEST(fchown(fildes, -1, Group_id));
+		TEST(fchown(fildes, -1, group_id));
 
 		/* check return code of fchown(2) */
 		if (TEST_RETURN == -1) {
@@ -157,11 +161,11 @@
 			 * Check for expected Ownership ids
 			 * set on testfile.
 			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id)) {
+			if ((stat_buf.st_uid != user_id) ||
+			    (stat_buf.st_gid != group_id)) {
 				tst_resm(TFAIL, "%s: Incorrect "
 					 "ownership set, Expected %d %d",
-					 TESTFILE, User_id, Group_id);
+					 TESTFILE, user_id, group_id);
 			}
 
 			/*
@@ -185,7 +189,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }				/* End main */
 
 /*
@@ -202,7 +206,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/fchown/fchown04.c b/testcases/kernel/syscalls/fchown/fchown04.c
index 03ebaa6..743873e 100644
--- a/testcases/kernel/syscalls/fchown/fchown04.c
+++ b/testcases/kernel/syscalls/fchown/fchown04.c
@@ -126,11 +126,15 @@
 	char *test_desc;	/* test specific error message */
 	int fd;			/* test file descriptor */
 	int ind;		/* counter to test different test conditions */
-	uid_t User_id;		/* Effective user id of a test process */
-	gid_t Group_id;		/* Effective group id of a test process */
+	uid_t user_id;		/* Effective user id of a test process */
+	gid_t group_id;		/* Effective group id of a test process */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -146,8 +150,8 @@
 	TEST_EXP_ENOS(exp_enos);
 
 	/* Set uid/gid values to that of test process */
-	User_id = geteuid();
-	Group_id = getegid();
+	user_id = geteuid();
+	group_id = getegid();
 
 	/* Check looping state if -i option given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -169,7 +173,7 @@
 			 * verify that it fails with -1 return value and
 			 * sets appropriate errno.
 			 */
-			TEST(fchown(fd, User_id, Group_id));
+			TEST(fchown(fd, user_id, group_id));
 
 			/* Check return code from fchown(2) */
 			if (TEST_RETURN == -1) {
@@ -199,7 +203,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchown/fchown05.c b/testcases/kernel/syscalls/fchown/fchown05.c
index 26e2039..2475982 100644
--- a/testcases/kernel/syscalls/fchown/fchown05.c
+++ b/testcases/kernel/syscalls/fchown/fchown05.c
@@ -109,12 +109,16 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 	int ind;		/* counter variable for chmod(2) tests */
-	uid_t User_id;		/* user id of the user set for testfile */
-	gid_t Group_id;		/* group id of the user set for testfile */
+	uid_t user_id;		/* user id of the user set for testfile */
+	gid_t group_id;		/* group id of the user set for testfile */
 	char *test_desc;	/* test specific message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -130,15 +134,15 @@
 
 		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
 			test_desc = Test_cases[ind].desc;
-			User_id = Test_cases[ind].user_id;
-			Group_id = Test_cases[ind].group_id;
+			user_id = Test_cases[ind].user_id;
+			group_id = Test_cases[ind].group_id;
 
 			/*
 			 * Call fchwon(2) with different user id and
 			 * group id (numeric values) to set it on
 			 * testfile.
 			 */
-			TEST(fchown(fildes, User_id, Group_id));
+			TEST(fchown(fildes, user_id, group_id));
 
 			/* check return code of fchown(2) */
 			if (TEST_RETURN == -1) {
@@ -161,22 +165,22 @@
 						 "%s failed, errno:%d",
 						 TESTFILE, TEST_ERRNO);
 				}
-				if (User_id == -1) {
-					User_id = Test_cases[ind - 1].user_id;
+				if (user_id == -1) {
+					user_id = Test_cases[ind - 1].user_id;
 				}
-				if (Group_id == -1) {
-					Group_id = Test_cases[ind - 1].group_id;
+				if (group_id == -1) {
+					group_id = Test_cases[ind - 1].group_id;
 				}
 
 				/*
 				 * Check for expected Ownership ids
 				 * set on testfile.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id)) {
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id)) {
 					tst_resm(TFAIL, "%s: Incorrect owner"
 						 "ship set, Expected %d %d",
-						 TESTFILE, User_id, Group_id);
+						 TESTFILE, user_id, group_id);
 				} else {
 					tst_resm(TPASS,
 						 "fchown() succeeds to %s of %s",
@@ -191,7 +195,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
index 986c670..664dbea 100644
--- a/testcases/kernel/syscalls/fchownat/fchownat01.c
+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
@@ -103,7 +103,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl01.c b/testcases/kernel/syscalls/fcntl/fcntl01.c
index 1531240..e2f85d7 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl01.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl01.c
@@ -55,7 +55,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -275,7 +279,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl02.c b/testcases/kernel/syscalls/fcntl/fcntl02.c
index cc5b2f3..32f6bf4 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl02.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl02.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl03.c b/testcases/kernel/syscalls/fcntl/fcntl03.c
index 88bbd81..842f3d1 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl03.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl03.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl04.c b/testcases/kernel/syscalls/fcntl/fcntl04.c
index fe7ac04..6ad5720 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl04.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl04.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl05.c b/testcases/kernel/syscalls/fcntl/fcntl05.c
index 6943a92..364862b 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl05.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl05.c
@@ -141,7 +141,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl06.c b/testcases/kernel/syscalls/fcntl/fcntl06.c
index 1dee9bf..e830778 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl06.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl06.c
@@ -79,7 +79,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -94,7 +98,7 @@
 			tst_resm(TINFO, "fcntl remote locking feature not "
 				 "implemented in the kernel: exitting");
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			tst_resm(TPASS, "fcntl on file failed: Test " "PASSED");
 		}
 	}
diff --git a/testcases/kernel/syscalls/fcntl/fcntl09.c b/testcases/kernel/syscalls/fcntl/fcntl09.c
index 0d475c8..f57e47a 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl09.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl09.c
@@ -141,7 +141,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl10.c b/testcases/kernel/syscalls/fcntl/fcntl10.c
index 92998e4..5e6b43d 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl10.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl10.c
@@ -141,7 +141,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c
index 26838db..b829fc9 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl11.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
@@ -300,7 +300,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "ddddd", &parent_pipe[0],
diff --git a/testcases/kernel/syscalls/fcntl/fcntl12.c b/testcases/kernel/syscalls/fcntl/fcntl12.c
index 4f5ed31..c150e82 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl12.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl12.c
@@ -65,7 +65,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -85,7 +89,7 @@
 		if (pid < 0) {
 			tst_resm(TFAIL, "Fork failed");
 			cleanup();
-		 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+		 } else if (pid == 0) {	/* child */
 			max_files = getdtablesize();
 			for (i = 0; i < max_files; i++) {
 				if ((fd = open(fname, O_CREAT | O_RDONLY,
@@ -113,7 +117,7 @@
 		tst_resm(TINFO, "Exit block 1");
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl13.c b/testcases/kernel/syscalls/fcntl/fcntl13.c
index fe09cba..e26b40f 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl13.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl13.c
@@ -58,7 +58,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -182,7 +186,7 @@
 		tst_resm(TINFO, "Exit block 4");
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl14.c b/testcases/kernel/syscalls/fcntl/fcntl14.c
index 31119ab..0c09d7c 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl14.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl14.c
@@ -596,7 +596,7 @@
 		tst_resm(TFAIL, "SIGUSR1 signal setup failed, errno = %d",
 			 errno);
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = catch_alarm;
@@ -605,7 +605,7 @@
 	if ((sigaction(SIGALRM, &act, NULL)) < 0) {
 		tst_resm(TFAIL, "SIGALRM signal setup failed");
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 }
 
 void wake_parent(void)
@@ -804,18 +804,18 @@
 		fd = open(tmpname, file_flag, file_mode);
 		if (fd < 0) {
 			tst_brkm(TBROK, cleanup, "open() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* write some dummy data to the file */
 		if (write(fd, FILEDATA, 10) < 0) {
 			tst_brkm(TBROK, cleanup, "write() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* seek into file if indicated */
 		if (seek) {
 			if (lseek(fd, seek, 0) < 0) {
 				tst_brkm(TBROK, cleanup, "lseek() failed");
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		/* Initialize first parent lock structure */
@@ -871,7 +871,7 @@
 				      thiscase->a_type, fd, test, parent) < 0) {
 				tst_resm(TFAIL, "self_exec failed");
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 #else
 			dochild();
 #endif
@@ -879,7 +879,7 @@
 		if (child < 0) {
 			tst_resm(TFAIL, "Fork failed");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		/* parent process */
 		if ((thiscase->c_flag) == WILLBLOCK) {
 			/*
@@ -975,7 +975,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = av[0];
@@ -1067,12 +1071,12 @@
 		fd = open(tmpname, O_CREAT | O_RDWR | O_TRUNC, 0777);
 		if (fd < 0) {
 			tst_brkm(TBROK, cleanup, "open failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* Write some dummy data to the file */
 		if (write(fd, FILEDATA, 10) < 0) {
 			tst_brkm(TBROK, cleanup, "write failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* Initialize lock structure */
 		flock.l_type = F_WRLCK;
@@ -1118,12 +1122,12 @@
 		fd = open(tmpname, O_CREAT | O_RDWR | O_TRUNC, 0777);
 		if (fd < 0) {
 			tst_brkm(TBROK, cleanup, "open failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* Write some dummy data to the file */
 		if (write(fd, FILEDATA, 10) < 0) {
 			tst_brkm(TBROK, cleanup, "write failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* Initialize first parent lock structure */
 		thiscase = &testcases[58];
@@ -1142,12 +1146,12 @@
 		/* Write some additional data to end of file */
 		if (write(fd, FILEDATA, 10) < 0) {
 			tst_brkm(TBROK, cleanup, "write failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* Mask signal to avoid race */
 		if (sighold(SIGUSR1) < 0) {
 			tst_brkm(TBROK, cleanup, "sighold failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* spawn a child process */
 		if ((child = FORK_OR_VFORK()) == 0) {
@@ -1158,7 +1162,7 @@
 				      thiscase->a_type, fd, test, parent) < 0) {
 				tst_resm(TFAIL, "self_exec failed");
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 #else
 			dochild();
 #endif
@@ -1166,7 +1170,7 @@
 		if (child < 0) {
 			tst_resm(TFAIL, "Fork failed");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/* parent process */
 
diff --git a/testcases/kernel/syscalls/fcntl/fcntl15.c b/testcases/kernel/syscalls/fcntl/fcntl15.c
index 24efeb1..a375224 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl15.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl15.c
@@ -541,7 +541,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&dochild1_uc, "nddds", 1, &uc_file_flag,
diff --git a/testcases/kernel/syscalls/fcntl/fcntl16.c b/testcases/kernel/syscalls/fcntl/fcntl16.c
index 0dc9090..7b806c9 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl16.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl16.c
@@ -464,7 +464,7 @@
 		fd = open(tmpname, file_flag, file_mode);
 		if (fd < 0) {
 			tst_brkm(TBROK, cleanup, "open failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/* write some dummy data to the file */
 		(void)write(fd, FILEDATA, 10);
@@ -664,7 +664,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(dochild_uc, "ddddd", &kid_uc, &parent, &test,
diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c
index 1f57416..b2d66c0 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl17.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
@@ -393,7 +393,7 @@
 {
 	tst_resm(TFAIL, "Unexpected death of child process");
 	cleanup();
- /*NOTREACHED*/}
+ }
 
 void catch_alarm()
 {
@@ -415,7 +415,7 @@
 	tst_resm(TFAIL, "Alarm expired, deadlock not detected");
 	tst_resm(TWARN, "You may need to kill child processes by hand");
 	cleanup();
- /*NOTREACHED*/}
+ }
 
 int main(int ac, char **av)
 {
@@ -426,7 +426,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child1, "nddddddddd", 1, &file_fd,
@@ -449,7 +453,7 @@
 	if (setup()) {		/* global testup */
 		tst_resm(TINFO, "setup failed");
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -473,7 +477,7 @@
 		} else if (child_pid1 < 0) {
 			perror("Fork failed: child 1");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/* parent */
 
@@ -497,7 +501,7 @@
 					 "1 failed");
 			}
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/* parent */
 
@@ -526,7 +530,7 @@
 					 "failed");
 			}
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		/* parent */
 
 		close(parent_pipe[1]);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c
index 678b493..4adcba3 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl18.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c
@@ -71,7 +71,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c
index 617f17e..d10d8a6 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl19.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
@@ -307,7 +307,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c
index 761ddf9..6afc7c2 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl20.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
@@ -302,7 +302,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c
index 888b4ac..85b2666 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl21.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
@@ -303,7 +303,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
diff --git a/testcases/kernel/syscalls/fcntl/fcntl22.c b/testcases/kernel/syscalls/fcntl/fcntl22.c
index f3152f0..4a109a3 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl22.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl22.c
@@ -104,7 +104,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* setup */
diff --git a/testcases/kernel/syscalls/fcntl/fcntl23.c b/testcases/kernel/syscalls/fcntl/fcntl23.c
index 26c526f..6962d61 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl23.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl23.c
@@ -116,7 +116,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl24.c b/testcases/kernel/syscalls/fcntl/fcntl24.c
index ef74b41..33c092f 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl24.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl24.c
@@ -116,7 +116,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl25.c b/testcases/kernel/syscalls/fcntl/fcntl25.c
index 8088dbe..add616f 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl25.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl25.c
@@ -117,7 +117,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl26.c b/testcases/kernel/syscalls/fcntl/fcntl26.c
index d232607..c72c127 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl26.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl26.c
@@ -117,7 +117,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl27.c b/testcases/kernel/syscalls/fcntl/fcntl27.c
index d81e22c..03779b9 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl27.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl27.c
@@ -117,7 +117,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl28.c b/testcases/kernel/syscalls/fcntl/fcntl28.c
index c825787..cd163d9 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl28.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl28.c
@@ -114,7 +114,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync01.c b/testcases/kernel/syscalls/fdatasync/fdatasync01.c
index 3e4e4c7..9e6b454 100644
--- a/testcases/kernel/syscalls/fdatasync/fdatasync01.c
+++ b/testcases/kernel/syscalls/fdatasync/fdatasync01.c
@@ -118,7 +118,7 @@
 	/* perform global cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -139,13 +139,13 @@
 	/* Initialize unique filename for each child process */
 	if (sprintf(filename, "fdatasync_%d", getpid()) <= 0) {
 		tst_brkm(TBROK, cleanup, "Failed to initialize filename");
-	 /*NOTREACHED*/}
+	 }
 	if ((fd = open(filename, O_CREAT | O_WRONLY, 0777)) == -1) {	//mode must be specified when O_CREATE is in the flag
 		tst_brkm(TBROK, cleanup, "open() failed");
-	 /*NOTREACHED*/}
+	 }
 	if ((write(fd, filename, strlen(filename) + 1)) == -1) {
 		tst_brkm(TBROK, cleanup, "write() failed");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -168,4 +168,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync02.c b/testcases/kernel/syscalls/fdatasync/fdatasync02.c
index da22d48..7f20d6a 100644
--- a/testcases/kernel/syscalls/fdatasync/fdatasync02.c
+++ b/testcases/kernel/syscalls/fdatasync/fdatasync02.c
@@ -154,7 +154,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 int setup1(void)
@@ -177,7 +177,7 @@
 {
 	/* close special file */
 	if (close(fd) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to close fd of %s", SPL_FILE);
+		tst_brkm(TBROK, NULL, "Failed to close fd of %s", SPL_FILE);
 	}
 }
 
@@ -215,4 +215,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c
index 32b4048..db221c6 100644
--- a/testcases/kernel/syscalls/flock/flock01.c
+++ b/testcases/kernel/syscalls/flock/flock01.c
@@ -103,7 +103,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -203,4 +203,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c
index 491022a..8f66f0e 100644
--- a/testcases/kernel/syscalls/flock/flock02.c
+++ b/testcases/kernel/syscalls/flock/flock02.c
@@ -101,7 +101,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -222,4 +222,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock03.c b/testcases/kernel/syscalls/flock/flock03.c
index 9245008..dcb82cc 100644
--- a/testcases/kernel/syscalls/flock/flock03.c
+++ b/testcases/kernel/syscalls/flock/flock03.c
@@ -99,7 +99,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&childfunc_uc, "ds", &fd_uc, filename);
 #endif
@@ -257,4 +257,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock04.c b/testcases/kernel/syscalls/flock/flock04.c
index 83f2b06..bed1c22 100644
--- a/testcases/kernel/syscalls/flock/flock04.c
+++ b/testcases/kernel/syscalls/flock/flock04.c
@@ -101,7 +101,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -169,7 +169,7 @@
 
 	cleanup();
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup()
@@ -229,4 +229,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock05.c b/testcases/kernel/syscalls/flock/flock05.c
index d5c9f76..f440164 100644
--- a/testcases/kernel/syscalls/flock/flock05.c
+++ b/testcases/kernel/syscalls/flock/flock05.c
@@ -101,7 +101,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -168,7 +168,7 @@
 	close(fd1);
 	cleanup();
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup()
@@ -228,4 +228,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/flock/flock06.c b/testcases/kernel/syscalls/flock/flock06.c
index e54838f..1d268fb 100644
--- a/testcases/kernel/syscalls/flock/flock06.c
+++ b/testcases/kernel/syscalls/flock/flock06.c
@@ -86,7 +86,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	setup();
 
@@ -200,4 +200,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/fork/fork01.c b/testcases/kernel/syscalls/fork/fork01.c
index 8d7c3f8..a284293 100644
--- a/testcases/kernel/syscalls/fork/fork01.c
+++ b/testcases/kernel/syscalls/fork/fork01.c
@@ -206,7 +206,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fork/fork02.c b/testcases/kernel/syscalls/fork/fork02.c
index 7babc56..0182655 100644
--- a/testcases/kernel/syscalls/fork/fork02.c
+++ b/testcases/kernel/syscalls/fork/fork02.c
@@ -67,8 +67,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -105,7 +109,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork03.c b/testcases/kernel/syscalls/fork/fork03.c
index 0661b8d..3e907d7 100644
--- a/testcases/kernel/syscalls/fork/fork03.c
+++ b/testcases/kernel/syscalls/fork/fork03.c
@@ -67,8 +67,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -127,7 +131,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork06.c b/testcases/kernel/syscalls/fork/fork06.c
index c0c3d7c..7ac8e8e 100644
--- a/testcases/kernel/syscalls/fork/fork06.c
+++ b/testcases/kernel/syscalls/fork/fork06.c
@@ -65,8 +65,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -115,7 +119,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork07.c b/testcases/kernel/syscalls/fork/fork07.c
index 3ce523a..97c5673 100644
--- a/testcases/kernel/syscalls/fork/fork07.c
+++ b/testcases/kernel/syscalls/fork/fork07.c
@@ -86,8 +86,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	if (Nflag) {
 		if (sscanf(Nforkarg, "%i", &Nforks) != 1) {
@@ -201,7 +205,7 @@
 	fclose(rea);
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 void help()
diff --git a/testcases/kernel/syscalls/fork/fork08.c b/testcases/kernel/syscalls/fork/fork08.c
index ec3d609..d10d341 100644
--- a/testcases/kernel/syscalls/fork/fork08.c
+++ b/testcases/kernel/syscalls/fork/fork08.c
@@ -70,8 +70,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -169,7 +173,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork09.c b/testcases/kernel/syscalls/fork/fork09.c
index 02515b3..a5e0eb6 100644
--- a/testcases/kernel/syscalls/fork/fork09.c
+++ b/testcases/kernel/syscalls/fork/fork09.c
@@ -76,8 +76,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -87,7 +91,7 @@
 	fildeses = (FILE **) malloc((OPEN_MAX + 10) * sizeof(FILE *));
 	if (fildeses == NULL) {
 		tst_brkm(TBROK, cleanup, "malloc failed");
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * check looping state if -i option is given
@@ -107,7 +111,7 @@
 		if ((first = creat(filname, 0660)) == -1) {
 			tst_brkm(TBROK, cleanup, "Cannot open first file %s, "
 				 "errno = %d", filname, errno);
-		 /*NOTREACHED*/}
+		 }
 		close(first);
 
 		tst_resm(TINFO, "first file descriptor is %d ", first);
@@ -115,7 +119,7 @@
 		if (unlink(filname) == -1) {
 			tst_brkm(TBROK, cleanup, "Cannot unlink file %s, "
 				 "errno = %d", filname, errno);
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * now open all the files for the test
@@ -129,7 +133,7 @@
 				tst_brkm(TBROK, cleanup, "Parent: cannot open "
 					 "file %d %s errno = %d", nfiles,
 					 filname, errno);
-			 /*NOTREACHED*/}
+			 }
 #ifdef DEBUG
 			tst_resm(TINFO, "filname: %s", filname);
 #endif
@@ -139,7 +143,7 @@
 
 		if ((pid = fork()) == -1) {
 			tst_brkm(TBROK, cleanup, "Fork failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* child */
 			nfiles--;
@@ -147,7 +151,7 @@
 				tst_resm(TINFO, "Child could not close file "
 					 "#%d, errno = %d", nfiles, errno);
 				exit(1);
-			 /*NOTREACHED*/} else {
+			 } else {
 				sprintf(childfile, "cfile.%d", getpid());
 				if ((fildeses[nfiles] =
 				     fopen(childfile, "a")) == NULL) {
@@ -155,7 +159,7 @@
 						 "file %s, errno = %d",
 						 childfile, errno);
 					exit(1);
-				 /*NOTREACHED*/} else {
+				 } else {
 					tst_resm(TINFO, "Child opened new "
 						 "file #%d", nfiles);
 					unlink(childfile);
@@ -180,7 +184,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork10.c b/testcases/kernel/syscalls/fork/fork10.c
index 90448e0..3774277 100644
--- a/testcases/kernel/syscalls/fork/fork10.c
+++ b/testcases/kernel/syscalls/fork/fork10.c
@@ -71,8 +71,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -91,18 +95,18 @@
 		if ((fildes = creat(fnamebuf, 0600)) < 0) {
 			tst_brkm(TBROK, cleanup, "Parent: cannot open %s for "
 				 "write, errno = %d", fnamebuf, errno);
-		 /*NOTREACHED*/}
+		 }
 		write(fildes, "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n", 27);
 		close(fildes);
 
 		if ((fildes = open(fnamebuf, 0)) == -1) {
 			tst_brkm(TBROK, cleanup, "Parent: cannot open %s for "
 				 "reading", fnamebuf);
-		 /*NOTREACHED*/}
+		 }
 
 		if ((pid = fork()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #1 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* child */
 			tst_resm(TINFO, "fork child A");
@@ -117,7 +121,7 @@
 			/* parent starts second child */
 			if ((pid = fork()) == -1) {
 				tst_brkm(TBROK, cleanup, "fork() #2 failed");
-			 /*NOTREACHED*/}
+			 }
 
 			if (pid == 0) {	/* child */
 				if (read(fildes, chilchar, 1) <= 0) {
@@ -159,7 +163,7 @@
 	close(fildes);
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork11.c b/testcases/kernel/syscalls/fork/fork11.c
index e2e0ebe..2f46fa2 100644
--- a/testcases/kernel/syscalls/fork/fork11.c
+++ b/testcases/kernel/syscalls/fork/fork11.c
@@ -64,8 +64,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -105,7 +109,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fork/fork12.c b/testcases/kernel/syscalls/fork/fork12.c
index f5203d6..d0733fe 100644
--- a/testcases/kernel/syscalls/fork/fork12.c
+++ b/testcases/kernel/syscalls/fork/fork12.c
@@ -69,8 +69,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -122,7 +126,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fstat/fstat01.c b/testcases/kernel/syscalls/fstat/fstat01.c
index 0c784cb..6861c07 100644
--- a/testcases/kernel/syscalls/fstat/fstat01.c
+++ b/testcases/kernel/syscalls/fstat/fstat01.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fstat/fstat02.c b/testcases/kernel/syscalls/fstat/fstat02.c
index a763556..b2366b2 100644
--- a/testcases/kernel/syscalls/fstat/fstat02.c
+++ b/testcases/kernel/syscalls/fstat/fstat02.c
@@ -86,8 +86,8 @@
 char *TCID = "fstat02";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-uid_t User_id;			/* user id/group id of test process */
-gid_t Group_id;
+uid_t user_id;			/* user id/group id of test process */
+gid_t group_id;
 int fildes;			/* File descriptor of testfile */
 
 char nobody_uid[] = "nobody";
@@ -103,7 +103,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -138,8 +142,8 @@
 			 * Verify the data returned by fstat(2)
 			 * aganist the expected data.
 			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id) ||
+			if ((stat_buf.st_uid != user_id) ||
+			    (stat_buf.st_gid != group_id) ||
 			    (stat_buf.st_size != FILE_SIZE) ||
 			    ((stat_buf.st_mode & MASK) != FILE_MODE)) {
 				tst_resm(TFAIL, "Functionality of fstat(2) on "
@@ -156,7 +160,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -178,7 +182,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
@@ -212,8 +216,8 @@
 	}
 
 	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
+	user_id = getuid();
+	group_id = getgid();
 
 }				/* End setup() */
 
diff --git a/testcases/kernel/syscalls/fstat/fstat03.c b/testcases/kernel/syscalls/fstat/fstat03.c
index 7352eb8..2aeddbb 100644
--- a/testcases/kernel/syscalls/fstat/fstat03.c
+++ b/testcases/kernel/syscalls/fstat/fstat03.c
@@ -78,7 +78,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -124,7 +128,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/fstat/fstat04.c b/testcases/kernel/syscalls/fstat/fstat04.c
index d68c1dc..5484174 100644
--- a/testcases/kernel/syscalls/fstat/fstat04.c
+++ b/testcases/kernel/syscalls/fstat/fstat04.c
@@ -85,8 +85,8 @@
 char *TCID = "fstat04";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-uid_t User_id;			/* user id/group id of test process */
-gid_t Group_id;
+uid_t user_id;			/* user id/group id of test process */
+gid_t group_id;
 int fildes;			/* File descriptor of testfile */
 
 char nobody_uid[] = "nobody";
@@ -102,7 +102,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -137,8 +141,8 @@
 			 * Verify the data returned by fstat(2)
 			 * aganist the expected data.
 			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id) ||
+			if ((stat_buf.st_uid != user_id) ||
+			    (stat_buf.st_gid != group_id) ||
 			    (stat_buf.st_size != FILE_SIZE) ||
 			    ((stat_buf.st_mode & MASK) != FILE_MODE)) {
 				tst_resm(TFAIL, "Functionality of fstat(2) on "
@@ -155,7 +159,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -177,7 +181,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
@@ -211,8 +215,8 @@
 	}
 
 	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
+	user_id = getuid();
+	group_id = getgid();
 
 }				/* End setup() */
 
diff --git a/testcases/kernel/syscalls/fstat/fstat05.c b/testcases/kernel/syscalls/fstat/fstat05.c
index 9d11f56..3f56ff3 100644
--- a/testcases/kernel/syscalls/fstat/fstat05.c
+++ b/testcases/kernel/syscalls/fstat/fstat05.c
@@ -137,11 +137,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Buffer points outside user's accessible address space. */
 	ptr_str = &stat_buf;	/* if it was for conformance testing */
@@ -189,7 +193,7 @@
 	 * in the setup().
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 #else
@@ -223,7 +227,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c
index 275498b..dc443f6 100644
--- a/testcases/kernel/syscalls/fstatat/fstatat01.c
+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
@@ -113,28 +113,10 @@
 
 	/* Disable test if the version of the kernel is less than 2.6.16 */
 	if ((tst_kvercmp(2, 6, 16)) < 0) {
-		tst_resm(TWARN, "This test can only run on kernels that are ");
-		tst_resm(TWARN, "2.6.16 and higher");
-		exit(0);
+		tst_brkm(TCONF, NULL,
+		    "This test can only run on kernels that are 2.6.16 and higher");
 	}
 
-	/* report failure if run with stubs */
-#ifdef __NR_fstatat64
-	if (__NR_fstatat64 == 0)
-#endif
-#ifdef __NR_newfstatat
-		if (__NR_newfstatat == 0)
-#endif
-		{
-			tst_resm(TFAIL,
-				 "fstatat() Failed, neither __NR_fstatat64 "
-				 "no __NR_newfstatat is implemented ");
-			exit(0);
-		}
-
-	/***************************************************************
-	 * parse standard options
-	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
@@ -167,16 +149,11 @@
 				 ***************************************************************/
 				if (STD_FUNCTIONAL_TEST) {
 					/* No Verification test, yet... */
-					tst_resm(TPASS,
-						 "fstatat() returned the expected  errno %d: %s",
-						 TEST_ERRNO,
-						 strerror(TEST_ERRNO));
+					tst_resm(TPASS|TTERRNO,
+						 "fstatat() failed as expected");
 				}
 			} else {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_resm(TFAIL,
-					 "fstatat() Failed, errno=%d : %s",
-					 TEST_ERRNO, strerror(TEST_ERRNO));
+				tst_resm(TFAIL|TTERRNO, "fstatat failed")
 			}
 		}
 
@@ -186,8 +163,7 @@
 	 * cleanup and exit
 	 ***************************************************************/
 	cleanup();
-
-	return (0);
+	tst_exit();
 }				/* End main */
 
 void setup_every_copy()
@@ -201,32 +177,32 @@
 
 	ret = mkdir(pathname, 0700);
 	if (ret < 0) {
-		perror("mkdir: ");
-		exit(-1);
+		perror("mkdir");
+		exit(1);
 	}
 
 	dirfd = open(pathname, O_DIRECTORY);
 	if (dirfd < 0) {
-		perror("open: ");
-		exit(-1);
+		perror("open");
+		exit(1);
 	}
 
 	fd = open(testfile, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		perror("open: ");
-		exit(-1);
+		perror("open");
+		exit(1);
 	}
 
 	fd = open(testfile2, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		perror("open: ");
-		exit(-1);
+		perror("open");
+		exit(1);
 	}
 
 	fd = open(testfile3, O_CREAT | O_RDWR, 0600);
 	if (fd < 0) {
-		perror("open: ");
-		exit(-1);
+		perror("open");
+		exit(1);
 	}
 
 	fds[0] = fds[1] = fds[4] = dirfd;
@@ -249,7 +225,7 @@
 
 	/* Pause if that option was specified */
 	TEST_PAUSE;
-}				/* End setup() */
+}
 
 /***************************************************************
  * cleanup() - performs all ONE TIME cleanup for this test at
@@ -268,7 +244,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}				/* End cleanup() */
+}
diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs01.c b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
index ec9deb4..f703f77 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs01.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs02.c b/testcases/kernel/syscalls/fstatfs/fstatfs02.c
index 88dc282..7498924 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs02.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs02.c
@@ -88,7 +88,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -127,7 +131,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fsync/fsync01.c b/testcases/kernel/syscalls/fsync/fsync01.c
index 5c5303c..106f5a7 100644
--- a/testcases/kernel/syscalls/fsync/fsync01.c
+++ b/testcases/kernel/syscalls/fsync/fsync01.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/fsync/fsync02.c b/testcases/kernel/syscalls/fsync/fsync02.c
index da91407..8b487ad 100644
--- a/testcases/kernel/syscalls/fsync/fsync02.c
+++ b/testcases/kernel/syscalls/fsync/fsync02.c
@@ -89,7 +89,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -158,7 +162,7 @@
 	close(fd);
 	sync();
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/fsync/fsync03.c b/testcases/kernel/syscalls/fsync/fsync03.c
index 4cc7860..91cd68b 100644
--- a/testcases/kernel/syscalls/fsync/fsync03.c
+++ b/testcases/kernel/syscalls/fsync/fsync03.c
@@ -82,7 +82,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -121,7 +125,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate01.c b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
index effdbaa..294d1c2 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate01.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
@@ -99,7 +99,11 @@
 	off_t file_length;	/* test file length */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -161,7 +165,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate02.c b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
index d684204..459a3b4 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate02.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
@@ -105,7 +105,11 @@
 	int err_flag = 0;	/* error indicator flag */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -248,7 +252,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate04.c b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
index 02ecc23..6726aec 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate04.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
@@ -295,7 +295,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 #ifdef UCLINUX
 	maybe_run_child(&dochild, "dddd", filename, &recstart, &reclen, &ppid);
@@ -314,7 +314,7 @@
 			 " not support mandatory locks. Cannot run this test.");
 		tst_rmdir();
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 		setvbuf(stdin, 0, _IOLBF, BUFSIZ);
diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
index 504860d..91d8b5c 100644
--- a/testcases/kernel/syscalls/futimesat/futimesat01.c
+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
@@ -102,7 +102,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c b/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
index 509213a..c71f002 100644
--- a/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
+++ b/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
@@ -105,9 +105,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -138,7 +135,6 @@
 /*
  * Global variables
  */
-static int opt_debug;
 static char *progname;
 
 enum test_type {
@@ -351,11 +347,6 @@
 	if (tc->policy == MPOL_DEFAULT)
 		nodemask_zero(&nodemask);
 	cmp_ok = tc->policy == policy && (tc->from_node == NONE || nodemask_equal(&nodemask,&getnodemask));
-	if (opt_debug) {
-		nodemask_dump("nodemask Expect:", &nodemask);
-		nodemask_dump("nodemask Result:", &getnodemask);
-		tst_resm(TINFO,"policy E:%d R:%d", tc->policy, policy);
-	}
 TEST_END:
 	/*
 	 * Check results
@@ -367,96 +358,40 @@
 
 
 /*
- * usage()
- */
-
-void usage(const char *progname)
-{
-	tst_resm(TINFO, "usage: %s [options]", progname);
-	tst_resm(TINFO, "This is a regression test program of %s system call.", SYSCALL_NAME);
-	tst_resm(TINFO, "options:");
-	tst_resm(TINFO, "    -d --debug	   Show debug messages");
-	tst_resm(TINFO, "    -h --help	    Show this message");
-
-	tst_resm(TINFO,"NG");
-	exit(1);
-}
-
-
-/*
  * main()
  */
 
 
 
 int main(int argc, char **argv) {
-	int c, i, lc, ret;
-	char *msg;	      /* message returned from parse_opts */
-
-	struct option long_options[] = {
-		{ "debug", no_argument, 0, 'd' },
-		{ "help",  no_argument, 0, 'h' },
-		{ NULL, 0, NULL, 0 }
-	};
-
-	progname = basename(argv[0]);
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
-	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	     tst_exit();
-	}
+	int i, ret;
 
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
+	ret = 0;
 
-		Tst_count = 0;
-
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-
-			TEST(c = getopt_long(argc, argv, "dh", long_options, NULL));
-
-			while (TEST_RETURN != -1) {
-				switch (c) {
-				case 'd':
-					opt_debug = 1;
-					break;
-				default:
-					usage(progname);
-					// NOTREACHED
-				}
-			}
-
-			/*
-			 * Execute test
-		 	 */
-			for (i = 0; i < (int)(sizeof(tcase) / sizeof(*tcase)); i++) {
-				tst_resm(TINFO, "(case%02d) START", i);
-				ret = do_test(&tcase[i]);
-				tst_resm((ret == 0 ? TPASS : TFAIL | TERRNO),
-					 "(case%02d) END", i);
-			}
-		
-		}
-
+	/*
+	 * Execute test
+	 */
+	for (i = 0; ret == 0 && i < (int)(sizeof(tcase) / sizeof(*tcase));
+	    i++) {
+		tst_resm(TINFO, "(case%02d) START", i);
+		ret = do_test(&tcase[i]);
+		tst_resm((ret == 0 ? TPASS : TFAIL|TERRNO), "(case%02d) END",
+		    i);
 	}
 
 	cleanup();
 	tst_exit();
 
-
 }
 #else
 int main(void) {
-	tst_resm(TBROK, "XXX: test is broken on libnuma v2 (read numa_helpers.h for more details).");
-	return 0;
+	tst_brkm(TBROK, NULL, "XXX: test is broken on libnuma v2 (read numa_helpers.h for more details).");
 }
 #endif
 #else
 int main(void) {
-	tst_resm(TCONF, "System doesn't have required numa support");
-	tst_exit();
+	tst_brkm(TCONF, NULL, "System doesn't have required numa support");
 }
 #endif
diff --git a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
index 730ffdd..d8adc48 100644
--- a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
+++ b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
@@ -82,7 +82,11 @@
 	size_t len_ptr;		/* size of structure struct robust_list_head */
 	int retval;
 
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/getcontext/getcontext01.c b/testcases/kernel/syscalls/getcontext/getcontext01.c
index 7566596..6370c82 100644
--- a/testcases/kernel/syscalls/getcontext/getcontext01.c
+++ b/testcases/kernel/syscalls/getcontext/getcontext01.c
@@ -63,7 +63,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
      	* perform global setup for test
diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c
index 53effd8..f1db668 100644
--- a/testcases/kernel/syscalls/getcpu/getcpu01.c
+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
@@ -114,7 +114,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	setup();		/* global setup */
 
@@ -158,7 +162,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c
index 0879578..19ab072 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd01.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd01.c
@@ -95,7 +95,11 @@
 	char *test_erg;
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 	setup();
 
@@ -139,7 +143,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 void setup_test4()
diff --git a/testcases/kernel/syscalls/getcwd/getcwd02.c b/testcases/kernel/syscalls/getcwd/getcwd02.c
index cdfe509..2498430 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd02.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd02.c
@@ -92,7 +92,11 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 	setup();
 
@@ -105,11 +109,11 @@
 		if ((fin = popen(pwd, "r")) == NULL) {
 			tst_resm(TINFO, "%s: can't run %s", TCID, pwd);
 			tst_brkm(TBROK, cleanup, "%s FAILED", TCID);
-		 /*NOTREACHED*/}
+		 }
 		while (fgets(pwd_buf, sizeof(pwd_buf), fin) != NULL) {
 			if ((cp = strchr(pwd_buf, '\n')) == NULL) {
 				tst_brkm(TBROK, cleanup, "pwd output too long");
-			 /*NOTREACHED*/}
+			 }
 			*cp = 0;
 			cp_cur = pwd_buf;
 		}
@@ -124,7 +128,7 @@
 		do_block7();
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 void do_block1()		//valid cwd[]: -> Should work fine
diff --git a/testcases/kernel/syscalls/getcwd/getcwd03.c b/testcases/kernel/syscalls/getcwd/getcwd03.c
index f58f6c3..cb9dbfc 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd03.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd03.c
@@ -83,7 +83,11 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -103,10 +107,10 @@
 		sprintf(dir1, "getcwd1.%d", getpid());
 		if (mkdir(dir1, 00755) < 0) {
 			tst_brkm(TBROK, cleanup, "mkdir(2) failed");
-		 /*NOTREACHED*/}
+		 }
 		if (chdir(dir1) != 0) {
 			tst_brkm(TBROK, cleanup, "chdir(2) failed");
-		 /*NOTREACHED*/}
+		 }
 
 		pwd1 = getpwd();
 		if (getcwd(cwd1, sizeof cwd1) == NULL) {
@@ -118,7 +122,7 @@
 			tst_brkm(TFAIL, cleanup, "getcwd() returned unexpected "
 				 "working directory: expected: %s, got: %s\n",
 				 pwd1, cwd1);
-		 /*NOTREACHED*/}
+		 }
 
 		tst_resm(TINFO, "getcwd(2) succeeded in returning correct path "
 			 "for dir1");
@@ -134,12 +138,12 @@
 		if (symlink(dir1, dir2) < 0) {
 			tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d",
 				 errno);
-		 /*NOTREACHED*/}
+		 }
 
 		if (chdir(dir2) != 0) {
 			tst_brkm(TBROK, cleanup, "chdir(2) failed: errno: %d",
 				 errno);
-		 /*NOTREACHED*/}
+		 }
 
 		pwd2 = getpwd();
 		if (getcwd(cwd2, sizeof cwd2) == NULL) {
@@ -153,7 +157,7 @@
 		    ((n = readlink(dir2, link2, sizeof(link2))) < 0)) {
 			tst_brkm(TBROK, cleanup, "readlink(2) failed: errno:%d",
 				 errno);
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Finally compare the pwd, cwd, link informations:
@@ -201,7 +205,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 void setup()
@@ -240,11 +244,11 @@
 	if ((fin = popen(pwd, "r")) == NULL) {
 		tst_resm(TINFO, "%s: can't run %s", TCID, pwd);
 		tst_brkm(TBROK, cleanup, "%s FAILED", TCID);
-	 /*NOTREACHED*/}
+	 }
 	while (fgets(buf, BUFSIZ, fin) != NULL) {
 		if ((cp = strchr(buf, '\n')) == NULL) {
 			tst_brkm(TBROK, cleanup, "pwd output too long");
-		 /*NOTREACHED*/}
+		 }
 		*cp = 0;
 		cp_cur = buf;
 	}
diff --git a/testcases/kernel/syscalls/getdents/getdents01.c b/testcases/kernel/syscalls/getdents/getdents01.c
index 32383bf..fbf2d43 100644
--- a/testcases/kernel/syscalls/getdents/getdents01.c
+++ b/testcases/kernel/syscalls/getdents/getdents01.c
@@ -95,7 +95,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -187,7 +191,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getdents/getdents02.c b/testcases/kernel/syscalls/getdents/getdents02.c
index a17118c..8d4198f 100644
--- a/testcases/kernel/syscalls/getdents/getdents02.c
+++ b/testcases/kernel/syscalls/getdents/getdents02.c
@@ -93,7 +93,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -173,7 +177,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getdents/getdents03.c b/testcases/kernel/syscalls/getdents/getdents03.c
index 9f6f348..39df308 100644
--- a/testcases/kernel/syscalls/getdents/getdents03.c
+++ b/testcases/kernel/syscalls/getdents/getdents03.c
@@ -96,7 +96,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -182,7 +186,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getdents/getdents04.c b/testcases/kernel/syscalls/getdents/getdents04.c
index d97792d..ea5e490 100644
--- a/testcases/kernel/syscalls/getdents/getdents04.c
+++ b/testcases/kernel/syscalls/getdents/getdents04.c
@@ -98,7 +98,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -209,7 +213,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getdomainname/getdomainname01.c b/testcases/kernel/syscalls/getdomainname/getdomainname01.c
index fcbc255..e3e8450 100644
--- a/testcases/kernel/syscalls/getdomainname/getdomainname01.c
+++ b/testcases/kernel/syscalls/getdomainname/getdomainname01.c
@@ -85,9 +85,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -118,7 +124,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/getegid/getegid01.c b/testcases/kernel/syscalls/getegid/getegid01.c
index 23207af..412ce42 100644
--- a/testcases/kernel/syscalls/getegid/getegid01.c
+++ b/testcases/kernel/syscalls/getegid/getegid01.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getegid/getegid02.c b/testcases/kernel/syscalls/getegid/getegid02.c
index a0211d2..bf119e9 100644
--- a/testcases/kernel/syscalls/getegid/getegid02.c
+++ b/testcases/kernel/syscalls/getegid/getegid02.c
@@ -83,8 +83,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -129,7 +133,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/geteuid/geteuid01.c b/testcases/kernel/syscalls/geteuid/geteuid01.c
index 8301385..48bd4f7 100644
--- a/testcases/kernel/syscalls/geteuid/geteuid01.c
+++ b/testcases/kernel/syscalls/geteuid/geteuid01.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getgid/getgid01.c b/testcases/kernel/syscalls/getgid/getgid01.c
index 25b2939..03dfb86 100644
--- a/testcases/kernel/syscalls/getgid/getgid01.c
+++ b/testcases/kernel/syscalls/getgid/getgid01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getgid/getgid03.c b/testcases/kernel/syscalls/getgid/getgid03.c
index a3ed6e2..f35c2a6 100644
--- a/testcases/kernel/syscalls/getgid/getgid03.c
+++ b/testcases/kernel/syscalls/getgid/getgid03.c
@@ -83,8 +83,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -128,7 +132,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getgroups/getgroups02.c b/testcases/kernel/syscalls/getgroups/getgroups02.c
index d87803d..dd0c51c 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups02.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups02.c
@@ -141,7 +141,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getgroups/getgroups03.c b/testcases/kernel/syscalls/getgroups/getgroups03.c
index 464cc26..350859b 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups03.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups03.c
@@ -102,7 +102,11 @@
 	int gidsetsize = NGROUPS;	/* total groups */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -151,7 +155,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getgroups/getgroups04.c b/testcases/kernel/syscalls/getgroups/getgroups04.c
index 04cebfa..0bbcd10 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups04.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups04.c
@@ -108,7 +108,11 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -161,7 +165,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/gethostid/gethostid01.c b/testcases/kernel/syscalls/gethostid/gethostid01.c
index 3adf8b2..eeb5671 100644
--- a/testcases/kernel/syscalls/gethostid/gethostid01.c
+++ b/testcases/kernel/syscalls/gethostid/gethostid01.c
@@ -155,7 +155,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/gethostname/gethostname01.c b/testcases/kernel/syscalls/gethostname/gethostname01.c
index c9ff65c..68f6454 100644
--- a/testcases/kernel/syscalls/gethostname/gethostname01.c
+++ b/testcases/kernel/syscalls/gethostname/gethostname01.c
@@ -130,15 +130,9 @@
 
 	char hname[100];	/* host name */
 
-	/***************************************************************
-	 * parse standard options
-	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-	/***************************************************************
-	 * perform global setup for test
-	 ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/getitimer/getitimer01.c b/testcases/kernel/syscalls/getitimer/getitimer01.c
index 4baca5f..1ba3e94 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer01.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer01.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -121,7 +125,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getitimer/getitimer02.c b/testcases/kernel/syscalls/getitimer/getitimer02.c
index 6270366..8a45f91 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer02.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer02.c
@@ -75,7 +75,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -117,7 +121,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getitimer/getitimer03.c b/testcases/kernel/syscalls/getitimer/getitimer03.c
index 1e43f22..9237e5f 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer03.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer03.c
@@ -77,7 +77,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -135,7 +139,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getpagesize/getpagesize01.c b/testcases/kernel/syscalls/getpagesize/getpagesize01.c
index 22cbf42..690526d 100644
--- a/testcases/kernel/syscalls/getpagesize/getpagesize01.c
+++ b/testcases/kernel/syscalls/getpagesize/getpagesize01.c
@@ -64,43 +64,25 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-	/***************************************************************
-	* perform global setup for test
-	***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-	/***************************************************************
-	* check looping state if -c option given
-	***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
 		Tst_count = 0;
 
-		/*
-		 * TEST CASE:
-		 *  Get page size
-		 */
-		;
-
 		/* Call getpagesize(2) */
 		TEST(getpagesize());
 
 		/* check return code */
 		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL,
-				 "getpagesize -  Get page size failed, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TFAIL|TTERRNO, "getpagesize failed"),
 			continue;	/* next loop for MTKERNEL */
 		}
 
-	/***************************************************************
-         * only perform functional verification if flag set (-f not given)
-         ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			size = getpagesize();
 			tst_resm(TINFO, "Page Size is %d", size);
@@ -118,14 +100,10 @@
 					 "getpagesize - Page size returned %d",
 					 ret_sysconf);
 		}
-	}			/* End for TEST_LOOPING */
+	}
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
-
-	return 0;
+	tst_exit();
 }				/* End main */
 
 /***************************************************************
@@ -151,7 +129,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/getpeername/getpeername01.c b/testcases/kernel/syscalls/getpeername/getpeername01.c
index aa7524d..dd73f42 100644
--- a/testcases/kernel/syscalls/getpeername/getpeername01.c
+++ b/testcases/kernel/syscalls/getpeername/getpeername01.c
@@ -113,7 +113,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -154,7 +158,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c
index 50b079a..35b9c7a 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid01.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid01.c
@@ -69,7 +69,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
diff --git a/testcases/kernel/syscalls/getpgid/getpgid02.c b/testcases/kernel/syscalls/getpgid/getpgid02.c
index f1a0c84..5d58ad0 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid02.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid02.c
@@ -85,7 +85,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -123,7 +127,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getpgrp/getpgrp01.c b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
index 550b4ca..281ad99 100644
--- a/testcases/kernel/syscalls/getpgrp/getpgrp01.c
+++ b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
@@ -135,7 +135,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getpid/getpid02.c b/testcases/kernel/syscalls/getpid/getpid02.c
index 200e3d7..1888207 100644
--- a/testcases/kernel/syscalls/getpid/getpid02.c
+++ b/testcases/kernel/syscalls/getpid/getpid02.c
@@ -90,11 +90,8 @@
 	int status;		/* exit status of child process */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	/* Perform global setup for test */
 	setup();
@@ -104,19 +101,11 @@
 		/* Reset Tst_count in case we are looping. */
 		Tst_count = 0;
 
-		/*
-		 * Invoke getpid() to get the process id of
-		 * the test process.
-		 */
 		TEST(getpid());
 
 		/* Save the process id returned by getpid() */
 		proc_id = TEST_RETURN;
 
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
 		if (STD_FUNCTIONAL_TEST) {
 			/* Fork a child now */
 			if ((pid = FORK_OR_VFORK()) < 0) {
@@ -132,10 +121,13 @@
 				}
 				exit(0);
 			} else {	/* parent process */
-				wait(&status);
-
+				if (wait(&status) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
 				/* Check exit status of child */
-				if (WEXITSTATUS(status) != 0) {
+				if (WIFEXITED(status) &&
+				    WEXITSTATUS(status) != 0) {
 					tst_resm(TFAIL, "getpid() returned "
 						 "invalid pid %d", proc_id);
 				} else {
@@ -151,7 +143,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -178,7 +170,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/getppid/getppid01.c b/testcases/kernel/syscalls/getppid/getppid01.c
index 9b0bf06..5edba06 100644
--- a/testcases/kernel/syscalls/getppid/getppid01.c
+++ b/testcases/kernel/syscalls/getppid/getppid01.c
@@ -135,7 +135,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/getppid/getppid02.c b/testcases/kernel/syscalls/getppid/getppid02.c
index fb327d7..7b43f71 100644
--- a/testcases/kernel/syscalls/getppid/getppid02.c
+++ b/testcases/kernel/syscalls/getppid/getppid02.c
@@ -62,7 +62,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -110,7 +114,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getpriority/getpriority01.c b/testcases/kernel/syscalls/getpriority/getpriority01.c
index c41e204..10bbdfd 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority01.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority01.c
@@ -95,7 +95,11 @@
 	TST_TOTAL = sizeof(prio_which) / sizeof(int);
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -135,7 +139,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getpriority/getpriority02.c b/testcases/kernel/syscalls/getpriority/getpriority02.c
index b349670..43dbd3b 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority02.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority02.c
@@ -114,7 +114,11 @@
 	uid_t who;		/* process uid of the test process */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -173,7 +177,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid01.c b/testcases/kernel/syscalls/getresgid/getresgid01.c
index 9475959..2abb3cf 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid01.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid01.c
@@ -87,7 +87,11 @@
 	 eff_gid, sav_gid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -139,7 +143,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid02.c b/testcases/kernel/syscalls/getresgid/getresgid02.c
index 27a6394..d12e937 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid02.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid02.c
@@ -97,7 +97,11 @@
 	 eff_gid, sav_gid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -151,7 +155,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid03.c b/testcases/kernel/syscalls/getresgid/getresgid03.c
index 8cb0984..b108203 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid03.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid03.c
@@ -98,7 +98,11 @@
 	 eff_gid, sav_gid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -152,7 +156,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid01.c b/testcases/kernel/syscalls/getresuid/getresuid01.c
index ae8ff88..7442107 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid01.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid01.c
@@ -92,7 +92,11 @@
 	 eff_uid, sav_uid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -145,7 +149,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid02.c b/testcases/kernel/syscalls/getresuid/getresuid02.c
index 24e0578..216cd73 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid02.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid02.c
@@ -97,7 +97,11 @@
 	 eff_uid, sav_uid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -151,7 +155,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid03.c b/testcases/kernel/syscalls/getresuid/getresuid03.c
index da7b2b4..6274245 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid03.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid03.c
@@ -97,7 +97,11 @@
 	 eff_uid, sav_uid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -151,7 +155,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/getrusage/getrusage01.c b/testcases/kernel/syscalls/getrusage/getrusage01.c
index 5282a19..2faed98 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage01.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage01.c
@@ -86,9 +86,15 @@
 	struct rusage usage;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -120,7 +126,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/getrusage/getrusage02.c b/testcases/kernel/syscalls/getrusage/getrusage02.c
index ce5df95..9f6219b 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage02.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage02.c
@@ -109,9 +109,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -147,7 +153,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/getsid/getsid01.c b/testcases/kernel/syscalls/getsid/getsid01.c
index 6ba6cc1..58994f6 100644
--- a/testcases/kernel/syscalls/getsid/getsid01.c
+++ b/testcases/kernel/syscalls/getsid/getsid01.c
@@ -80,7 +80,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -147,7 +151,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getsid/getsid02.c b/testcases/kernel/syscalls/getsid/getsid02.c
index fbc75f2..abc791e 100644
--- a/testcases/kernel/syscalls/getsid/getsid02.c
+++ b/testcases/kernel/syscalls/getsid/getsid02.c
@@ -99,7 +99,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -138,7 +142,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/getsockname/getsockname01.c b/testcases/kernel/syscalls/getsockname/getsockname01.c
index 2616454..3527a6a 100644
--- a/testcases/kernel/syscalls/getsockname/getsockname01.c
+++ b/testcases/kernel/syscalls/getsockname/getsockname01.c
@@ -112,7 +112,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -146,7 +150,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/getsockopt/getsockopt01.c b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
index aaa4374..9ea0c77 100644
--- a/testcases/kernel/syscalls/getsockopt/getsockopt01.c
+++ b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
@@ -137,7 +137,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -173,7 +177,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/gettid/gettid01.c b/testcases/kernel/syscalls/gettid/gettid01.c
index 33e9adb..8cce12e 100644
--- a/testcases/kernel/syscalls/gettid/gettid01.c
+++ b/testcases/kernel/syscalls/gettid/gettid01.c
@@ -52,9 +52,8 @@
 	int lc;			/* loop counter */
 	char *msg;		/* parse_opts() return message */
 
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -85,7 +84,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -112,8 +111,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
index bacff53..bc1fff2 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -107,7 +111,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
index 7e7511b..00e0bc8 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
@@ -87,7 +87,11 @@
 	char *msg;
 
 	if ((msg = parse_opts(ac, av, opts, help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/getuid/getuid01.c b/testcases/kernel/syscalls/getuid/getuid01.c
index a157783..a9c5599 100644
--- a/testcases/kernel/syscalls/getuid/getuid01.c
+++ b/testcases/kernel/syscalls/getuid/getuid01.c
@@ -193,7 +193,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/getuid/getuid02.c b/testcases/kernel/syscalls/getuid/getuid02.c
index 7133d9d..fc1f358 100644
--- a/testcases/kernel/syscalls/getuid/getuid02.c
+++ b/testcases/kernel/syscalls/getuid/getuid02.c
@@ -60,9 +60,8 @@
 	char *msg;		/* message returned by parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/inotify/inotify01.c b/testcases/kernel/syscalls/inotify/inotify01.c
index fed89f8..f51c64a 100644
--- a/testcases/kernel/syscalls/inotify/inotify01.c
+++ b/testcases/kernel/syscalls/inotify/inotify01.c
@@ -49,8 +49,9 @@
 #include <sys/syscall.h>
 #include "test.h"
 #include "usctest.h"
+#include "linux_syscall_numbers.h"
 
-#if defined(HAVE_SYS_INOTIFY_H) && defined(__NR_inotify_init)
+#if defined(HAVE_SYS_INOTIFY_H)
 #include <sys/inotify.h>
 
 #define EVENT_MAX 1024
@@ -119,64 +120,56 @@
 		 * generate sequence of events
 		 */
 		if (chmod(fname, 0755) < 0) {
-			tst_brkm(TBROK, cleanup,
-				 "chmod(%s, 0755) Failed, errno=%d : %s",
-				 fname, errno, strerror(errno));
+			tst_brkm(TBROK|TERRNO, cleanup,
+				 "chmod(%s, 0755) failed", fname);
 		}
 		event_set[Tst_count] = IN_ATTRIB;
 		Tst_count++;
 
 		if ((fd = open(fname, O_RDONLY)) == -1) {
-			tst_brkm(TBROK, cleanup,
-				 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-				 fname, errno, strerror(errno));
+			tst_brkm(TBROK|TERRNO, cleanup,
+			    "open(%s, O_RDWR|O_CREAT,0700) failed", fname);
 		}
 		event_set[Tst_count] = IN_OPEN;
 		Tst_count++;
 
 		if (read(fd, buf, BUF_SIZE) == -1) {
-			tst_brkm(TBROK, cleanup,
-				 "read(%d, buf, %d) Failed, errno=%d : %s",
-				 fd, BUF_SIZE, errno, strerror(errno));
+			tst_brkm(TBROK|TERRNO, cleanup,
+			    "read(%d, buf, %d) failed", fd, BUF_SIZE);
 		}
 		event_set[Tst_count] = IN_ACCESS;
 		Tst_count++;
 
 		if (close(fd) == -1) {
-			tst_brkm(TBROK, cleanup,
-				 "close(%s) Failed, errno=%d : %s",
-				 fname, errno, strerror(errno));
+			tst_brkm(TBROK, cleanup, "close(%s) failed", fname);
 		}
 		event_set[Tst_count] = IN_CLOSE_NOWRITE;
 		Tst_count++;
 
 		if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1) {
 			tst_brkm(TBROK, cleanup,
-				 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-				 fname, errno, strerror(errno));
+			    "open(%s, O_RDWR|O_CREAT,0700) failed", fname);
 		}
 		event_set[Tst_count] = IN_OPEN;
 		Tst_count++;
 
 		if (write(fd, buf, BUF_SIZE) == -1) {
 			tst_brkm(TBROK, cleanup,
-				 "write(%d, %s, 1) Failed, errno=%d : %s",
-				 fd, fname, errno, strerror(errno));
+			    "write(%d, %s, 1) failed", fd, fname);
 		}
 		event_set[Tst_count] = IN_MODIFY;
 		Tst_count++;
 
 		if (close(fd) == -1) {
 			tst_brkm(TBROK, cleanup,
-				 "close(%s) Failed, errno=%d : %s",
-				 fname, errno, strerror(errno));
+			    "close(%s) failed", fname);
 		}
 		event_set[Tst_count] = IN_CLOSE_WRITE;
 		Tst_count++;
 
 		if (TST_TOTAL != Tst_count) {
 			tst_brkm(TBROK, cleanup,
-				 "TST_TOTAL and Tst_count are not equal");
+			     "TST_TOTAL and Tst_count are not equal");
 		}
 		Tst_count = 0;
 
@@ -186,9 +179,8 @@
 		int len, i = 0, test_num = 0;
 		if ((len = read(fd_notify, event_buf, EVENT_BUF_LEN)) < 0) {
 			tst_brkm(TBROK, cleanup,
-				 "read(%d, buf, %d) Failed, errno=%d : %s",
-				 fd_notify, EVENT_BUF_LEN, errno,
-				 strerror(errno));
+			    "read(%d, buf, %d) failed",
+			    fd_notify, EVENT_BUF_LEN);
 
 		}
 
@@ -221,8 +213,8 @@
 			i += EVENT_SIZE + event->len;
 		}
 		for (; test_num < TST_TOTAL; test_num++) {
-			tst_resm(TFAIL, "don't get event: mask=%x ",
-				 event_set[test_num]);
+			tst_resm(TFAIL, "didn't get event: mask=%x",
+			    event_set[test_num]);
 
 		}
 
@@ -253,16 +245,13 @@
 			 fname);
 	}
 	if ((write(fd, fname, 1)) == -1) {
-		tst_brkm(TBROK|TERRNO, cleanup,
-			 "write(%d, %s, 1) failed",
-			 fd, fname);
+		tst_brkm(TBROK|TERRNO, cleanup, "write(%d, %s, 1) failed",
+		    fd, fname);
 	}
 
 	/* close the file we have open */
 	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) failed",
-			 fname);
+		tst_brkm(TBROK, cleanup, "close(%s) failed", fname);
 	}
 	if ((fd_notify = myinotify_init()) < 0) {
 		if (errno == ENOSYS) {
@@ -275,8 +264,8 @@
 
 	if ((wd = myinotify_add_watch(fd_notify, fname, IN_ALL_EVENTS)) < 0) {
 		tst_brkm(TBROK|TERRNO, cleanup,
-			 "inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed",
-			 fd_notify, fname);
+		    "inotify_add_watch (%d, %s, IN_ALL_EVENTS) failed",
+		    fd_notify, fname);
 	};
 
 }				/* End setup() */
@@ -314,17 +303,7 @@
 
 int main(void)
 {
-#ifndef __NR_inotify_init
-	tst_resm(TCONF, "This test needs a kernel that has inotify syscall.");
-	tst_resm(TCONF,
-		 "Inotify syscall can be found at kernel 2.6.13 or higher.");
-	return 0;
-#endif
-#ifndef HAVE_SYS_INOTIFY_H
-	tst_resm(TBROK, "can't find header sys/inotify.h");
-	return 1;
-#endif
-	return 0;
+	tst_brkm(TCONF, NULL, "system doesn't have required inotify support");
 }
 
 #endif
diff --git a/testcases/kernel/syscalls/inotify/inotify02.c b/testcases/kernel/syscalls/inotify/inotify02.c
index 3aee5d2..8c26912 100644
--- a/testcases/kernel/syscalls/inotify/inotify02.c
+++ b/testcases/kernel/syscalls/inotify/inotify02.c
@@ -53,8 +53,9 @@
 #include <sys/syscall.h>
 #include "test.h"
 #include "usctest.h"
+#include "linux_syscall_numbers.h"
 
-#if defined(__NR_inotify_init) && defined(HAVE_SYS_INOTIFY_H)
+#if defined(HAVE_SYS_INOTIFY_H)
 #include <sys/inotify.h>
 
 #ifndef IN_MOVE_SELF
@@ -135,7 +136,7 @@
 		 * generate sequence of events
 		 */
 		if (chmod(".", 0755) < 0) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "chmod(\".\", 0755) failed");
 		}
 		event_set[Tst_count].mask = IN_ISDIR | IN_ATTRIB;
@@ -143,7 +144,7 @@
 		Tst_count++;
 
 		if ((fd = creat(FILE_NAME1, 0755)) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "creat(\"%s\", 755) failed",
 				 FILE_NAME1);
 		}
@@ -156,7 +157,7 @@
 		Tst_count++;
 
 		if (close(fd) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "close(%s) failed", FILE_NAME1);
 		}
 		event_set[Tst_count].mask = IN_CLOSE_WRITE;
@@ -164,7 +165,7 @@
 		Tst_count++;
 
 		if (rename(FILE_NAME1, FILE_NAME2) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "rename(%s, %s) failed",
 				 FILE_NAME1, FILE_NAME2);
 		}
@@ -176,14 +177,14 @@
 		Tst_count++;
 
 		if (getcwd(fname1, BUF_SIZE) == NULL) {
-			tst_brkm(TBROK | TERRNO, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "getcwd(%p, %d) failed", fname1,
 				 BUF_SIZE);
 		}
 
 		snprintf(fname2, BUF_SIZE, "%s.rename1", fname1);
 		if (rename(fname1, fname2) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "rename(%s, %s) failed", fname1, fname2);
 		}
 		event_set[Tst_count].mask = IN_MOVE_SELF;
@@ -191,7 +192,7 @@
 		Tst_count++;
 
 		if (unlink(FILE_NAME2) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "unlink(%s) failed", FILE_NAME2);
 		}
 		event_set[Tst_count].mask = IN_DELETE;
@@ -206,12 +207,12 @@
 		 */
 		snprintf(fname3, BUF_SIZE, "%s.rename2", fname1);
 		if (rename(fname2, fname3) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "rename(%s, %s) failed", fname2, fname3);
 		}
 
 		if (rename(fname3, fname1) == -1) {
-			tst_brkm(TBROK, cleanup,
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "rename(%s, %s) failed", fname3, fname1);
 		}
 		event_set[Tst_count].mask = IN_MOVE_SELF;
@@ -226,8 +227,8 @@
 		Tst_count = 0;
 
 		int len, i = 0, test_num = 0;
-		if ((len = read(fd_notify, event_buf, EVENT_BUF_LEN)) < 0) {
-			tst_brkm(TBROK, cleanup,
+		if ((len = read(fd_notify, event_buf, EVENT_BUF_LEN)) == -1) {
+			tst_brkm(TBROK|TERRNO, cleanup,
 				 "read(%d, buf, %d) failed",
 				 fd_notify, EVENT_BUF_LEN);
 
@@ -361,17 +362,7 @@
 
 int main(void)
 {
-#ifndef __NR_inotify_init
-	tst_resm(TCONF, "This test needs a kernel that has inotify syscall.");
-	tst_resm(TCONF,
-		 "Inotify syscall can be found at kernel 2.6.13 or higher.");
-	return 0;
-#endif
-#ifndef HAVE_SYS_INOTIFY_H
-	tst_resm(TBROK, "can't find header sys/inotify.h");
-	return 1;
-#endif
-	return 0;
+	tst_brkm(TCONF, NULL, "system doesn't have required inotify support");
 }
 
 #endif
diff --git a/testcases/kernel/syscalls/inotify/inotify03.c b/testcases/kernel/syscalls/inotify/inotify03.c
index b25c08d..45cf617 100644
--- a/testcases/kernel/syscalls/inotify/inotify03.c
+++ b/testcases/kernel/syscalls/inotify/inotify03.c
@@ -48,8 +48,9 @@
 #include <signal.h>
 #include "test.h"
 #include "usctest.h"
+#include "linux_syscall_numbers.h"
 
-#if defined(HAVE_SYS_INOTIFY_H) && defined(__NR_inotify_init)
+#if defined(HAVE_SYS_INOTIFY_H)
 #include <sys/inotify.h>
 
 #define EVENT_MAX 1024
@@ -115,7 +116,7 @@
 	int len, i, test_num;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *) options, &help)) != NULL)
+	if ((msg = parse_opts(ac, av, options, &help)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 	/* Check for mandatory option of the testcase */
@@ -283,8 +284,7 @@
 			tst_brkm(TCONF, cleanup,
 				 "inotify is not configured in this kernel.");
 		} else {
-			tst_brkm(TBROK|TERRNO, cleanup,
-				 "inotify_init() failed");
+			tst_brkm(TBROK|TERRNO, cleanup, "inotify_init failed");
 		}
 	}
 
@@ -311,7 +311,7 @@
 	if (mount_flag) {
 		TEST(umount(mntpoint));
 		if (TEST_RETURN != 0) {
-			tst_resm(TWARN|TTERRNO, "umount(2) failed ");
+			tst_resm(TWARN|TTERRNO, "umount(%s) failed", mntpoint);
 		}
 	}
 
@@ -342,17 +342,7 @@
 
 int main()
 {
-#ifndef __NR_inotify_init
-	tst_resm(TCONF, "This test needs a kernel that has inotify syscall.");
-	tst_resm(TCONF,
-		 "Inotify syscall can be found at kernel 2.6.13 or higher.");
-	return 0;
-#endif
-#ifndef HAVE_SYS_INOTIFY_H
-	tst_resm(TBROK, "can't find header sys/inotify.h");
-	return 1;
-#endif
-	return 0;
+	tst_brkm(TCONF, NULL, "system doesn't have required inotify support");
 }
 
 #endif
diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
index 4df90ef..d7bb0e1 100644
--- a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
+++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
@@ -137,7 +137,12 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+>>>>>>> master
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
 		tst_brkm(TCONF, NULL,
diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
index 87841be..eacdc95 100644
--- a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
+++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
@@ -134,7 +134,12 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+>>>>>>> master
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
 		tst_brkm(TCONF, NULL,
diff --git a/testcases/kernel/syscalls/io_cancel/io_cancel01.c b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
index 5fd9c10..0cbcc5f 100644
--- a/testcases/kernel/syscalls/io_cancel/io_cancel01.c
+++ b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
@@ -73,8 +73,12 @@
 
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/io_destroy/io_destroy01.c b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
index 221b952..140a125 100644
--- a/testcases/kernel/syscalls/io_destroy/io_destroy01.c
+++ b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
@@ -73,8 +73,12 @@
 
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/io_getevents/io_getevents01.c b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
index a6f7870..91a8509 100644
--- a/testcases/kernel/syscalls/io_getevents/io_getevents01.c
+++ b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
@@ -73,8 +73,12 @@
 
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/io_setup/io_setup01.c b/testcases/kernel/syscalls/io_setup/io_setup01.c
index 64b610d..4aeee64 100644
--- a/testcases/kernel/syscalls/io_setup/io_setup01.c
+++ b/testcases/kernel/syscalls/io_setup/io_setup01.c
@@ -46,8 +46,6 @@
 	 * print errno log if that option was specified
 	 */
 	TEST_CLEANUP;
-
-	tst_exit();
 }
 
 /*
@@ -71,10 +69,8 @@
 	io_context_t ctx;
 	int expected_return;
 
-	if ((msg =
-	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/io_submit/io_submit01.c b/testcases/kernel/syscalls/io_submit/io_submit01.c
index 3e24cb4..c581a14 100644
--- a/testcases/kernel/syscalls/io_submit/io_submit01.c
+++ b/testcases/kernel/syscalls/io_submit/io_submit01.c
@@ -78,8 +78,12 @@
 
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -175,7 +179,7 @@
 		rval = io_setup(1, &ctx);
 		if (rval != 0) {
 			tst_brkm(TBROK, cleanup, "io_setup failed: %d", rval);
-		 /*NOTREACHED*/}
+		 }
 
 		TEST(io_submit(ctx, 1, iocbs));
 		if (TEST_RETURN == 0) {
diff --git a/testcases/kernel/syscalls/ioctl/ioctl01.c b/testcases/kernel/syscalls/ioctl/ioctl01.c
index def5bb1..b083529 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl01.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl01.c
@@ -115,7 +115,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	if (!Devflag) {
@@ -126,7 +130,7 @@
 	}
 
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	setup();
@@ -168,7 +172,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ioctl/ioctl02.c b/testcases/kernel/syscalls/ioctl/ioctl02.c
index e43adf5..f9f772d 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl02.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl02.c
@@ -114,7 +114,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "dS", &parentpid, &childtty);
@@ -128,7 +132,7 @@
 	}
 
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	setup();
@@ -146,7 +150,7 @@
 
 		if ((childpid = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (childpid == 0) {	/* child */
 #ifdef UCLINUX
@@ -169,7 +173,7 @@
 			kill(childpid, SIGTERM);
 			waitpid(childpid, NULL, 0);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/* run the parent test */
 		if ((rval = run_ptest()) == -1) {
@@ -210,7 +214,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 void do_child()
diff --git a/testcases/kernel/syscalls/ioperm/ioperm01.c b/testcases/kernel/syscalls/ioperm/ioperm01.c
index fe9162c..9a59304 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm01.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm01.c
@@ -95,9 +95,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -128,7 +134,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -141,8 +147,8 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	/*
 	 * The value of IO_BITMAP_BITS (include/asm-i386/processor.h) changed
@@ -174,7 +180,7 @@
 	 * Reset I/O privileges for the specified port.
 	 */
 	if ((ioperm(io_addr, NUM_BYTES, TURN_OFF)) == -1) {
-		tst_brkm(TBROK, tst_exit, "ioperm() cleanup failed");
+		tst_brkm(TBROK, NULL, "ioperm() cleanup failed");
 	}
 
 	/*
diff --git a/testcases/kernel/syscalls/ioperm/ioperm02.c b/testcases/kernel/syscalls/ioperm/ioperm02.c
index 85b4fd8..aa2aa7d 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm02.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm02.c
@@ -116,9 +116,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -173,7 +179,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -194,7 +200,7 @@
 {
 	/* reset user as root */
 	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to set uid as root");
+		tst_brkm(TBROK, NULL, "Failed to set uid as root");
 	}
 }
 
@@ -207,12 +213,12 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
 	}
 
 	/* Check if "nobody" user id exists */
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "\"nobody\" user id doesn't exist");
+		tst_brkm(TBROK, NULL, "\"nobody\" user id doesn't exist");
 	}
 
 	/*
diff --git a/testcases/kernel/syscalls/iopl/iopl01.c b/testcases/kernel/syscalls/iopl/iopl01.c
index eaac071..7048cc3 100644
--- a/testcases/kernel/syscalls/iopl/iopl01.c
+++ b/testcases/kernel/syscalls/iopl/iopl01.c
@@ -89,10 +89,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -139,8 +137,8 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	/* Pause if that option was specified */
 	TEST_PAUSE;
diff --git a/testcases/kernel/syscalls/iopl/iopl02.c b/testcases/kernel/syscalls/iopl/iopl02.c
index 3763524..7efa5b0 100644
--- a/testcases/kernel/syscalls/iopl/iopl02.c
+++ b/testcases/kernel/syscalls/iopl/iopl02.c
@@ -188,7 +188,7 @@
 {
 	/* reset user as root */
 	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "Failed to set uid as root");
+		tst_brkm(TBROK, NULL, "Failed to set uid as root");
 	}
 }
 
@@ -201,12 +201,12 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
 	}
 
 	/* Check if "nobody" user id exists */
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "\"nobody\" user id doesn't exist");
+		tst_brkm(TBROK, NULL, "\"nobody\" user id doesn't exist");
 	}
 
 	/* Set up the expected error numbers for -e option */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
index 72c42be..5cf2d66 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
@@ -76,7 +76,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -117,7 +121,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
index bc6f16f..a9e687d 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
@@ -78,7 +78,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -131,7 +135,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
index 9e8e3a7..121e29f 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -111,7 +115,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
index a1d8ca5..783b09a 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
@@ -110,7 +110,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -148,7 +152,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -169,7 +173,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
index 7eead0d..5de0144 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
@@ -82,7 +82,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
index bf75a3d..cac5d6b 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
@@ -123,7 +123,11 @@
 	/* parse standard options */
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
index e454dd9..17aa706 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
@@ -127,7 +127,11 @@
 	/* parse standard options */
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
index 1ad2506..4ea4e0d 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
@@ -120,7 +120,11 @@
 	/* parse standard options */
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
@@ -452,7 +456,11 @@
 		cleanup();
 
 	MSGMNI = nr_msgqs - get_used_msgqueues();
+<<<<<<< HEAD
 	if (MSGMNI > MAXNPROCS)
+=======
+	if ( MSGMNI > MAXNPROCS )
+>>>>>>> master
 		MSGMNI = MAXNPROCS;
 	if (MSGMNI <= 0) {
 		tst_resm(TBROK,
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
index 5dd6b2b..bf74033 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
@@ -130,7 +130,11 @@
 	/* parse standard options */
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget01.c b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
index 55977ea..ef3c999 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget01.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
@@ -73,7 +73,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -119,7 +123,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget02.c b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
index 85b2481..7bba407 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget02.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
@@ -91,7 +91,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -141,7 +145,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget03.c b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
index 9337381..6a5a9f6 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget03.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
@@ -76,7 +76,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -119,7 +123,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
index 2dff025..7f69c8a 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget04.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
@@ -79,7 +79,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -125,7 +129,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -144,7 +148,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
index 1b0db9e..99dbfce 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
@@ -87,7 +87,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "d", &msg_q_1);
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
index 5d3ad75..0fd5209 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
@@ -101,7 +101,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -142,7 +146,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -163,7 +167,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
index cb66d44..677a2a2 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
@@ -89,7 +89,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -130,7 +134,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
index 50cf94b..e1ad660 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
@@ -100,7 +100,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -141,7 +145,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
index e7d92f3..68869c4 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
@@ -93,7 +93,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
@@ -158,7 +162,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
index a82582e..819c1a8 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
@@ -95,7 +95,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
@@ -164,7 +168,7 @@
 		}
 	}
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
index 3f71353..1001d55 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
@@ -81,7 +81,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -136,7 +140,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
index fd6a7ab..6fe5ee5 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
@@ -92,7 +92,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -130,7 +134,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -149,7 +153,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
index 5942b26..71b31d2 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
@@ -98,7 +98,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -142,7 +146,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
index 1b62426..f0c82c4 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
@@ -76,7 +76,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -115,7 +119,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
index 526e1d2..a027fa6 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
@@ -97,7 +97,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
@@ -162,7 +166,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
index 68dac6b..8de4457 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
@@ -91,7 +91,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 #define PIPE_NAME	"msgsnd06"
@@ -172,7 +176,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl01.c b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
index 6f901a3..f226a75 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl01.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
@@ -147,7 +147,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = av[0];
@@ -249,7 +253,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl02.c b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
index b005f05..5852643 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl02.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -114,7 +118,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -133,7 +137,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
index b03823b..a53245b 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
@@ -104,7 +104,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -140,7 +144,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
index 1379073..59ca88e 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
@@ -83,7 +83,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl05.c b/testcases/kernel/syscalls/ipc/semctl/semctl05.c
index 18196b0..63291a1 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl05.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl05.c
@@ -103,7 +103,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -143,7 +147,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl06.c b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
index d99a378..644e83a 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl06.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
@@ -116,7 +116,11 @@
 	char *msg;
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/ipc/semget/semget01.c b/testcases/kernel/syscalls/ipc/semget/semget01.c
index 6d31fde..3899869 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget01.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget01.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -115,7 +119,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semget/semget02.c b/testcases/kernel/syscalls/ipc/semget/semget02.c
index 1ddf5c0..3f18f2c 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget02.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget02.c
@@ -85,7 +85,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -122,7 +126,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -132,7 +136,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/semget/semget03.c b/testcases/kernel/syscalls/ipc/semget/semget03.c
index 69eefba..388055f 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget03.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget03.c
@@ -67,7 +67,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -104,7 +108,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semget/semget05.c b/testcases/kernel/syscalls/ipc/semget/semget05.c
index 88c7496..2b5c149 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget05.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget05.c
@@ -81,7 +81,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Set the MAXIDS for the specific machine by reading the system limit
@@ -132,7 +136,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semget/semget06.c b/testcases/kernel/syscalls/ipc/semget/semget06.c
index ebe1c09..c84fc7a 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget06.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget06.c
@@ -73,7 +73,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -114,7 +118,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop01.c b/testcases/kernel/syscalls/ipc/semop/semop01.c
index 4dddc25..7b0d612 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop01.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop01.c
@@ -83,7 +83,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -144,7 +148,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return (0);
+	  return (0);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop02.c b/testcases/kernel/syscalls/ipc/semop/semop02.c
index 7ac2903..329e249 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop02.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop02.c
@@ -109,7 +109,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -148,7 +152,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -160,7 +164,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/semop/semop03.c b/testcases/kernel/syscalls/ipc/semop/semop03.c
index 47412ae..e3b1044 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop03.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop03.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -123,7 +127,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop04.c b/testcases/kernel/syscalls/ipc/semop/semop04.c
index 599bbd0..b2ae8da 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop04.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop04.c
@@ -87,7 +87,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -140,7 +144,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop05.c b/testcases/kernel/syscalls/ipc/semop/semop05.c
index 703c6cd..b2a47a6 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop05.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop05.c
@@ -117,7 +117,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "dd", &i_uclinux, &sem_id_1);
@@ -218,7 +222,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat01.c b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
index f3f3c70..0c0e8b6 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat01.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
@@ -92,7 +92,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -139,7 +143,7 @@
 
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat02.c b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
index c753cca..f9aaf8a 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat02.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
@@ -111,7 +111,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -157,7 +161,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -169,7 +173,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat03.c b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
index a02313e..d2af29c 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat03.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
@@ -80,7 +80,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
index 6ee11cf..cd21b3c 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
@@ -142,7 +142,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = av[0];
@@ -214,7 +218,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
index 90a39f2..d68e299 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
@@ -111,7 +111,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -157,7 +161,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -169,7 +173,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
index af69d48..3cd3e60 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
@@ -100,7 +100,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
index 870d0ed..e96c76a 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
@@ -62,7 +62,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -88,7 +92,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
index 186e238..aa7082e 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
@@ -84,7 +84,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -125,7 +129,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
index 08ca4ce..5210ec6 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
@@ -65,7 +65,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -103,7 +107,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget01.c b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
index 0bf79d4..823f3f2 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget01.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -142,7 +146,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget02.c b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
index e69dc98..b476359 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget02.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
@@ -99,7 +99,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -139,7 +143,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget03.c b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
index 3133e16..e3ef703 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget03.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
@@ -76,7 +76,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -116,7 +120,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget04.c b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
index 446c997..54ba0af 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget04.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
@@ -70,7 +70,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -109,7 +113,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -128,7 +132,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget05.c b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
index 7a29b9d..70beb0a 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget05.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
@@ -79,7 +79,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -99,7 +103,7 @@
 
 		cleanup();
 
-	 /*NOTREACHED*/} else {	/* parent */
+	 } else {	/* parent */
 		/* wait for the child to return */
 		if (waitpid(pid, NULL, 0) == -1) {
 			tst_brkm(TBROK, cleanup, "waitpid failed");
diff --git a/testcases/kernel/syscalls/keyctl/keyctl01.c b/testcases/kernel/syscalls/keyctl/keyctl01.c
index 75cb9c2..f4d612e 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl01.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl01.c
@@ -125,7 +125,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
@@ -178,7 +182,7 @@
 
 	}
 	cleanup();
-	/* NOTREACHED */
+	
 	return (1);
 }
 #else
diff --git a/testcases/kernel/syscalls/kill/kill01.c b/testcases/kernel/syscalls/kill/kill01.c
index c1a93bd..017faeb 100644
--- a/testcases/kernel/syscalls/kill/kill01.c
+++ b/testcases/kernel/syscalls/kill/kill01.c
@@ -82,7 +82,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -117,7 +121,7 @@
 		if (TEST_RETURN == -1) {
 			tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s",
 				 TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		 /*NOTREACHED*/}
+		 }
 
 		if (STD_FUNCTIONAL_TEST) {
 			/*
@@ -139,7 +143,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -150,7 +154,7 @@
 	int exno = 1;
 
 	pause();
-	 /*NOTREACHED*/ exit(exno);
+	  exit(exno);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c
index 837d38f..ff4ef09 100644
--- a/testcases/kernel/syscalls/kill/kill03.c
+++ b/testcases/kernel/syscalls/kill/kill03.c
@@ -84,7 +84,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -124,7 +128,7 @@
 				 "Expected a return value of -1 got %ld",
 				 TCID, TEST_ERRNO, strerror(TEST_ERRNO),
 				 TEST_RETURN);
-		 /*NOTREACHED*/}
+		 }
 
 		if (STD_FUNCTIONAL_TEST) {
 			/*
@@ -146,7 +150,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -157,7 +161,7 @@
 	int exno = 1;
 
 	pause();
-	 /*NOTREACHED*/ exit(exno);
+	  exit(exno);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c
index 40d8795..f631b94 100644
--- a/testcases/kernel/syscalls/kill/kill04.c
+++ b/testcases/kernel/syscalls/kill/kill04.c
@@ -84,7 +84,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -140,7 +144,7 @@
 				 "Expected a return value of -1 got %ld",
 				 TCID, TEST_ERRNO, strerror(TEST_ERRNO),
 				 TEST_RETURN);
-		 /*NOTREACHED*/}
+		 }
 
 		if (STD_FUNCTIONAL_TEST) {
 			/*
@@ -162,7 +166,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -173,7 +177,7 @@
 	int exno = 1;
 
 	pause();
-	 /*NOTREACHED*/ exit(exno);
+	  exit(exno);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/kill/kill05.c b/testcases/kernel/syscalls/kill/kill05.c
index 43e84ce..9586ebe 100644
--- a/testcases/kernel/syscalls/kill/kill05.c
+++ b/testcases/kernel/syscalls/kill/kill05.c
@@ -107,7 +107,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -127,7 +131,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/kill/kill06.c b/testcases/kernel/syscalls/kill/kill06.c
index 2217479..cf3aa1f 100644
--- a/testcases/kernel/syscalls/kill/kill06.c
+++ b/testcases/kernel/syscalls/kill/kill06.c
@@ -83,7 +83,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -126,7 +130,7 @@
 			/* Kill all processes in this process group */
 			TEST(kill(-getpgrp(), TEST_SIG));
 			sleep(300);
-			 /*NOTREACHED*/
+			 
 			    tst_resm(TINFO, "%d never recieved a"
 				     " signal", getpid());
 			exit(exno);
@@ -159,7 +163,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -170,7 +174,7 @@
 	int exno = 1;
 
 	sleep(299);
-	 /*NOTREACHED*/
+	 
 	    tst_resm(TINFO, "%d never recieved a" " signal", getpid());
 	exit(exno);
 }
diff --git a/testcases/kernel/syscalls/kill/kill07.c b/testcases/kernel/syscalls/kill/kill07.c
index 5af5c60..9eeea4e 100644
--- a/testcases/kernel/syscalls/kill/kill07.c
+++ b/testcases/kernel/syscalls/kill/kill07.c
@@ -95,7 +95,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -153,7 +157,7 @@
 		if (TEST_RETURN == -1) {
 			tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s",
 				 TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		 /*NOTREACHED*/}
+		 }
 
 		if (STD_FUNCTIONAL_TEST) {
 			/*
@@ -180,11 +184,11 @@
 		}
 		if (shmdt(flag)) {
 			tst_brkm(TBROK, cleanup, "shmdt failed ");
-		 /*NOTREACHED*/}
+		 }
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -206,7 +210,7 @@
 	int exno = 1;
 
 	sleep(300);
-	 /*NOTREACHED*/ tst_resm(TINFO, "Child never recieved a signal");
+	  tst_resm(TINFO, "Child never recieved a signal");
 	exit(exno);
 }
 
diff --git a/testcases/kernel/syscalls/kill/kill08.c b/testcases/kernel/syscalls/kill/kill08.c
index affec88..67c4858 100644
--- a/testcases/kernel/syscalls/kill/kill08.c
+++ b/testcases/kernel/syscalls/kill/kill08.c
@@ -83,7 +83,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
@@ -126,7 +130,7 @@
 			/* Kill all processes in this process group */
 			TEST(kill(0, TEST_SIG));
 			pause();
-			 /*NOTREACHED*/ exit(exno);
+			  exit(exno);
 		} else {
 			waitpid(pid1, &status, 0);
 			if (TEST_RETURN != 0) {
@@ -156,7 +160,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -167,7 +171,7 @@
 	int exno = 1;
 
 	pause();
-	 /*NOTREACHED*/ exit(exno);
+	  exit(exno);
 }
 
 /*
diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c
index fb70c12..303857a 100644
--- a/testcases/kernel/syscalls/kill/kill10.c
+++ b/testcases/kernel/syscalls/kill/kill10.c
@@ -226,25 +226,25 @@
 	Tst_nobuf = 1;
 
 	if ((msg = parse_opts(ac, av, options, &help))) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	if (nflag) {
 		if (sscanf(narg, "%i", &num_procs) != 1) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 			    "-n option arg is not a number");
 		}
 	}
 	if (gflag) {
 		if (sscanf(garg, "%i", &num_pgrps) != 1) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 			    "-g option arg is not a number");
 		}
 	}
 
 	if (dflag) {
 		if (sscanf(darg, "%i", &debug_flag) != 1) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 			    "-d option arg is not a number");
 		}
 	}
diff --git a/testcases/kernel/syscalls/kill/kill11.c b/testcases/kernel/syscalls/kill/kill11.c
index edc3bf7..20ed012 100644
--- a/testcases/kernel/syscalls/kill/kill11.c
+++ b/testcases/kernel/syscalls/kill/kill11.c
@@ -101,18 +101,20 @@
 
 #ifdef UCLINUX
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg =
 	     parse_opts(argc, argv, NULL, NULL)) != NULL) {
+=======
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+>>>>>>> master
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	maybe_run_child(&do_child, "dd", &temp, &sig);
 #endif
 
 	setup();
 	// tempdir();           /* move to new directory */
-/*--------------------------------------------------------------------*/
-	blenter();		/*<<<<<ENTER DATA HERE<<<<<<<< */
+	blenter();
 
 	exno = 1;
 	unlink("core");
diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c
index 25633db..c28578a 100644
--- a/testcases/kernel/syscalls/kill/kill12.c
+++ b/testcases/kernel/syscalls/kill/kill12.c
@@ -101,8 +101,7 @@
 
 	setup();
 	//tempdir();            /* move to new directory */ 12/20/2003
-/*--------------------------------------------------------------------*/
-	blenter();		/*<<<<<ENTER DATA HERE<<<<<<<< */
+	blenter();
 
 	exno = 1;
 
diff --git a/testcases/kernel/syscalls/lchown/lchown01.c b/testcases/kernel/syscalls/lchown/lchown01.c
index 01b65f8..d78d450 100644
--- a/testcases/kernel/syscalls/lchown/lchown01.c
+++ b/testcases/kernel/syscalls/lchown/lchown01.c
@@ -80,7 +80,7 @@
 #include "test.h"
 #include "usctest.h"
 
-#define FILE_MODE	S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
+#define FILE_MODE	(S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
 #define TESTFILE	"testfile"
 #define SFILE		"slink_file"
 
@@ -110,12 +110,19 @@
 int main(int argc, char *argv[])
 {
 	struct stat stat_buf;
-	int lc, i;
+	int lc;
 	char *msg;
+	int i;
 
+<<<<<<< HEAD
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
+=======
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+>>>>>>> master
 	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -128,7 +135,7 @@
 			char *test_desc = test_cases[i].desc;
 
 			/*
-			 * Call lchwon(2) with different user id and
+			 * Call lchown(2) with different user id and
 			 * group id (numeric values) to set it on
 			 * symlink of testfile.
 			 */
@@ -154,26 +161,28 @@
 					         "%s failed, errno %d",
 						 SFILE, TEST_ERRNO);
 				}
-
-				if (user_id == (uid_t)-1) {
+				if (user_id == -1) {
 					if (i > 0)
 						user_id = test_cases[i-1].user_id;
 					else
 						user_id = geteuid();
 				}
-
-				if (group_id == (gid_t)-1) {
+				if (group_id == -1) {
 					if (i > 0)
-						group_id = test_cases[i - 1].group_id;
+						group_id = test_cases[i-1].group_id;
 					else
 						group_id = getegid();
 				}
 
+				/*
+				 * Check for expected Ownership ids
+				 * set on testfile.
+				 */
 				if ((stat_buf.st_uid != user_id) ||
 				    (stat_buf.st_gid != group_id)) {
 					tst_resm(TFAIL,
 						 "%s: incorrect ownership set, "
-						 "expected %u %u", SFILE,
+						 "Expected %d %d", SFILE,
 						 user_id, group_id);
 				} else {
 					tst_resm(TPASS, "lchown() succeeds to "
@@ -186,6 +195,7 @@
 	}
 
 	cleanup();
+
 	tst_exit();
 }
 
@@ -202,21 +212,24 @@
 	/* capture signals */
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 	
-	tst_require_root(tst_exit);
+	tst_require_root(NULL);
 	
 	TEST_PAUSE;
 	tst_tmpdir();
 
 	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "open(2) %s mode %o failed",
-		         TESTFILE, FILE_MODE);
+		tst_brkm(TBROK, cleanup, "open(%s, O_RDWR|O_CREAT, %o) failed",
+			 TESTFILE, FILE_MODE);
+	}
+	if (close(fd) == -1) {
+		tst_brkm(TBROK|TERRNO, cleanup, "close(%s) failed", TESTFILE);
 	}
 	
 	if (close(fd) == -1)
-		tst_brkm(TBROK | TERRNO, cleanup, "close(2) %s", TESTFILE);
+		tst_brkm(TBROK|TERRNO, cleanup, "close(2) %s", TESTFILE);
 
 	if (symlink(TESTFILE, SFILE) < 0) {
-		tst_brkm(TBROK | TERRNO, cleanup, "symlink(2) %s to %s failed",
+		tst_brkm(TBROK|TERRNO, cleanup, "symlink(2) %s to %s failed",
 		         TESTFILE, SFILE);
 	}
 }
diff --git a/testcases/kernel/syscalls/lchown/lchown02.c b/testcases/kernel/syscalls/lchown/lchown02.c
index 6dd5b2d..4b98781 100644
--- a/testcases/kernel/syscalls/lchown/lchown02.c
+++ b/testcases/kernel/syscalls/lchown/lchown02.c
@@ -152,9 +152,15 @@
 	gid_t group_id;
 	int i;
 
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
+=======
+	/* Parse standard options given to run the test. */
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	setup();
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
index d7ade4a..038408d 100644
--- a/testcases/kernel/syscalls/linkat/linkat01.c
+++ b/testcases/kernel/syscalls/linkat/linkat01.c
@@ -211,7 +211,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/listen/listen01.c b/testcases/kernel/syscalls/listen/listen01.c
index 9d33ee9..c94dd1f 100644
--- a/testcases/kernel/syscalls/listen/listen01.c
+++ b/testcases/kernel/syscalls/listen/listen01.c
@@ -92,7 +92,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -128,7 +132,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c
index 64afba0..7638508 100644
--- a/testcases/kernel/syscalls/llseek/llseek01.c
+++ b/testcases/kernel/syscalls/llseek/llseek01.c
@@ -106,7 +106,11 @@
 	loff_t offset;		/* Ret value from llseek */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -191,7 +195,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c
index b0e3dcc..698e8a9 100644
--- a/testcases/kernel/syscalls/llseek/llseek02.c
+++ b/testcases/kernel/syscalls/llseek/llseek02.c
@@ -129,7 +129,11 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -187,7 +191,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/lseek/lseek06.c b/testcases/kernel/syscalls/lseek/lseek06.c
index 4daa3f8..2ae7e92 100644
--- a/testcases/kernel/syscalls/lseek/lseek06.c
+++ b/testcases/kernel/syscalls/lseek/lseek06.c
@@ -98,7 +98,11 @@
 	char read_buf[1];	/* data read from temp. file */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -168,7 +172,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/lseek/lseek07.c b/testcases/kernel/syscalls/lseek/lseek07.c
index 6ec57d7..013dcdc 100644
--- a/testcases/kernel/syscalls/lseek/lseek07.c
+++ b/testcases/kernel/syscalls/lseek/lseek07.c
@@ -102,7 +102,11 @@
 	off_t offset;		/* byte position in temporary file */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -209,7 +213,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/lseek/lseek08.c b/testcases/kernel/syscalls/lseek/lseek08.c
index 521bc9d..fc74ce3 100644
--- a/testcases/kernel/syscalls/lseek/lseek08.c
+++ b/testcases/kernel/syscalls/lseek/lseek08.c
@@ -98,7 +98,11 @@
 	char read_buf[1];	/* data read from temp. file */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -160,7 +164,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return 0;
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/lseek/lseek09.c b/testcases/kernel/syscalls/lseek/lseek09.c
index 4aa0ddb..1023a00 100644
--- a/testcases/kernel/syscalls/lseek/lseek09.c
+++ b/testcases/kernel/syscalls/lseek/lseek09.c
@@ -100,7 +100,11 @@
 	char read_buf[BUFSIZ];	/* data read from temp. file */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -180,7 +184,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/lseek/lseek10.c b/testcases/kernel/syscalls/lseek/lseek10.c
index f6ab209..582e4dd 100644
--- a/testcases/kernel/syscalls/lseek/lseek10.c
+++ b/testcases/kernel/syscalls/lseek/lseek10.c
@@ -132,7 +132,11 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -191,7 +195,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/lstat/lstat01.c b/testcases/kernel/syscalls/lstat/lstat01.c
index 34714b8..ce5f0c8 100644
--- a/testcases/kernel/syscalls/lstat/lstat01.c
+++ b/testcases/kernel/syscalls/lstat/lstat01.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/lstat/lstat02.c b/testcases/kernel/syscalls/lstat/lstat02.c
index 29ebb6a..8c26102 100644
--- a/testcases/kernel/syscalls/lstat/lstat02.c
+++ b/testcases/kernel/syscalls/lstat/lstat02.c
@@ -152,7 +152,11 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -214,7 +218,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -233,7 +237,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/lstat/lstat03.c b/testcases/kernel/syscalls/lstat/lstat03.c
index de5d547..46bbb88 100644
--- a/testcases/kernel/syscalls/lstat/lstat03.c
+++ b/testcases/kernel/syscalls/lstat/lstat03.c
@@ -87,8 +87,8 @@
 char *TCID = "lstat03";		/* Test program identifier.    */
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
-uid_t User_id;			/* user id/group id of test process */
-gid_t Group_id;
+uid_t user_id;			/* user id/group id of test process */
+gid_t group_id;
 
 char nobody_uid[] = "nobody";
 struct passwd *ltpuser;
@@ -103,7 +103,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -139,8 +143,8 @@
 			 * Verify the data returned by lstat(2)
 			 * aganist the expected data.
 			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id) ||
+			if ((stat_buf.st_uid != user_id) ||
+			    (stat_buf.st_gid != group_id) ||
 			    (!(stat_buf.st_mode && S_IFLNK)) ||
 			    (stat_buf.st_size != strlen(TESTFILE))) {
 				tst_resm(TFAIL, "Functionality of lstat(2) on "
@@ -157,7 +161,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -180,7 +184,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -229,8 +233,8 @@
 	}
 
 	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
+	user_id = getuid();
+	group_id = getgid();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/mbind/mbind01.c b/testcases/kernel/syscalls/mbind/mbind01.c
index 25adf60..b0c2304 100644
--- a/testcases/kernel/syscalls/mbind/mbind01.c
+++ b/testcases/kernel/syscalls/mbind/mbind01.c
@@ -361,7 +361,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
diff --git a/testcases/kernel/syscalls/memmap/mem03.c b/testcases/kernel/syscalls/memmap/mem03.c
index 9d135a6..10c28c9 100644
--- a/testcases/kernel/syscalls/memmap/mem03.c
+++ b/testcases/kernel/syscalls/memmap/mem03.c
@@ -141,7 +141,7 @@
 	/* clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir01.c b/testcases/kernel/syscalls/mkdir/mkdir01.c
index 5e0c1ed..72dffd2 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir01.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir01.c
@@ -116,10 +116,6 @@
 void setup();
 void cleanup();
 
-#if !defined(UCLINUX)
-char *get_high_address();
-#endif
-
 char *TCID = "mkdir01";		/* Test program identifier.    */
 int TST_TOTAL = 2;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
@@ -133,23 +129,20 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
+<<<<<<< HEAD
     /***************************************************************
      * parse standard options
      ***************************************************************/
+=======
+>>>>>>> master
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -168,9 +161,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -204,9 +194,6 @@
 			TEST_ERROR_LOG(TEST_ERRNO);
 		}
 
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
 		if (STD_FUNCTIONAL_TEST) {
 			if (TEST_RETURN == -1) {
 				if (TEST_ERRNO == EFAULT) {
@@ -230,13 +217,9 @@
 
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
-
-	return 0;
-}				/* End main */
+	tst_exit();
+}
 
 /***************************************************************
  * setup() - performs all ONE TIME setup for this test.
diff --git a/testcases/kernel/syscalls/mkdir/mkdir02.c b/testcases/kernel/syscalls/mkdir/mkdir02.c
index c25633e..515c7fa 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir02.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir02.c
@@ -107,7 +107,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -135,7 +139,7 @@
 
 		if ((pid = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TFAIL, cleanup, "fork() failed");
-			/* NOTREACHED */
+			
 		}
 
 		if (pid == 0) {	/* first child */
@@ -147,7 +151,7 @@
 					 "effective gid to %d",
 					 ltpuser1->pw_gid, ltpuser1->pw_gid);
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			/* being ltupuser1 */
 			rval = setreuid(ltpuser1->pw_uid, ltpuser1->pw_uid);
@@ -158,7 +162,7 @@
 					 "effective uid to %d",
 					 ltpuser1->pw_uid, ltpuser1->pw_uid);
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 
 			/*
@@ -171,7 +175,7 @@
 					 " a directory with Set "
 					 " group ID turn on ");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			if (stat(tstdir1, &buf1) == -1) {
 				perror("stat");
@@ -179,18 +183,18 @@
 					 "failed to stat the new directory"
 					 "in mkdir()");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			if (chmod(tstdir1, buf1.st_mode | S_ISGID) != 0) {
 				perror("chmod");
 				tst_resm(TFAIL, "failed to set S_ISGID bit");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 
 			/* Successfully create the parent directory */
 			exit(0);
-			/* NOTREACHED */
+			
 		}
 		wait(&status);
 		if (WEXITSTATUS(status) != 0) {
@@ -211,7 +215,7 @@
 		if ((pid1 = FORK_OR_VFORK()) < 0) {
 			perror("fork failed");
 			tst_brkm(TFAIL, cleanup, "fork() failed");
-			/* NOTREACHED */
+			
 		} else if (pid1 == 0) {	/* second child */
 
 			/* being user ltpuser2 */
@@ -223,7 +227,7 @@
 					 ltpuser2->pw_gid, ltpuser2->pw_gid);
 				perror("setregid");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			rval = setreuid(ltpuser2->pw_uid, ltpuser2->pw_uid);
 			if (rval < 0) {
@@ -233,7 +237,7 @@
 					 ltpuser2->pw_uid, ltpuser2->pw_uid);
 				perror("setreuid");
 				exit(1);
-				/* NOTREACHED */
+				
 
 			}
 
@@ -247,7 +251,7 @@
 					 " a directory %s under %s ", tstdir2,
 					 tstdir1);
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			/*
 			 * check the group ID
@@ -259,14 +263,14 @@
 					 "failed to stat the new directory"
 					 "in mkdir()");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			if (stat(tstdir1, &buf1) == -1) {
 				tst_resm(TFAIL,
 					 "failed to stat the new directory"
 					 "in mkdir()");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			if (buf.st_gid != buf1.st_gid) {
 				tst_resm(TFAIL, "mkdir() FAILED to inherit "
@@ -274,7 +278,7 @@
 					 " directory %d",
 					 buf.st_gid, buf1.st_gid);
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 
 			/* check the S_ISGID  bit */
@@ -283,11 +287,11 @@
 					 " the S_ISGID bit from parent "
 					 " directory");
 				exit(1);
-				/* NOTREACHED */
+				
 			}
 			/* PASS */
 			exit(0);
-			/* NOTREACHED */
+			
 		}
 
 		waitpid(pid1, &status, 0);
@@ -298,7 +302,7 @@
 			tst_resm(TFAIL, "Test to attempt to make a directory"
 				 " inherits group ID FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 	}			/* End for TEST_LOOPING */
 
@@ -307,7 +311,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir03.c b/testcases/kernel/syscalls/mkdir/mkdir03.c
index 011bce3..5052367 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir03.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir03.c
@@ -139,7 +139,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -192,7 +196,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
@@ -252,7 +256,7 @@
 	/* create a file */
 	if ((fileHandle2 = creat(tstfile5, PERMS)) == -1) {
 		tst_brkm(TBROK, cleanup, "creat a file failed");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir04.c b/testcases/kernel/syscalls/mkdir/mkdir04.c
index a7ed717..238d6cb 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir04.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir04.c
@@ -111,7 +111,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -136,7 +140,7 @@
 
 		if ((pid = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TBROK, cleanup, "fork #1 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* first child */
 			/* set to ltpuser1 */
@@ -148,13 +152,13 @@
 					 ltpuser1->pw_uid, ltpuser1->pw_uid);
 				perror("setreuid");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 			/* create the parent directory with 0700 permits */
 			if (mkdir(tstdir1, PERMS) == -1) {
 				tst_resm(TFAIL, "mkdir(%s, %#o) Failed",
 					 tstdir1, PERMS);
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 			/* create tstdir1 succeeded */
 			exit(0);
 		}
@@ -170,7 +174,7 @@
 
 		if ((pid1 = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TBROK, cleanup, "fork #2 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid1 == 0) {	/* second child */
 			/* set to ltpuser2 */
@@ -182,17 +186,17 @@
 					 ltpuser2->pw_uid, ltpuser2->pw_uid);
 				perror("setreuid");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 			if (mkdir(tstdir2, PERMS) != -1) {
 				tst_resm(TFAIL, "mkdir(%s, %#o) unexpected "
 					 "succeeded", tstdir2, PERMS);
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 			if (errno != EACCES) {
 				tst_resm(TFAIL, "Expected EACCES got %d",
 					 errno);
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 			/* PASS */
 			exit(0);
 		}
@@ -213,7 +217,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -223,8 +227,8 @@
 {
 	/* must run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run this as root");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must run this as root");
+	 }
 
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/mkdir/mkdir05.c b/testcases/kernel/syscalls/mkdir/mkdir05.c
index f6ad562..66f28ac 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir05.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir05.c
@@ -98,7 +98,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -134,7 +138,7 @@
 			if (stat(tstdir1, &buf) == -1) {
 				tst_brkm(TBROK, cleanup, "failed to stat the "
 					 "new directory");
-			 /*NOTREACHED*/}
+			 }
 			/* check the owner */
 			if (buf.st_uid != geteuid()) {
 				tst_resm(TFAIL, "mkdir() FAILED to set owner ID"
@@ -163,7 +167,7 @@
 	 * cleanup and exit
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -173,7 +177,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/mkdir/mkdir08.c b/testcases/kernel/syscalls/mkdir/mkdir08.c
index d22f69d..55d0e8a 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir08.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir08.c
@@ -139,7 +139,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
index 109958d..4fde6fc 100644
--- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
@@ -91,7 +91,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/mknod/mknod02.c b/testcases/kernel/syscalls/mknod/mknod02.c
index 23a7e58..b2b010f 100644
--- a/testcases/kernel/syscalls/mknod/mknod02.c
+++ b/testcases/kernel/syscalls/mknod/mknod02.c
@@ -110,7 +110,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -198,7 +202,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod03.c b/testcases/kernel/syscalls/mknod/mknod03.c
index 54c1ff1..b8013d8 100644
--- a/testcases/kernel/syscalls/mknod/mknod03.c
+++ b/testcases/kernel/syscalls/mknod/mknod03.c
@@ -110,7 +110,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -197,7 +201,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod04.c b/testcases/kernel/syscalls/mknod/mknod04.c
index 75084c0..e0c95a6 100644
--- a/testcases/kernel/syscalls/mknod/mknod04.c
+++ b/testcases/kernel/syscalls/mknod/mknod04.c
@@ -110,7 +110,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -197,7 +201,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod05.c b/testcases/kernel/syscalls/mknod/mknod05.c
index e268a10..5dd4f7b 100644
--- a/testcases/kernel/syscalls/mknod/mknod05.c
+++ b/testcases/kernel/syscalls/mknod/mknod05.c
@@ -110,7 +110,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -196,7 +200,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod06.c b/testcases/kernel/syscalls/mknod/mknod06.c
index 9313292..7b97146 100644
--- a/testcases/kernel/syscalls/mknod/mknod06.c
+++ b/testcases/kernel/syscalls/mknod/mknod06.c
@@ -142,7 +142,11 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -207,7 +211,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c
index cf843f2..ffd22a9 100644
--- a/testcases/kernel/syscalls/mknod/mknod07.c
+++ b/testcases/kernel/syscalls/mknod/mknod07.c
@@ -124,7 +124,11 @@
 	int mode;		/* creation mode for the node created */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -184,7 +188,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -206,7 +210,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/mknod/mknod08.c b/testcases/kernel/syscalls/mknod/mknod08.c
index 4eae8db..502314b 100644
--- a/testcases/kernel/syscalls/mknod/mknod08.c
+++ b/testcases/kernel/syscalls/mknod/mknod08.c
@@ -109,7 +109,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -195,7 +199,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknod/mknod09.c b/testcases/kernel/syscalls/mknod/mknod09.c
index 0f6b0f2..5510f46 100644
--- a/testcases/kernel/syscalls/mknod/mknod09.c
+++ b/testcases/kernel/syscalls/mknod/mknod09.c
@@ -89,7 +89,11 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -137,7 +141,7 @@
 	/* Call cleanup */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
index 3706faf..c6be3d0 100644
--- a/testcases/kernel/syscalls/mknodat/mknodat01.c
+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
@@ -99,7 +99,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/mlock/mlock03.c b/testcases/kernel/syscalls/mlock/mlock03.c
index d11e42d..3008713 100644
--- a/testcases/kernel/syscalls/mlock/mlock03.c
+++ b/testcases/kernel/syscalls/mlock/mlock03.c
@@ -58,7 +58,7 @@
 
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	setup();
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 		fp = fopen("/proc/self/maps", "r");
diff --git a/testcases/kernel/syscalls/mlockall/mlockall01.c b/testcases/kernel/syscalls/mlockall/mlockall01.c
index 42b87f1..9c21c73 100644
--- a/testcases/kernel/syscalls/mlockall/mlockall01.c
+++ b/testcases/kernel/syscalls/mlockall/mlockall01.c
@@ -160,7 +160,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/mmap/mmap02.c b/testcases/kernel/syscalls/mmap/mmap02.c
index 5542853..1fa597c 100644
--- a/testcases/kernel/syscalls/mmap/mmap02.c
+++ b/testcases/kernel/syscalls/mmap/mmap02.c
@@ -102,10 +102,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* Perform global setup for test */
 	setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap03.c b/testcases/kernel/syscalls/mmap/mmap03.c
index fc2d8df..1142459 100644
--- a/testcases/kernel/syscalls/mmap/mmap03.c
+++ b/testcases/kernel/syscalls/mmap/mmap03.c
@@ -311,7 +311,4 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/mmap/mmap05.c b/testcases/kernel/syscalls/mmap/mmap05.c
index 0e1cdf8..b9239dc 100644
--- a/testcases/kernel/syscalls/mmap/mmap05.c
+++ b/testcases/kernel/syscalls/mmap/mmap05.c
@@ -95,7 +95,7 @@
 size_t page_sz;			/* system page size */
 volatile char *addr;		/* addr of memory mapped region */
 int fildes;			/* file descriptor for temporary file */
-volatile int pass = 0;		/* pass flag perhaps set to 1 in sig_handler */
+volatile int pass = 0;
 sigjmp_buf env;			/* environment for sigsetjmp/siglongjmp */
 
 void setup();			/* Main setup function of test */
@@ -108,7 +108,6 @@
 	char *msg;		/* message returned from parse_opts */
 	char file_content;	/* tempfile content */
 
-	/* Parse standard options given to run the test. */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
@@ -166,8 +165,7 @@
 
 		/* Unmap mapped memory and reset pass in case we are looping */
 		if (munmap((void *)addr, page_sz) != 0) {
-			tst_brkm(TFAIL, cleanup, "munmap() fails to unmap the "
-				 "memory, errno=%d", errno);
+			tst_brkm(TFAIL|TERRNO, cleanup, "munmap failed");
 		}
 		pass = 0;
 
@@ -201,7 +199,7 @@
 	}
 
 	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
+	if ((tst_buff = calloc(page_sz, sizeof(char))) == NULL) {
 		tst_brkm(TFAIL, NULL, "calloc failed (tst_buff)");
 	}
 
@@ -247,7 +245,7 @@
 }
 
 /*
- * sig_handler() - Signal Cathing function.
+ * sig_handler() - Signal Catching function.
  *   This function gets executed when the test process receives
  *   the signal SIGSEGV while trying to access the contents of memory which
  *   is not accessible.
diff --git a/testcases/kernel/syscalls/mmap/mmap10.c b/testcases/kernel/syscalls/mmap/mmap10.c
index fe9d622..8924f8f 100644
--- a/testcases/kernel/syscalls/mmap/mmap10.c
+++ b/testcases/kernel/syscalls/mmap/mmap10.c
@@ -87,7 +87,7 @@
 
 	msg = parse_opts(argc, argv, options, help);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	setup();
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 		Tst_count = 0;
diff --git a/testcases/kernel/syscalls/mmap/mmap11.c b/testcases/kernel/syscalls/mmap/mmap11.c
index 0cd32d4..c17b77e 100644
--- a/testcases/kernel/syscalls/mmap/mmap11.c
+++ b/testcases/kernel/syscalls/mmap/mmap11.c
@@ -73,7 +73,7 @@
 
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL)
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	setup();
 	check();
 	cleanup();
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
index cbc4d95..741d923 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
@@ -106,8 +106,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -184,7 +188,7 @@
 		 */
 		if (create_segment(seg, sizeof(seg)) == -1) {
 			tst_brkm(TINFO, cleanup, "Creation of segment failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Check for EFAULT
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
index 48b6d1f..857e5ff 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
@@ -102,8 +102,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -120,7 +124,7 @@
 		seg[0] = 12345;
 		if (create_segment(seg, sizeof(seg)) == -1) {
 			tst_brkm(TINFO, cleanup, "Creation of segment failed");
-		 /*NOTREACHED*/}
+		 }
 
 		val = read_segment(0);
 
@@ -144,7 +148,7 @@
 
 		if (create_segment(0, 10) == -1) {
 			tst_brkm(TINFO, cleanup, "Creation of segment failed");
-		 /*NOTREACHED*/}
+		 }
 
 		tst_flush();
 		if ((pid = FORK_OR_VFORK()) == 0) {
diff --git a/testcases/kernel/syscalls/mount/mount01.c b/testcases/kernel/syscalls/mount/mount01.c
index 0536774..275a734 100644
--- a/testcases/kernel/syscalls/mount/mount01.c
+++ b/testcases/kernel/syscalls/mount/mount01.c
@@ -106,31 +106,27 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+	if ((msg = parse_opts(ac, av, options, &help)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	/* Check for mandatory option of the testcase */
-	if (!Dflag) {
-		tst_brkm(TBROK, NULL, "You must specifiy the device used for "
-			 " mounting with -D option, Run '%s  -h' for option "
-			 " information.", TCID);
-		tst_exit();
-	}
+	if (!Dflag)
+		tst_brkm(TBROK, NULL, 
+		    "you must specify the device used for mounting with the -D "
+		    "option");
 
 	if (Tflag) {
-		Fstype = (char *)malloc(strlen(fstype) + 1);
+		Fstype = malloc(strlen(fstype) + 1);
 		if (Fstype == NULL) {
-			tst_brkm(TBROK, NULL, "malloc - failed to alloc %d"
-				 "errno %d", strlen(fstype), errno);
+			tst_brkm(TBROK|TERRNO, NULL,
+			    "malloc - failed to alloc %zd", strlen(fstype));
 		}
 		strncpy(Fstype, fstype, strlen(fstype) + 1);
 	} else {
-		Fstype = (char *)malloc(strlen(DEFAULT_FSTYPE) + 1);
+		Fstype = malloc(strlen(DEFAULT_FSTYPE) + 1);
 		if (Fstype == NULL) {
-			tst_brkm(TBROK, NULL, "malloc - failed to alloc %d"
-				 "errno %d", strlen(DEFAULT_FSTYPE), errno);
+			tst_brkm(TBROK, NULL, "malloc - failed to alloc %d",
+			    strlen(DEFAULT_FSTYPE));
 		}
 		strncpy(Fstype, DEFAULT_FSTYPE, strlen(DEFAULT_FSTYPE) + 1);
 	}
@@ -156,17 +152,13 @@
 
 		/* check return code */
 		if (TEST_RETURN != 0) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "mount(2) Failed errno = %d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TFAIL|TTERRNO, "mount(2) failed");
 		} else {
-			tst_resm(TPASS, "mount(2) Passed ");
+			tst_resm(TPASS, "mount(2) passed ");
 			TEST(umount(mntpoint));
 			if (TEST_RETURN != 0) {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_brkm(TBROK, cleanup, "umount(2) Failed "
-					 "while unmounting errno = %d : %s",
-					 TEST_ERRNO, strerror(TEST_ERRNO));
+				tst_brkm(TBROK|TTERRNO, cleanup,
+				    "umount(2) failed");
 			}
 		}
 	}			/* End for TEST_LOOPING */
@@ -174,8 +166,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
-
+	tst_exit();
 }				/* End main */
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -186,8 +177,11 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		free(Fstype);
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		if (Fstype != NULL) {
+			free(Fstype);
+			Fstype = NULL;
+		}
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* make a temp directory */
@@ -197,9 +191,8 @@
 	(void)sprintf(mntpoint, "mnt_%d", getpid());
 
 	if (mkdir(mntpoint, DIR_MODE) < 0) {
-		tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) failed; "
-			 "errno = %d: %s", mntpoint, DIR_MODE, errno,
-			 strerror(errno));
+		tst_brkm(TBROK|TERRNO, cleanup, "mkdir(%s, %#o) failed",
+		    mntpoint, DIR_MODE);
 	}
 
 	/* Pause if that option was specified */
@@ -213,8 +206,10 @@
  */
 void cleanup()
 {
-	free(Fstype);
-
+	if (Fstype) {
+		free(Fstype);
+		Fstype = NULL;
+	}
 	/*
 	 * print timing stats if that option was specified.
 	 * print errno log if that option was specified.
@@ -223,9 +218,6 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 /*
diff --git a/testcases/kernel/syscalls/mount/mount02.c b/testcases/kernel/syscalls/mount/mount02.c
index 248cb40..1e72ba5 100644
--- a/testcases/kernel/syscalls/mount/mount02.c
+++ b/testcases/kernel/syscalls/mount/mount02.c
@@ -124,34 +124,12 @@
 static int Tflag = 0;
 static int Dflag = 0;
 
-static struct test_case_t {
-	char *err_desc;		/* error description            */
-	int exp_errno;		/* Expected error no            */
-	char *exp_errval;	/* Expected error value string  */
-} testcases[] = {
-	{
-	"Fstype not configured", ENODEV, "ENODEV"}, {
-	"Not a block device", ENOTBLK, "ENOTBLK"}, {
-	"Already mounted/busy", EBUSY, "EBUSY"}, {
-	"Cannot remount as read-only", EBUSY, "EBUSY"}, {
-	"Invalid  device ", EINVAL, "EINVAL"}, {
-	"Invalid  fstype ", EINVAL, "EINVAL"}, {
-	"Attempted remounted without mounting ", EINVAL, "EINVAL"}, {
-	"Invalid address space for fstype", EFAULT, "EFAULT"}, {
-	"Invalid address space for Device", EFAULT, "EFAULT"}, {
-	"Pathname too long", ENAMETOOLONG, "ENAMETOOLONG"}, {
-	"Pathname empty", ENOENT, "ENOENT"}, {
-	"Directory not found", ENOENT, "ENOENT"}, {
-	"Not a Directory", ENOTDIR, "ENOTDIR"}
-};
-
-/* Total number of test cases. */
-int TST_TOTAL = sizeof(testcases) / sizeof(testcases[0]);
-
 static int exp_enos[] = { ENODEV, ENOTBLK, EBUSY, EINVAL, EFAULT, ENAMETOOLONG,
 	ENOENT, ENOTDIR, 0
 };
 
+int TST_TOTAL = (sizeof(exp_enos) / sizeof(exp_enos[0])) - 1;
+
 static option_t options[] = {	/* options supported by mount02 test */
 	{"T:", &Tflag, &fstype},	/* -T type of filesystem        */
 	{"D:", &Dflag, &device},	/* -D device used for mounting  */
@@ -163,25 +141,17 @@
 	int lc, i;		/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+	if ((msg = parse_opts(ac, av, options, &help)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	/* Check for mandatory option of the testcase */
-	if (Dflag == 0) {
+	if (Dflag == 0)
 		tst_brkm(TBROK, NULL, "You must specifiy the device used for "
-			 " mounting with -D option, Run '%s  -h' for option "
-			 " information.", TCID);
-		tst_exit();
-	}
+			 " mounting with -D option.");
 
-	Type = (char *)malloc(FSTYPE_LEN);
-	if (!Type) {
-		tst_brkm(TBROK, NULL, "malloc - alloc of %d failed",
-			 FSTYPE_LEN);
-		tst_exit();
+	Type = malloc(FSTYPE_LEN);
+	if (Type == NULL) {
+		tst_brkm(TBROK|TERRNO, NULL, "malloc failed");
 	}
 
 	if (Tflag == 1) {
@@ -210,10 +180,8 @@
 
 		for (i = 0; i < TST_TOTAL; ++i) {
 
-			if (setup_test(i, lc)) {
-				tst_resm(TWARN, "Not able to test mount(2) for "
-					 "error %s as setup failed",
-					 testcases[i].exp_errval);
+			if (setup_test(i, lc) != 0) {
+				tst_resm(TWARN, "testcase setup failed");
 				continue;
 			}
 
@@ -224,28 +192,20 @@
 			TEST(mount(Device, Mntpoint, Fstype, Flag, NULL));
 
 			/* check return code */
-			if ((TEST_RETURN == -1) &&
-			    (TEST_ERRNO == testcases[i].exp_errno)) {
-				tst_resm(TPASS, "mount(2) expected failure; "
-					 "Got errno - %s : %s",
-					 testcases[i].exp_errval,
-					 testcases[i].err_desc);
+			if (TEST_RETURN == -1 && TEST_ERRNO == exp_enos[i]) {
+				tst_resm(TPASS|TERRNO,
+				    "mount got expected failure");
 			} else {
 				if (umount(mntpoint) == -1) {
-					tst_brkm(TBROK, cleanup, "umount(2) "
-						 "failed to umount mntpoint %s "
-						 "errno - %d : %s", Mntpoint,
-						 TEST_ERRNO,
-						 strerror(TEST_ERRNO));
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "umount of %s failed", Mntpoint);
 				}
-				tst_resm(TFAIL, "mount(2) failed to produce "
-					 "expected error; %d, errno:%s got %d",
-					 testcases[i].exp_errno,
-					 testcases[i].exp_errval, TEST_ERRNO);
+				tst_resm(TFAIL|TERRNO,
+				    "mount(2) failed to produce expected "
+				    "error (%d)",
+				    exp_enos[i]);
 			}
 
-			TEST_ERROR_LOG(TEST_ERRNO);
-
 			(void)cleanup_test(i);
 
 		}		/* End of TEST CASE LOOPING. */
@@ -254,8 +214,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
-
+	tst_exit();
 }				/* End main */
 
 /*
@@ -287,9 +246,8 @@
 			Device = Path;
 			return 0;
 		} else {
-			tst_resm(TWARN, "mknod(2) failed to creat device %s "
-				 "errno = %d : %s", Path, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TWARN, "mknod(2) failed to create device: %s",
+			    Path);
 			return 1;
 		}
 	case 2:
@@ -297,9 +255,9 @@
 
 		TEST(mount(Device, Mntpoint, Fstype, 0, NULL));
 		if (TEST_RETURN != 0) {
-			tst_resm(TWARN, "mount(2) failed to mount device %s "
-				 "errno = %d : %s", device, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TWARN|TTERRNO,
+			    "mount(2) failed to mount device %s",
+			    device);
 			return 1;
 		}
 		return 0;
@@ -308,23 +266,19 @@
 
 		TEST(mount(Device, Mntpoint, Fstype, 0, NULL));
 		if (TEST_RETURN != 0) {
-			tst_resm(TWARN, "mount(2) failed to mount device %s "
-				 "errno = %d : %s", device, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TWARN|TTERRNO,
+			    "mount(2) failed to mount device %s", device);
 			return 1;
 		}
 		if (getcwd(Path, PATH_MAX) == NULL) {
-			tst_resm(TWARN, "getcwd() failed to get current working"
-				 " directory errno = %d : %s", errno,
-				 strerror(errno));
+			tst_resm(TWARN|TERRNO, "getcwd failed");
 			return 1;
 		}
 		sprintf(temp, "/%s/t3_%d", mntpoint, cnt);
 		strcat(Path, temp);
 		if ((fd = open(Path, O_CREAT | O_RDWR, S_IRWXU)) == -1) {
-			tst_resm(TWARN, "open() failed to create a file "
-				 " %s errno = %d : %s", Path, errno,
-				 strerror(errno));
+			tst_resm(TWARN|TERRNO, "open() failed to create %s",
+			    Path);
 			return 1;
 		}
 		Flag = MS_REMOUNT | MS_RDONLY;
@@ -376,17 +330,13 @@
 		/* Setup for mount(2) returning errno ENOTDIR. */
 
 		if (getcwd(Path, PATH_MAX) == NULL) {
-			tst_resm(TWARN, "getcwd() failed to get current working"
-				 " directory errno = %d : %s", errno,
-				 strerror(errno));
+			tst_resm(TWARN, "getcwd failed");
 			return 1;
 		}
 		sprintf(temp, "/t_%d_%d", getpid(), cnt);
 		strcat(Path, temp);
 		if ((fd = open(Path, O_CREAT, S_IRWXU)) == -1) {
-			tst_resm(TWARN, "open() failed to create a file "
-				 " %s errno = %d : %s", Path, errno,
-				 strerror(errno));
+			tst_resm(TWARN, "open failed to create %s", Path);
 			return 1;
 		} else {
 			Mntpoint = Path;
@@ -422,9 +372,7 @@
 	case 2:
 		TEST(umount(mntpoint));
 		if (TEST_RETURN != 0) {
-			tst_resm(TWARN, "umount(2) Failed while unmounting"
-				 " errno %d for testcase %s", TEST_ERRNO,
-				 testcases[i].exp_errval);
+			tst_resm(TWARN|TTERRNO, "umount failed");
 		}
 		break;
 	case 12:
@@ -440,21 +388,16 @@
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
-	/* Check whether we are root */
-	if (geteuid() != 0) {
-		free(Type);
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
-	}
+	tst_require_root(NULL);
 
 	/* make a temp directory */
 	tst_tmpdir();
 
 	(void)sprintf(mntpoint, "mnt_%d", getpid());
 
-	if (mkdir(mntpoint, DIR_MODE)) {
-		tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) failed; "
-			 "errno = %d: %s", mntpoint, DIR_MODE, errno,
-			 strerror(errno));
+	if (mkdir(mntpoint, DIR_MODE) == -1) {
+		tst_brkm(TBROK|TERRNO, cleanup, "mkdir(%s, %#o) failed",
+		    mntpoint, DIR_MODE);
 	}
 
 	/* set up expected error numbers */
@@ -462,8 +405,6 @@
 
 	/* Pause if that option was specified */
 	TEST_PAUSE;
-
-	return;
 }				/* End setup() */
 
 /*
@@ -482,11 +423,6 @@
 
 	/* Remove tmp dir and all files in it. */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
-	return;
 }				/* End cleanup() */
 
 /*
diff --git a/testcases/kernel/syscalls/mount/mount03.c b/testcases/kernel/syscalls/mount/mount03.c
index 9581a4e..94cd766 100644
--- a/testcases/kernel/syscalls/mount/mount03.c
+++ b/testcases/kernel/syscalls/mount/mount03.c
@@ -82,13 +82,14 @@
 # define _GNU_SOURCE
 #endif
 
-#include <errno.h>
-#include <sys/mount.h>
 #include <sys/types.h>
+#include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <pwd.h>
+#include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <pwd.h>
 #include <unistd.h>
 #include "test.h"
 #include "usctest.h"
@@ -97,7 +98,7 @@
 static void setup(void);
 static void cleanup(void);
 static int test_rwflag(int, int);
-static void setup_uid(void);
+static int setup_uid(void);
 
 char *TCID = "mount03";		/* Test program identifier.    */
 int TST_TOTAL = 6;		/* Total number of test cases. */
@@ -106,14 +107,12 @@
 
 #define DEFAULT_FSTYPE	"ext2"
 #define TEMP_FILE	"temp_file"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define DIR_MODE	S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH
-#define SUID_MODE	S_ISUID|S_IRUSR|S_IXUSR|S_IXGRP|S_IXOTH
+#define FILE_MODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
+#define DIR_MODE	(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
+#define SUID_MODE	(S_ISUID|S_IRUSR|S_IXUSR|S_IXGRP|S_IXOTH)
 
 static char *Fstype;
 
-static unsigned long Flag;
-
 static char mntpoint[20];
 static char *fstype;
 static char *device;
@@ -129,18 +128,13 @@
 static char file[PATH_MAX];	/* Temporary file                */
 static char cmd[] = "cp";
 
-static struct test_case_t {
-	char *rwflag_desc;	/* error description            */
-	unsigned long rwflag;	/* Expected error no            */
-	char *rwdesc;		/* rwflag                       */
-} testcases[] = {
-	{
-	"mount read-only", MS_RDONLY, "MS_RDONLY"}, {
-	"disallow access to device special files", MS_NODEV, "MS_NODEV"}, {
-	"disallow program execution", MS_NOEXEC, "MS_NOEXEC"}, {
-	"writes are synced at once", MS_SYNCHRONOUS, "MS_SYNCHRONOUS"}, {
-	"alter flags of a mounted FS", MS_RDONLY, "MS_REMOUNT"}, {
-	"ignore suid and sgid bits", MS_NOSUID, "MS_NOSUID"}
+long rwflags[] = {
+	MS_RDONLY,
+	MS_NODEV,
+	MS_NOEXEC,
+	MS_SYNCHRONOUS,
+	MS_RDONLY,
+	MS_NOSUID,
 };
 
 static option_t options[] = {	/* options supported by mount03 test */
@@ -155,34 +149,30 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, options, &help)) != NULL) {
+	if ((msg = parse_opts(ac, av, options, &help)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
+
 	/* Check for mandatory option of the testcase */
 	if (!Dflag) {
-		tst_resm(TWARN, "You must specifiy the device used for "
-			 " mounting with -D option, Run '%s  -h' for option "
-			 " information.", TCID);
-		tst_exit();
+		tst_brkm(TBROK, NULL,
+		    "you must specify the device used for mounting with -D "
+		    "option");
 	}
 
 	if (Tflag) {
 		Fstype = (char *)malloc(strlen(fstype)+1);
 		if (Fstype == NULL) {
-			tst_brkm(TBROK, NULL, "malloc failed to alloc %d errno "
-				 " %d ", strlen(fstype)+1, errno);
+			tst_brkm(TBROK|TERRNO, NULL, "malloc failed");
 		}
-		memset(Fstype, 0, strlen(fstype)+1);
+		Fstype[strlen(fstype)] = '\0';
 		strncpy(Fstype, fstype, strlen(fstype));
 	} else {
 		Fstype = (char *)malloc(strlen(DEFAULT_FSTYPE)+1);
 		if (Fstype == NULL) {
-			tst_brkm(TBROK, NULL, "malloc failed to alloc %d errno "
-				 " %d ", strlen(fstype)+1, errno);
+			tst_brkm(TBROK|TERRNO, NULL, "malloc failed");
 		}
-		memset(Fstype, 0, strlen(DEFAULT_FSTYPE)+1);
 		strncpy(Fstype, DEFAULT_FSTYPE, strlen(DEFAULT_FSTYPE));
+		Fstype[strlen(DEFAULT_FSTYPE)] = '\0';
 	}
 
 	if (STD_COPIES != 1) {
@@ -202,36 +192,28 @@
 		Tst_count = 0;
 
 		for (i = 0; i < TST_TOTAL; ++i) {
-			Flag = testcases[i].rwflag;
 
 			/* Call mount(2) */
-			TEST(mount(device, mntpoint, Fstype, Flag, NULL));
+			TEST(mount(device, mntpoint, Fstype, rwflags[i], NULL));
 
 			/* check return code */
 			if (TEST_RETURN != 0) {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_resm(TFAIL, "mount(2) failed errno = %d : "
-					 "%s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
+				tst_resm(TFAIL|TTERRNO, "mount(2) failed");
 				continue;
 			}
 
 			/* Validate the rwflag */
 			if (test_rwflag(i, lc) == 1) {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_resm(TFAIL, "mount(2) Failed while"
-					 " validating %s", testcases[i].rwdesc);
+				tst_resm(TFAIL, "mount(2) failed while"
+				    " validating %ld", rwflags[i]);
 			} else {
-				tst_resm(TPASS, "mount(2) Passed for rwflag"
-					 " %s - %s", testcases[i].rwdesc,
-					 testcases[i].rwflag_desc);
+				tst_resm(TPASS, "mount(2) passed with "
+				    "rwflag = %ld", rwflags[i]);
 			}
 			TEST(umount(mntpoint));
 			if (TEST_RETURN != 0) {
-				tst_brkm(TBROK, cleanup, "umount(2) failed to "
-					 "to umount %s errno = %d : %s",
-					 mntpoint, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
+				tst_brkm(TBROK|TTERRNO, cleanup,
+				    "umount(2) failed for %s", mntpoint);
 			}
 		}		/* End of TEST CASE LOOPING. */
 	}			/* End for TEST_LOOPING */
@@ -239,8 +221,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
-
+	tst_exit();
 }				/* End main */
 
 /*
@@ -263,9 +244,8 @@
 			if (errno == EROFS) {
 				return 0;
 			} else {
-				tst_resm(TWARN, "open(%s) failed with "
-					 " error %d instead EACCES",
-					 file, errno);
+				tst_resm(TWARN|TERRNO,
+				    "open(%s) didn't fail with EROFS", file);
 				return 1;
 			}
 		}
@@ -281,17 +261,15 @@
 				if (errno == EACCES) {
 					return 0;
 				} else {
-					tst_resm(TWARN, "open(%s) "
-						 "failed  with error %d instead "
-						 "EACCES", file, errno);
+					tst_resm(TWARN|TERRNO,
+					    "open(%s) didn't fail with EACCES");
 					return 1;
 				}
 			}
 			close(fd);
 		} else {
-			tst_resm(TWARN, "mknod(2) failed to creat "
-				 "device %s errno = %d : %s", file,
-				 errno, strerror(errno));
+			tst_resm(TWARN|TERRNO, "mknod(2) failed to create %s",
+			    file);
 			return 1;
 		}
 		return 1;
@@ -300,18 +278,12 @@
 
 		snprintf(file, PATH_MAX, "%stmp1", Path_name);
 		if ((fd = open(file, O_CREAT | O_RDWR, S_IRWXU)) == -1) {
-			tst_resm(TWARN,
-				 "open() of %s failed with error" " %d : %s",
-				 file, errno, strerror(errno));
-			return 1;
+			tst_resm(TWARN|TERRNO, "opening %s failed", file); 
 		} else {
 			close(fd);
-			if (execve(file, NULL, NULL) == -1) {
-				return 0;
-			} else {
-				return 1;
-			}
+			execlp(file, basename(file), NULL);
 		}
+		return 1;
 	case 3:
 		/*
 		 * Validate MS_SYNCHRONOUS flag of mount call.
@@ -324,17 +296,16 @@
 		snprintf(file, PATH_MAX, "%s%s", Path_name, TEMP_FILE);
 		if ((fildes = open(file, O_RDWR | O_CREAT, FILE_MODE))
 		    == -1) {
-			tst_resm(TWARN, "open(%s, O_RDWR | O_CREAT,"
-				 " %#o) Failed, errno=%d :%s",
-				 file, FILE_MODE, errno, strerror(errno));
+			tst_resm(TWARN|TERRNO,
+			    "open(%s, O_RDWR|O_CREAT, %#o) failed",
+			    file, FILE_MODE);
 			return 1;
 		}
 
 		/* Write the buffer data into file */
 		if (write(fildes, write_buffer, strlen(write_buffer)) !=
 		    strlen(write_buffer)) {
-			tst_resm(TWARN, "write() failed to write buffer"
-				 " data to %s", file);
+			tst_resm(TWARN|TERRNO, "writing to %s failed", file);
 			close(fildes);
 			return 1;
 		}
@@ -350,9 +321,8 @@
 		/* Read the contents of file */
 		if (read(fildes, read_buffer, sizeof(read_buffer)) > 0) {
 			if (strcmp(read_buffer, write_buffer)) {
-				tst_resm(TWARN, "Data read "
-					 "from %s doesn't match with"
-					 " written data", file);
+				tst_resm(TWARN, "Data read from %s and written "
+				    "mismatch", file);
 				close(fildes);
 				return 1;
 			} else {
@@ -360,8 +330,7 @@
 				return 0;
 			}
 		} else {
-			tst_resm(TWARN, "read() Fails on %s, error=%d",
-				 file, errno);
+			tst_resm(TWARN|TERRNO, "read() Fails on %s", file);
 			close(fildes);
 			return 1;
 		}
@@ -371,9 +340,7 @@
 
 		TEST(mount(device, mntpoint, Fstype, MS_REMOUNT, NULL));
 		if (TEST_RETURN != 0) {
-			tst_resm(TWARN, "mount(2) Failed to remount "
-				 "errno = %d : %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TWARN|TTERRNO, "mount(2) failed to remount");
 			return 1;
 		} else {
 			snprintf(file, PATH_MAX, "%stmp2", Path_name);
@@ -390,26 +357,30 @@
 	case 5:
 		/* Validate MS_NOSUID flag of mount call */
 
-		setup_uid();
-		if ((pid = fork()) == 0) {
+		if (setup_uid() != 0) {
+			tst_resm(TBROK|TERRNO, "setup_uid failed");
+			return 1;
+		}
+		switch (pid = fork()) {
+		case -1:
+			tst_resm(TBROK|TERRNO, "fork failed");
+			return 1;
+		case 0:
 			snprintf(file, PATH_MAX, "%ssetuid_test", Path_name);
 			if (chmod(file, SUID_MODE) != 0) {
-				tst_resm(TWARN, "chmod() failed to "
-					 "change mode  %d errno = %d : %s",
-					 4511, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
+				tst_resm(TWARN, "chmod(%s, %#o) failed",
+				    file, SUID_MODE);
 			}
 
 			ltpuser = getpwnam(nobody_uid);
 			if (setreuid(ltpuser->pw_uid, ltpuser->pw_uid) == -1) {
-				tst_resm(TWARN, "seteuid() failed to "
-					 "change euid to %d errno = %d : %s",
-					 ltpuser->pw_uid, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
+				tst_resm(TWARN|TERRNO,
+				    "seteuid() failed to change euid to %d",
+				    ltpuser->pw_uid);
 			}
-			execve(file, NULL, NULL);
-			/* NOT REACHEAD */
-		} else {
+			execlp(file, basename(file), NULL);
+			exit(1);
+		default:
 			waitpid(pid, &status, 0);
 			if (WIFEXITED(status)) {
 				/* reset the setup_uid */
@@ -424,17 +395,15 @@
 }
 
 /* setup_uid() - performs setup for NOUID test */
-void setup_uid()
+int setup_uid()
 {
 	int pid, status;
 	char command[PATH_MAX];
 
 	switch (pid = fork()) {
 	case -1:
-		tst_resm(TWARN, "Unable to fork a child process"
-			 " to exec over!  Errno:%d, :%s",
-			 errno, strerror(errno));
-		break;
+		tst_resm(TWARN|TERRNO, "fork failed");
+		return 1;
 	case 0:
 		Cmd_buffer[0] = cmd;
 		Cmd_buffer[1] = testhome_path;
@@ -443,18 +412,25 @@
 		/* Put command into string */
 		sprintf(command, "%s %s %s", cmd, testhome_path, Path_name);
 
-		/*Run command to cp file to right spot */
-		system(command);
-
-		/* Must kill child */
-		execve(file, NULL, NULL);
-
-		/* execve("/bin/cp", Cmd_buffer, environ); */
-		exit(errno);
+		/* Run command to cp file to right spot */
+		if (system(command) == 0) {
+			execlp(file, basename(file), NULL);
+		} else {
+			printf("call to %s failed\n", command);
+		}
+		exit(1);
 	default:
 		waitpid(pid, &status, 0);
+		if (WIFEXITED(status)) {
+			return WEXITSTATUS(status);
+		} else if (WIFSIGNALED(status)) {
+			return WTERMSIG(status);
+		} else {
+			/* Should be 0. */
+			assert (status == 0);
+			return 0;
+		}
 	}
-	return;
 }
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -469,7 +445,7 @@
 	/* Check whether we are root */
 	if (geteuid() != 0) {
 		free(Fstype);
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Test home directory */
@@ -482,19 +458,16 @@
 	(void)sprintf(mntpoint, "mnt_%d", getpid());
 
 	if (mkdir(mntpoint, DIR_MODE)) {
-		tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) failed; "
-			 "errno = %d: %s", mntpoint, DIR_MODE, errno,
-			 strerror(errno));
+		tst_brkm(TBROK|TERRNO, cleanup, "mkdir(%s, %#o) failed",
+		    mntpoint, DIR_MODE);
 	}
 	/* Get the current working directory of the process */
 	if (getcwd(Path_name, sizeof(Path_name)) == NULL) {
-		tst_brkm(TBROK, cleanup,
-			 "getcwd(3) fails to get working directory of process");
+		tst_brkm(TBROK, cleanup, "getcwd failed");
 	}
 	if (chmod(Path_name, DIR_MODE) != 0) {
-		tst_brkm(TBROK, cleanup, "chmod() failed to change mode %#o "
-			 "errno = %d : %s", DIR_MODE, TEST_ERRNO,
-			 strerror(TEST_ERRNO));
+		tst_brkm(TBROK, cleanup, "chmod(%s, %#o) failed",
+		    Path_name, DIR_MODE);
 	}
 	snprintf(file, PATH_MAX, "%ssetuid_test", Path_name);
 	if (stat(file, &setuid_test_stat) < 0) {
@@ -505,8 +478,8 @@
 			tst_brkm(TBROK, cleanup,
 					"chown for setuid_test failed");
 		}
-		if (setuid_test_stat.st_mode != 04511 &&
-		    chmod(file, 04511) < 0) {
+		if (setuid_test_stat.st_mode != SUID_MODE &&
+		    chmod(file, SUID_MODE) < 0) {
 			tst_brkm(TBROK, cleanup,
 					"setuid for setuid_test failed");
 		}
@@ -519,7 +492,6 @@
 	snprintf(Path_name, PATH_MAX, "%s/%s/", Path_name, mntpoint);
 
 	strcpy(testhome_path, test_home);
-
 	strcat(testhome_path, "/setuid_test");
 
 	/* Pause if that option was specified */
@@ -543,9 +515,6 @@
 
 	/* Remove tmp dir and all files in it  */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 /*
diff --git a/testcases/kernel/syscalls/mount/mount04.c b/testcases/kernel/syscalls/mount/mount04.c
index dceaf2d..de51a1f 100644
--- a/testcases/kernel/syscalls/mount/mount04.c
+++ b/testcases/kernel/syscalls/mount/mount04.c
@@ -131,8 +131,7 @@
 	/* Check for mandatory option of the testcase */
 	if (Dflag == 0) {
 		tst_brkm(TBROK, NULL, "You must specifiy the device used for "
-			 " mounting with -D option, Run '%s  -h' for option "
-			 " information.", TCID);
+			 " mounting with -D option.");
 		tst_exit();
 	}
 
@@ -200,7 +199,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -216,7 +215,7 @@
 	/* Check whether we are root */
 	if (geteuid() != 0) {
 		free(Type);
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/mount/setuid_test.c b/testcases/kernel/syscalls/mount/setuid_test.c
index 14562d5..0364191 100644
--- a/testcases/kernel/syscalls/mount/setuid_test.c
+++ b/testcases/kernel/syscalls/mount/setuid_test.c
@@ -32,7 +32,7 @@
 
 /* Save the effective and real UIDs. */
 
-static uid_t euid, ruid;
+static uid_t ruid;
 
 /* Restore the effective UID to its original value. */
 
@@ -55,9 +55,8 @@
 {
 	int exit_status;
 
-/* Save the real and effective user IDs.  */
+	/* Save the real and effective user IDs.  */
 	ruid = getuid();
-	euid = geteuid();
 	exit_status = do_setuid();
 
 	exit(exit_status);
diff --git a/testcases/kernel/syscalls/move_pages/move_pages01.c b/testcases/kernel/syscalls/move_pages/move_pages01.c
index b380ce0..5aa3be3 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages01.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages01.c
@@ -76,7 +76,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -149,4 +149,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages02.c b/testcases/kernel/syscalls/move_pages/move_pages02.c
index 4e1c342..a9a6212 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages02.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages02.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -161,4 +161,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages03.c b/testcases/kernel/syscalls/move_pages/move_pages03.c
index 1cbfd26..ad13e5c 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages03.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages03.c
@@ -115,7 +115,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -227,4 +227,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages04.c b/testcases/kernel/syscalls/move_pages/move_pages04.c
index d96321e..5a4459d 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages04.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages04.c
@@ -83,7 +83,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -180,4 +180,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages05.c b/testcases/kernel/syscalls/move_pages/move_pages05.c
index d09d54d..3e94ed3 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages05.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages05.c
@@ -116,7 +116,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -241,4 +241,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages06.c b/testcases/kernel/syscalls/move_pages/move_pages06.c
index d426d6c..8c8782d 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages06.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages06.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -157,4 +157,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages07.c b/testcases/kernel/syscalls/move_pages/move_pages07.c
index 6d2221d..7bb7ee2 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages07.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages07.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -168,4 +168,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages08.c b/testcases/kernel/syscalls/move_pages/move_pages08.c
index 50d6f7b..e155004 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages08.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages08.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -156,4 +156,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages09.c b/testcases/kernel/syscalls/move_pages/move_pages09.c
index 107c80a..8a0909a 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages09.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages09.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -155,4 +155,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages10.c b/testcases/kernel/syscalls/move_pages/move_pages10.c
index 8ba8a35..c800b8a 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages10.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages10.c
@@ -77,7 +77,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -156,4 +156,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages11.c b/testcases/kernel/syscalls/move_pages/move_pages11.c
index a9c3017..ea2d665 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages11.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages11.c
@@ -115,7 +115,7 @@
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-		/* NOTREACHED */
+		
 	}
 
 	setup();
@@ -246,4 +246,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/mprotect/mprotect01.c b/testcases/kernel/syscalls/mprotect/mprotect01.c
index 60c7c5a..3f881ec 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect01.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect01.c
@@ -121,7 +121,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -166,7 +170,7 @@
 	}
 	cleanup();
 	return 0;
- /*NOTREACHED*/}
+ }
 
 #else
 
@@ -195,7 +199,7 @@
 	addr2 = (char *)malloc(PAGESIZE);
 	if (addr2 == NULL) {
 		tst_brkm(TINFO, cleanup, "malloc failed");
-	 /*NOTREACHED*/}
+	 }
 	addr2++;		/* Ensure addr2 is not page aligned */
 }
 
@@ -207,7 +211,7 @@
 	fd = open("/etc/passwd", O_RDONLY);
 	if (fd < 0) {
 		tst_brkm(TBROK, cleanup, "open failed");
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * mmap the PAGESIZE bytes as read only.
@@ -215,7 +219,7 @@
 	addr3 = mmap(0, PAGESIZE, PROT_READ, MAP_SHARED, fd, 0);
 	if (addr3 < 0) {
 		tst_brkm(TBROK, cleanup, "mmap failed");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/mprotect/mprotect02.c b/testcases/kernel/syscalls/mprotect/mprotect02.c
index cd345db..2cecbb4 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect02.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect02.c
@@ -87,7 +87,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -100,7 +104,7 @@
 
 		if ((fd = open(file1, O_RDWR | O_CREAT, 0777)) < 0) {	//mode must be specified when O_CREATE is in the flag
 			tst_brkm(TBROK, cleanup, "open failed");
-		 /*NOTREACHED*/}
+		 }
 		(void)write(fd, buf, strlen(buf));
 
 		/*
@@ -109,7 +113,7 @@
 		addr = mmap(0, strlen(buf), PROT_READ, MAP_SHARED, fd, 0);
 		if (addr < 0) {
 			tst_brkm(TBROK, cleanup, "mmap failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #1 failed");
@@ -119,17 +123,17 @@
 			(void)memcpy((void *)addr, (void *)buf, strlen(buf));
 			tst_resm(TINFO, "memcpy() did not generate SIGSEGV");
 			exit(1);
-		 /*NOTREACHED*/}
+		 }
 
 		/* parent */
 		(void)waitpid(pid, &status, 0);
 		if (WIFEXITED(status) == 0) {
 			tst_brkm(TBROK, cleanup, "chiled exited abnormally");
-		 /*NOTREACHED*/}
+		 }
 		/* exit status should be 1 */
 		if (WEXITSTATUS(status) != 1) {
 			tst_brkm(TBROK, cleanup, "child failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Change the protection to WRITE.
@@ -154,7 +158,7 @@
 				if (WIFEXITED(status) == 0) {
 					tst_brkm(TBROK, cleanup, "child exited "
 						 "abnormally");
-				 /*NOTREACHED*/}
+				 }
 				/*
 				 * if we get a SIGSEGV, the exit status
 				 * will be 1.
@@ -187,7 +191,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 #else
diff --git a/testcases/kernel/syscalls/mprotect/mprotect03.c b/testcases/kernel/syscalls/mprotect/mprotect03.c
index 0584a2c..c7f0304 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect03.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect03.c
@@ -88,7 +88,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -101,7 +105,7 @@
 
 		if ((fd = open(file1, O_RDWR | O_CREAT, 0777)) < 0) {	//mode must be specified when O_CREAT is in the flag
 			tst_brkm(TBROK, cleanup, "open failed");
-		 /*NOTREACHED*/}
+		 }
 
 		(void)write(fd, buf, strlen(buf));
 
@@ -112,7 +116,7 @@
 			    fd, 0);
 		if (addr < 0) {
 			tst_brkm(TBROK, cleanup, "mmap failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Try to change the protection to WRITE.
@@ -131,7 +135,7 @@
 					tst_resm(TINFO, "memcpy() did "
 						 "not generate SIGSEGV");
 					exit(1);
-				 /*NOTREACHED*/}
+				 }
 
 				/* parent */
 				(void)waitpid(pid, &status, 0);
@@ -148,7 +152,7 @@
 		} else {
 			tst_resm(TFAIL, "mprotect failed "
 				 "unexpectedly, errno: %d", errno);
-		 /*NOTREACHED*/}
+		 }
 
 		/* clean up things in case we are looping */
 		if (munmap(addr, strlen(buf)) == -1) {
diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
index d7cbc42..3f65e1d 100644
--- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
@@ -410,9 +410,42 @@
 
 	progname = basename(av[0]);
 	
+<<<<<<< HEAD
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+        /* parse standard options */
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+             tst_exit();
+           }
+
+        setup();
+
+        /* Check looping state if -i option given */
+        for (lc = 0; TEST_LOOPING(lc); ++lc) {
+                Tst_count = 0;
+                for (testno = 0; testno < TST_TOTAL; ++testno) {
+			 TEST(c = getopt_long(ac, av, "dh", long_options, NULL));
+			 while (TEST_RETURN != -1) {
+		                switch (c) {
+                		case 'd':
+		                        opt_debug = 1;
+                		        break;
+		                default:
+                		        usage(progname);
+                        		
+                		}
+		        }
+
+
+		if (ac != optind) {
+        	        tst_resm(TINFO,"Options are not match.");
+                	usage(progname);
+                	
+	        }
+>>>>>>> master
 
 	setup();
 
diff --git a/testcases/kernel/syscalls/mq_open/mq_open01.c b/testcases/kernel/syscalls/mq_open/mq_open01.c
index 2c7d257..07e5e78 100644
--- a/testcases/kernel/syscalls/mq_open/mq_open01.c
+++ b/testcases/kernel/syscalls/mq_open/mq_open01.c
@@ -433,7 +433,7 @@
 					(ret == 0) ? "OK" : "NG");
 				result |= ret;
 			}
-		
+
 			/*
 			 * Check results
 	 		 */
diff --git a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
index 9d00f39..a69a39a 100644
--- a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
+++ b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
@@ -88,7 +88,7 @@
 {
 	if (sig == SIGINT)
 		return;
-	// NOTREACHED
+	
 	return;
 }
 
@@ -449,6 +449,7 @@
 
 int main(int ac, char **av) {
 	int result = RESULT_OK;
+<<<<<<< HEAD
 	int i;
 	int lc;		 /* loop counter */
 	char *msg;	      /* message returned from parse_opts */
@@ -490,5 +491,82 @@
 		}
 	}
 	cleanup();
+=======
+        int c;
+        int i;
+        int lc;                 /* loop counter */
+        char *msg;              /* message returned from parse_opts */
+
+	struct option long_options[] = {
+                { "debug", no_argument, 0, 'd' },
+                { "help",  no_argument, 0, 'h' },
+                { NULL, 0, NULL, 0 }
+        };
+
+	progname = strchr(av[0], '/');
+        progname = progname ? progname + 1 : av[0];
+
+        /* parse standard options */
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+             tst_exit();
+           }
+
+        setup();
+
+        /* Check looping state if -i option given */
+        for (lc = 0; TEST_LOOPING(lc); ++lc) {
+                Tst_count = 0;
+                for (testno = 0; testno < TST_TOTAL; ++testno) {
+			 TEST(c = getopt_long(ac, av, "dh", long_options, NULL));
+			 while (TEST_RETURN != -1) {
+		                switch (c) {
+                		case 'd':
+		                        opt_debug = 1;
+                		        break;
+		                default:
+                		        usage(progname);
+                        		
+                		}
+		        }
+
+
+		if (ac != optind) {
+        	        tst_resm(TINFO,"Options are not match.");
+                	usage(progname);
+                	
+	        }
+
+		/*
+		* Execute test
+         	*/
+	        for (i = 0; i < (int)(sizeof(tcase) / sizeof(tcase[0])); i++) {
+        	        int ret;
+	                tst_resm(TINFO,"(case%02d) START", i);
+	                ret = do_test(&tcase[i]);
+	                tst_resm(TINFO,"(case%02d) END => %s", i, (ret == 0) ? "OK" : "NG");
+	                result |= ret;
+        	}
+
+		/*
+        	 * Check results
+         	*/
+        	switch(result) {
+	        case RESULT_OK:
+        			tst_resm(TPASS, "mq_timedreceive call succeeded");
+		                break;
+
+	        default:
+                 	   	tst_resm(TFAIL, "%s failed - errno = %d : %s", TCID, TEST_ERRNO, strerror(TEST_ERRNO));
+        		        tst_resm(TINFO,"NG");
+				cleanup();
+				tst_exit();
+		                break;
+        	}
+
+                }
+        }
+        cleanup();
+>>>>>>> master
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
index 5966971..4f3d861 100644
--- a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
+++ b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
@@ -1,49 +1,49 @@
 /******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007-2008 ,Hitachi, Ltd                */
-/*          Author(s): Takahiro Yasui <takahiro.yasui.mp@hitachi.com>,	      */
+/* Copyright (c) Crackerjack Project., 2007-2008 ,Hitachi, Ltd		*/
+/*	  Author(s): Takahiro Yasui <takahiro.yasui.mp@hitachi.com>,	      */
 /*		       Yumiko Sugita <yumiko.sugita.yf@hitachi.com>, 	      */
 /*		       Satoshi Fujiwara <sa-fuji@sdl.hitachi.co.jp>	      */
-/*                                                                  	      */
+/*								  	      */
 /* This program 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 Software Foundation; either version 2 of the License, or          */
-/* (at your option) any later version.                                        */
-/*                                                                            */
-/* This program is distributed in the hope that it will be useful,            */
-/* but WITHOUT ANY WARRANTY;  without even the implied warranty of            */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See                  */
-/* the GNU General Public License for more details.                           */
-/*                                                                            */
-/* You should have received a copy of the GNU General Public License          */
-/* along with this program;  if not, write to the Free Software               */
+/* the Free Software Foundation; either version 2 of the License, or	  */
+/* (at your option) any later version.					*/
+/*									    */
+/* This program is distributed in the hope that it will be useful,	    */
+/* but WITHOUT ANY WARRANTY;  without even the implied warranty of	    */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See		  */
+/* the GNU General Public License for more details.			   */
+/*									    */
+/* You should have received a copy of the GNU General Public License	  */
+/* along with this program;  if not, write to the Free Software	       */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA    */
-/*                                                                            */
+/*									    */
 /******************************************************************************/
 /******************************************************************************/
-/*                                                                            */
-/* File:        mq_ulink01.c                                                  */
-/*                                                                            */
-/* Description: This tests the mq_ulink() syscall                             */
+/*									    */
+/* File:	mq_ulink01.c						  */
+/*									    */
+/* Description: This tests the mq_ulink() syscall			     */
 /*									      */
 /* 									      */
 /*									      */
 /*									      */
 /*									      */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* mq_ulink01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                            */
-/*      where,  -c n : Run n copies concurrently.                             */
-/*              -e   : Turn on errno logging.                                 */
-/*              -i n : Execute test n times.                                  */
-/*              -I x : Execute test for x seconds.                            */
-/*              -P x : Pause for x seconds between iterations.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   mq_ulink01                                             */
-/* History:     Porting from Crackerjack to LTP is done by                    */
-/*              Manas Kumar Nayak maknayak@in.ibm.com>                        */
+/*									    */
+/* Usage:  <for command-line>						 */
+/* mq_ulink01 [-c n] [-e][-i n] [-I x] [-p x] [-t]			    */
+/*      where,  -c n : Run n copies concurrently.			     */
+/*	      -e   : Turn on errno logging.				 */
+/*	      -i n : Execute test n times.				  */
+/*	      -I x : Execute test for x seconds.			    */
+/*	      -P x : Pause for x seconds between iterations.		*/
+/*	      -t   : Turn on syscall timing.				*/
+/*									    */
+/* Total Tests: 1							     */
+/*									    */
+/* Test Name:   mq_ulink01					     */
+/* History:     Porting from Crackerjack to LTP is done by		    */
+/*	      Manas Kumar Nayak maknayak@in.ibm.com>			*/
 /******************************************************************************/
 
 #include <sys/syscall.h>
@@ -69,62 +69,62 @@
 #include "linux_syscall_numbers.h"
 
 /* Extern Global Variables */
-extern int Tst_count;           /* counter for tst_xxx routines.         */
-extern char *TESTDIR;           /* temporary dir created by tst_tmpdir() */
+extern int Tst_count;	   /* counter for tst_xxx routines.	 */
+extern char *TESTDIR;	   /* temporary dir created by tst_tmpdir() */
 
 /* Global Variables */
 char *TCID = "mq_ulink01";  /* Test program identifier.*/
 int  testno;
-int  TST_TOTAL = 1;                   /* total number of tests in this file.   */
+int  TST_TOTAL = 1;		   /* total number of tests in this file.   */
 
 /* Extern Global Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    cleanup                                                       */
-/*                                                                            */
+/*									    */
+/* Function:    cleanup						       */
+/*									    */
 /* Description: Performs all one time clean up for this test on successful    */
-/*              completion,  premature exit or  failure. Closes all temporary */
-/*              files, removes all temporary directories exits the test with  */
-/*              appropriate return code by calling tst_exit() function.       */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
+/*	      completion,  premature exit or  failure. Closes all temporary */
+/*	      files, removes all temporary directories exits the test with  */
+/*	      appropriate return code by calling tst_exit() function.       */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
 /* Return:      On failure - Exits calling tst_exit(). Non '0' return code.   */
-/*              On success - Exits calling tst_exit(). With '0' return code.  */
-/*                                                                            */
+/*	      On success - Exits calling tst_exit(). With '0' return code.  */
+/*									    */
 /******************************************************************************/
 extern void cleanup() {
-        /* Remove tmp dir and all files in it */
-        TEST_CLEANUP;
-        tst_rmdir();
+	/* Remove tmp dir and all files in it */
+	TEST_CLEANUP;
+	tst_rmdir();
 }
 
 /* Local  Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    setup                                                         */
-/*                                                                            */
+/*									    */
+/* Function:    setup							 */
+/*									    */
 /* Description: Performs all one time setup for this test. This function is   */
-/*              typically used to capture signals, create temporary dirs      */
-/*              and temporary files that may be used in the course of this    */
-/*              test.                                                         */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits by calling cleanup().                      */
-/*              On success - returns 0.                                       */
-/*                                                                            */
+/*	      typically used to capture signals, create temporary dirs      */
+/*	      and temporary files that may be used in the course of this    */
+/*	      test.							 */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
+/* Return:      On failure - Exits by calling cleanup().		      */
+/*	      On success - returns 0.				       */
+/*									    */
 /******************************************************************************/
 void setup() {
-        tst_require_root(tst_exit);
-        /* Capture signals if any */
-        /* Create temporary directories */
-        TEST_PAUSE;
-        tst_tmpdir();
+	tst_require_root(tst_exit);
+	/* Capture signals if any */
+	/* Create temporary directories */
+	TEST_PAUSE;
+	tst_tmpdir();
 }
 
 
@@ -143,10 +143,10 @@
  */
 struct test_case {
 	char *user;
-        char *qname;
-        int ttype;
-        int ret;
-        int err;
+	char *qname;
+	int ttype;
+	int ret;
+	int err;
 };
 
 
@@ -154,53 +154,53 @@
 *
 *   test status of errors on man page
 *
-*   EACCES             v (permission is denied)
+*   EACCES	     v (permission is denied)
 *   ENAMETOOLONG       v (too long name length)
-*   ENOENT             v (named message queue does not exist)
+*   ENOENT	     v (named message queue does not exist)
 */
 
 static struct test_case tcase[] = {
 	{ // case00
-                .ttype          = NORMAL,
-                .qname          = QUEUE_NAME,
-                .ret            = 0,
-                .err            = 0,
-        },
-        { // case01
-                .ttype          = NORMAL,
-                .user           = "nobody",
-                .qname          = QUEUE_NAME,
-                .ret            = -1,
-                .err            = EACCES,
-        },
-        { // case02
-                .ttype          = NORMAL,
-                                //  0         1         2         3
-                                //  0123456789012345678901234567890123456789
-                .qname          = "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaa",
-                .ret            = -1,
-                .err            = ENOENT,
-        },
+		.ttype	  = NORMAL,
+		.qname	  = QUEUE_NAME,
+		.ret	    = 0,
+		.err	    = 0,
+	},
+	{ // case01
+		.ttype	  = NORMAL,
+		.user	   = "nobody",
+		.qname	  = QUEUE_NAME,
+		.ret	    = -1,
+		.err	    = EACCES,
+	},
+	{ // case02
+		.ttype	  = NORMAL,
+				//  0	 1	 2	 3
+				//  0123456789012345678901234567890123456789
+		.qname	  = "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaa",
+		.ret	    = -1,
+		.err	    = ENOENT,
+	},
 	{ // case03
-                .ttype          = NORMAL,
-                                //  0         1         2         3
-                                //  0123456789012345678901234567890123456789
-                .qname          = "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
-                                   "aaaaaaaaaaaaaaaa",
-                .ret            = -1,
-                .err            = ENAMETOOLONG,
-        },
+		.ttype	  = NORMAL,
+				//  0	 1	 2	 3
+				//  0123456789012345678901234567890123456789
+		.qname	  = "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+				   "aaaaaaaaaaaaaaaa",
+		.ret	    = -1,
+		.err	    = ENAMETOOLONG,
+	},
 };
 
 /*
@@ -213,69 +213,64 @@
 
 static int do_test(struct test_case *tc)
 {
-        int sys_ret;
-        int sys_errno;
-        int result = RESULT_OK;
+	int sys_ret;
+	int sys_errno;
+	int result = RESULT_OK;
 	int rc, fd1 = -1, fd2 = -1;
-        uid_t old_uid = -1;
+	uid_t old_uid = -1;
 
-        /*
-         * When test ended with SIGTERM etc, mq discriptor is left remains.
-         * So we delete it first.
-         */
-        TEST(mq_unlink(QUEUE_NAME));
+	/*
+	 * When test ended with SIGTERM etc, mq discriptor is left remains.
+	 * So we delete it first.
+	 */
+	TEST(mq_unlink(QUEUE_NAME));
 
-        /*
-         * Open message queue
-         */
-        TEST(rc = mq_open(QUEUE_NAME, O_CREAT|O_EXCL|O_RDWR, S_IRWXU, NULL));
-	if (TEST_RETURN < 0) {
-                tst_resm(TFAIL, "mq_open failed - errno = %d : %s",TEST_ERRNO, strerror(TEST_ERRNO));
-                result = 1;
-                goto EXIT;
-        }
-        fd1 = rc;
+	/*
+	 * Open message queue
+	 */
+	rc = mq_open(QUEUE_NAME, O_CREAT|O_EXCL|O_RDWR, S_IRWXU, NULL);
+	if (rc == -1) {
+		tst_resm(TFAIL|TTERRNO, "mq_open failed");
+		result = 1;
+		goto EXIT;
+	}
+	fd1 = rc;
 
-        /*
-         * Change effective user id
-         */
-        if (tc->user != NULL) {
-                TEST(rc = setup_euid(tc->user, &old_uid));
-                if (TEST_RETURN < 0) {
-                        result = 1;
-                        goto EXIT;
-                }
-        }
+	/*
+	 * Change effective user id
+	 */
+	if (tc->user != NULL) {
+		TEST(rc = setup_euid(tc->user, &old_uid));
+		if (TEST_RETURN < 0) {
+			result = 1;
+			goto EXIT;
+		}
+	}
 
-/*
-         * Execute system call
-         */
-        //tst_resm(TINFO,"PATH_MAX: %d\n", PATH_MAX);
-        //tst_resm(TINFO,"NAME_MAX: %d\n", NAME_MAX);
-        errno = 0;
-        TEST(sys_ret = mq_unlink(tc->qname));
-        sys_errno = errno;
-        if (sys_ret >= 0)
-                fd2 = sys_ret;
+	/*
+	 * Execute system call
+	 */
+	errno = 0;
+	TEST(sys_ret = mq_unlink(tc->qname));
+	sys_errno = errno;
+	if (sys_ret >= 0)
+		fd2 = sys_ret;
 
-        /*
-         * Check results
-         */
-        result |= (sys_errno != tc->err);
-        PRINT_RESULT(sys_ret >= 0, tc->ret, tc->err, sys_ret, sys_errno);
+	/*
+	 * Check results
+	 */
+	result |= (sys_errno != tc->err);
+	PRINT_RESULT(sys_ret >= 0, tc->ret, tc->err, sys_ret, sys_errno);
 
 EXIT:
-        if (tc->user != NULL && old_uid != -1)
-                cleanup_euid(old_uid);
+	if (tc->user != NULL && old_uid != -1)
+		cleanup_euid(old_uid);
 
-        if (fd1 >= 0)
-                close(fd1);
-        if (fd2 >= 0)
-                close(fd2);
-        if (fd1 >= 0)
-                mq_unlink(QUEUE_NAME);
-
-        return result;
+	if (fd1 >= 0)
+		close(fd1);
+	if (fd2 >= 0)
+		close(fd2);
+	mq_unlink(QUEUE_NAME);
 }
 
 
@@ -286,49 +281,36 @@
 
 int main(int ac, char **av) {
 	int result = RESULT_OK;
-        int i;
-        int lc;                 /* loop counter */
-        char *msg;              /* message returned from parse_opts */
+	int i;
+	int lc;
+	char *msg;
 
-        /* parse standard options */
-        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+	/* parse standard options */
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-        setup();
+	setup();
 
-        /* Check looping state if -i option given */
-        for (lc = 0; TEST_LOOPING(lc); ++lc) {
-                Tst_count = 0;
-                for (testno = 0; testno < TST_TOTAL; ++testno) {
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+		Tst_count = 0;
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
+
+			int ret;
+
+			ret = 0;
 
 			/*
 			 * Execute test
 			 */
-		        for (i = 0; i < (int)(sizeof(tcase) / sizeof(tcase[0])); i++) {
-        		        int ret;
-	        	        tst_resm(TINFO,"(case%02d) START", i);
-	                	ret = do_test(&tcase[i]);
-		                tst_resm(TINFO,"(case%02d) END => %s", i,
-					(ret == 0) ? "OK" : "NG");
-		                result |= ret;
-        		}
-		
-			/*
-        		 * Check results
-         		 */
-	        	switch(result) {
-		        case RESULT_OK:
-        			tst_resm(TPASS, "mq_unlink call succeeded");
-		                break;
+			for (i = 0; ret == 0 &&
+				    i < (int)(sizeof(tcase) / sizeof(tcase[0])); i++) {
+				ret = do_test(&tcase[i]);
+			}
 
-	        	default:
-                 	   	tst_resm(TFAIL|TTERRNO, "mq_unlink failed");
-		                break;
-        		}
-
-                }
-        }	
-        cleanup();
+		}
+	}	
+	cleanup();
 	tst_exit();
 }
 
diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c
index a816bf7..77ae73f 100644
--- a/testcases/kernel/syscalls/mremap/mremap01.c
+++ b/testcases/kernel/syscalls/mremap/mremap01.c
@@ -104,9 +104,15 @@
 	int ind;		/* counter variable */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Check looping state if -i option given */
@@ -172,7 +178,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -198,7 +204,7 @@
 
 	/* Get the system page size */
 	if ((pagesz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, tst_exit,
+		tst_brkm(TFAIL, NULL,
 			 "getpagesize() fails to get system page size");
 	}
 
diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c
index 2d6c1d0..7021118 100644
--- a/testcases/kernel/syscalls/mremap/mremap02.c
+++ b/testcases/kernel/syscalls/mremap/mremap02.c
@@ -99,9 +99,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -154,7 +160,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -175,7 +181,7 @@
 
 	/* Get the system page size */
 	if ((memsize = getpagesize()) < 0) {
-		tst_brkm(TFAIL, tst_exit,
+		tst_brkm(TFAIL, NULL,
 			 "getpagesize() fails to get system page size");
 	}
 
diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c
index a6a96a3..ec03571 100644
--- a/testcases/kernel/syscalls/mremap/mremap03.c
+++ b/testcases/kernel/syscalls/mremap/mremap03.c
@@ -101,9 +101,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -157,7 +163,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -179,7 +185,7 @@
 
 	/* Get the system page size */
 	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, tst_exit,
+		tst_brkm(TFAIL, NULL,
 			 "getpagesize() fails to get system page size");
 	}
 
diff --git a/testcases/kernel/syscalls/mremap/mremap04.c b/testcases/kernel/syscalls/mremap/mremap04.c
index ff7795f..deb1d6a 100644
--- a/testcases/kernel/syscalls/mremap/mremap04.c
+++ b/testcases/kernel/syscalls/mremap/mremap04.c
@@ -111,9 +111,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -168,7 +174,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -198,7 +204,7 @@
 
 	/* Get the system page size */
 	if ((memsize = getpagesize()) < 0) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			 "getpagesize() failed to get system page size");
 	}
 
@@ -214,7 +220,7 @@
 	 */
 	shmid = shmget(shmkey, newsize, IPC_CREAT | SHM_MODE);
 	if (shmid == -1) {
-		tst_brkm(TBROK, tst_exit, "shmget() Failed to create a shared "
+		tst_brkm(TBROK, NULL, "shmget() Failed to create a shared "
 			 "memory, error:%d", errno);
 	}
 
diff --git a/testcases/kernel/syscalls/msync/msync01.c b/testcases/kernel/syscalls/msync/msync01.c
index 9b38220..19045b4 100644
--- a/testcases/kernel/syscalls/msync/msync01.c
+++ b/testcases/kernel/syscalls/msync/msync01.c
@@ -96,9 +96,15 @@
 	int nread = 0, count, err_flg = 0;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Check looping state if -i option given */
@@ -183,7 +189,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/msync/msync02.c b/testcases/kernel/syscalls/msync/msync02.c
index 94d96f8..2cd13d9 100644
--- a/testcases/kernel/syscalls/msync/msync02.c
+++ b/testcases/kernel/syscalls/msync/msync02.c
@@ -93,9 +93,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Check looping state if -i option given */
@@ -151,7 +157,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/msync/msync03.c b/testcases/kernel/syscalls/msync/msync03.c
index 7bc3891..ca1afc5 100644
--- a/testcases/kernel/syscalls/msync/msync03.c
+++ b/testcases/kernel/syscalls/msync/msync03.c
@@ -88,9 +88,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -135,7 +141,7 @@
 	/* Call cleanup() to exit the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/msync/msync04.c b/testcases/kernel/syscalls/msync/msync04.c
index a72baa6..9061f8e 100644
--- a/testcases/kernel/syscalls/msync/msync04.c
+++ b/testcases/kernel/syscalls/msync/msync04.c
@@ -94,9 +94,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	TEST_EXP_ENOS(exp_enos);
@@ -146,7 +152,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/msync/msync05.c b/testcases/kernel/syscalls/msync/msync05.c
index 30a7b04..1e0a257 100644
--- a/testcases/kernel/syscalls/msync/msync05.c
+++ b/testcases/kernel/syscalls/msync/msync05.c
@@ -88,9 +88,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -135,7 +141,7 @@
 	/* Call test cleanup to exit the test */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/munlock/munlock01.c b/testcases/kernel/syscalls/munlock/munlock01.c
index d5524fb..3874d47 100644
--- a/testcases/kernel/syscalls/munlock/munlock01.c
+++ b/testcases/kernel/syscalls/munlock/munlock01.c
@@ -162,7 +162,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/munlockall/munlockall01.c b/testcases/kernel/syscalls/munlockall/munlockall01.c
index d51fae0..3b6cd94 100644
--- a/testcases/kernel/syscalls/munlockall/munlockall01.c
+++ b/testcases/kernel/syscalls/munlockall/munlockall01.c
@@ -137,7 +137,7 @@
 	TEST_EXP_ENOS(exp_enos);
 
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be tested as root");
+		tst_brkm(TBROK, NULL, "Test must be tested as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/munlockall/munlockall02.c b/testcases/kernel/syscalls/munlockall/munlockall02.c
index b48bc22..0c4901f 100644
--- a/testcases/kernel/syscalls/munlockall/munlockall02.c
+++ b/testcases/kernel/syscalls/munlockall/munlockall02.c
@@ -137,15 +137,15 @@
 
 	/* switch to nobody user */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "\"nobody\"user not present");
+		tst_brkm(TBROK, NULL, "\"nobody\"user not present");
 	}
 
 	if (seteuid(ltpuser->pw_uid) == -1) {
-		tst_brkm(TBROK, tst_exit, "seteuid failed to "
+		tst_brkm(TBROK, NULL, "seteuid failed to "
 			 "to set the effective uid to %d", ltpuser->pw_uid);
 	}
 
diff --git a/testcases/kernel/syscalls/munmap/munmap01.c b/testcases/kernel/syscalls/munmap/munmap01.c
index 258f9c9..58837f9 100644
--- a/testcases/kernel/syscalls/munmap/munmap01.c
+++ b/testcases/kernel/syscalls/munmap/munmap01.c
@@ -97,9 +97,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Check looping state if -i option given */
@@ -158,7 +164,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/munmap/munmap02.c b/testcases/kernel/syscalls/munmap/munmap02.c
index a85f84f..9165d55 100644
--- a/testcases/kernel/syscalls/munmap/munmap02.c
+++ b/testcases/kernel/syscalls/munmap/munmap02.c
@@ -101,9 +101,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Check looping state if -i option given */
@@ -156,7 +162,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/munmap/munmap03.c b/testcases/kernel/syscalls/munmap/munmap03.c
index 6199566..912a5d3 100644
--- a/testcases/kernel/syscalls/munmap/munmap03.c
+++ b/testcases/kernel/syscalls/munmap/munmap03.c
@@ -98,9 +98,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* set the expected errnos... */
@@ -148,7 +154,7 @@
 	/* exit with return code appropriate for results */
 	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep01.c b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
index 9178198..078d44e 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep01.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
@@ -93,7 +93,11 @@
 	int retval = 0, e_code, status;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep02.c b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
index 553f6a2..3aa651a 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep02.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
@@ -113,9 +113,15 @@
 	int status;		/* child exit status */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "dddd", &timereq.tv_sec, &timereq.tv_nsec,
@@ -175,7 +181,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep03.c b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
index aeddd6f..c880767 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep03.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
@@ -92,9 +92,15 @@
 	int status;		/* child exit status */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "dddd", &timereq.tv_sec, &timereq.tv_nsec,
@@ -155,7 +161,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep04.c b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
index 5020023..93f4474 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep04.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
@@ -89,9 +89,15 @@
 	int status;		/* child exit status */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -160,7 +166,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/newuname/newuname01.c b/testcases/kernel/syscalls/newuname/newuname01.c
index 15c42c0..9f1b51e 100644
--- a/testcases/kernel/syscalls/newuname/newuname01.c
+++ b/testcases/kernel/syscalls/newuname/newuname01.c
@@ -117,7 +117,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/nftw/nftw.c b/testcases/kernel/syscalls/nftw/nftw.c
index 801f5a3..5718cb1 100644
--- a/testcases/kernel/syscalls/nftw/nftw.c
+++ b/testcases/kernel/syscalls/nftw/nftw.c
@@ -663,7 +663,7 @@
 	cleanup_function();
 
 	anyfail();		/* THIS CALL DOES NOT RETURN - EXITS!!  */
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 /*--------------------------------------------------------------*/
 }
 
diff --git a/testcases/kernel/syscalls/nftw/nftw64.c b/testcases/kernel/syscalls/nftw/nftw64.c
index 4941065..a5cf382 100644
--- a/testcases/kernel/syscalls/nftw/nftw64.c
+++ b/testcases/kernel/syscalls/nftw/nftw64.c
@@ -689,7 +689,7 @@
 
 	anyfail();		/* THIS CALL DOES NOT RETURN - EXITS!!  */
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*--------------------------------------------------------------*/
diff --git a/testcases/kernel/syscalls/nice/nice01.c b/testcases/kernel/syscalls/nice/nice01.c
index 7904270..c78f0b3 100644
--- a/testcases/kernel/syscalls/nice/nice01.c
+++ b/testcases/kernel/syscalls/nice/nice01.c
@@ -95,9 +95,15 @@
 	int rval;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -164,7 +170,7 @@
 
 	/* Make sure the calling process is super-user only */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be ROOT to run this test.");
+		tst_brkm(TBROK, NULL, "Must be ROOT to run this test.");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/nice/nice02.c b/testcases/kernel/syscalls/nice/nice02.c
index 048f0ce..844f7e4 100644
--- a/testcases/kernel/syscalls/nice/nice02.c
+++ b/testcases/kernel/syscalls/nice/nice02.c
@@ -89,9 +89,15 @@
 	int max_val;		/* Maximum nice value per OS. */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
diff --git a/testcases/kernel/syscalls/nice/nice03.c b/testcases/kernel/syscalls/nice/nice03.c
index 04a3c82..0fcd07b 100644
--- a/testcases/kernel/syscalls/nice/nice03.c
+++ b/testcases/kernel/syscalls/nice/nice03.c
@@ -92,9 +92,15 @@
 	int New_nice;		/* priority of process after nice() */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
diff --git a/testcases/kernel/syscalls/nice/nice04.c b/testcases/kernel/syscalls/nice/nice04.c
index 644789a..899bcf1 100644
--- a/testcases/kernel/syscalls/nice/nice04.c
+++ b/testcases/kernel/syscalls/nice/nice04.c
@@ -100,9 +100,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -156,7 +162,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/open/open01.c b/testcases/kernel/syscalls/open/open01.c
index 2405dda..fb88616 100644
--- a/testcases/kernel/syscalls/open/open01.c
+++ b/testcases/kernel/syscalls/open/open01.c
@@ -78,8 +78,12 @@
 	 * parse standard command line options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup for test */
 
@@ -149,7 +153,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/open/open02.c b/testcases/kernel/syscalls/open/open02.c
index cb1efd6..7ca5b59 100644
--- a/testcases/kernel/syscalls/open/open02.c
+++ b/testcases/kernel/syscalls/open/open02.c
@@ -70,8 +70,12 @@
 	 * parse standard command line options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup for test */
 
@@ -101,7 +105,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/open/open03.c b/testcases/kernel/syscalls/open/open03.c
index 591ad6d..b9a290b 100644
--- a/testcases/kernel/syscalls/open/open03.c
+++ b/testcases/kernel/syscalls/open/open03.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/open/open04.c b/testcases/kernel/syscalls/open/open04.c
index c441390..ec3b02a 100644
--- a/testcases/kernel/syscalls/open/open04.c
+++ b/testcases/kernel/syscalls/open/open04.c
@@ -75,7 +75,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -106,7 +110,7 @@
 	close(fd);
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -137,7 +141,7 @@
 
 	/* Allocate memory for stat and ustat structure variables */
 	if ((buf = (int *)malloc(sizeof(int) * nfile - first)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	for (ifile = first; ifile <= nfile; ifile++) {
diff --git a/testcases/kernel/syscalls/open/open05.c b/testcases/kernel/syscalls/open/open05.c
index a1666a7..05a8948 100644
--- a/testcases/kernel/syscalls/open/open05.c
+++ b/testcases/kernel/syscalls/open/open05.c
@@ -75,7 +75,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -90,7 +94,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* child */
 			if (seteuid(nobody->pw_uid) == -1) {
@@ -137,7 +141,7 @@
 		}
 	}
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -147,7 +151,7 @@
 {
 	/* test must be run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run test as root");
+		tst_brkm(TBROK, NULL, "Must run test as root");
 	}
 
 	/* capture signals */
@@ -165,7 +169,7 @@
 
 	if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1) {
 		tst_brkm(TBROK, cleanup, "open() failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/open/open06.c b/testcases/kernel/syscalls/open/open06.c
index 5a711ae..a36f8d5 100644
--- a/testcases/kernel/syscalls/open/open06.c
+++ b/testcases/kernel/syscalls/open/open06.c
@@ -70,7 +70,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -99,7 +103,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -120,7 +124,7 @@
 
 	if (mknod(fname, S_IFIFO | 0644, (dev_t) NULL) == -1) {
 		tst_brkm(TBROK, cleanup, "mknod FAILED");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/open/open07.c b/testcases/kernel/syscalls/open/open07.c
index 7529ee8..378d02b 100644
--- a/testcases/kernel/syscalls/open/open07.c
+++ b/testcases/kernel/syscalls/open/open07.c
@@ -112,7 +112,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -167,7 +171,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 void setupfunc_test1()
@@ -178,10 +182,10 @@
 	sprintf(file2, "open03.2.%d", getpid());
 	if ((fd1 = creat(file1, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file1, file2) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	strcpy(TC[0].filename, file2);
 }
 
@@ -193,10 +197,10 @@
 	sprintf(file2, "open03.4.%d", getpid());
 	if (mkdir(file1, 00700) < 0) {
 		tst_brkm(TBROK, cleanup, "mkdir(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file1, file2) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	strcpy(TC[1].filename, file2);
 }
 
@@ -209,13 +213,13 @@
 	sprintf(file3, "open03.7.%d", getpid());
 	if ((fd2 = creat(file1, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file1, file2) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file2, file3) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	strcpy(TC[2].filename, file3);
 }
 
@@ -228,13 +232,13 @@
 	sprintf(file3, "open03.10.%d", getpid());
 	if (mkdir(file1, 00700) < 0) {
 		tst_brkm(TBROK, cleanup, "mkdir(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file1, file2) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (symlink(file2, file3) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	strcpy(TC[3].filename, file3);
 }
 
@@ -246,10 +250,10 @@
 	sprintf(file2, "open12.4.%d", getpid());
 	if (mkdir(file1, 00700) < 0) {
 		tst_brkm(TBROK, cleanup, "mkdir(2) failed: errno: %d", errno);
-	/*NOTREACHED*/}
+	}
 	if (symlink(file1, file2) < 0) {
 		tst_brkm(TBROK, cleanup, "symlink(2) failed: errno: %d", errno);
-	/*NOTREACHED*/}
+	}
 	strcpy(TC[4].filename, file2);
 	strcat(TC[4].filename, "/");
 }
diff --git a/testcases/kernel/syscalls/open/open08.c b/testcases/kernel/syscalls/open/open08.c
index 0bc2c45..4ebc854 100644
--- a/testcases/kernel/syscalls/open/open08.c
+++ b/testcases/kernel/syscalls/open/open08.c
@@ -102,7 +102,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -142,7 +146,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -162,14 +166,14 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setgid(ltpuser->pw_gid) == -1) {
-		tst_brkm(TBROK | TERRNO, tst_exit, "setgid(%d) failed",
+		tst_brkm(TBROK | TERRNO, NULL, "setgid(%d) failed",
 			ltpuser->pw_gid);
 	} else if (setuid(ltpuser->pw_uid) == -1) {
-		tst_brkm(TBROK | TERRNO, tst_exit, "setuid(%d) failed",
+		tst_brkm(TBROK | TERRNO, NULL, "setuid(%d) failed",
 			ltpuser->pw_uid);
 	}
 
diff --git a/testcases/kernel/syscalls/open/open09.c b/testcases/kernel/syscalls/open/open09.c
index 0931a2f..66f835a 100644
--- a/testcases/kernel/syscalls/open/open09.c
+++ b/testcases/kernel/syscalls/open/open09.c
@@ -65,7 +65,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 	tst_tmpdir();
 	local_flag = PASSED;
 	sprintf(tempfile, "open09.%d", getpid());
diff --git a/testcases/kernel/syscalls/open/open10.c b/testcases/kernel/syscalls/open/open10.c
index b2eb11d..ef14f79 100644
--- a/testcases/kernel/syscalls/open/open10.c
+++ b/testcases/kernel/syscalls/open/open10.c
@@ -123,8 +123,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	tst_tmpdir();
 
diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
index 05adc9a..c74716e 100644
--- a/testcases/kernel/syscalls/openat/openat01.c
+++ b/testcases/kernel/syscalls/openat/openat01.c
@@ -98,7 +98,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/pathconf/pathconf01.c b/testcases/kernel/syscalls/pathconf/pathconf01.c
index daea9ae..9ce298a 100644
--- a/testcases/kernel/syscalls/pathconf/pathconf01.c
+++ b/testcases/kernel/syscalls/pathconf/pathconf01.c
@@ -161,7 +161,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, options, &help)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	if (!lflag) {
 		path = strdup("/tmp");
diff --git a/testcases/kernel/syscalls/pause/pause01.c b/testcases/kernel/syscalls/pause/pause01.c
index b5d1d1f..1693507 100644
--- a/testcases/kernel/syscalls/pause/pause01.c
+++ b/testcases/kernel/syscalls/pause/pause01.c
@@ -133,7 +133,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/pause/pause02.c b/testcases/kernel/syscalls/pause/pause02.c
index 880928e..b785b5a 100644
--- a/testcases/kernel/syscalls/pause/pause02.c
+++ b/testcases/kernel/syscalls/pause/pause02.c
@@ -95,9 +95,15 @@
 	int rval;		/* return value for wait() */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "");
diff --git a/testcases/kernel/syscalls/pause/pause03.c b/testcases/kernel/syscalls/pause/pause03.c
index a63d78b..0e90ac8 100644
--- a/testcases/kernel/syscalls/pause/pause03.c
+++ b/testcases/kernel/syscalls/pause/pause03.c
@@ -90,9 +90,15 @@
 	int ret_val;		/* return value for wait() */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/personality/personality01.c b/testcases/kernel/syscalls/personality/personality01.c
index 8c16229..07d568c 100644
--- a/testcases/kernel/syscalls/personality/personality01.c
+++ b/testcases/kernel/syscalls/personality/personality01.c
@@ -75,7 +75,6 @@
 	PER_IRIX32, PER_IRIXN32, PER_IRIX64
 };
 
-#ifdef __NR_personality
 int main(int ac, char **av)
 {
 	int lc;			/* loop counter */
@@ -83,9 +82,8 @@
 	int i, start_pers;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
@@ -145,15 +143,8 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
-}
-#else
-int main(int ac, char **av)
-{
-	tst_resm(TCONF, "personality() not defined in your system");
 	tst_exit();
 }
-#endif
 
 /*
  * setup() - performs all the ONE TIME setup for this test.
@@ -178,7 +169,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/personality/personality02.c b/testcases/kernel/syscalls/personality/personality02.c
index 0659fa8..d26efa0 100644
--- a/testcases/kernel/syscalls/personality/personality02.c
+++ b/testcases/kernel/syscalls/personality/personality02.c
@@ -66,6 +66,7 @@
 
 #include <errno.h>
 #include <linux/personality.h>
+#include "linux_syscall_numbers.h"
 #undef personality
 
 extern int personality(unsigned long);
@@ -79,7 +80,6 @@
 
 #define	PER_BAD	0x00dd		/* A non-existent personality type */
 
-#ifdef __NR_personality
 int main(int ac, char **av)
 {
 	int lc;			/* loop counter */
@@ -87,16 +87,15 @@
 	int start_pers;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
 	start_pers = personality(PER_LINUX);
 	if (start_pers == -1) {
 		printf("personality01:  Test Failed\n");
-		exit(-1);
+		exit(1);
 	}
 
 	/* The following checks the looping state if -i option given */
@@ -126,17 +125,8 @@
 	}
 
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
-}
-#else
-int main(int ac, char **av)
-{
-	tst_resm(TCONF, "personality() not defined in your system");
 	tst_exit();
 }
-#endif
-
 
 /*
  * setup() - performs all the ONE TIME setup for this test.
@@ -161,7 +151,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe01.c b/testcases/kernel/syscalls/pipe/pipe01.c
index d9740d4..54562a1 100644
--- a/testcases/kernel/syscalls/pipe/pipe01.c
+++ b/testcases/kernel/syscalls/pipe/pipe01.c
@@ -78,9 +78,8 @@
 	int greater, length;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -106,16 +105,16 @@
 				tst_brkm(TBROK, cleanup, "write() failed");
 			}
 
-			if ((written < 0) || (written > 26)) {
+			if (written < 0 || written > 26) {
 				tst_resm(TFAIL, "Condition #1 test failed");
 				continue;
 			}
 
 			if ((red = safe_read(fildes[0], rebuf, written)) == -1) {
-				tst_brkm(TBROK, cleanup, "read() failed");
+				tst_brkm(TBROK|TERRNO, cleanup, "read() failed");
 			}
 
-			if ((red < 0) || (red > written)) {
+			if (red < 0 || red > written) {
 				tst_resm(TFAIL, "Condition #2 test failed");
 				continue;
 			}
@@ -132,7 +131,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -158,7 +157,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe02.c b/testcases/kernel/syscalls/pipe/pipe02.c
index ec9600b..7e24efe 100644
--- a/testcases/kernel/syscalls/pipe/pipe02.c
+++ b/testcases/kernel/syscalls/pipe/pipe02.c
@@ -91,8 +91,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "dd", &pp[0], &pp[1]);
 #endif
diff --git a/testcases/kernel/syscalls/pipe/pipe03.c b/testcases/kernel/syscalls/pipe/pipe03.c
index 4899653..3695bf6 100644
--- a/testcases/kernel/syscalls/pipe/pipe03.c
+++ b/testcases/kernel/syscalls/pipe/pipe03.c
@@ -76,9 +76,8 @@
 	char rbuf[BUFSIZ];
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -90,8 +89,8 @@
 		TEST(pipe(fildes));
 
 		if (TEST_RETURN == -1)
-			tst_brkm(TBROK, cleanup, "pipe() failed unexpectedly "
-				 "- errno %d", TEST_ERRNO);
+			tst_brkm(TBROK|TTERRNO, cleanup,
+			    "pipe() failed unexpectedly");
 
 		TEST(write(fildes[0], "A", 1));
 		if (TEST_RETURN == -1 && TEST_ERRNO == EBADF)
@@ -107,13 +106,13 @@
 			tst_resm(TPASS, "expected failure reading from "
 				 "write end of pipe");
 		else
-			tst_resm(TFAIL, "success when reading from "
+			tst_resm(TFAIL|TTERRNO, "success when reading from "
 				 "write end of pipe ret=%ld, "
-				 "errno=%d", TEST_RETURN, TEST_ERRNO);
+				 "errno=%d", TEST_RETURN);
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -139,7 +138,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe04.c b/testcases/kernel/syscalls/pipe/pipe04.c
index 431b64a..01be958 100644
--- a/testcases/kernel/syscalls/pipe/pipe04.c
+++ b/testcases/kernel/syscalls/pipe/pipe04.c
@@ -88,9 +88,8 @@
 	char rbuf[BUFSIZ];
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 #ifdef UCLINUX
 	maybe_run_child(&c1func, "ndd", 1, &fildes[0], &fildes[1]);
 	maybe_run_child(&c2func, "ndd", 2, &fildes[0], &fildes[1]);
@@ -174,25 +173,24 @@
 		 * Set action for the alarm
 		 */
 		if (signal(SIGALRM, alarmfunc) == SIG_ERR)
-			tst_resm(TWARN, "call to signal failed, errno=%d",
-				 errno);
+			tst_resm(TWARN|TERRNO, "call to signal failed");
 		/*
 		 * Set an alarm for 60 seconds just in case the child
 		 * processes don't die
 		 */
 		alarm(60);
-		if ((wtchild = waitpid(c1pid, &wtstatus, 0)) != -1) {
+		if (waitpid(c1pid, &wtstatus, 0) != -1) {
 			if (wtstatus != SIGKILL)
-				tst_resm(TFAIL, "unexpected wait status %d, "
-					 "errno=%d", wtstatus, errno);
+				tst_resm(TFAIL|TERRNO, "unexpected wait status "
+				    "%d", wtstatus);
 			else
 				tst_resm(TPASS, "Child 1 killed while "
 					 "writing to a pipe");
 		}
-		if ((wtchild = waitpid(c2pid, &wtstatus, 0)) != -1) {
-			if (wtstatus != SIGKILL)
-				tst_resm(TFAIL, "unexpected wait status %d, "
-					 "errno=%d", wtstatus, errno);
+		if (waitpid(c2pid, &wtstatus, 0) != -1) {
+			if (!WIFSIGNALED(wtstatus) || WTERMSIG != SIGKILL)
+				tst_resm(TFAIL|TERRNO, "unexpected wait status "
+				    "%d", wtstatus);
 			else
 				tst_resm(TPASS, "Child 2 killed while "
 					 "writing to a pipe");
@@ -202,7 +200,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -228,9 +226,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
 
 void c1func()
@@ -239,8 +234,7 @@
 		tst_resm(TWARN, "Could not close fildes[0] - errno %d", errno);
 	while (1)
 		if (write(fildes[1], "bbbbbbbbbbbbbbbbbbbbbbbbb", 25) == -1)
-			tst_resm(TBROK, "Child 1 error writing to pipe - "
-				 "errno %d", errno);
+			tst_resm(TBROK|TERRNO, "[child 1] pipe write failed");
 }
 
 void c2func()
@@ -249,13 +243,12 @@
 		tst_resm(TWARN, "Could not close fildes[0] - errno %d", errno);
 	while (1)
 		if (write(fildes[1], "AAAAAAAAAAAAAAAAAAAAAAAAA", 25) == -1)
-			tst_resm(TBROK, "Child 2 error writing to pipe - "
-				 "errno %d", errno);
+			tst_resm(TBROK|TERRNO, "[child 2] pipe write failed");
 }
 
 void alarmfunc(int sig)
 {
 	/* for some reason tst_brkm doesn't seem to work in a signal handler */
-	tst_resm(TFAIL, "One or more children did not die within 60 seconds");
-	cleanup();
+	tst_brkm(TFAIL, cleanup, "one or more children did't die in 60 second "
+	    "time limit");
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe05.c b/testcases/kernel/syscalls/pipe/pipe05.c
index 3663e07..cf3dcdb 100644
--- a/testcases/kernel/syscalls/pipe/pipe05.c
+++ b/testcases/kernel/syscalls/pipe/pipe05.c
@@ -68,9 +68,8 @@
 	struct sigaction sa, osa;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -114,7 +113,7 @@
 
 	}
 	cleanup();
-	return 0;
+	tst_exit();
 }
 
 /*
@@ -148,7 +147,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe06.c b/testcases/kernel/syscalls/pipe/pipe06.c
index 06d7cfe..4cc050e 100644
--- a/testcases/kernel/syscalls/pipe/pipe06.c
+++ b/testcases/kernel/syscalls/pipe/pipe06.c
@@ -64,9 +64,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -86,18 +85,14 @@
 		TEST_ERROR_LOG(TEST_ERRNO);
 
 		if (TEST_ERRNO != EMFILE) {
-			tst_resm(TFAIL, "unexpected error - %d : %s - "
-				 "expected EMFILE", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TFAIL|TTERRNO, "pipe failed unexpectedly");
 		} else {
-			tst_resm(TPASS, "expected failure - "
-				 "errno = %d : %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
+			tst_resm(TPASS, "failed with EMFILE");
 		}
 
 	}
 	cleanup();
-	return 0;
+	tst_exit();
 }
 
 /*
@@ -119,8 +114,8 @@
 		pipe_ret = pipe(pipes);
 		if (pipe_ret < 0) {
 			if (errno != EMFILE) {
-				tst_brkm(TBROK, cleanup, "got unexpected "
-					 "error - %d", errno);
+				tst_brkm(TBROK|TTERRNO, cleanup,
+				    "didn't get EMFILE");
 			}
 			break;
 		}
@@ -138,7 +133,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe07.c b/testcases/kernel/syscalls/pipe/pipe07.c
index 2935d34..083e8ca 100644
--- a/testcases/kernel/syscalls/pipe/pipe07.c
+++ b/testcases/kernel/syscalls/pipe/pipe07.c
@@ -77,9 +77,8 @@
 	FILE *f;		/* used for retrieving the used fds */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 	setup();
 	/* Get the currently used number of file descriptors */
 	mypid = getpid();
@@ -176,7 +175,4 @@
 
 	/* Remove temporary test directory */
 	rmdir(tempdir);
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe08.c b/testcases/kernel/syscalls/pipe/pipe08.c
index 24b5948..a608a3d 100644
--- a/testcases/kernel/syscalls/pipe/pipe08.c
+++ b/testcases/kernel/syscalls/pipe/pipe08.c
@@ -73,9 +73,8 @@
 	int close_stat;		/*  exit status of close(read fd) */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	if (!STD_FUNCTIONAL_TEST) {
 		tst_resm(TWARN, "-f option should not be used");
@@ -111,7 +110,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -149,7 +148,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe09.c b/testcases/kernel/syscalls/pipe/pipe09.c
index 7b9a962..e036bf0 100644
--- a/testcases/kernel/syscalls/pipe/pipe09.c
+++ b/testcases/kernel/syscalls/pipe/pipe09.c
@@ -85,9 +85,8 @@
 	int fork_1, fork_2;	/* ret values in parent */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -111,7 +110,7 @@
 
 		if ((fork_1 = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #1 failed");
-		 /*NOTREACHED*/}
+		}
 
 		if (fork_1 == 0) {	/* 1st child */
 			if (close(pipefd[0]) != 0) {
@@ -131,26 +130,25 @@
 
 		/* parent */
 
-		waitpid(fork_1, &wtstatus, 0);
-		if (WEXITSTATUS(wtstatus) != 0) {
-			tst_brkm(TBROK, cleanup, "problem detected in child, "
-				 "wait status %d, errno = %d", wtstatus, errno);
+		if (waitpid(fork_1, &wtstatus, 0) == -1)
+			tst_brkm(TBROK, cleanup, "waitpid failed");
+		if (WIFEXITED(wstatus) && WEXITSTATUS(wtstatus) != 0) {
+			tst_brkm(TBROK, cleanup, "child exited abnormally");
 		}
 
 		if ((fork_2 = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #2 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (fork_2 == 0) {	/* 2nd child */
 			if (close(pipefd[0]) != 0) {
-				tst_resm(TWARN, "pipefd[0] close "
-					 "failed, errno = %d", errno);
+				perror("pipefd[0] close failed");
 				exit(1);
 			}
 
 			for (i = 0; i < PIPEWRTCNT / 2; ++i) {
 				if (write(pipefd[1], "B", 1) != 1) {
-					tst_resm(TWARN, "write to pipe failed");
+					perror("write to pipe failed");
 					exit(1);
 				}
 			}
@@ -159,16 +157,17 @@
 
 		/* parent */
 
-		waitpid(fork_2, &wtstatus, 0);
+		if (waitpid(fork_2, &wtstatus, 0) == -1)
+			tst_brkm(TBROK, cleanup, "waitpid failed");
 		if (WEXITSTATUS(wtstatus) != 0) {
 			tst_brkm(TBROK, cleanup, "problem detected in child, "
 				 "wait status %d, errno = %d", wtstatus, errno);
 		}
 
 		if (close(pipefd[1]) != 0) {
-			tst_brkm(TBROK, cleanup, "pipefd[1] close failed, "
-				 "errno = %d", errno);
-		 /*NOTREACHED*/}
+			tst_brkm(TBROK|TERRNO, cleanup,
+			    "pipefd[1] close failed");
+		}
 
 		while ((red = safe_read(pipefd[0], rebuf, 100)) > 0) {
 			for (i = 0; i < red; i++) {
@@ -187,8 +186,8 @@
 		}
 
 		if (red == -1) {
-			tst_brkm(TBROK, cleanup, "Failure reading pipefd pipe, "
-				 "errno = %d", errno);
+			tst_brkm(TBROK|TERRNO, cleanup,
+			    "reading pipefd pipe failed");
 		}
 
 		if (Bcnt == Acnt && Bcnt == (PIPEWRTCNT / 2)) {
@@ -203,7 +202,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -229,7 +228,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe10.c b/testcases/kernel/syscalls/pipe/pipe10.c
index 9b92780..19a554a 100644
--- a/testcases/kernel/syscalls/pipe/pipe10.c
+++ b/testcases/kernel/syscalls/pipe/pipe10.c
@@ -81,9 +81,8 @@
 	int retval = 0, status, e_code;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 
 	setup();
 
@@ -119,7 +118,7 @@
 
 		if (forkstat == -1) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (forkstat == 0) {	/* child */
 			red = safe_read(fd[0], rebuf, written);
@@ -152,7 +151,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -178,7 +177,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/pipe/pipe11.c b/testcases/kernel/syscalls/pipe/pipe11.c
index c01b73b..8a1ded3 100644
--- a/testcases/kernel/syscalls/pipe/pipe11.c
+++ b/testcases/kernel/syscalls/pipe/pipe11.c
@@ -97,8 +97,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "ddddd", &fd[0], &fd[1], &kidid,
 			&ncperchild, &szcharbuf);
@@ -134,7 +138,7 @@
 
 		if (fork_ret < 0) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fork_ret != 0) && (fork_ret != -1) && (kidid < numchild)) {
 			goto refork;
@@ -145,7 +149,7 @@
 			if (self_exec(av[0], "ddddd", fd[0], fd[1], kidid,
 				      ncperchild, szcharbuf) < 0) {
 				tst_brkm(TBROK, cleanup, "self_exec failed");
-			 /*NOTREACHED*/}
+			 }
 #else
 			do_child();
 #endif
@@ -167,7 +171,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -199,7 +203,7 @@
 {
 	if ((rdbuf = (char *)malloc(szcharbuf)) == (char *)0) {
 		tst_brkm(TBROK, cleanup, "malloc of rdbuf failed");
-	 /*NOTREACHED*/}
+	 }
 
 	do_child();
 }
@@ -233,11 +237,11 @@
 
 	if ((wrbuf = (char *)malloc(szcharbuf)) == (char *)0) {
 		tst_brkm(TBROK, cleanup, "malloc failed");
-	 /*NOTREACHED*/}
+	 }
 
 	if ((rdbuf = (char *)malloc(szcharbuf)) == (char *)0) {
 		tst_brkm(TBROK, cleanup, "malloc of rdbuf failed");
-	 /*NOTREACHED*/}
+	 }
 
 	/* initialize wrbuf */
 	j = 0;
diff --git a/testcases/kernel/syscalls/pipe2/pipe2_01.c b/testcases/kernel/syscalls/pipe2/pipe2_01.c
index 96518d6..957ec84 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_01.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_01.c
@@ -146,7 +146,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/pipe2/pipe2_02.c b/testcases/kernel/syscalls/pipe2/pipe2_02.c
index 634a6b3..47a6c33 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_02.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_02.c
@@ -137,7 +137,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/poll/poll01.c b/testcases/kernel/syscalls/poll/poll01.c
index 03639f5..dd5b799 100644
--- a/testcases/kernel/syscalls/poll/poll01.c
+++ b/testcases/kernel/syscalls/poll/poll01.c
@@ -95,9 +95,15 @@
 	int rval;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -203,7 +209,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -221,7 +227,7 @@
 
 	/* Creat read/write pipe */
 	if (pipe(fildes) < 0) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			 "pipe() failed to create interprocess channel");
 	}
 
diff --git a/testcases/kernel/syscalls/ppoll/ppoll01.c b/testcases/kernel/syscalls/ppoll/ppoll01.c
index bec6551..a48ae3b 100644
--- a/testcases/kernel/syscalls/ppoll/ppoll01.c
+++ b/testcases/kernel/syscalls/ppoll/ppoll01.c
@@ -110,9 +110,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 void sighandler(int sig); /* signals handler function for the test */
@@ -137,7 +134,7 @@
 /******************************************************************************/
 void setup() {
 	/* Capture signals if any */
-	signal(SIGINT, &sighandler);
+	tst_sig(NOFORK, sighandler, cleanup);
 
 	/* Create temporary directories */
 	TEST_PAUSE;
@@ -349,8 +346,8 @@
 	 * Execute system call
 	 */
 	errno = 0;
-	TEST(sys_ret = syscall(__NR_ppoll, p_fds, nfds, p_ts, p_sigmask, SIGSETSIZE));
-		sys_errno = errno;
+	sys_ret = syscall(__NR_ppoll, p_fds, nfds, p_ts, p_sigmask, SIGSETSIZE);
+	sys_errno = errno;
 	if (sys_ret <= 0 || tc->ret < 0)
 		goto TEST_END;
 
@@ -358,7 +355,7 @@
 	tst_resm(TINFO, "EXPECT: revents=0x%04x", tc->expect_revents);
 	tst_resm(TINFO, "RESULT: revents=0x%04x", fds[0].revents);
 
-	TEST_END:
+TEST_END:
 	/*
 	 * Check results
 	 */
@@ -378,7 +375,8 @@
 	}
 	result |= (sys_errno != tc->err) || !cmp_ok;
 	PRINT_RESULT_CMP(sys_ret >= 0, tc->ret, tc->err, sys_ret, sys_errno, cmp_ok);
-	cleanup: if (fd >= 0) {
+cleanup:
+	if (fd >= 0) {
 		close(fd);
 		cleanup_file(fpath);
 	}
@@ -399,7 +397,7 @@
 void sighandler(int sig) {
 	if (sig == SIGINT)
 		return;
-	// NOTREACHED
+	
 	return;
 }
 
@@ -408,53 +406,20 @@
  */
 
 int main(int ac, char **av) {
-	int result = RESULT_OK;
 	int i;
-	int lc; /* loop counter */
-	char *msg; /* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
+	int ret;
 
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			/*
-			 * Execute test
-			 */
-			for (i = 0; i < (int) (sizeof(tcase) / sizeof(tcase[0])); i++) {
-				int ret;
-				tst_resm(TINFO, "(case%02d) START", i);
-				ret = do_test(&tcase[i]);
-				tst_resm(TINFO, "(case%02d) END => %s", i, (ret == 0) ? "OK"
-						: "NG");
-				TEST_ERROR_LOG(TEST_ERRNO);
-				result |= ret;
-			}
+	ret = 0;
 
-			/*
-			 * Check results
-			 */
-			switch (result) {
-			case RESULT_OK:
-				tst_resm(TPASS, "ppoll01 call succeeded ");
-				break;
-
-			default:
-				tst_resm(TFAIL | TTERRNO, "%s failed", TCID);
-				RPRINTF("NG");
-				cleanup();
-				break;
-			}
-
-		}
+	for (i = 0; ret == 0 &&
+	    i < (sizeof(tcase) / sizeof(tcase[0])); i++) {
+		tst_resm(TINFO, "(case%02d) START", i);
+		ret = do_test(&tcase[i]);
+		tst_resm(TINFO, "(case%02d) END => %s", i, (ret == 0) ? "OK"
+				: "NG");
 	}
 	cleanup();
-	return 0;
+	tst_exit();
 }
-
diff --git a/testcases/kernel/syscalls/prctl/prctl01.c b/testcases/kernel/syscalls/prctl/prctl01.c
index 8ee11d6..c4e5a44 100644
--- a/testcases/kernel/syscalls/prctl/prctl01.c
+++ b/testcases/kernel/syscalls/prctl/prctl01.c
@@ -98,9 +98,15 @@
 	int status, sig;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -159,7 +165,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/prctl/prctl02.c b/testcases/kernel/syscalls/prctl/prctl02.c
index 99ba546..7ef86a2 100644
--- a/testcases/kernel/syscalls/prctl/prctl02.c
+++ b/testcases/kernel/syscalls/prctl/prctl02.c
@@ -114,9 +114,15 @@
 	int status;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -175,7 +181,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/pread/pread01.c b/testcases/kernel/syscalls/pread/pread01.c
index 58c67fc..8c8c76a 100644
--- a/testcases/kernel/syscalls/pread/pread01.c
+++ b/testcases/kernel/syscalls/pread/pread01.c
@@ -106,9 +106,15 @@
 	int nread;		/* no. of bytes read by pread() */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -194,7 +200,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/* End main */
 
 /*
@@ -289,7 +295,7 @@
 		read_buf[count] = (char *)malloc(K1);
 
 		if ((write_buf[count] == NULL) || (read_buf[count] == NULL)) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "malloc() failed on read/write buffers");
 		}
 		memset(write_buf[count], count, K1);
diff --git a/testcases/kernel/syscalls/pread/pread02.c b/testcases/kernel/syscalls/pread/pread02.c
index 32cf9b2..00dd937 100644
--- a/testcases/kernel/syscalls/pread/pread02.c
+++ b/testcases/kernel/syscalls/pread/pread02.c
@@ -121,9 +121,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -184,7 +190,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -283,7 +289,7 @@
 		read_buf[count] = (char *)malloc(K1);
 
 		if ((write_buf[count] == NULL) || (read_buf[count] == NULL)) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "malloc() failed on read/write buffers");
 		}
 		memset(write_buf[count], count, K1);
diff --git a/testcases/kernel/syscalls/pread/pread03.c b/testcases/kernel/syscalls/pread/pread03.c
index 626be66..9eb38de 100644
--- a/testcases/kernel/syscalls/pread/pread03.c
+++ b/testcases/kernel/syscalls/pread/pread03.c
@@ -107,9 +107,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -153,7 +159,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -189,7 +195,7 @@
 	if (mkdir(PREAD_TEMPDIR, 0777) != 0) {
 		tst_resm(TFAIL, "mkdir() failed to create" " test directory");
 		exit(1);
-		/* NOTREACHED */
+		
 	}
 
 	/* open temporary directory used for test */
@@ -214,7 +220,7 @@
 		read_buf[count] = (char *)malloc(K1);
 
 		if (read_buf[count] == NULL) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "malloc() failed on read buffers");
 		}
 	}
diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c
index 62e7578..e152070 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace01.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c
@@ -121,9 +121,15 @@
 	struct sigaction parent_act;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "d", &i);
@@ -220,7 +226,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/ptrace/ptrace02.c b/testcases/kernel/syscalls/ptrace/ptrace02.c
index 6bf4961..ad0b5cf 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace02.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace02.c
@@ -121,9 +121,15 @@
 	struct sigaction parent_act;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "d", &i);
@@ -221,7 +227,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c
index 20d5773..ccc74a4 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace03.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace03.c
@@ -124,9 +124,15 @@
 	int status;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -204,7 +210,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/ptrace/ptrace04.c b/testcases/kernel/syscalls/ptrace/ptrace04.c
index 2a7f61d..f0f45d0 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace04.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace04.c
@@ -103,7 +103,7 @@
 	char *msg;
 
 	if (ARRAY_SIZE(regs) == 0)
-		tst_brkm(TCONF, tst_exit,
+		tst_brkm(TCONF, NULL,
 			"test not supported for your arch (yet)");
 
 	if ((msg = parse_opts(argc, argv, NULL, NULL)))
diff --git a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h
index 24f4d7f..40e9f81 100644
--- a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h
+++ b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h
@@ -34,7 +34,7 @@
 	int status;
 	if (sig != SIGCHLD) {
  die:
-		tst_brkm(TBROK, tst_exit, "child signal %i: %s\n", sig, strsignal(sig));
+		tst_brkm(TBROK, NULL, "child signal %i: %s\n", sig, strsignal(sig));
 		kill(pid, SIGKILL);
 		exit(1);
 	}
diff --git a/testcases/kernel/syscalls/pwrite/pwrite01.c b/testcases/kernel/syscalls/pwrite/pwrite01.c
index 9d1d091..8456fb2 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite01.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite01.c
@@ -107,9 +107,15 @@
 	int nwrite;		/* no. of bytes written by pwrite() */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -255,7 +261,7 @@
 		write_buf[count] = (char *)malloc(K1);
 
 		if (write_buf[count] == NULL) {
-			tst_brkm(TBROK, tst_exit, "malloc() failed ");
+			tst_brkm(TBROK, NULL, "malloc() failed ");
 		}
 		memset(write_buf[count], count, K1);
 	}
diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c b/testcases/kernel/syscalls/pwrite/pwrite02.c
index a312d89..b0bdafc 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite02.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite02.c
@@ -122,9 +122,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -300,7 +306,7 @@
 		write_buf[count] = (char *)malloc(K1);
 
 		if (write_buf[count] == NULL) {
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "malloc() failed on write buffer");
 		}
 		memset(write_buf[count], count, K1);
diff --git a/testcases/kernel/syscalls/pwrite/pwrite03.c b/testcases/kernel/syscalls/pwrite/pwrite03.c
index ce6910c..a8d5218 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite03.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite03.c
@@ -101,9 +101,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
diff --git a/testcases/kernel/syscalls/quotactl/quotactl01.c b/testcases/kernel/syscalls/quotactl/quotactl01.c
index c5692d0..a6745d0 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl01.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl01.c
@@ -150,11 +150,11 @@
 	/* Create temporary directories */
 
 	if (geteuid() != 0) {
-		tst_brkm(TCONF, tst_exit,
+		tst_brkm(TCONF, NULL,
 			"You must be root in order to execute this test");
 	}
 	if ((quota_loc = malloc(FILENAME_MAX)) == NULL) {
-		tst_brkm(TCONF | TERRNO, tst_exit,
+		tst_brkm(TCONF | TERRNO, NULL,
 			"couldn't allocate memory for the quota loc buffer");
 	}
 
diff --git a/testcases/kernel/syscalls/read/read01.c b/testcases/kernel/syscalls/read/read01.c
index a560c9f..8c32eca 100644
--- a/testcases/kernel/syscalls/read/read01.c
+++ b/testcases/kernel/syscalls/read/read01.c
@@ -149,7 +149,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/read/read02.c b/testcases/kernel/syscalls/read/read02.c
index 6c15ae0..fffd1d2 100644
--- a/testcases/kernel/syscalls/read/read02.c
+++ b/testcases/kernel/syscalls/read/read02.c
@@ -112,7 +112,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -151,7 +155,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -178,7 +182,7 @@
 
 	if (write(fd3, "A", 1) != 1) {
 		tst_brkm(TBROK, cleanup, "can't write to fd3");
-	 /*NOTREACHED*/}
+	 }
 	close(fd3);
 	if ((fd3 = open(fname, O_RDWR | O_CREAT, 0666)) == -1) {
 		tst_brkm(TBROK, cleanup, "open of fd3 (temp file) failed");
diff --git a/testcases/kernel/syscalls/read/read03.c b/testcases/kernel/syscalls/read/read03.c
index 7b3afe8..b84991f 100644
--- a/testcases/kernel/syscalls/read/read03.c
+++ b/testcases/kernel/syscalls/read/read03.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -108,7 +112,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -130,13 +134,13 @@
 
 	if (mknod(fifo, S_IFIFO | 0777, 0) < 0) {
 		tst_brkm(TBROK, cleanup, "mknod() failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(fifo, &buf) != 0) {
 		tst_brkm(TBROK, cleanup, "stat() failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if ((buf.st_mode & S_IFIFO) == 0) {
 		tst_brkm(TBROK, cleanup, "Mode does not indicate fifo file");
-	 /*NOTREACHED*/}
+	 }
 
 	rfd = open(fifo, O_RDONLY | O_NONBLOCK);
 	wfd = open(fifo, O_WRONLY | O_NONBLOCK);
diff --git a/testcases/kernel/syscalls/read/read04.c b/testcases/kernel/syscalls/read/read04.c
index e68b2e6..69319e0 100644
--- a/testcases/kernel/syscalls/read/read04.c
+++ b/testcases/kernel/syscalls/read/read04.c
@@ -77,8 +77,12 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup for test */
 
@@ -89,7 +93,7 @@
 
 		if ((rfild = open(fname, O_RDONLY)) == -1) {
 			tst_brkm(TBROK, cleanup, "can't open for reading");
-		 /*NOTREACHED*/}
+		 }
 		TEST(read(rfild, prbuf, BUFSIZ));
 
 		if (TEST_RETURN == -1) {
@@ -114,10 +118,10 @@
 		}
 		if (close(rfild) == -1) {
 			tst_brkm(TBROK, cleanup, "close() failed");
-		 /*NOTREACHED*/}
+		 }
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -141,10 +145,10 @@
 	if ((fild = creat(fname, 0777)) == -1) {
 		tst_brkm(TBROK, cleanup, "creat(%s, 0777) Failed, errno = %d"
 			 " : %s", fname, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (write(fild, palfa, TST_SIZE) != TST_SIZE) {
 		tst_brkm(TBROK, cleanup, "can't write to Xread");
-	 /*NOTREACHED*/}
+	 }
 	close(fild);
 }
 
diff --git a/testcases/kernel/syscalls/readdir/readdir02.c b/testcases/kernel/syscalls/readdir/readdir02.c
index 13f48df..af4eb08 100644
--- a/testcases/kernel/syscalls/readdir/readdir02.c
+++ b/testcases/kernel/syscalls/readdir/readdir02.c
@@ -98,7 +98,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
     /***************************************************************
diff --git a/testcases/kernel/syscalls/readlink/readlink01.c b/testcases/kernel/syscalls/readlink/readlink01.c
index 233fb52..4ee37e4 100644
--- a/testcases/kernel/syscalls/readlink/readlink01.c
+++ b/testcases/kernel/syscalls/readlink/readlink01.c
@@ -98,18 +98,13 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
-	/* Perform global setup for test */
 	setup();
 
-	/* Check looping state if -i option given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
-		/* Reset Tst_count in case we are looping. */
 		Tst_count = 0;
 
 		/*
@@ -118,7 +113,6 @@
 		 */
 		TEST(readlink(SYMFILE, buffer, sizeof(buffer)));
 
-		/* Check return code of readlink(2) */
 		if (TEST_RETURN == -1) {
 			tst_resm(TFAIL,
 				 "readlink() on %s failed, errno=%d : %s",
@@ -155,13 +149,12 @@
 		} else {
 			tst_resm(TPASS, "call succeeded");
 		}
-	}			/* End for TEST_LOOPING */
+	}
 
-	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	return 0;
-}				/* End main */
+	tst_exit();
+}
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -174,44 +167,35 @@
 {
 	int fd;			/* file handle for testfile */
 
-	/* Switch to nobody user for correct error code collection */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
-	}
+	tst_require_root(NULL);
+
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
 		tst_brkm(TBROK, cleanup, "getpwname(nobody_uid) failed ");
 	}
 	if (seteuid(ltpuser->pw_uid) == -1) {
-		tst_resm(TINFO, "seteuid failed to "
-			 "to set the effective uid to %d", ltpuser->pw_uid);
-		perror("seteuid");
+		tst_brkm(TBROK|TERRNO, cleanup, "seteuid to nobody failed");
 	}
 
-	/* capture signals */
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-	/* Pause if that option was specified */
 	TEST_PAUSE;
 
-	/* make a temp directory and cd to it */
 	tst_tmpdir();
 
 	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
+		tst_brkm(TBROK|TERRNO, cleanup,
+			 "open(%s, O_RDWR|O_CREAT, %#o) failed",
+			 TESTFILE, FILE_MODE);
 	}
 
 	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
+		tst_resm(TWARN|TERRNO, "close(%s) failed", TESTFILE);
 	}
 
 	/* Create a symlink of testfile under temporary directory */
 	if (symlink(TESTFILE, SYMFILE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "symlink(%s, %s) failed, errno=%d : %s",
-			 TESTFILE, SYMFILE, errno, strerror(errno));
+		tst_brkm(TBROK|TERRNO, cleanup, "symlink(%s, %s) failed",
+		    TESTFILE, SYMFILE);
 	}
 
 	/* Get the strlen of testfile */
@@ -232,9 +216,6 @@
 	 */
 	TEST_CLEANUP;
 
-	/* Remove tmp dir and all files in it */
 	tst_rmdir();
 
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
+}
\ No newline at end of file
diff --git a/testcases/kernel/syscalls/readlink/readlink02.c b/testcases/kernel/syscalls/readlink/readlink02.c
index b5a0e0b..ddfd0ac 100644
--- a/testcases/kernel/syscalls/readlink/readlink02.c
+++ b/testcases/kernel/syscalls/readlink/readlink02.c
@@ -137,7 +137,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/readlink/readlink03.c b/testcases/kernel/syscalls/readlink/readlink03.c
index 461ab9f..ca5fbe0 100644
--- a/testcases/kernel/syscalls/readlink/readlink03.c
+++ b/testcases/kernel/syscalls/readlink/readlink03.c
@@ -150,9 +150,15 @@
 	size_t buf_size;	/* size of buffer for readlink */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -226,7 +232,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
 		tst_brkm(TBROK, cleanup, "getpwname(nobody_uid) failed ");
diff --git a/testcases/kernel/syscalls/readlink/readlink04.c b/testcases/kernel/syscalls/readlink/readlink04.c
index f71d60c..24af4a9 100644
--- a/testcases/kernel/syscalls/readlink/readlink04.c
+++ b/testcases/kernel/syscalls/readlink/readlink04.c
@@ -102,9 +102,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -184,7 +190,7 @@
 
 	/* Check that the test process id is super/root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
 	}
 
 	/* capture signals */
@@ -195,7 +201,7 @@
 
 	/* Get current bin directory */
 	if (getcwd(bin_dir, sizeof(bin_dir)) == NULL) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			 "getcwd(3) fails to get working directory of process");
 	}
 
@@ -204,7 +210,7 @@
 
 	/* get the name of the temporary directory */
 	if ((tmp_dir = getcwd(tmp_dir, 0)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "getcwd failed");
+		tst_brkm(TBROK, NULL, "getcwd failed");
 	}
 
 	if ((pwent = getpwnam("bin")) == NULL) {
diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
index cb9dce7..d6ba697 100644
--- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
@@ -111,7 +111,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/readv/readv01.c b/testcases/kernel/syscalls/readv/readv01.c
index ea74297..2fc7ad0 100644
--- a/testcases/kernel/syscalls/readv/readv01.c
+++ b/testcases/kernel/syscalls/readv/readv01.c
@@ -92,8 +92,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -125,7 +129,7 @@
 	close(fd);
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 int init_buffs(char *pbufs[])
diff --git a/testcases/kernel/syscalls/readv/readv02.c b/testcases/kernel/syscalls/readv/readv02.c
index fd14815..db41a7e 100644
--- a/testcases/kernel/syscalls/readv/readv02.c
+++ b/testcases/kernel/syscalls/readv/readv02.c
@@ -107,8 +107,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -182,7 +186,7 @@
 	close(fd[1]);
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/readv/readv03.c b/testcases/kernel/syscalls/readv/readv03.c
index 171c84d..9c0fc0f 100644
--- a/testcases/kernel/syscalls/readv/readv03.c
+++ b/testcases/kernel/syscalls/readv/readv03.c
@@ -84,8 +84,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -109,7 +113,7 @@
 
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/reboot/reboot01.c b/testcases/kernel/syscalls/reboot/reboot01.c
index ae1a8aa..bc7532d 100644
--- a/testcases/kernel/syscalls/reboot/reboot01.c
+++ b/testcases/kernel/syscalls/reboot/reboot01.c
@@ -95,9 +95,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -127,7 +133,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -138,7 +144,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/reboot/reboot02.c b/testcases/kernel/syscalls/reboot/reboot02.c
index 503380d..5b00656 100644
--- a/testcases/kernel/syscalls/reboot/reboot02.c
+++ b/testcases/kernel/syscalls/reboot/reboot02.c
@@ -110,9 +110,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -166,7 +172,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/*End of main */
 
 /*
@@ -198,7 +204,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/recv/recv01.c b/testcases/kernel/syscalls/recv/recv01.c
index 6c15744..50d3da6 100644
--- a/testcases/kernel/syscalls/recv/recv01.c
+++ b/testcases/kernel/syscalls/recv/recv01.c
@@ -115,9 +115,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = argv[0];
@@ -156,7 +162,7 @@
 	}
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return 0;
 }				/* End main */
 
@@ -261,7 +267,7 @@
 		return pid;
 	}
 
-	 /*NOTREACHED*/ exit(1);
+	  exit(1);
 }
 
 void do_child()
diff --git a/testcases/kernel/syscalls/recvfrom/recvfrom01.c b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
index ca857df..31fd1ce 100644
--- a/testcases/kernel/syscalls/recvfrom/recvfrom01.c
+++ b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
@@ -135,9 +135,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = argv[0];
@@ -287,7 +293,7 @@
 		return pid;
 	}
 
-	 /*NOTREACHED*/ exit(1);
+	  exit(1);
 }
 
 void do_child()
diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
index 07abf15..62eddc5 100644
--- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c
+++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
@@ -203,10 +203,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 #ifdef UCLINUX
 	argv0 = argv[0];
 	maybe_run_child(&do_child, "dd", &sfd, &ufd);
@@ -430,7 +428,7 @@
 		(void)close(ufd);
 		return pid;
 	}
-	 /*NOTREACHED*/ exit(1);
+	exit(1);
 }
 
 void do_child()
diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
index 94fe8da..83d2a33 100644
--- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
+++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
@@ -127,7 +127,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -149,7 +153,7 @@
 	/* clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /* test case function, that runs remap_file_pages */
diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
index 9dcb611..8701b61 100644
--- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
+++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
@@ -146,9 +146,15 @@
 #endif
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -207,7 +213,7 @@
 	/* clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/rename/rename01.c b/testcases/kernel/syscalls/rename/rename01.c
index 4414406..2bdf7c6 100644
--- a/testcases/kernel/syscalls/rename/rename01.c
+++ b/testcases/kernel/syscalls/rename/rename01.c
@@ -112,9 +112,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -143,7 +142,7 @@
 				if (stat(TC[i].name2, &buf1) == -1) {
 					tst_brkm(TBROK, cleanup, "stat of %s "
 						 "failed", TC[i].desc);
-					/* NOTREACHED */
+					
 				}
 
 				/*
@@ -184,11 +183,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -217,7 +213,7 @@
 	if (stat(fname, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat file %s"
 			 "in setup()", fname);
-		/* NOTREACHED */
+		
 	}
 
 	f_olddev = buf1.st_dev;
@@ -226,12 +222,12 @@
 	/* create "old" directory */
 	if (mkdir(fdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s"
 			 "in setup()", fname);
-		/* NOTREACHED */
+		
 	}
 
 	d_olddev = buf1.st_dev;
@@ -254,9 +250,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename02.c b/testcases/kernel/syscalls/rename/rename02.c
index 2c5046e..b3884f3 100644
--- a/testcases/kernel/syscalls/rename/rename02.c
+++ b/testcases/kernel/syscalls/rename/rename02.c
@@ -134,23 +134,14 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -168,9 +159,6 @@
 				 fname, mname, TEST_ERRNO,
 				 strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS, "rename(%s, %s) returned %ld",
@@ -185,12 +173,9 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
+	tst_exit();
 
-	return 0;
 }				/* End main */
 
 /***************************************************************
@@ -227,8 +212,4 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/rename/rename03.c b/testcases/kernel/syscalls/rename/rename03.c
index d4a201e..a274e0c 100644
--- a/testcases/kernel/syscalls/rename/rename03.c
+++ b/testcases/kernel/syscalls/rename/rename03.c
@@ -93,12 +93,8 @@
 	dev_t *olddev;
 	ino_t *oldino;
 } TC[] = {
-	/* comment goes here */
-	{
-	fname, mname, "file", &f_olddev, &f_oldino},
-	    /* comment goes here */
-	{
-	fdir, mdir, "directory", &d_olddev, &d_oldino}
+	{ fname, mname, "file", &f_olddev, &f_oldino},
+	{ fdir, mdir, "directory", &d_olddev, &d_oldino}
 };
 
 int main(int ac, char **av)
@@ -110,10 +106,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
-
 	/*
 	 * perform global setup for test
 	 */
@@ -145,7 +139,7 @@
 				if (stat(TC[i].name2, &buf2) == -1) {
 					tst_brkm(TBROK, cleanup, "stat of %s "
 						 "failed", TC[i].desc);
-					/* NOTREACHED */
+					
 				}
 
 				/*
@@ -186,16 +180,13 @@
 
 		/* remove the new directory */
 		if (rmdir(mdir) == -1) {
-			tst_brkm(TBROK, cleanup, "Could not remove "
-				 "directory %s", mdir);
-		 /*NOTREACHED*/}
+			tst_brkm(TBROK, cleanup, "Couldn't remove directory %s",
+			    mdir);
+		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -230,7 +221,7 @@
 	if (stat(fname, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat file %s"
 			 "in rename()", fname);
-		/* NOTREACHED */
+		
 	}
 
 	/* save original file's dev and ino */
@@ -243,11 +234,11 @@
 	/* create "old" directory */
 	if (mkdir(fdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	}
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s"
 			 "in rename()", fdir);
-		/* NOTREACHED */
+		
 	}
 
 	d_olddev = buf1.st_dev;
@@ -256,7 +247,7 @@
 	/* create another directory */
 	if (mkdir(mdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", mdir);
-	 /*NOTREACHED*/}
+	}
 }
 
 /*
@@ -275,9 +266,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename04.c b/testcases/kernel/syscalls/rename/rename04.c
index 2f074b3..117e203 100644
--- a/testcases/kernel/syscalls/rename/rename04.c
+++ b/testcases/kernel/syscalls/rename/rename04.c
@@ -91,9 +91,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -139,7 +138,7 @@
 	 * cleanup and exit
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -164,12 +163,12 @@
 	/* create "old" directory */
 	if (mkdir(fdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s"
 			 "in rename()", fdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "old"'s dev and ino */
@@ -179,7 +178,7 @@
 	/* create another directory */
 	if (mkdir(mdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", mdir);
-	 /*NOTREACHED*/}
+	 }
 
 	/* create a file under "new" directory */
 	do_file_setup(tstfile);
@@ -187,7 +186,7 @@
 	if (stat(mdir, &buf2) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 			 "in rename()", mdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "new"'s dev and ino */
@@ -211,9 +210,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename05.c b/testcases/kernel/syscalls/rename/rename05.c
index c715202..91fe146 100644
--- a/testcases/kernel/syscalls/rename/rename05.c
+++ b/testcases/kernel/syscalls/rename/rename05.c
@@ -88,9 +88,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -131,7 +130,7 @@
 	 * cleanup and exit
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -157,7 +156,7 @@
 	if (stat(fname, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat file %s"
 			 "in rename()", fname);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "old"'s dev and ino */
@@ -167,16 +166,16 @@
 	/* create another directory */
 	if (stat(mdir, &buf2) != -1) {
 		tst_brkm(TBROK, cleanup, "tmp directory %s found!", mdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (mkdir(mdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", mdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(mdir, &buf2) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 			 "in rename()", mdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "new"'s dev and ino */
diff --git a/testcases/kernel/syscalls/rename/rename06.c b/testcases/kernel/syscalls/rename/rename06.c
index 1a1309f..61d9cf7 100644
--- a/testcases/kernel/syscalls/rename/rename06.c
+++ b/testcases/kernel/syscalls/rename/rename06.c
@@ -89,9 +89,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -128,11 +127,9 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+
+	tst_exit();
 
 }				/* End main */
 
@@ -156,14 +153,14 @@
 	/* create "old" directory */
 	if (stat(fdir, &buf1) != -1) {
 		tst_brkm(TBROK, cleanup, "tmp directory %s found!", fdir);
-	 /*NOTREACHED*/}
+	 }
 	if (mkdir(fdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 			 "in rename()", fdir);
-		/* NOTREACHED */
+		
 	}
 	/* save "old"'s dev and ino */
 	olddev = buf1.st_dev;
@@ -172,15 +169,15 @@
 	/* create another directory */
 	if (stat(mdir, &buf2) != -1) {
 		tst_brkm(TBROK, cleanup, "tmp directory %s found!", mdir);
-	 /*NOTREACHED*/}
+	 }
 	if (mkdir(mdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", mdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(mdir, &buf2) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 			 "in rename()", mdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "new"'s dev and ino */
@@ -204,9 +201,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename07.c b/testcases/kernel/syscalls/rename/rename07.c
index 14bf6da..05312b5 100644
--- a/testcases/kernel/syscalls/rename/rename07.c
+++ b/testcases/kernel/syscalls/rename/rename07.c
@@ -71,9 +71,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -110,11 +109,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -138,16 +134,16 @@
 	/* create "old" directory */
 	if (stat(fdir, &buf1) != -1) {
 		tst_brkm(TBROK, cleanup, "tmp directory %s found!", fdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (mkdir(fdir, 00770) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 			 "in rename()", fdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "old"'s dev and ino */
@@ -162,7 +158,7 @@
 	if (stat(mname, &buf2) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat file %s in rename()",
 			 mname);
-		/* NOTREACHED */
+		
 	}
 
 	/* save "new"'s dev and ino */
@@ -186,9 +182,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename08.c b/testcases/kernel/syscalls/rename/rename08.c
index c85a1af..53e793a 100644
--- a/testcases/kernel/syscalls/rename/rename08.c
+++ b/testcases/kernel/syscalls/rename/rename08.c
@@ -115,13 +115,9 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
-	/*
-	 * perform global setup for test
-	 */
 	setup();
 
 	/* set the expected errnos... */
@@ -159,11 +155,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -212,9 +205,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename09.c b/testcases/kernel/syscalls/rename/rename09.c
index 271ca80..89de1a7 100644
--- a/testcases/kernel/syscalls/rename/rename09.c
+++ b/testcases/kernel/syscalls/rename/rename09.c
@@ -112,9 +112,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -134,7 +133,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #1 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* first child */
 			/* set to nobody */
@@ -146,14 +145,14 @@
 					 nobody->pw_uid, nobody->pw_uid);
 				perror("setreuid");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			/* create the a directory with 0700 permits */
 			if (mkdir(fdir, PERMS) == -1) {
 				tst_resm(TWARN, "mkdir(%s, %#o) Failed",
 					 fdir, PERMS);
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			/* create "old" file under it */
 			do_file_setup(fname);
@@ -170,7 +169,7 @@
 
 		if ((pid1 = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() #2 failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid1 == 0) {	/* second child */
 			/* set to bin */
@@ -178,14 +177,14 @@
 				tst_resm(TWARN, "seteuid() failed");
 				perror("setreuid");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			/* create "new" directory */
 			if (mkdir(mdir, PERMS) == -1) {
 				tst_resm(TWARN, "mkdir(%s, %#o) failed",
 					 mdir, PERMS);
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			/* create the new file */
 			do_file_setup(mname);
@@ -202,7 +201,7 @@
 			if (TEST_ERRNO != EACCES) {
 				tst_resm(TFAIL, "Expected EACCES got %d",
 					 TEST_ERRNO);
-			 /*NOTREACHED*/} else {
+			 } else {
 				tst_resm(TPASS, "rename() returned EACCES");
 			}
 
@@ -241,7 +240,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -252,8 +251,8 @@
 {
 	/* must run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run test as root");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must run test as root");
+	 }
 
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/rename/rename10.c b/testcases/kernel/syscalls/rename/rename10.c
index 09690ee..7db9e66 100644
--- a/testcases/kernel/syscalls/rename/rename10.c
+++ b/testcases/kernel/syscalls/rename/rename10.c
@@ -106,9 +106,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -150,12 +149,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -196,9 +191,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename12.c b/testcases/kernel/syscalls/rename/rename12.c
index 88ef774..a8e4ef9 100644
--- a/testcases/kernel/syscalls/rename/rename12.c
+++ b/testcases/kernel/syscalls/rename/rename12.c
@@ -106,9 +106,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -134,7 +133,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* child */
 			/* set to nobody */
@@ -142,7 +141,7 @@
 				tst_resm(TWARN, "setreuid failed");
 				perror("setreuid");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			/* rename "old" to "new" */
 			TEST(rename(fname, mname));
@@ -150,7 +149,7 @@
 			if (TEST_RETURN != -1) {
 				tst_resm(TFAIL, "call succeeded unexpectedly");
 				exit(1);
-			 /*NOTREACHED*/}
+			 }
 
 			TEST_ERROR_LOG(TEST_ERRNO);
 
@@ -159,7 +158,7 @@
 					 "Expected EPERM or EACCES, got %d",
 					 TEST_ERRNO);
 				exit(1);
-			 /*NOTREACHED*/} else {
+			 } else {
 				tst_resm(TPASS,
 					 "rename returned EPERM or EACCES");
 			}
@@ -179,12 +178,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/*
-	 * cleanup and exit
-	 */
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -195,8 +190,8 @@
 {
 	/* must run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run this as root");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must run this as root");
+	 }
 
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
@@ -216,17 +211,17 @@
 	/* create a directory */
 	if (mkdir(fdir, PERMS) == -1) {
 		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-	 /*NOTREACHED*/}
+	 }
 
 	if (stat(fdir, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat directory %s", fdir);
-		/* NOTREACHED */
+		
 	}
 
 	/* set the sticky bit */
 	if (chmod(fdir, buf1.st_mode | S_ISVTX) != 0) {
 		tst_brkm(TBROK, cleanup, "failed to set the S_ISVTX bit");
-		/* NOTREACHED */
+		
 	}
 
 	/* create a file under fdir */
@@ -252,9 +247,4 @@
 	 * Remove the temporary directory.
 	 */
 	tst_rmdir();
-
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename13.c b/testcases/kernel/syscalls/rename/rename13.c
index 32a19e9..c21358a 100644
--- a/testcases/kernel/syscalls/rename/rename13.c
+++ b/testcases/kernel/syscalls/rename/rename13.c
@@ -89,9 +89,8 @@
 	/*
 	 * parse standard options
 	 */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/*
 	 * perform global setup for test
@@ -124,14 +123,14 @@
 			if (stat(mname, &buf2) == -1) {
 				tst_brkm(TBROK, cleanup, "failed to stat file "
 					 "%s in rename()", mname);
-				/* NOTREACHED */
+				
 			}
 
 			/* check the existence of "old", and get the status */
 			if (stat(fname, &buf1) == -1) {
 				tst_brkm(TBROK, cleanup, "failed to stat file "
 					 "%s in rename()", fname);
-				/* NOTREACHED */
+				
 			}
 
 			/* verify the new file is the same as the original */
@@ -161,7 +160,7 @@
 	 * cleanup and exit
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -188,7 +187,7 @@
 	if (stat(fname, &buf1) == -1) {
 		tst_brkm(TBROK, cleanup, "failed to stat file %s"
 			 "in rename()", fname);
-		/* NOTREACHED */
+		
 	}
 
 	/* save the dev and inode */
@@ -199,7 +198,7 @@
 	if (link(fname, mname) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "link from %s to %s failed!", fname, mname);
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -219,8 +218,4 @@
 	 */
 	tst_rmdir();
 
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/rename/rename14.c b/testcases/kernel/syscalls/rename/rename14.c
index 1b4f4df..dec6d6a 100644
--- a/testcases/kernel/syscalls/rename/rename14.c
+++ b/testcases/kernel/syscalls/rename/rename14.c
@@ -78,10 +78,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	maybe_run_child(&dochild1, "n", 1);
 	maybe_run_child(&dochild2, "n", 2);
@@ -158,10 +156,7 @@
 	    : tst_resm(TFAIL, "Test Failed");
 
 	tst_rmdir();
-/*--------------------------------------------------------------*/
-	tst_exit();		/* THIS CALL DOES NOT RETURN - EXITS!!  */
-/*--------------------------------------------------------------*/
-	return 0;
+	tst_exit();
 }
 
 /* FUNCTIONS GO HERE */
diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
index c18dca4..f149b13 100644
--- a/testcases/kernel/syscalls/renameat/renameat01.c
+++ b/testcases/kernel/syscalls/renameat/renameat01.c
@@ -109,7 +109,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/rmdir/rmdir01.c b/testcases/kernel/syscalls/rmdir/rmdir01.c
index 3a43c62..ef2dd98 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir01.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir01.c
@@ -86,7 +86,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -112,7 +116,7 @@
 		if (mkdir(tstdir, PERMS) == -1) {
 			tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) Failed",
 				 tstdir, PERMS);
-		 /*NOTREACHED*/}
+		 }
 		/* call rmdir using TEST macro */
 
 		TEST(rmdir(tstdir));
@@ -142,7 +146,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/rmdir/rmdir02.c b/testcases/kernel/syscalls/rmdir/rmdir02.c
index 078906b..1d01ee2 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir02.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir02.c
@@ -146,7 +146,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/*
@@ -210,7 +214,7 @@
 	 * cleanup and exit
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -230,7 +234,7 @@
 		if (mkdir(tstdir1, PERMS) == -1) {
 			tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) Failed",
 				 tstdir1, PERMS);
-		 /*NOTREACHED*/}
+		 }
 
 		/* create a file under tstdir1 */
 		do_file_setup(tstfile);
@@ -251,7 +255,7 @@
 		/* create a file */
 		if ((fd = creat(tstfile, PERMS)) == -1) {
 			tst_brkm(TBROK, cleanup, "creat() failed");
-		 /*NOTREACHED*/}
+		 }
 		close(fd);
 		break;
 	default:
diff --git a/testcases/kernel/syscalls/rmdir/rmdir03.c b/testcases/kernel/syscalls/rmdir/rmdir03.c
index f852688..1632b78 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir03.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir03.c
@@ -107,7 +107,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	maybe_run_child(&dochild1, "ns", 1, tstdir2);
@@ -140,24 +144,24 @@
 		if (stat(tstdir1, &buf1) != -1) {
 			tst_brkm(TBROK, cleanup,
 				 "tmp directory %s found!", tstdir1);
-		 /*NOTREACHED*/}
+		 }
 		/* create a directory */
 		if (mkdir(tstdir1, PERMS) == -1) {
 			tst_brkm(TBROK, cleanup,
 				 "Couldnot create directory %s", tstdir1);
-		 /*NOTREACHED*/}
+		 }
 		if (stat(tstdir1, &buf1) == -1) {
 			perror("stat");
 			tst_brkm(TBROK, cleanup, "failed to stat directory %s "
 				 "in rmdir()", tstdir1);
-			/* NOTREACHED */
+			
 		}
 		/* set the sticky bit */
 		if (chmod(tstdir1, buf1.st_mode | S_ISVTX) != 0) {
 			perror("chmod");
 			tst_brkm(TBROK, cleanup,
 				 "failed to set the S_ISVTX bit");
-			/* NOTREACHED */
+			
 		}
 		/* create a sub directory under tstdir1 */
 		if (mkdir(tstdir2, PERMS) == -1) {
@@ -167,7 +171,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* first child */
 #ifdef UCLINUX
@@ -185,16 +189,16 @@
 		if (mkdir(tstdir3, 0700) == -1) {
 			tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) Failed",
 				 tstdir3, PERMS);
-		 /*NOTREACHED*/}
+		 }
 		/* create the a directory with 0700 permits */
 		if (mkdir(tstdir4, 0777) == -1) {
 			tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) Failed",
 				 tstdir4, PERMS);
-		 /*NOTREACHED*/}
+		 }
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork() failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (pid == 0) {	/* child */
 #ifdef UCLINUX
@@ -236,7 +240,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -253,7 +257,7 @@
 		retval = 1;
 		tst_brkm(TBROK, cleanup, "setreuid failed to "
 			 "set effective uid to %d", nobody->pw_uid);
-	 /*NOTREACHED*/}
+	 }
 
 	/* rmdir tstdir2 */
 	TEST(rmdir(tstdir2));
@@ -293,7 +297,7 @@
 		retval = 1;
 		tst_brkm(TBROK, cleanup, "setreuid failed to "
 			 "set effective uid to %d", nobody->pw_uid);
-	 /*NOTREACHED*/}
+	 }
 
 	/* rmdir tstdir4 */
 	TEST(rmdir(tstdir4));
@@ -326,7 +330,7 @@
 {
 	/* test must be run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "test must be run as root");
+		tst_brkm(TBROK, NULL, "test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/rmdir/rmdir04.c b/testcases/kernel/syscalls/rmdir/rmdir04.c
index 715807c..a65ba22 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir04.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir04.c
@@ -140,7 +140,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
index 4e4e2fb..0cb8e12 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
@@ -155,7 +155,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
index 88e6a54..25feb25 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
@@ -151,7 +151,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
index 6ae60f6..b243e79 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
@@ -165,7 +165,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
index f0c0d6b..cffa307 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
@@ -152,7 +152,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -239,7 +243,7 @@
 	}	
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 1;
 
 }
diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
index c98a18c..36d239d 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
@@ -156,7 +156,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
diff --git a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
index be87f99..11780f7 100644
--- a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
+++ b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
@@ -122,7 +122,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -186,7 +190,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 1;
 }
 
diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
index 8fdef0f..7d0b43e 100644
--- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
+++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
@@ -94,9 +94,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -128,7 +134,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
index 5fa86b8..46f3d6e 100644
--- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
+++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
@@ -86,9 +86,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -117,7 +123,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
index d2a96b1..1aea113 100644
--- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
+++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
@@ -94,9 +94,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -128,7 +134,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
index b8d72c6..4da3dc1 100644
--- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
+++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
@@ -86,9 +86,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -117,7 +123,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
index ec54d02..795d5d7 100644
--- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
+++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
@@ -134,7 +134,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -240,7 +244,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return (1);
 
 }
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
index 770e245..d223151 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
@@ -83,10 +83,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -123,10 +121,8 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-	/* cleanup and exit */
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -154,7 +150,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
index 0c74700..5a87c70 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
@@ -95,10 +95,8 @@
 	pid_t child_pid;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -160,11 +158,9 @@
 
 	}			/* End for TEST_LOOPING */
 
-	/* cleanup and exit */
 	cleanup();
-
-	 /*NOTREACHED*/ return 0;
-
+	tst_exit();
+	
 }				/* End main */
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -190,7 +186,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
index d4ff931..6728da9 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
@@ -109,10 +109,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
@@ -146,8 +144,8 @@
 	}
 
 	cleanup();
+	tst_exit();
 
-	 /*NOTREACHED*/ return 0;
 }
 
 /*
@@ -179,7 +177,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
index 08f2dab..6eac20f 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
@@ -83,8 +83,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -128,7 +132,7 @@
 	cleanup();
 
 	return -1;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -137,7 +141,7 @@
 {
 	/* Must run test as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run test as root");
+		tst_brkm(TBROK, NULL, "Must run test as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
index 276af97..4379a28 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
@@ -64,8 +64,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -94,7 +98,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
index 7e42fb9..159fb59 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
@@ -85,9 +85,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -118,7 +124,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
index dfd637f..3b77540 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
@@ -86,9 +86,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -123,7 +129,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
index 27f63ec..33ad77a 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
@@ -109,9 +109,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -144,7 +150,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
index a5125f8..fccb9e1 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
@@ -83,10 +83,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -115,7 +113,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -145,7 +143,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
index a21d8fe..d3a3efd 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
@@ -11,8 +11,6 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
  */
 /**********************************************************
  *
@@ -102,10 +100,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -148,7 +144,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -175,9 +171,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 /*
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
index 95f1d17..b875446 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
@@ -95,10 +95,8 @@
 	pid_t child_pid;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -127,7 +125,7 @@
 			TEST(sched_setparam(getppid(), &param));
 
 			if (TEST_RETURN == -1) {
-				tst_resm(TWARN|TTERRNO, "sched_setparam() returned %ld", TEST_RETURN);
+				perror("sched_setparam returned %ld", TEST_RETURN);
 				exit(0);
 			}
 			exit(1);
@@ -155,7 +153,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -189,9 +187,6 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
 
 /*
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
index 2db4656..4b98213 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
@@ -117,10 +117,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();		/* global setup */
 
@@ -153,7 +151,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
index 31ecc10..5787805 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
@@ -99,10 +99,8 @@
 	pid_t child_pid;
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL))
-	    != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	setup();
@@ -125,7 +123,7 @@
 
 			/* Switch to nobody user */
 			if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-				tst_brkm(TBROK, tst_exit, "\"nobody\" user"
+				tst_brkm(TBROK, NULL, "\"nobody\" user"
 					 "not present");
 			}
 			if (seteuid(ltpuser->pw_uid) == -1) {
@@ -168,7 +166,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -178,7 +176,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
@@ -204,7 +202,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
index e33806f..2f27373 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
@@ -105,8 +105,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/* check looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -144,7 +148,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
index aa64932..74b8c47 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
@@ -80,8 +80,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -136,7 +140,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -147,7 +151,7 @@
 {
 	/* must run test as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run test as root");
+		tst_brkm(TBROK, NULL, "Must run test as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/sched_yield/sched_yield01.c b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
index 6271598..40bbffa 100644
--- a/testcases/kernel/syscalls/sched_yield/sched_yield01.c
+++ b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
@@ -62,8 +62,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -84,7 +88,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/send/send01.c b/testcases/kernel/syscalls/send/send01.c
index 4f38a32..81f9e07 100644
--- a/testcases/kernel/syscalls/send/send01.c
+++ b/testcases/kernel/syscalls/send/send01.c
@@ -154,7 +154,7 @@
 		return pid;
 	}
 
-	 /*NOTREACHED*/ exit(1);
+	  exit(1);
 }
 
 void do_child()
@@ -204,9 +204,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = av[0];
@@ -251,7 +257,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 pid_t pid;
diff --git a/testcases/kernel/syscalls/sendfile/sendfile02.c b/testcases/kernel/syscalls/sendfile/sendfile02.c
index c621438..8d89a11 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile02.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile02.c
@@ -109,22 +109,22 @@
 
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(in_file, &sb) < 0) {
 		tst_brkm(TBROK, cleanup, "stat failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	if ((before_pos = lseek(in_fd, 0, SEEK_CUR)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "lseek before invoking sendfile failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	TEST(sendfile(out_fd, in_fd, &offset, sb.st_size - offset));
 
 	if ((after_pos = lseek(in_fd, 0, SEEK_CUR)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "lseek after invoking sendfile failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	if (STD_FUNCTIONAL_TEST) {
 		/* Close the sockets */
@@ -204,11 +204,11 @@
 	if ((fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(fd);
 	sprintf(out_file, "out.%d", getpid());
 }
@@ -292,8 +292,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	argv0 = av[0];
 	maybe_run_child(&do_child, "");
@@ -313,5 +317,5 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sendfile/sendfile03.c b/testcases/kernel/syscalls/sendfile/sendfile03.c
index 48b83c4..6809900 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile03.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile03.c
@@ -95,8 +95,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -135,7 +139,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -158,19 +162,19 @@
 	if ((in_fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(in_fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(in_fd);
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(out_file, "out.%d", getpid());
 	if ((out_fd = open(out_file, O_TRUNC | O_CREAT | O_RDWR, 0777)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sendfile/sendfile04.c b/testcases/kernel/syscalls/sendfile/sendfile04.c
index 8a07363..bfb671d 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile04.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile04.c
@@ -109,21 +109,21 @@
 				prot, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 	if (protected_buffer == MAP_FAILED) {
 		tst_brkm(TBROK, cleanup, "mmap failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	out_fd = create_server();
 
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(in_file, &sb) < 0) {
 		tst_brkm(TBROK, cleanup, "stat failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	if (pass_unmapped_buffer) {
 		if (munmap(protected_buffer, sizeof(*protected_buffer)) < 0) {
 			tst_brkm(TBROK, cleanup, "munmap failed: %d", errno);
-		 /*NOTREACHED*/}
+		 }
 	}
 
 	TEST(sendfile(out_fd, in_fd, protected_buffer, sb.st_size));
@@ -191,11 +191,11 @@
 	if ((fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(fd);
 	sprintf(out_file, "out.%d", getpid());
 }
@@ -279,8 +279,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	argv0 = av[0];
 	maybe_run_child(&do_child, "");
@@ -301,5 +305,5 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sendfile/sendfile05.c b/testcases/kernel/syscalls/sendfile/sendfile05.c
index 558c412..6cff59e 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile05.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile05.c
@@ -89,10 +89,10 @@
 
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(in_file, &sb) < 0) {
 		tst_brkm(TBROK, cleanup, "stat failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	offset = -1;
 	TEST(sendfile(out_fd, in_fd, &offset, sb.st_size));
@@ -155,11 +155,11 @@
 	if ((fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(fd);
 	sprintf(out_file, "out.%d", getpid());
 }
@@ -242,8 +242,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	argv0 = av[0];
 	maybe_run_child(&do_child, "");
@@ -261,5 +265,5 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sendfile/sendfile06.c b/testcases/kernel/syscalls/sendfile/sendfile06.c
index b2a47d8..da8cbbb 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile06.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile06.c
@@ -93,16 +93,16 @@
 
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	if (stat(in_file, &sb) < 0) {
 		tst_brkm(TBROK, cleanup, "stat failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	TEST(sendfile(out_fd, in_fd, NULL, sb.st_size));
 	if ((after_pos = lseek(in_fd, 0, SEEK_CUR)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "lseek after invoking sendfile failed: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	if (STD_FUNCTIONAL_TEST) {
 		/* Close the sockets */
@@ -177,11 +177,11 @@
 	if ((fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(fd);
 	sprintf(out_file, "out.%d", getpid());
 }
@@ -264,8 +264,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	argv0 = av[0];
 	maybe_run_child(&do_child, "");
@@ -283,5 +287,5 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sendfile/sendfile07.c b/testcases/kernel/syscalls/sendfile/sendfile07.c
index 9e96218..8f04f99 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile07.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile07.c
@@ -81,8 +81,12 @@
 	char *msg;		/* parse_opts() return message */
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -113,7 +117,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -138,20 +142,20 @@
 	if ((in_fd = creat(in_file, 00700)) < 0) {
 		tst_brkm(TBROK, cleanup, "creat failed in setup, errno: %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 	sprintf(buf, "abcdefghijklmnopqrstuvwxyz");
 	if (write(in_fd, buf, strlen(buf)) < 0) {
 		tst_brkm(TBROK, cleanup, "write failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 	close(in_fd);
 	if ((in_fd = open(in_file, O_RDONLY)) < 0) {
 		tst_brkm(TBROK, cleanup, "open failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Make fulfilled out_fd. */
 	if (socketpair(PF_UNIX, SOCK_DGRAM, 0, p) < 0) {
 		tst_brkm(TBROK, cleanup, "socketpair failed, errno: %d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Don't close.
 	   You cannot write nothing on out_fd if ignored_fd is closed. */
diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg01.c b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
index db0975e..134a181 100644
--- a/testcases/kernel/syscalls/sendmsg/sendmsg01.c
+++ b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
@@ -230,7 +230,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -343,7 +347,7 @@
 		return pid;
 	}
 
-	 /*NOTREACHED*/ exit(1);
+	  exit(1);
 }
 
 void do_child()
diff --git a/testcases/kernel/syscalls/sendto/sendto01.c b/testcases/kernel/syscalls/sendto/sendto01.c
index a98954d..ce1f91e 100644
--- a/testcases/kernel/syscalls/sendto/sendto01.c
+++ b/testcases/kernel/syscalls/sendto/sendto01.c
@@ -177,7 +177,7 @@
 		return pid;
 	}
 
-	 /*NOTREACHED*/ exit(1);
+	  exit(1);
 }
 
 void do_child()
@@ -227,9 +227,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 #ifdef UCLINUX
 	argv0 = av[0];
@@ -274,7 +280,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 pid_t pid;
diff --git a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
index 2f76d86..5e07d89 100644
--- a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
+++ b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
@@ -90,7 +90,11 @@
 	int retval;
 #endif
 
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
index 6388340..27c8b01 100644
--- a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
+++ b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
@@ -116,7 +116,11 @@
 	
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		 tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		 tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		 tst_exit();
 	}
 
diff --git a/testcases/kernel/syscalls/set_thread_area/set_thread_area02.c b/testcases/kernel/syscalls/set_thread_area/set_thread_area02.c
index 03fee58..54e5b37 100644
--- a/testcases/kernel/syscalls/set_thread_area/set_thread_area02.c
+++ b/testcases/kernel/syscalls/set_thread_area/set_thread_area02.c
@@ -53,7 +53,6 @@
 
 /* Global Variables */
 char *TCID = "set_thread_area_02";  /* Test program identifier.*/
-int  testno;
 int  TST_TOTAL = 3;		   /* total number of tests in this file.   */
 
 #if defined(HAVE_ASM_LDT_H) && defined(HAVE_STRUCT_USER_DESC)
@@ -83,9 +82,6 @@
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -116,81 +112,46 @@
 int main(int ac, char **av) {
 	
 	thread_area_s u_info;
-	int lc;		 /* loop counter */
-	char *msg;		  /* message returned from parse_opts */
-	
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-
-		Tst_count = 0;
-
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-
-			u_info.entry_number = 6;
+	u_info.entry_number = 6;
 	
-			/*
-			 * This call to get_thread_area function should be sucessful.
-			 */
+	TEST(syscall(__NR_get_thread_area, &u_info));	 //call get_thread_area()
+	if (TEST_RETURN == -1) {
+		tst_brkm(TFAIL|TTERRNO, cleanup, "call get_thread_area() failed");
+	}
 
-			TEST(syscall(__NR_get_thread_area, &u_info));	 //call get_thread_area()
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL | TTERRNO, "call get_thread_area() failed");
-				cleanup();
-				tst_exit();
-			}
-			 
-			u_info.entry_number = -2;
-			/*
-			 * This call to set_thread_area function with invalid entry_number should be FAILED.
-			 */
+	u_info.entry_number = -2;
+	TEST(syscall(__NR_set_thread_area, &u_info));	 //call set_thread_area()
+	if (TEST_RETURN == -1) {
 
-			TEST(syscall(__NR_set_thread_area, &u_info));	 //call set_thread_area()
-			if (TEST_RETURN == -1) {
-
-				if (TEST_ERRNO == EINVAL) {
-					tst_resm(TPASS, "Call to set_thread_area call failed with invalid entry_number  errno = %d (expected EINVAL)",TEST_ERRNO);
-				} else {
-			 		tst_resm(TFAIL,"Call to set_thread_area with invalid entry_number got unexpected errno = %d (expected EINVAL)",TEST_ERRNO);
-				}
-
-			} else {
-		   		tst_resm(TFAIL,"Call to set_thread_area with invalid entry_number succeed,but should fail" );
-				cleanup();
-				tst_exit();
-			}
-
-			/*
-			 * This call to set_thread_area function with an invalid pointer should be FAILED with EFAULT.
-			 */
-
-			TEST(syscall(__NR_set_thread_area,(struct user_desc *)-9));	 //call set_thread_area()
-			if (TEST_RETURN == -1) {
-				if (TEST_ERRNO == EFAULT) {
-					tst_resm(TPASS, "Call to set_thread_area call with invalid entry_number errno = %d (got expected error EFAULT)",TEST_ERRNO);
-				} else {
-					tst_resm(TFAIL,"Call to set_thread_area with invalid entry_number got unexpected errno = %d (expected EFAULT)",TEST_ERRNO);
-				}
-			} else {
-				tst_resm(TFAIL,"Call to set_thread_area with invalid entry_number succeed,but should fail" );
-				tst_exit();
-			}
+		if (TEST_ERRNO == EINVAL) {
+			tst_resm(TPASS, "set_thread_area failed with EINVAL as expected");
+		} else {
+	 		tst_resm(TFAIL|TTERRNO, "set_thread_area didn't fail with EINVAL");
 		}
+
+	} else {
+   		tst_brkm(TFAIL, cleanup, "set_thread_area succeeded unexpectedly");
+	}
+
+	TEST(syscall(__NR_set_thread_area,(struct user_desc *)-9));	 //call set_thread_area()
+	if (TEST_RETURN == -1) {
+		if (TEST_ERRNO == EFAULT) {
+			tst_resm(TPASS, "set_thread_area failed with EFAULT as expected");
+		} else {
+			tst_resm(TFAIL|TTERRNO, "set_thread_area didn't fail with EFAULT");
+		}
+	} else {
+		tst_resm(TFAIL, cleanup, "set_thread_area succeeded unexpectedly");
 	}
 	cleanup();
 	tst_exit();
 }
 #else
 int main(void) {
-	tst_resm(TCONF, "is not available for this architecture");
-	tst_exit();
+	tst_brkm(TCONF, NULL, "set_thread_area isn't available for this architecture");
 }
 #endif
 
diff --git a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
index 7a00402..2a6e737 100644
--- a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
+++ b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
@@ -114,7 +114,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname01.c b/testcases/kernel/syscalls/setdomainname/setdomainname01.c
index 567e230..a95552c 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname01.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname01.c
@@ -123,7 +123,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -136,12 +136,12 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Save current domain name */
 	if ((getdomainname(old_domain_name, sizeof(old_domain_name))) < 0) {
-		tst_brkm(TBROK, tst_exit, "getdomainname() failed while"
+		tst_brkm(TBROK, NULL, "getdomainname() failed while"
 			 " getting current domain name");
 	}
 
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname02.c b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
index 0ab3570..2acac5d 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname02.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
@@ -114,7 +114,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+>>>>>>> master
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -153,7 +157,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -171,12 +175,12 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Save current domainname */
 	if ((getdomainname(old_domain_name, MAX_NAME_LEN)) < 0) {
-		tst_brkm(TBROK, tst_exit, "getdomainname() failed while"
+		tst_brkm(TBROK, NULL, "getdomainname() failed while"
 			 " getting current domain name");
 	}
 
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname03.c b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
index 08107cf..b3c1659 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname03.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
@@ -101,7 +101,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -141,7 +145,7 @@
 	 */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -159,10 +163,10 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "\"nobody\" user not present");
+		tst_brkm(TBROK, NULL, "\"nobody\" user not present");
 	}
 	if (seteuid(ltpuser->pw_uid) == -1) {
 		tst_resm(TWARN, "seteuid failed to "
@@ -172,7 +176,7 @@
 
 	/* Save current domainname */
 	if ((getdomainname(old_domain_name, MAX_NAME_LEN)) < 0) {
-		tst_brkm(TBROK, tst_exit, "getdomainname() failed while"
+		tst_brkm(TBROK, NULL, "getdomainname() failed while"
 			 " getting current domain name");
 	}
 
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid01.c b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
index 1e2fe6b..c7a68cd 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid01.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
@@ -68,7 +68,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -103,7 +107,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid02.c b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
index d0844d3..d4711b5 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid02.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
@@ -72,7 +72,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -110,7 +114,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return EXIT_SUCCESS;
+	  return EXIT_SUCCESS;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid03.c b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
index 36a4144..addbaa4 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid03.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -113,7 +117,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return EXIT_SUCCESS;
+	  return EXIT_SUCCESS;
 }
 
 /*
@@ -123,7 +127,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid01.c b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
index 2603388..758e12d 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid01.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
@@ -69,7 +69,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -105,7 +109,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
index fcba413..333d6d5 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
@@ -74,7 +74,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -114,7 +118,7 @@
 	cleanup();
 
 	return 0;
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid03.c b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
index 760615e..b6f6c0f 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid03.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
@@ -75,7 +75,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -118,7 +122,7 @@
 
 	return 0;
 
- /*NOTREACHED*/}
+ }
 
 /*
  * setup() - performs all ONE TIME setup for this test.
@@ -127,7 +131,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid04.c b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
index d445915..aeb7ee9 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid04.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
@@ -78,8 +78,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -103,7 +107,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -209,7 +213,7 @@
 void setup(void)
 {
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/setgid/setgid01.c b/testcases/kernel/syscalls/setgid/setgid01.c
index 8d3d7d8..d525d4b 100644
--- a/testcases/kernel/syscalls/setgid/setgid01.c
+++ b/testcases/kernel/syscalls/setgid/setgid01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/setgid/setgid02.c b/testcases/kernel/syscalls/setgid/setgid02.c
index 58b7af3..edc2fab 100644
--- a/testcases/kernel/syscalls/setgid/setgid02.c
+++ b/testcases/kernel/syscalls/setgid/setgid02.c
@@ -73,8 +73,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -115,7 +119,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -125,7 +129,7 @@
 {
 /* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 
diff --git a/testcases/kernel/syscalls/setgid/setgid03.c b/testcases/kernel/syscalls/setgid/setgid03.c
index 403d20a..9f196b5 100644
--- a/testcases/kernel/syscalls/setgid/setgid03.c
+++ b/testcases/kernel/syscalls/setgid/setgid03.c
@@ -68,8 +68,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -100,7 +104,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -110,7 +114,7 @@
 {
 	/* test must be run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/setgroups/setgroups02.c b/testcases/kernel/syscalls/setgroups/setgroups02.c
index 1626acc..a009712 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups02.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups02.c
@@ -94,9 +94,15 @@
 	int PASS_FLAG = 0;	/* used for checking group array */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform global setup for test */
@@ -158,7 +164,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -174,7 +180,7 @@
 
 	/* Make sure the calling process is super-user only */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be ROOT to run this test.");
+		tst_brkm(TBROK, NULL, "Must be ROOT to run this test.");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/setgroups/setgroups03.c b/testcases/kernel/syscalls/setgroups/setgroups03.c
index df59c32..c7e4659 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups03.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups03.c
@@ -116,9 +116,15 @@
 	int ngroups_max = sysconf(_SC_NGROUPS_MAX);	/* max no. of groups in the current system */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	groups_list = malloc(ngroups_max * sizeof(GID_T));
@@ -181,7 +187,7 @@
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -193,7 +199,7 @@
 {
 
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/setgroups/setgroups04.c b/testcases/kernel/syscalls/setgroups/setgroups04.c
index 9e9a955..82a436b 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups04.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups04.c
@@ -92,9 +92,15 @@
 	char *test_desc;	/* test specific error message */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* Perform setup for test */
@@ -143,7 +149,7 @@
 	/* Call cleanup() */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 #else
@@ -164,7 +170,7 @@
 
 	/* check root user */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/sethostname/sethostname01.c b/testcases/kernel/syscalls/sethostname/sethostname01.c
index fbc386c..1bf4c59 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname01.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname01.c
@@ -138,12 +138,12 @@
 
 	/* Test should be executed as root user */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Store the existing hostname to retain it before exiting */
 	if ((ret = gethostname(hname, sizeof(hname))) < 0) {
-		tst_brkm(TBROK, tst_exit, "gethostname() failed while getting"
+		tst_brkm(TBROK, NULL, "gethostname() failed while getting"
 			 " current host name");
 	}
 
diff --git a/testcases/kernel/syscalls/sethostname/sethostname02.c b/testcases/kernel/syscalls/sethostname/sethostname02.c
index bf7ad55..dfdebc2 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname02.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname02.c
@@ -178,12 +178,12 @@
 
 	/* Test should be executed as root user */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Keep the host name before starting the test */
 	if ((ret = gethostname(hname, sizeof(hname))) < 0) {
-		tst_brkm(TBROK, tst_exit, "gethostname() failed while"
+		tst_brkm(TBROK, NULL, "gethostname() failed while"
 			 " getting current host name");
 	}
 
diff --git a/testcases/kernel/syscalls/sethostname/sethostname03.c b/testcases/kernel/syscalls/sethostname/sethostname03.c
index 9255129..d90d327 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname03.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname03.c
@@ -145,12 +145,12 @@
 
 	/* Test should be executed as root user */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Switch to nobody user for correct error code collection */
 	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Required user \"nobody\" not"
+		tst_brkm(TBROK, NULL, "Required user \"nobody\" not"
 			 " present");
 	}
 
@@ -162,7 +162,7 @@
 
 	/* Keep current hostname */
 	if ((ret = gethostname(hname, sizeof(hname))) < 0) {
-		tst_brkm(TBROK, tst_exit, "gethostname() failed while"
+		tst_brkm(TBROK, NULL, "gethostname() failed while"
 			 " getting current host name");
 	}
 
diff --git a/testcases/kernel/syscalls/setitimer/setitimer01.c b/testcases/kernel/syscalls/setitimer/setitimer01.c
index b4fc8ab..8b00bd3 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer01.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer01.c
@@ -76,7 +76,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -148,7 +152,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c
index 5177b0d..978dc85 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer02.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer02.c
@@ -77,7 +77,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -139,7 +143,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c
index beae6c1..d8dffe4 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer03.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer03.c
@@ -75,7 +75,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -148,7 +152,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/setpgid/setpgid01.c b/testcases/kernel/syscalls/setpgid/setpgid01.c
index d9cf346..5060504 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid01.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c
index 6598fa1..a8b7041 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid02.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid02.c
@@ -93,7 +93,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -133,7 +137,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c
index cec9fa6..370978f 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03.c
@@ -64,8 +64,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "");
 #endif
diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp02.c b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
index e516194..06a72a7 100644
--- a/testcases/kernel/syscalls/setpgrp/setpgrp02.c
+++ b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
@@ -66,7 +66,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -119,7 +123,7 @@
 		}
 	}
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setpriority/setpriority01.c b/testcases/kernel/syscalls/setpriority/setpriority01.c
index bdd4dc1..f5dfdb7 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority01.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority01.c
@@ -78,7 +78,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -135,7 +139,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/setpriority/setpriority02.c b/testcases/kernel/syscalls/setpriority/setpriority02.c
index c30a07b..70e6cb9 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority02.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority02.c
@@ -79,7 +79,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -120,7 +124,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -131,7 +135,7 @@
 {
 /* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setpriority/setpriority03.c b/testcases/kernel/syscalls/setpriority/setpriority03.c
index 1af40b8..75756d9 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority03.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority03.c
@@ -78,7 +78,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -119,7 +123,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
diff --git a/testcases/kernel/syscalls/setpriority/setpriority04.c b/testcases/kernel/syscalls/setpriority/setpriority04.c
index 7cfd13a..52a68aa 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority04.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority04.c
@@ -95,7 +95,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -137,7 +141,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setpriority/setpriority05.c b/testcases/kernel/syscalls/setpriority/setpriority05.c
index 07d8d42..2580445 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority05.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority05.c
@@ -80,7 +80,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -120,7 +124,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -131,7 +135,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setregid/setregid01.c b/testcases/kernel/syscalls/setregid/setregid01.c
index f97809a..be0c0d9 100644
--- a/testcases/kernel/syscalls/setregid/setregid01.c
+++ b/testcases/kernel/syscalls/setregid/setregid01.c
@@ -134,23 +134,14 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -173,9 +164,6 @@
 				 "setregid -  Dont change either real or effective gid failed, errno=%d : %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS,
@@ -199,9 +187,6 @@
 				 "setregid -  change effective to effective gid failed, errno=%d : %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS,
@@ -225,9 +210,6 @@
 				 "setregid -  change real to real gid failed, errno=%d : %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS,
@@ -251,9 +233,6 @@
 				 "setregid -  change effective to real gid failed, errno=%d : %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS,
@@ -273,18 +252,12 @@
 		/* check return code */
 		if (TEST_RETURN == -1) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL,
-				 "setregid -  try to change real to current real failed, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TFAIL|TTERRNO, "setregid failed");
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
-				tst_resm(TPASS,
-					 "setregid -  try to change real to current real returned %ld",
-					 TEST_RETURN);
+				tst_resm(TPASS, "setregid return %ld",
+				    TEST_RETURN);
 			}
 		}
 
diff --git a/testcases/kernel/syscalls/setregid/setregid02.c b/testcases/kernel/syscalls/setregid/setregid02.c
index d3b8691..b368f08 100644
--- a/testcases/kernel/syscalls/setregid/setregid02.c
+++ b/testcases/kernel/syscalls/setregid/setregid02.c
@@ -196,37 +196,42 @@
  */
 void setup(void)
 {
+	struct group *junk;
+
 	tst_require_root(NULL);
 	
 	/* capture signals */
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
 	if ((nobody = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
+		tst_brkm(TBROK, NULL, "getpwnam(\"nobody\") failed");
 	}
 
 	if (setgid(nobody->pw_gid) == -1) {
-		tst_resm(TINFO, "setgid failed to "
-			 "to set the effective gid to %d", nobody->pw_gid);
-		perror("setgid");
+		tst_brkm(TBROK|TERRNO, NULL,
+		    "setgid failed to set the effective gid to %d",
+		    nobody->pw_gid);
 	}
 	if (setuid(nobody->pw_uid) == -1) {
-		tst_resm(TINFO, "setuid failed to "
-			 "to set the effective uid to %d", nobody->pw_uid);
-		perror("setuid");
+		tst_brkm(TBROK|TERRNO, NULL,
+		    "setuid failed to to set the effective uid to %d",
+		    nobody->pw_uid);
 	}
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-	root = *(getgrnam("root"));
-	root_gr_gid = root.gr_gid;
+#define GET_GID(group)	do {		\
+	junk = getgrnam(#group);	\
+	if (junk == NULL) {		\
+		tst_brkm(TBROK|TERRNO, NULL, "getgrnam(\"%s\") failed", #group); \
+	}				\
+	group ## _gr_gid = junk->gr_gid;\
+} while (0)
 
-	users = *(getgrnam("users"));
-	users_gr_gid = users.gr_gid;
-
-	bin = *(getgrnam("bin"));
-	bin_gr_gid = bin.gr_gid;
+	GET_GID(root);
+	GET_GID(users);
+	GET_GID(bin);
 
 	/* Pause if that option was specified
 	 * TEST_PAUSE contains the code to fork the test with the -c option.
@@ -246,10 +251,7 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void gid_verify(struct group *rg, struct group *eg, char *when)
 {
diff --git a/testcases/kernel/syscalls/setregid/setregid03.c b/testcases/kernel/syscalls/setregid/setregid03.c
index 4996b8d..d6c51b9 100644
--- a/testcases/kernel/syscalls/setregid/setregid03.c
+++ b/testcases/kernel/syscalls/setregid/setregid03.c
@@ -141,7 +141,7 @@
 		/* set the appropriate ownership values */
 		if (setregid(sys_gr_gid, bin_gr_gid) == -1) {
 			tst_brkm(TBROK, NULL, "Initial setregid failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if (seteuid(nobody_pw_uid) == -1) {
 			tst_brkm(TBROK, NULL, "Initial seteuid failed");
diff --git a/testcases/kernel/syscalls/setregid/setregid04.c b/testcases/kernel/syscalls/setregid/setregid04.c
index 595dbcf..be55a67 100644
--- a/testcases/kernel/syscalls/setregid/setregid04.c
+++ b/testcases/kernel/syscalls/setregid/setregid04.c
@@ -133,9 +133,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* Perform global setup for test */
 	setup();
diff --git a/testcases/kernel/syscalls/setresgid/setresgid01.c b/testcases/kernel/syscalls/setresgid/setresgid01.c
index e28984f..6a31f8f 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid01.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid01.c
@@ -163,7 +163,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 static int test_functionality(uid_t exp_rgid, uid_t exp_egid, uid_t exp_sgid)
@@ -203,19 +203,19 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	if ((passwd_p = getpwnam("root")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "getpwnam() failed for root");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "getpwnam() failed for root");
+		
 	}
 	root = *passwd_p;
 	root_gid = root.pw_gid;
 
 	if ((passwd_p = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "nobody user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
+		
 	}
 	nobody = *passwd_p;
 	nobody_gid = nobody.pw_gid;
@@ -242,4 +242,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/setresgid/setresgid02.c b/testcases/kernel/syscalls/setresgid/setresgid02.c
index 0d9d89e..7828f2f 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid02.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid02.c
@@ -170,7 +170,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 static int test_functionality(uid_t exp_rgid, uid_t exp_egid, uid_t exp_sgid)
@@ -211,35 +211,35 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	if ((passwd_p = getpwnam("root")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "getpwnam() failed for root");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "getpwnam() failed for root");
+		
 	}
 	root = *passwd_p;
 	root_gid = root.pw_gid;
 
 	if ((passwd_p = getpwnam("bin")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "bin user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "bin user id doesn't exist");
+		
 	}
 	bin = *passwd_p;
 	bin_gid = bin.pw_gid;
 
 	if ((passwd_p = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "nobody user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
+		
 	}
 	nobody = *passwd_p;
 	nobody_gid = nobody.pw_gid;
 
 	/* Set effective/saved gid to nobody */
 	if (setresgid(-1, nobody_gid, nobody_gid) == -1) {
-		tst_brkm(TBROK, tst_exit, "setup() failed for setting while"
+		tst_brkm(TBROK, NULL, "setup() failed for setting while"
 			 " setting real/effective/saved gid");
-		/* NOTREACHED */
+		
 	}
 
 	/* Pause if that option was specified
@@ -264,4 +264,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/setresgid/setresgid03.c b/testcases/kernel/syscalls/setresgid/setresgid03.c
index 551278f..bdc8e25 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid03.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid03.c
@@ -169,7 +169,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 static int test_functionality(uid_t exp_rgid, uid_t exp_egid, uid_t exp_sgid)
@@ -209,25 +209,25 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	if ((passwd_p = getpwnam("root")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "getpwnam() failed for root");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "getpwnam() failed for root");
+		
 	}
 	root = *passwd_p;
 
 	if ((passwd_p = getpwnam("bin")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "bin user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "bin user id doesn't exist");
+		
 	}
 	bin = *passwd_p;
 	bin_gid = bin.pw_gid;
 
 	if ((passwd_p = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "nobody user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
+		
 	}
 	nobody = *passwd_p;
 	nobody_gid = nobody.pw_gid;
@@ -237,15 +237,15 @@
 
 	/* Set real/effective/saved gid to nobody */
 	if (setresgid(nobody_gid, nobody_gid, nobody_gid) == -1) {
-		tst_brkm(TBROK, tst_exit, "setup() failed for setting while"
+		tst_brkm(TBROK, NULL, "setup() failed for setting while"
 			 " setting real/effective/saved gid");
-		/* NOTREACHED */
+		
 	}
 	/* Set euid to nobody */
 	if (setuid(nobody.pw_uid) == -1) {
-		tst_brkm(TBROK, tst_exit, "setuid failed to "
+		tst_brkm(TBROK, NULL, "setuid failed to "
 			 "to set the effective uid to nodody");
-		/* NOTREACHED */
+		
 	}
 	/* Pause if that option was specified
 	 * TEST_PAUSE contains the code to fork the test with the -c option.
@@ -269,4 +269,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/setresuid/setresuid01.c b/testcases/kernel/syscalls/setresuid/setresuid01.c
index bfb5b01..f8dea2f 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid01.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid01.c
@@ -131,7 +131,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -172,7 +172,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -188,17 +188,17 @@
 	if (geteuid() != 0) {
 		tst_brkm(TBROK, NULL, "Must be root for this test!");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("bin") == NULL) {
 		tst_brkm(TBROK, NULL, "bin must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
@@ -233,7 +233,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void
 uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *when)
@@ -241,7 +241,7 @@
 	uid_t cur_ru, cur_eu, cur_su;
 	if (getresuid(&cur_ru, &cur_eu, &cur_su) != 0) {
 		tst_brkm(TBROK, cleanup, "Set getresuid() failed");
-	 /*NOTREACHED*/}
+	 }
 	if ((cur_ru != ru->pw_uid) || (cur_eu != eu->pw_uid) || (cur_su !=
 								 su->pw_uid)) {
 		tst_resm(TFAIL, "ERROR: %s real uid = %d; effective uid = %d; "
diff --git a/testcases/kernel/syscalls/setresuid/setresuid02.c b/testcases/kernel/syscalls/setresuid/setresuid02.c
index db138ca..9866deb 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid02.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid02.c
@@ -120,7 +120,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -135,11 +135,11 @@
 		/* set the appropriate ownership values */
 		if (setresuid(nobody_pw_uid, bin_pw_uid, nobody_pw_uid) == -1) {
 			tst_brkm(TFAIL, cleanup, "Initial setresuid failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+		 } else if (pid == 0) {	/* child */
 
 			for (i = 0; i < TST_TOTAL; i++) {
 
@@ -186,7 +186,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -201,12 +201,12 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("bin") == NULL) {
 		tst_brkm(TBROK, NULL, "bin must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Check that the test process id is root */
 	if (geteuid() != 0) {
@@ -243,7 +243,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void
 uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *when)
@@ -252,7 +252,7 @@
 	if (getresuid(&cur_ru, &cur_eu, &cur_su) != 0) {
 		flag = -1;
 		tst_brkm(TBROK, cleanup, "Set getresuid() failed");
-	 /*NOTREACHED*/}
+	 }
 	if ((cur_ru != ru->pw_uid) || (cur_eu != eu->pw_uid) || (cur_su !=
 								 su->pw_uid)) {
 		tst_resm(TFAIL, "ERROR: %s real uid = %d; effective uid = %d; "
diff --git a/testcases/kernel/syscalls/setresuid/setresuid03.c b/testcases/kernel/syscalls/setresuid/setresuid03.c
index 38d4f9c..f13780e 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid03.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid03.c
@@ -131,7 +131,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -147,11 +147,11 @@
 		if (setresuid(root_pw_uid, bin_pw_uid, bin_pw_uid)
 		    == -1) {
 			tst_brkm(TFAIL, cleanup, "Initial setresuid failed");
-		 /*NOTREACHED*/}
+		 }
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+		 } else if (pid == 0) {	/* child */
 
 			for (i = 0; i < TST_TOTAL; i++) {
 
@@ -199,7 +199,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -214,18 +214,18 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("bin") == NULL) {
 		tst_brkm(TBROK, NULL, "bin must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Check that the test process id is root */
 	if (geteuid() != 0) {
 		tst_brkm(TBROK, NULL, "Must be root for this test!");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	root = *(getpwnam("root"));
 	root_pw_uid = root.pw_uid;
@@ -259,7 +259,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void
 uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *when)
@@ -268,7 +268,7 @@
 	if (getresuid(&cur_ru, &cur_eu, &cur_su) != 0) {
 		flag = -1;
 		tst_brkm(TBROK, cleanup, "Set getresuid() failed");
-	 /*NOTREACHED*/}
+	 }
 	if ((cur_ru != ru->pw_uid) || (cur_eu != eu->pw_uid) || (cur_su !=
 								 su->pw_uid)) {
 		tst_resm(TFAIL, "ERROR: %s real uid = %d; effective uid = %d; "
diff --git a/testcases/kernel/syscalls/setresuid/setresuid04.c b/testcases/kernel/syscalls/setresuid/setresuid04.c
index 23a11ac..9b0bac4 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid04.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid04.c
@@ -76,8 +76,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -101,7 +105,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -207,7 +211,7 @@
 void setup(void)
 {
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c
index 93eea59..a75f9fd 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid01.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid01.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/setreuid/setreuid02.c b/testcases/kernel/syscalls/setreuid/setreuid02.c
index 8d0982b..c7b263d 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid02.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid02.c
@@ -116,7 +116,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -154,7 +154,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -170,12 +170,12 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("daemon") == NULL) {
 		tst_brkm(TBROK, NULL, "daemon must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Check that the test process id is root  */
 	if (geteuid() != 0) {
@@ -219,7 +219,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void uid_verify(struct passwd *ru, struct passwd *eu, char *when)
 {
diff --git a/testcases/kernel/syscalls/setreuid/setreuid03.c b/testcases/kernel/syscalls/setreuid/setreuid03.c
index af40f89..07162c5 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid03.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid03.c
@@ -142,7 +142,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -204,7 +204,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -220,12 +220,12 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("bin") == NULL) {
 		tst_brkm(TBROK, NULL, "bin must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
@@ -267,7 +267,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void uid_verify(struct passwd *ru, struct passwd *eu, char *when)
 {
diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c
index 65c1a5f..587ff77 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid04.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid04.c
@@ -113,7 +113,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -127,7 +127,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+		 } else if (pid == 0) {	/* child */
 
 			for (i = 0; i < TST_TOTAL; i++) {
 
@@ -170,7 +170,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -186,7 +186,7 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Check that the test process id is root */
 	if (geteuid() != 0) {
@@ -223,7 +223,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void uid_verify(struct passwd *ru, struct passwd *eu, char *when)
 {
diff --git a/testcases/kernel/syscalls/setreuid/setreuid05.c b/testcases/kernel/syscalls/setreuid/setreuid05.c
index e12e8ef..4dc5fef 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid05.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid05.c
@@ -141,7 +141,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -155,7 +155,7 @@
 
 		if ((pid = FORK_OR_VFORK()) == -1) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+		 } else if (pid == 0) {	/* child */
 			for (i = 0; i < TST_TOTAL; i++) {
 				/* Set the real or effective user id */
 				TEST(setreuid(*test_data[i].real_uid,
@@ -218,7 +218,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -234,17 +234,17 @@
 	if (getpwnam("nobody") == NULL) {
 		tst_brkm(TBROK, NULL, "nobody must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getpwnam("daemon") == NULL) {
 		tst_brkm(TBROK, NULL, "daemon must be a valid user.");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	if (getuid() != 0) {
 		tst_resm(TBROK, "Must be run as root");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
@@ -282,7 +282,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void uid_verify(struct passwd *ru, struct passwd *eu, char *when)
 {
diff --git a/testcases/kernel/syscalls/setreuid/setreuid06.c b/testcases/kernel/syscalls/setreuid/setreuid06.c
index 2e66738..f6af207 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid06.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid06.c
@@ -76,7 +76,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -103,7 +103,7 @@
 
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -123,7 +123,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setreuid/setreuid07.c b/testcases/kernel/syscalls/setreuid/setreuid07.c
index f220ba0..fafb833 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid07.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid07.c
@@ -75,8 +75,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -100,7 +104,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -206,7 +210,7 @@
 void setup(void)
 {
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit01.c b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
index 37e9f84..6cc29f9 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit01.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
@@ -82,8 +82,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* set "tstdir", and "fname" vars */
 
@@ -105,7 +109,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -343,7 +347,7 @@
 {
 	/* must run test as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must run test as root");
+		tst_brkm(TBROK, NULL, "Must run test as root");
 	}
 
 	umask(0);
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit02.c b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
index 753eaa0..12c08c0 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit02.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
@@ -88,8 +88,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -127,7 +131,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }
 
@@ -145,7 +149,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
index 498dd78..41928ff 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
@@ -70,8 +70,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();
 
@@ -105,7 +109,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -115,7 +119,7 @@
 {
 	/* must run test as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "must run test as root");
+		tst_brkm(TBROK, NULL, "must run test as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/setsid/setsid01.c b/testcases/kernel/syscalls/setsid/setsid01.c
index 1232214..840a990 100644
--- a/testcases/kernel/syscalls/setsid/setsid01.c
+++ b/testcases/kernel/syscalls/setsid/setsid01.c
@@ -71,9 +71,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
 #ifdef UCLINUX
 	argv0 = av[0];
 
@@ -148,7 +147,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/setsockopt/setsockopt01.c b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
index bd066a0..872c211 100644
--- a/testcases/kernel/syscalls/setsockopt/setsockopt01.c
+++ b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
@@ -138,11 +138,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 	setup();
 
 	/* Check looping state if -i option given */
@@ -176,7 +180,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday01.c b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
index 415b789..8e1da9f 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday01.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
@@ -89,7 +89,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	setup();
 
@@ -144,7 +144,7 @@
 
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -171,7 +171,7 @@
 	if (geteuid() != 0) {
 		tst_brkm(TBROK, NULL, "Must be root for this test!");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
@@ -185,7 +185,7 @@
 	if ((gettimeofday(&tp, (struct timezone *)&tp1)) == -1) {
 		tst_brkm(TBROK, cleanup, "gettimeofday failed. "
 			 "errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 	save_tv_sec = tp.tv_sec;
 	save_tv_usec = tp.tv_usec;
 }
@@ -213,4 +213,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday02.c b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
index 4242fa5..4bee4a3 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday02.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
@@ -132,7 +132,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -159,7 +159,7 @@
 	if (geteuid() != 0) {
 		tst_brkm(TBROK, NULL, "Must be root for this test!");
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Switch to nobody user for correct error code collection */
 	ltpuser = getpwnam(nobody_uid);
@@ -181,7 +181,7 @@
 	if ((gettimeofday(&tp, (struct timezone *)&tp)) == -1) {
 		tst_brkm(TBROK, cleanup, "gettimeofday failed. "
 			 "errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 	save_tv_sec = tp.tv_sec;
 	save_tv_usec = tp.tv_usec;
 }
@@ -201,7 +201,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void restore_time(void)
 {
diff --git a/testcases/kernel/syscalls/setuid/setuid02.c b/testcases/kernel/syscalls/setuid/setuid02.c
index c100c70..558e12f 100644
--- a/testcases/kernel/syscalls/setuid/setuid02.c
+++ b/testcases/kernel/syscalls/setuid/setuid02.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/setuid/setuid03.c b/testcases/kernel/syscalls/setuid/setuid03.c
index 4ac97c8..3cda4be 100644
--- a/testcases/kernel/syscalls/setuid/setuid03.c
+++ b/testcases/kernel/syscalls/setuid/setuid03.c
@@ -67,8 +67,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -101,7 +105,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -111,7 +115,7 @@
 {
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/setuid/setuid04.c b/testcases/kernel/syscalls/setuid/setuid04.c
index 0d1cfdd..92c502f 100644
--- a/testcases/kernel/syscalls/setuid/setuid04.c
+++ b/testcases/kernel/syscalls/setuid/setuid04.c
@@ -77,8 +77,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/*
 	 * perform global setup for the test
@@ -101,7 +105,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -114,7 +118,7 @@
 	int status;
 
 	if (setuid(ltpuser->pw_uid) == -1) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			 "setuid failed to set the effective uid to %d",
 			 ltpuser->pw_uid);
 	}
@@ -143,7 +147,7 @@
 
 		pid = FORK_OR_VFORK();
 		if (pid < 0)
-			tst_brkm(TBROK, tst_exit, "Fork failed");
+			tst_brkm(TBROK, NULL, "Fork failed");
 
 		if (pid == 0) {
 			int tst_fd2;
@@ -182,7 +186,7 @@
 void setup(void)
 {
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	ltpuser = getpwnam(nobody_uid);
diff --git a/testcases/kernel/syscalls/sgetmask/sgetmask01.c b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
index 3183e30..9e2263a 100644
--- a/testcases/kernel/syscalls/sgetmask/sgetmask01.c
+++ b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
@@ -127,7 +127,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/sigaction/sigaction01.c b/testcases/kernel/syscalls/sigaction/sigaction01.c
index 31b271a..9de1b2e 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction01.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction01.c
@@ -243,7 +243,11 @@
 	};
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -284,5 +288,5 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c
index ba05d06..618e010 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
@@ -117,7 +117,11 @@
 	int ret;
 
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 //test1:
 	testcase_no = 1;
diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
index d54f245..e5263a2 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
@@ -100,11 +100,15 @@
 	void *alt_stk;		/* address of alternate stack for signal */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -187,7 +191,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -215,7 +219,7 @@
 	if ((sigaction(SIGUSR1, &act, &oact)) == -1) {
 		tst_brkm(TFAIL, cleanup,
 			 "sigaction() fails in setup, errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Send the signal to the test process */
 	kill(my_pid, SIGUSR1);
@@ -230,7 +234,7 @@
 	if ((sigstk.ss_sp = (void *)malloc(SIGSTKSZ)) == NULL) {
 		tst_brkm(TFAIL, cleanup,
 			 "could not allocate memory for the alternate stack");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
index 145976a..ad94e26 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
@@ -119,11 +119,15 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -180,7 +184,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -201,7 +205,7 @@
 	if ((sigstk.ss_sp = (void *)malloc(SIGSTKSZ)) == NULL) {
 		tst_brkm(TFAIL, cleanup,
 			 "could not allocate memory for the alternate stack");
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
diff --git a/testcases/kernel/syscalls/signal/signal02.c b/testcases/kernel/syscalls/signal/signal02.c
index 87edded..2ef48fb 100644
--- a/testcases/kernel/syscalls/signal/signal02.c
+++ b/testcases/kernel/syscalls/signal/signal02.c
@@ -80,8 +80,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -104,7 +108,7 @@
 				tst_brkm(TFAIL, cleanup, "%s call failed - "
 					 "errno = %d : %s", TCID, TEST_ERRNO,
 					 strerror(TEST_ERRNO));
-			 /*NOTREACHED*/}
+			 }
 
 			TEST_ERROR_LOG(TEST_ERRNO);
 
@@ -126,7 +130,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/signal/signal03.c b/testcases/kernel/syscalls/signal/signal03.c
index 55c334d..6569260 100644
--- a/testcases/kernel/syscalls/signal/signal03.c
+++ b/testcases/kernel/syscalls/signal/signal03.c
@@ -98,8 +98,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -122,7 +126,7 @@
 				tst_brkm(TFAIL, cleanup, "%s call failed - "
 					 "errno = %d : %s", TCID,
 					 TEST_ERRNO, strerror(TEST_ERRNO));
-			 /*NOTREACHED*/}
+			 }
 
 			if (STD_FUNCTIONAL_TEST) {
 				/*
@@ -135,7 +139,7 @@
 				if ((rval = kill(pid, siglist[i])) != 0) {
 					tst_brkm(TBROK, cleanup, "call to "
 						 "kill failed");
-				 /*NOTREACHED*/}
+				 }
 
 				if (fail == 0) {
 					tst_resm(TPASS, "%s call succeeded",
@@ -153,7 +157,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/signal/signal04.c b/testcases/kernel/syscalls/signal/signal04.c
index 67ab344..587c11f 100644
--- a/testcases/kernel/syscalls/signal/signal04.c
+++ b/testcases/kernel/syscalls/signal/signal04.c
@@ -92,8 +92,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -117,7 +121,7 @@
 			if ((rval = signal(siglist[i], &sighandler)) == SIG_ERR) {
 				tst_brkm(TBROK, cleanup, "initial signal call"
 					 " failed");
-			 /*NOTREACHED*/}
+			 }
 
 			/* store the return value */
 			first = rval;
@@ -131,7 +135,7 @@
 				tst_brkm(TFAIL, cleanup, "%s call failed - "
 					 "errno = %d : %s", TCID, TEST_ERRNO,
 					 strerror(TEST_ERRNO));
-			 /*NOTREACHED*/}
+			 }
 
 			if (STD_FUNCTIONAL_TEST) {
 				/* now set the handler back to our own */
@@ -139,7 +143,7 @@
 				    == SIG_ERR) {
 					tst_brkm(TBROK, cleanup, "initial "
 						 "signal call failed");
-				 /*NOTREACHED*/}
+				 }
 
 				/*
 				 * the first return value should equal the
@@ -153,7 +157,7 @@
 						 "values for signal(%d) don't "
 						 "match. Got %p, expected %p.",
 						 siglist[i], rval, first);
-				 /*NOTREACHED*/}
+				 }
 			} else {
 				tst_resm(TPASS, "Call of signal(%d) succeeded",
 					 siglist[i]);
@@ -162,7 +166,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/signal/signal05.c b/testcases/kernel/syscalls/signal/signal05.c
index 3f525c6..ed15347 100644
--- a/testcases/kernel/syscalls/signal/signal05.c
+++ b/testcases/kernel/syscalls/signal/signal05.c
@@ -97,8 +97,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -134,7 +138,7 @@
 				if ((rval = kill(pid, siglist[i])) != 0) {
 					tst_brkm(TBROK, cleanup,
 						 "call to kill failed");
-				 /*NOTREACHED*/}
+				 }
 
 				if (siglist[i] == pass) {
 					tst_resm(TPASS,
@@ -151,7 +155,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
index 2ea8e78..9846a8f 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
@@ -144,7 +144,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
index 08e30b1..3f55209 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
@@ -136,7 +136,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
index dfb26d6..d91bb5a 100644
--- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
@@ -103,7 +103,11 @@
 	pid_t my_pid;		/* test process id */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -175,7 +179,7 @@
 						tst_brkm(TFAIL, cleanup,
 							 "sigismember() failed, "
 							 "error:%d", errno);
-					 /*NOTREACHED*/}
+					 }
 
 					/*
 					 * Invoke sigprocmask() again to
@@ -190,7 +194,7 @@
 							 "sigprocmask() failed "
 							 "to unblock signal, "
 							 "error=%d", errno);
-					 /*NOTREACHED*/}
+					 }
 					if (sig_catch) {
 						tst_resm(TPASS, "Functionality "
 							 "of sigprocmask() "
@@ -213,7 +217,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -242,12 +246,12 @@
 		tst_brkm(TFAIL, cleanup,
 			 "sigemptyset() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (sigfillset(&sigset2) == -1) {
 		tst_brkm(TFAIL, cleanup,
 			 "sigfillset() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Set the signal handler function to catch the signal */
 	sa_new.sa_handler = sig_handler;
@@ -255,7 +259,7 @@
 		tst_brkm(TFAIL, cleanup,
 			 "sigaction() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Add specified signal (SIGINT) to the signal set
@@ -265,7 +269,7 @@
 		tst_brkm(TFAIL, cleanup,
 			 "sigaddset() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 }				/* End setup() */
 
 /*
diff --git a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
index 1fd7a80..37c4380 100644
--- a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
+++ b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
@@ -194,12 +194,12 @@
 		tst_brkm(TFAIL, cleanup,
 			 "sigemptyset() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (sigfillset(&sigset2) == -1) {
 		tst_brkm(TFAIL, cleanup,
 			 "sigfillset() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Set the signal handler function to catch the signal */
 	sa_new.sa_handler = sig_handler;
@@ -207,14 +207,14 @@
 		tst_brkm(TFAIL, cleanup,
 			 "sigaction() failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Read the test process's current signal mask. */
 	if (sigprocmask(SIG_UNBLOCK, 0, &sigset1) == -1) {
 		tst_brkm(TFAIL, cleanup,
 			 "sigprocmask() Failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 }				/* End setup() */
 
 /*
diff --git a/testcases/kernel/syscalls/socket/socket01.c b/testcases/kernel/syscalls/socket/socket01.c
index f4a37bf..31ebb93 100644
--- a/testcases/kernel/syscalls/socket/socket01.c
+++ b/testcases/kernel/syscalls/socket/socket01.c
@@ -91,7 +91,11 @@
 	int s;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -124,7 +128,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/socket/socket02.c b/testcases/kernel/syscalls/socket/socket02.c
index 73af694..beee010 100644
--- a/testcases/kernel/syscalls/socket/socket02.c
+++ b/testcases/kernel/syscalls/socket/socket02.c
@@ -147,7 +147,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/socket/socket03.c b/testcases/kernel/syscalls/socket/socket03.c
index ca2ee46..839397f 100644
--- a/testcases/kernel/syscalls/socket/socket03.c
+++ b/testcases/kernel/syscalls/socket/socket03.c
@@ -131,7 +131,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/socketcall/socketcall02.c b/testcases/kernel/syscalls/socketcall/socketcall02.c
index 15ea122..6d4fd0a 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall02.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall02.c
@@ -131,7 +131,7 @@
 			tst_resm(TPASS, "socketcall() failed"
 				 " as expected for %s", TC.desc);
 		} else {
-			tst_brkm(TFAIL, tst_exit, "socketcall()"
+			tst_brkm(TFAIL, NULL, "socketcall()"
 				 " Failed with wrong experrno"
 				 " =%d got: errno=%d : %s",
 				 TC.experrno, TEST_ERRNO, strerror(TEST_ERRNO));
diff --git a/testcases/kernel/syscalls/socketcall/socketcall03.c b/testcases/kernel/syscalls/socketcall/socketcall03.c
index 6caec41..d4f84c1 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall03.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall03.c
@@ -153,7 +153,7 @@
 	si.sin_port = 0;
 
 	if ((s = socket(TC.domain, TC.type, TC.pro)) == -1) {
-		tst_brkm(TBROK, tst_exit, "socket creation failed");
+		tst_brkm(TBROK, NULL, "socket creation failed");
 	}
 	args[0] = s;
 	args[1] = (unsigned long)&si;
diff --git a/testcases/kernel/syscalls/socketcall/socketcall04.c b/testcases/kernel/syscalls/socketcall/socketcall04.c
index 44dd305..c1091fd 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall04.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall04.c
@@ -147,7 +147,7 @@
 void setup1(void)
 {
 	if ((s = socket(TC.domain, TC.type, TC.pro)) == -1) {
-		tst_brkm(TBROK, tst_exit, "socket creation failed");
+		tst_brkm(TBROK, NULL, "socket creation failed");
 	}
 	args[0] = s;
 	args[1] = 1;
diff --git a/testcases/kernel/syscalls/socketpair/socketpair01.c b/testcases/kernel/syscalls/socketpair/socketpair01.c
index ab64e41..84aedc4 100644
--- a/testcases/kernel/syscalls/socketpair/socketpair01.c
+++ b/testcases/kernel/syscalls/socketpair/socketpair01.c
@@ -99,12 +99,8 @@
 	char *msg;		/* message returned from parse_opts */
 	int s;
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	setup();
 
@@ -141,8 +137,7 @@
 
 	cleanup();
 
-	return 0;
-
+	tst_exit();
 }				/* End main */
 
 void setup(void)
@@ -156,5 +151,4 @@
 void cleanup(void)
 {
 	TEST_CLEANUP;
-	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/socketpair/socketpair02.c b/testcases/kernel/syscalls/socketpair/socketpair02.c
index e8232ef..3f661b2 100644
--- a/testcases/kernel/syscalls/socketpair/socketpair02.c
+++ b/testcases/kernel/syscalls/socketpair/socketpair02.c
@@ -67,8 +67,6 @@
 
 /* Global Variables */
 char *TCID = "socketpair02";	/* test program identifier.              */
-int testno;
-int TST_TOTAL = 1;		/* total number of tests in this file.   */
 
 /* Extern Global Functions */
 /******************************************************************************/
@@ -88,14 +86,11 @@
 /*              On success - Exits calling tst_exit(). With '0' return code.  */
 /*                                                                            */
 /******************************************************************************/
-extern void cleanup()
+void cleanup()
 {
 	/* Remove tmp dir and all files in it */
 	TEST_CLEANUP;
 	tst_rmdir();
-
-	/* Exit with appropriate return code. */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -127,75 +122,46 @@
 int main(int argc, char *argv[])
 {
 	int fds[2], fl, i;
-	int lc;			/* loop counter */
-	char *msg;		/* message returned from parse_opts */
 
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(argc, argv, NULL, NULL);
-	if (msg != NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 	if ((tst_kvercmp(2, 6, 27)) < 0) {
-		tst_resm(TCONF,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-		tst_exit();
+		tst_brkm(TCONF, NULL,
+		    "This test can only run on kernels that are 2.6.27 and higher");
 	}
 	setup();
 
 	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			if (socketpair(PF_UNIX, SOCK_STREAM, 0, fds) == -1) {
-				tst_resm(TFAIL, "socketpair(0) failed");
-				cleanup();
-				tst_exit();
-			}
-			for (i = 0; i < 2; ++i) {
-				fl = fcntl(fds[i], F_GETFL);
-				if (fl == -1) {
-					tst_brkm(TBROK, cleanup,
-						 "fcntl failed");
-					tst_exit();
-				}
-				if (fl & O_NONBLOCK) {
-					tst_resm(TFAIL,
-						 "socketpair(0) set non-blocking mode for fds[%d]",
-						 i);
-					cleanup();
-					tst_exit();
-				}
-				close(fds[i]);
-			}
-
-			if (socketpair
-			    (PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0,
-			     fds) == -1) {
-				tst_resm(TFAIL,
-					 "socketpair(SOCK_NONBLOCK) failed");
-				cleanup();
-				tst_exit();
-			}
-			for (i = 0; i < 2; ++i) {
-				fl = fcntl(fds[i], F_GETFL);
-				if (fl == -1) {
-					tst_brkm(TBROK, cleanup,
-						 "fcntl failed");
-					tst_exit();
-				}
-				if ((fl & O_NONBLOCK) == 0) {
-					tst_resm(TFAIL,
-						 "socketpair(SOCK_NONBLOCK) does not set non-blocking mode for fds[%d]",
-						 i);
-					cleanup();
-					tst_exit();
-				}
-				close(fds[i]);
-			}
-			tst_resm(TPASS, "socketpair(SOCK_NONBLOCK) PASSED");
-			cleanup();
-		}
+	if (socketpair(PF_UNIX, SOCK_STREAM, 0, fds) == -1) {
+		tst_brkm(TFAIL, cleanup, "socketpair(0) failed");
 	}
+	for (i = 0; i < (sizeof(fds) / sizeof(fds[0])); i++) {
+		fl = fcntl(fds[i], F_GETFL);
+		if (fl == -1) {
+			tst_brkm(TBROK, cleanup, "fcntl failed");
+		}
+		if (fl & O_NONBLOCK) {
+			tst_brkm(TFAIL, cleanup,
+			    "socketpair(0) set non-blocking mode for fds[%d]",
+			    i);
+		}
+		close(fds[i]);
+	}
+
+	if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, fds) == -1) {
+		tst_brkm(TFAIL, cleanup, "socketpair(SOCK_NONBLOCK) failed");
+	}
+	for (i = 0; i < (sizeof(fds) / sizeof(fds[0])); i++) {
+		fl = fcntl(fds[i], F_GETFL);
+		if (fl == -1) {
+			tst_brkm(TBROK, cleanup, "fcntl failed");
+		}
+		if ((fl & O_NONBLOCK) == 0) {
+			tst_brkm(TFAIL, cleanup,
+			    "socketpair(SOCK_NONBLOCK) didn't set non-blocking "
+			    "mode for fds[%d]", i);
+		}
+		close(fds[i]);
+	}
+	tst_resm(TPASS, "socketpair(SOCK_NONBLOCK) PASSED");
+	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sockioctl/sockioctl01.c b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
index 1b71012..973a508 100644
--- a/testcases/kernel/syscalls/sockioctl/sockioctl01.c
+++ b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
@@ -137,7 +137,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -168,7 +172,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/splice/splice02.c b/testcases/kernel/syscalls/splice/splice02.c
index 3f4cd87..d919478 100644
--- a/testcases/kernel/syscalls/splice/splice02.c
+++ b/testcases/kernel/syscalls/splice/splice02.c
@@ -133,7 +133,11 @@
             tst_exit();
 	}
 	fd=open(av[1], O_WRONLY | O_CREAT | O_TRUNC, 0644);
+<<<<<<< HEAD
 	if (fd < 0) {
+=======
+	if (fd < 0 ) {
+>>>>>>> master
 		tst_resm(TFAIL, "open(%s) failed - errno = %d : %s", av[1], errno, strerror(errno));
 	   cleanup();
 	   tst_exit();
diff --git a/testcases/kernel/syscalls/ssetmask/ssetmask01.c b/testcases/kernel/syscalls/ssetmask/ssetmask01.c
index 163c189..6dbbc72 100644
--- a/testcases/kernel/syscalls/ssetmask/ssetmask01.c
+++ b/testcases/kernel/syscalls/ssetmask/ssetmask01.c
@@ -118,7 +118,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
diff --git a/testcases/kernel/syscalls/stat/stat01.c b/testcases/kernel/syscalls/stat/stat01.c
index ffcacda..4aa5658 100644
--- a/testcases/kernel/syscalls/stat/stat01.c
+++ b/testcases/kernel/syscalls/stat/stat01.c
@@ -88,8 +88,8 @@
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
 int exp_enos[] = { 0 };
-uid_t User_id;			/* Owner id of the test file */
-gid_t Group_id;			/* Group id of the test file */
+uid_t user_id;			/* Owner id of the test file */
+gid_t group_id;			/* Group id of the test file */
 char nobody_uid[] = "nobody";
 struct passwd *ltpuser;
 
@@ -104,10 +104,8 @@
 
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	 /*NOTREACHED*/}
 
 	/* Perform global setup for test */
 	setup();
@@ -143,8 +141,8 @@
 				 * Verify the data returned by stat(2)
 				 * aganist the expected data.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id) ||
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id) ||
 				    (stat_buf.st_size != FILE_SIZE) ||
 				    ((stat_buf.st_mode & MASK) != FILE_MODE)) {
 					tst_resm(TFAIL, "Functionality of "
@@ -164,7 +162,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -187,7 +185,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -210,7 +208,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
 			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Fill the test buffer with the known data */
 	for (i = 0; i < BUF_SIZE; i++) {
@@ -223,7 +221,7 @@
 			tst_brkm(TBROK, cleanup,
 				 "write(2) on %s Failed, errno=%d : %s",
 				 TESTFILE, errno, strerror(errno));
-		 /*NOTREACHED*/} else {
+		 } else {
 			write_len += wbytes;
 		}
 	}
@@ -235,8 +233,8 @@
 	}
 
 	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
+	user_id = getuid();
+	group_id = getgid();
 
 }				/* End setup() */
 
@@ -255,7 +253,4 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/stat/stat02.c b/testcases/kernel/syscalls/stat/stat02.c
index 5577687..c9044eb 100644
--- a/testcases/kernel/syscalls/stat/stat02.c
+++ b/testcases/kernel/syscalls/stat/stat02.c
@@ -90,8 +90,8 @@
 int TST_TOTAL = 1;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
 int exp_enos[] = { 0 };
-uid_t User_id;			/* eff. user id/group id of test process */
-gid_t Group_id;
+uid_t user_id;			/* eff. user id/group id of test process */
+gid_t group_id;
 char nobody_uid[] = "nobody";
 struct passwd *ltpuser;
 
@@ -105,11 +105,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
 
 	/* Perform global setup for test */
 	setup();
@@ -145,8 +142,8 @@
 				 * Verify the data returned by stat(2)
 				 * aganist the expected data.
 				 */
-				if ((stat_buf.st_uid != User_id) ||
-				    (stat_buf.st_gid != Group_id) ||
+				if ((stat_buf.st_uid != user_id) ||
+				    (stat_buf.st_gid != group_id) ||
 				    (stat_buf.st_size != FILE_SIZE) ||
 				    ((stat_buf.st_mode & MASK) != NEW_MODE)) {
 					tst_resm(TFAIL, "Functionality of "
@@ -164,9 +161,8 @@
 		Tst_count++;	/* incr TEST_LOOP counter */
 	}			/* End for TEST_LOOPING */
 
-	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -190,7 +186,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -213,7 +209,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
 			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Fill the test buffer with the known data */
 	for (i = 0; i < BUF_SIZE; i++) {
@@ -223,29 +219,24 @@
 	/* Write to the file 1k data from the buffer */
 	while (write_len < FILE_SIZE) {
 		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		 /*NOTREACHED*/} else {
+			tst_brkm(TBROK|TERRNO, cleanup, "write to %s failed", TESTFILE);
+		} else {
 			write_len += wbytes;
 		}
 	}
 
 	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
+		tst_resm(TWARN|TERRNO, "closing %s failed", TESTFILE);
 	}
 
 	/* Modify mode permissions on the testfile */
 	if (chmod(TESTFILE, NEW_MODE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "chmod(2) on %s Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK|TERRNO, cleanup, "chmodding %s failed", TESTFILE);
+	 }
 
 	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
+	user_id = getuid();
+	group_id = getgid();
 
 }				/* End setup() */
 
@@ -264,7 +255,4 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/stat/stat03.c b/testcases/kernel/syscalls/stat/stat03.c
index aec9d0a..e10cec6 100644
--- a/testcases/kernel/syscalls/stat/stat03.c
+++ b/testcases/kernel/syscalls/stat/stat03.c
@@ -151,11 +151,8 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, NULL, NULL);
-	if (msg != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	 /*NOTREACHED*/}
 
 	/*
 	 * Invoke setup function to call individual test setup functions
@@ -216,7 +213,7 @@
 	 * in the setup().
 	 */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -237,7 +234,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -300,25 +297,25 @@
 	/* Creat a test directory */
 	if (mkdir(DIR_TEMP, MODE_RWX) < 0) {
 		tst_brkm(TBROK, cleanup, "mkdir(2) of %s failed", DIR_TEMP);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Creat a test file under above test directory */
 	if ((fd = open(TEST_FILE1, O_RDWR | O_CREAT, 0666)) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	/* Close the test file */
 	if (close(fd) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Modify mode permissions on test directory */
 	if (chmod(DIR_TEMP, FILE_MODE) < 0) {
 		tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", DIR_TEMP);
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
@@ -340,13 +337,13 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(2) on t_file failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	/* Close the test file created above */
 	if (close(fd) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "close(t_file) Failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
@@ -390,7 +387,4 @@
 
 	/* Remove files and temporary directory created */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/stat/stat05.c b/testcases/kernel/syscalls/stat/stat05.c
index cc06ff4..2aa2fe7 100644
--- a/testcases/kernel/syscalls/stat/stat05.c
+++ b/testcases/kernel/syscalls/stat/stat05.c
@@ -136,23 +136,14 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -166,13 +157,8 @@
 		/* check return code */
 		if (TEST_RETURN == -1) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL,
-				 "stat(%s, &statter) Failed, errno=%d : %s",
-				 fname, TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TFAIL, "stat(%s, &statter) failed", fname);
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS,
@@ -183,12 +169,9 @@
 
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
+	tst_exit();
 
-	return 0;
 }				/* End main */
 
 /***************************************************************
@@ -213,8 +196,8 @@
 	}
 
 	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			 fname, errno, strerror(errno));
+		tst_resm(TWARN|TERRNO, "close(%s) failed",
+			 fname);
 	}
 }				/* End setup() */
 
@@ -232,7 +215,4 @@
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/statfs/statfs01.c b/testcases/kernel/syscalls/statfs/statfs01.c
index 552753d..336ecb9 100644
--- a/testcases/kernel/syscalls/statfs/statfs01.c
+++ b/testcases/kernel/syscalls/statfs/statfs01.c
@@ -139,6 +139,9 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+
 	setup();
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/statfs/statfs03.c b/testcases/kernel/syscalls/statfs/statfs03.c
index be5fbd2..b2b5b6f 100644
--- a/testcases/kernel/syscalls/statfs/statfs03.c
+++ b/testcases/kernel/syscalls/statfs/statfs03.c
@@ -57,7 +57,6 @@
 #include "usctest.h"
 #include <pwd.h>
 
-extern char *TESTDIR;
 char *TCID = "statfs03";
 int TST_TOTAL = 1;
 int fileHandle = 0;
@@ -136,9 +135,9 @@
 
 	/* make a temporary directory and cd to it */
 	tst_tmpdir();
-	if (chmod(TESTDIR, S_IRWXU) == -1)
-		tst_brkm(TBROK, cleanup, "chmod(%s,700) failed; errno %d: %s",
-			 TESTDIR, errno, strerror(errno));
+	if (chmod(get_tst_tmpdir(), S_IRWXU) == -1)
+		tst_brkm(TBROK|TERRNO, cleanup, "chmod(%s, 700) failed",
+			 get_tst_tmpdir());
 
 	/* create a test file */
 	sprintf(fname, "%s.%d", fname, getpid());
@@ -147,15 +146,16 @@
 	} else {
 		sprintf(path, "%s/%s", fname, fname);
 		if ((fileHandle = creat(path, 0444)) == -1) {
-			tst_resm(TFAIL, "creat (2) FAILED to creat temp file");
+			tst_brkm(TFAIL|TERRNO, "creat (2) FAILED to creat temp file");
 		}
 	}
 
 	ltpuser = getpwnam(nobody_uid);
+	if (ltpuser == NULL)
+		tst_brkm(TBROK|TERRNO, cleanup, "getpwnam failed");
 	if (seteuid(ltpuser->pw_uid) == -1) {
-		tst_resm(TINFO, "seteuid failed to "
+		tst_resm(TINFO|TERRNO, "seteuid failed to "
 			 "to set the effective uid to %d", ltpuser->pw_uid);
-		perror("seteuid");
 	}
 
 }
diff --git a/testcases/kernel/syscalls/statvfs/statvfs01.c b/testcases/kernel/syscalls/statvfs/statvfs01.c
index 8080b5f..f11f762 100644
--- a/testcases/kernel/syscalls/statvfs/statvfs01.c
+++ b/testcases/kernel/syscalls/statvfs/statvfs01.c
@@ -60,45 +60,28 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-	/***************************************************************
-	 * parse standard options
-	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-	/***************************************************************
-	* perform global setup for test
-	***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-	/***************************************************************
-	* check looping state if -c option given
-	***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
 		Tst_count = 0;
 
-		/*
-		 * TEST CASE:
-		 * statvfs
-		 */
-		;
-
 		/* Call statvfs(2) */
 		TEST(statvfs(TEST_PATH, &buf));
 
 		/* check return code */
 		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL|TTERRNO,
-				 "statvfs - Basic sanity test failed");
+			tst_resm(TFAIL|TERRNO, "statvfs(%s, ...) failed",
+			    TEST_PATH);
 		} else {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TPASS, "statvfs - Basic sanity test,PASS");
+			tst_resm(TPASS, "statvfs(%s, ...) passed");
 		}
 
 	}			/* End for TEST_LOOPING */
@@ -116,7 +99,7 @@
 
 	cleanup();
 	tst_exit();
-}				/* End main */
+}
 
 /***************************************************************
  * setup() - performs all ONE TIME setup for this test.
@@ -128,7 +111,7 @@
 
 	/* Pause if that option was specified */
 	TEST_PAUSE;
-}				/* End setup() */
+}
 
 /***************************************************************
  * cleanup() - performs all ONE TIME cleanup for this test at
@@ -141,4 +124,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-}				/* End cleanup() */
+}
diff --git a/testcases/kernel/syscalls/stime/stime01.c b/testcases/kernel/syscalls/stime/stime01.c
index 67c5bb2..02161fc 100644
--- a/testcases/kernel/syscalls/stime/stime01.c
+++ b/testcases/kernel/syscalls/stime/stime01.c
@@ -99,11 +99,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -127,7 +131,7 @@
 		 * to as far as clock skew is concerned :P.
 		 */
 		if (gettimeofday(&real_time_tv, NULL) < 0) {
-			tst_brkm(TBROK|TERRNO, tst_exit,
+			tst_brkm(TBROK|TERRNO, NULL,
 				"failed to get current time via gettimeofday(2)");
 		}
 
@@ -207,7 +211,7 @@
 
 	/* Check that the test process id is super/root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit,
+		tst_brkm(TBROK, NULL,
 			"you must be root to execute this test!");
 	}
 
diff --git a/testcases/kernel/syscalls/stime/stime02.c b/testcases/kernel/syscalls/stime/stime02.c
index 81dc793..baf3d1d 100644
--- a/testcases/kernel/syscalls/stime/stime02.c
+++ b/testcases/kernel/syscalls/stime/stime02.c
@@ -97,7 +97,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -140,7 +144,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -156,7 +160,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -172,7 +176,7 @@
 	if ((curr_time = time(&tloc)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "time() failed to get current time, errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Get the system's new time */
 	new_time = curr_time + INCR_TIME;
diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c
index 805034b..436096c 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff01.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff01.c
@@ -97,9 +97,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -136,7 +142,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	/*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -147,7 +153,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/swapoff/swapoff02.c b/testcases/kernel/syscalls/swapoff/swapoff02.c
index c224739..4c45cfc 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff02.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff02.c
@@ -126,9 +126,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -188,7 +194,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/*End of main */
 
 /*
@@ -245,7 +251,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/swapon/swapon01.c b/testcases/kernel/syscalls/swapon/swapon01.c
index 84c310c..0c53f87 100644
--- a/testcases/kernel/syscalls/swapon/swapon01.c
+++ b/testcases/kernel/syscalls/swapon/swapon01.c
@@ -142,7 +142,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Pause if that option was specified */
diff --git a/testcases/kernel/syscalls/swapon/swapon02.c b/testcases/kernel/syscalls/swapon/swapon02.c
index b6041d6..0bec18d 100644
--- a/testcases/kernel/syscalls/swapon/swapon02.c
+++ b/testcases/kernel/syscalls/swapon/swapon02.c
@@ -143,9 +143,8 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	/* perform global setup for test */
 	uname(&uval);
@@ -364,7 +363,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* make a temp directory and cd to it */
diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
index e845d43..6f88bbe 100644
--- a/testcases/kernel/syscalls/swapon/swapon03.c
+++ b/testcases/kernel/syscalls/swapon/swapon03.c
@@ -448,7 +448,7 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* make a temp directory and cd to it */
diff --git a/testcases/kernel/syscalls/symlink/symlink02.c b/testcases/kernel/syscalls/symlink/symlink02.c
index 1bd7fab..d189210 100644
--- a/testcases/kernel/syscalls/symlink/symlink02.c
+++ b/testcases/kernel/syscalls/symlink/symlink02.c
@@ -138,7 +138,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/symlink/symlink03.c b/testcases/kernel/syscalls/symlink/symlink03.c
index e7aca2c..6dfb611 100644
--- a/testcases/kernel/syscalls/symlink/symlink03.c
+++ b/testcases/kernel/syscalls/symlink/symlink03.c
@@ -159,11 +159,15 @@
 	int ind;		/* counter to test different test conditions */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Invoke setup function to call individual test setup functions
@@ -224,7 +228,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -249,7 +253,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1)
@@ -301,23 +305,23 @@
 
 	if (mkdir(DIR_TEMP, MODE_RWX) < 0) {
 		tst_brkm(TBROK, cleanup, "mkdir(2) of %s failed", DIR_TEMP);
-	 /*NOTREACHED*/}
+	 }
 
 	if ((fd = open(TEST_FILE1, O_RDWR | O_CREAT, 0666)) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (close(fd) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Modify mode permissions on test directory */
 	if (chmod(DIR_TEMP, FILE_MODE) < 0) {
 		tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", DIR_TEMP);
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
@@ -333,18 +337,18 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (close(fd) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s",
 			 TEST_FILE2, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	if (symlink(TEST_FILE2, SYM_FILE2) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "symlink() Fails to create %s in setup2, error=%d",
 			 SYM_FILE2, errno);
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
@@ -382,11 +386,11 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(2) on t_file failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	if (close(fd) == -1) {
 		tst_brkm(TBROK, cleanup, "close(t_file) Failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
diff --git a/testcases/kernel/syscalls/symlink/symlink04.c b/testcases/kernel/syscalls/symlink/symlink04.c
index 9732d22..af406c1 100644
--- a/testcases/kernel/syscalls/symlink/symlink04.c
+++ b/testcases/kernel/syscalls/symlink/symlink04.c
@@ -97,11 +97,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -140,7 +144,7 @@
 					tst_brkm(TFAIL, cleanup, "lstat(2) of "
 						 "%s failed, error:%d", SYMFILE,
 						 errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/* Check if the st_mode contains a link  */
 				if (!S_ISLNK(stat_buf.st_mode)) {
@@ -162,13 +166,13 @@
 			tst_brkm(TBROK, cleanup,
 				 "unlink(%s) Failed, errno=%d : %s",
 				 SYMFILE, errno, strerror(errno));
-		 /*NOTREACHED*/}
+		 }
 		Tst_count++;	/* incr TEST_LOOP counter */
 	}			/* End for TEST_LOOPING */
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -200,7 +204,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
 			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Close the temporary file created above */
 	if (close(fd) == -1) {
diff --git a/testcases/kernel/syscalls/symlink/symlink05.c b/testcases/kernel/syscalls/symlink/symlink05.c
index 2beb907..ea5673b 100644
--- a/testcases/kernel/syscalls/symlink/symlink05.c
+++ b/testcases/kernel/syscalls/symlink/symlink05.c
@@ -97,11 +97,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -141,7 +145,7 @@
 					tst_brkm(TFAIL, cleanup, "lstat(2) of "
 						 "%s failed, error:%d",
 						 SYMFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/* Check if the st_mode contains a link  */
 				if (!S_ISLNK(stat_buf.st_mode)) {
@@ -169,7 +173,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
index 44bb52c..7035b80 100644
--- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
@@ -151,7 +151,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/sync/sync01.c b/testcases/kernel/syscalls/sync/sync01.c
index 955214e..d210374 100644
--- a/testcases/kernel/syscalls/sync/sync01.c
+++ b/testcases/kernel/syscalls/sync/sync01.c
@@ -133,7 +133,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/sync/sync02.c b/testcases/kernel/syscalls/sync/sync02.c
index 08c7698..2794e66 100644
--- a/testcases/kernel/syscalls/sync/sync02.c
+++ b/testcases/kernel/syscalls/sync/sync02.c
@@ -97,10 +97,16 @@
 	char read_buffer[BUFSIZ];	/* buffer used to read data from file */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+	if (msg != NULL) {
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	/* Perform global setup for test */
 	setup();
@@ -129,7 +135,7 @@
 					tst_brkm(TFAIL, cleanup, "lseek() "
 						 "failed on %s, error=%d",
 						 TEMP_FILE, errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/* Read the contents of file */
 				if (read(fildes, read_buffer,
@@ -147,7 +153,7 @@
 					tst_brkm(TFAIL, cleanup,
 						 "read() Fails on %s, error=%d",
 						 TEMP_FILE, errno);
-				 /*NOTREACHED*/}
+				 }
 			} else {
 				tst_resm(TPASS, "call succeeded");
 			}
@@ -157,7 +163,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -191,7 +197,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR | O_CREAT, %#o) Failed, errno=%d :%s",
 			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Write the buffer data into file */
 	if (write(fildes, write_buffer, strlen(write_buffer) + 1) !=
@@ -199,7 +205,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "write() failed to write buffer data to %s",
 			 TEMP_FILE);
-	 /*NOTREACHED*/}
+	 }
 
 }				/* End setup() */
 
diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
index b56c8ca..ee75611 100644
--- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
@@ -123,12 +123,11 @@
 	unsigned int flags;
 	int error;
 } test_data[] = {
-	{
-	&bfd, 0, 1, SYNC_FILE_RANGE_WRITE, EBADF}, {
-	&sfd, 0, 1, SYNC_FILE_RANGE_WAIT_AFTER, ESPIPE}, {
-	&filed, -1, 1, SYNC_FILE_RANGE_WAIT_BEFORE, EINVAL}, {
-	&filed, 0, -1, SYNC_FILE_RANGE_WRITE, EINVAL}, {
-	&filed, 0, 1, SYNC_FILE_RANGE_INVALID, EINVAL}
+	{ &bfd, 0, 1, SYNC_FILE_RANGE_WRITE, EBADF},
+	{ &sfd, 0, 1, SYNC_FILE_RANGE_WAIT_AFTER, ESPIPE},
+	{ &filed, -1, 1, SYNC_FILE_RANGE_WAIT_BEFORE, EINVAL},
+	{ &filed, 0, -1, SYNC_FILE_RANGE_WRITE, EINVAL},
+	{ &filed, 0, 1, SYNC_FILE_RANGE_INVALID, EINVAL}
 };
 
 int TST_TOTAL = sizeof(test_data) / sizeof(test_data[0]);
@@ -161,15 +160,11 @@
 
 	/* close the file we have open */
 	if (close(filed) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", filename,
-			 errno, strerror(errno));
+		tst_resm(TWARN|TERRNO, "close(%s) failed", filename);
 	}
 
 	/* Remove tmp dir and all files in it */
 	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }
 
 /* Local  Functions */
@@ -203,15 +198,11 @@
 
 	sprintf(filename, "tmpfile_%d", getpid());
 	if ((filed = open(filename, O_RDWR | O_CREAT, 0700)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-			 filename, errno, strerror(errno));
-
+		tst_brkm(TBROK|TERRNO, cleanup,
+			 "open(%s, O_RDWR|O_CREAT,0700) failed", filename);
 	}
 
-	sfd = open(spl_file, O_RDWR | O_CREAT, 0700);
-
-	return;
+	sfd = open(spl_file, O_RDWR|O_CREAT, 0700);
 }
 
 /*****************************************************************************
@@ -258,71 +249,55 @@
 /*	     On success - exits with 0 exit value.			  */
 /*									    */
 /******************************************************************************/
-int main(int ac,		/* number of command line parameters		      */
-	 char **av)
-{				/* pointer to the array of the command line parameters.   */
+int main(int ac, char **av)
+{
 
 	int test_index = 0;
-	int lc;
 	char *msg;
 
- /***************************************************************
-	      parse standard options$
-  ********************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 #if defined(__powerpc__) || defined(__powerpc64__)	/* for PPC, kernel version > 2.6.21 needed */
 	if (tst_kvercmp(2, 16, 22) < 0) {
-		tst_resm(TCONF, "System doesn't support execution of the test");
-		tst_exit();
+		tst_brkm(TCONF, NULL, "System doesn't support execution of the test");
 	}
 #else
 	/* For other archs, need kernel version > 2.6.16 */
 
 	if (tst_kvercmp(2, 6, 17) < 0) {
-		tst_resm(TCONF, "System doesn't support execution of the test");
-		tst_exit();
+		tst_brkm(TCONF, NULL, "System doesn't support execution of the test");
 	}
 #endif
 
-/* perform global test setup, call setup() function. */
 	setup();
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping. */
-		Tst_count = 0;
+	for (test_index = 0; test_index < TST_TOTAL; test_index++) {
+		TEST(syncfilerange
+		     (*(test_data[test_index].fd),
+		      test_data[test_index].offset,
+		      test_data[test_index].nbytes,
+		      test_data[test_index].flags));
 
-		for (test_index = 0; test_index < TST_TOTAL; test_index++) {
-			TEST(syncfilerange
-			     (*(test_data[test_index].fd),
-			      test_data[test_index].offset,
-			      test_data[test_index].nbytes,
-			      test_data[test_index].flags));
+		if (TEST_RETURN != -1) {
+			tst_resm(TFAIL,
+				"call succeeded unexpectedly (%ld != -1)",
+				TEST_RETURN);
+			continue;
+		}
 
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL,
-					"call succeeded unexpectedly "
-					"(%ld != -1)", TEST_RETURN);
-				continue;
-			}
+		TEST_ERROR_LOG(TEST_ERRNO);
 
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO == test_data[test_index].error) {
-				tst_resm(TPASS, "expected failure - "
-					 "errno = %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "unexpected error - %d : %s - "
-					 "expected %d", TEST_ERRNO,
-					 strerror(TEST_ERRNO),
-					 test_data[test_index].error);
-			}
+		if (TEST_ERRNO == test_data[test_index].error) {
+			tst_resm(TPASS|TTERRNO, "got expected error");
+		} else {
+			tst_resm(TFAIL|TTERRNO, "got unexpected error; "
+				 "expected %d",
+				 test_data[test_index].error);
 		}
 
 	}
 
 	cleanup();
-	return 0;
+	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/sysctl/sysctl01.c b/testcases/kernel/syscalls/sysctl/sysctl01.c
index 6249b96..f2769ec 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl01.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl01.c
@@ -103,7 +103,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -157,7 +161,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sysctl/sysctl03.c b/testcases/kernel/syscalls/sysctl/sysctl03.c
index 5b9530d..d82b14c 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl03.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl03.c
@@ -192,7 +192,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
@@ -202,7 +202,7 @@
 {
 	/* test must be run as root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* capture signals */
diff --git a/testcases/kernel/syscalls/sysctl/sysctl04.c b/testcases/kernel/syscalls/sysctl/sysctl04.c
index 644fdf2..c7b3fa4 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl04.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl04.c
@@ -97,7 +97,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -138,7 +142,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 /*
diff --git a/testcases/kernel/syscalls/sysctl/sysctl05.c b/testcases/kernel/syscalls/sysctl/sysctl05.c
index 6b06ef5..eea7e66 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl05.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl05.c
@@ -109,7 +109,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();
@@ -156,7 +160,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 #else
diff --git a/testcases/kernel/syscalls/sysfs/sysfs02.c b/testcases/kernel/syscalls/sysfs/sysfs02.c
index 7cf46bb..ce378c1 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs02.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs02.c
@@ -118,7 +118,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /* setup() - performs all ONE TIME setup for this test */
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
index c9ddad2..cbdfbf0 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
@@ -93,8 +93,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* Global setup */
 
@@ -110,7 +114,7 @@
 			/* To gather stats on errnos returned, log the errno */
 			tst_brkm(TFAIL, cleanup, "sysinfo() Failed, errno=%d"
 				 " : %s", TEST_ERRNO, strerror(TEST_ERRNO));
-		 /*NOTREACHED*/} else {
+		 } else {
 			/* Test succeeded */
 
 			/* This portion of the code generates information
@@ -153,7 +157,7 @@
 	}
 
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
index ef4df9f..ffa80a9 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
@@ -92,8 +92,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* Global setup */
 
@@ -113,10 +117,10 @@
 			/* Test Failed */
 			tst_brkm(TFAIL, cleanup, "sysinfo() Failed, Expected -1"
 				 "returned %d/n", TEST_ERRNO);
-		 /*NOTREACHED*/}
+		 }
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/syslog/syslog11.c b/testcases/kernel/syscalls/syslog/syslog11.c
index 8f1be07..b4d4560 100644
--- a/testcases/kernel/syscalls/syslog/syslog11.c
+++ b/testcases/kernel/syscalls/syslog/syslog11.c
@@ -167,7 +167,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 int setup1(void)
@@ -185,7 +185,7 @@
 {
 	/* Change effective user id to root */
 	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "seteuid failed to set the effective"
+		tst_brkm(TBROK, NULL, "seteuid failed to set the effective"
 			 " uid to root");
 	}
 }
@@ -201,13 +201,13 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	/* Check for nobody_uid user id */
 	if ((ltpuser = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "nobody user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
+		
 	}
 
 	/* Pause if that option was specified
@@ -232,4 +232,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/syslog/syslog12.c b/testcases/kernel/syscalls/syslog/syslog12.c
index ab98b80..58a3315 100644
--- a/testcases/kernel/syscalls/syslog/syslog12.c
+++ b/testcases/kernel/syscalls/syslog/syslog12.c
@@ -190,7 +190,7 @@
 	}
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }
 
 int setup1(void)
@@ -208,7 +208,7 @@
 {
 	/* Change effective user id to root */
 	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, tst_exit, "seteuid failed to set the effective"
+		tst_brkm(TBROK, NULL, "seteuid failed to set the effective"
 			 " uid to root");
 	}
 }
@@ -224,13 +224,13 @@
 
 	/* Check whether we are root  */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Must be root for this test!");
-	 /*NOTREACHED*/}
+		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	 }
 
 	/* Check for nobody_uid user id */
 	if ((ltpuser = getpwnam("nobody")) == NULL) {
-		tst_brkm(TBROK, tst_exit, "nobody user id doesn't exist");
-		/* NOTREACHED */
+		tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
+		
 	}
 
 	/* set the expected errnos... */
@@ -258,4 +258,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 5269016..6f01ea4 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -94,7 +94,11 @@
 	 * parse standard options
 	 */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/*
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/time/time01.c b/testcases/kernel/syscalls/time/time01.c
index 642e2f5..848dd3e 100644
--- a/testcases/kernel/syscalls/time/time01.c
+++ b/testcases/kernel/syscalls/time/time01.c
@@ -130,23 +130,14 @@
 	int lc;			/* loop counter */
 	char *msg;		/* message returned from parse_opts */
 
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
 	setup();
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		/* reset Tst_count in case we are looping. */
@@ -163,9 +154,6 @@
 			tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
 				 TEST_ERRNO, strerror(TEST_ERRNO));
 		} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
 			if (STD_FUNCTIONAL_TEST) {
 				/* No Verification test, yet... */
 				tst_resm(TPASS, "time(0) returned %ld",
@@ -174,12 +162,9 @@
 		}
 	}			/* End for TEST_LOOPING */
 
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
 	cleanup();
 
-	return 0;
+	tst_exit();
 }				/* End main */
 
 /***************************************************************
@@ -207,7 +192,4 @@
 	 * print errno log if that option was specified.
 	 */
 	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
 }				/* End cleanup() */
diff --git a/testcases/kernel/syscalls/time/time02.c b/testcases/kernel/syscalls/time/time02.c
index fa1d3ce..75bc1ba 100644
--- a/testcases/kernel/syscalls/time/time02.c
+++ b/testcases/kernel/syscalls/time/time02.c
@@ -93,7 +93,11 @@
 	time_t tloc;		/* time_t variables for time(2) */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -147,7 +151,7 @@
 
 	/* cleanup and exit */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
index b129d29..2fef966 100644
--- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
@@ -130,7 +130,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
@@ -160,7 +164,11 @@
 
 		ENTER(0);
                 TEST( syscall(__NR_timer_getoverrun, -1 ));
+<<<<<<< HEAD
                 if (TEST_RETURN < 0 && TEST_ERRNO == EINVAL) {
+=======
+                if (TEST_RETURN < 0 && TEST_ERRNO == EINVAL ) {
+>>>>>>> master
                         tst_resm(TPASS, "Block %d: test %d PASSED", block, Tst_count );
                 } else {
                         tst_resm(TFAIL, "Block %d: test %d FAILED... errno = %d : %s", block, Tst_count,TEST_ERRNO, strerror(TEST_ERRNO) );
diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
index 9a662bb..85fc49c 100644
--- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
@@ -81,11 +81,11 @@
 /*                                                                            */
 /******************************************************************************/
 extern void cleanup() {
-        /* Remove tmp dir and all files in it */
-        TEST_CLEANUP;
-        tst_rmdir();
-        /* Exit with appropriate return code. */
-        tst_exit();
+	/* Remove tmp dir and all files in it */
+	TEST_CLEANUP;
+	tst_rmdir();
+	/* Exit with appropriate return code. */
+	tst_exit();
 }
 
 /* Local  Functions */
@@ -107,15 +107,15 @@
 /*                                                                            */
 /******************************************************************************/
 void setup() {
-        /* Capture signals if any */
-        /* Create temporary directories */
-        TEST_PAUSE;
+	/* Capture signals if any */
+	/* Create temporary directories */
+	TEST_PAUSE;
 
-        tst_tmpdir();
+	tst_tmpdir();
 }
 
 #define ENTER(normal) tst_resm(TINFO, "Enter block %d: test %d (%s)", \
-                         block, Tst_count, normal?"NORMAL":"ERROR");
+		 block, Tst_count, normal?"NORMAL":"ERROR");
 
 char tmpname[40];
 int parent;
@@ -124,81 +124,81 @@
 
 
 int main(int ac, char **av) {
-        int lc;                 /* loop counter */
-        char *msg;              /* message returned from parse_opts */
+	int lc;                 /* loop counter */
+	char *msg;              /* message returned from parse_opts */
 
-        kernel_timer_t created_timer_id;
-        struct sigevent ev;
-        struct itimerspec spec;
+	kernel_timer_t created_timer_id;
+	struct sigevent ev;
+	struct itimerspec spec;
 
-	
-        /* parse standard options */
-        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-             tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-             tst_exit();
-           }
+	/* parse standard options */
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-        setup();
+	setup();
 
-        /* Check looping state if -i option given */
-        for (lc = 0; TEST_LOOPING(lc); ++lc) {
-                Tst_count = 0;
-	        for (testno = 0; testno < TST_TOTAL; ++testno) {
-                     ENTER(1);
-	                ev.sigev_value = (sigval_t)0;
-	                ev.sigev_signo = SIGALRM;
-	                ev.sigev_notify = SIGEV_SIGNAL;
-	                TEST(syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &created_timer_id ));
-			TEST( syscall(__NR_timer_gettime, created_timer_id, &spec ));
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+		Tst_count = 0;
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
+			ENTER(1);
+			ev.sigev_value = (sigval_t)0;
+			ev.sigev_signo = SIGALRM;
+			ev.sigev_notify = SIGEV_SIGNAL;
+			TEST(syscall(__NR_timer_create, CLOCK_REALTIME, &ev,
+				&created_timer_id));
+			TEST(syscall(__NR_timer_gettime, created_timer_id,
+				&spec));
 			if (TEST_RETURN == 0) {
-			      tst_resm(TPASS, "Block %d: test %d PASSED", block, Tst_count );
-	                } else {
-				tst_resm(TFAIL, "Block %d: test %d FAILED... errno = %d : %s", block, Tst_count,TEST_ERRNO, strerror(TEST_ERRNO) );
-				cleanup();
-        			tst_exit();
-			 }
-	
+				tst_resm(TPASS, "Block %d: test %d PASSED",
+					block, Tst_count);
+			} else {
+				tst_brkm(TFAIL|TERRNO, cleanup,
+				    "Block %d: test %d FAILED",
+				    block, Tst_count);
+			}
 
-			
 /*
 
 ERRORS
        -EINVAL
-              An invalid timer_id value was specified.
+	      An invalid timer_id value was specified.
 */
-                ENTER(0);
-                TEST( syscall(__NR_timer_gettime, -1, &spec ));
-		if (TEST_RETURN < 0 && TEST_ERRNO == EINVAL) {
-                        tst_resm(TPASS, "Block %d: test %d PASSED", block, Tst_count );
-	        } else {
-			tst_resm(TFAIL, "Block %d: test %d FAILED... errno = %d : %s", block, Tst_count,TEST_ERRNO, strerror(TEST_ERRNO) );
-			cleanup();
-        		tst_exit();
-                }
+			ENTER(0);
+			TEST(syscall(__NR_timer_gettime, -1, &spec));
+			if (TEST_RETURN < 0 && TEST_ERRNO == EINVAL) {
+				tst_resm(TPASS,
+				    "Block %d: test %d PASSED",
+				    block, Tst_count);
+			} else {
+				tst_brkm(TFAIL|TERRNO, cleanup,
+				    "Block %d: test %d FAILED",
+				    block, Tst_count);
+			}
 
 /*
 
        -EFAULT
-              An invalid address of setting was specified.
+	      An invalid address of setting was specified.
 */
 
+			ENTER(0);
+			TEST(syscall(__NR_timer_gettime, created_timer_id,
+			    NULL));
+			if (TEST_RETURN < 0 && TEST_ERRNO == EFAULT ) {
+				tst_resm(TPASS,
+				    "Block %d: test %d PASSED",
+				    block, Tst_count);
+			} else {
+				tst_brkm(TFAIL|TERRNO, cleanup,
+				    "Block %d: test %d FAILED",
+				    block, Tst_count);
+			}
 
-                ENTER(0);
-                TEST( syscall(__NR_timer_gettime, created_timer_id, NULL ));
-		if (TEST_RETURN < 0 && TEST_ERRNO == EFAULT) {
-                       tst_resm(TPASS, "Block %d: test %d PASSED", block, Tst_count );
-	        } else {
-			tst_resm(TFAIL, "Block %d: test %d FAILED... errno = %d : %s", block, Tst_count,TEST_ERRNO, strerror(TEST_ERRNO) );
-			cleanup();
-        		tst_exit();
-                }
+		}
+	}
 
-
-
-
-                }
-        }	
 	cleanup();
-        tst_exit();
-}
+	tst_exit();
 
+}
diff --git a/testcases/kernel/syscalls/timerfd/timerfd02.c b/testcases/kernel/syscalls/timerfd/timerfd02.c
index 043fc66..58183bf 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd02.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd02.c
@@ -142,7 +142,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/timerfd/timerfd03.c b/testcases/kernel/syscalls/timerfd/timerfd03.c
index 4a4ca8f..9f16683 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd03.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd03.c
@@ -138,7 +138,11 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(argc, argv, NULL, NULL);
+=======
+	msg = parse_opts(argc, argv, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/times/times01.c b/testcases/kernel/syscalls/times/times01.c
index 3b403bf..2108b39 100644
--- a/testcases/kernel/syscalls/times/times01.c
+++ b/testcases/kernel/syscalls/times/times01.c
@@ -137,7 +137,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/times/times03.c b/testcases/kernel/syscalls/times/times03.c
index 4f3ec76..b802f40 100644
--- a/testcases/kernel/syscalls/times/times03.c
+++ b/testcases/kernel/syscalls/times/times03.c
@@ -160,7 +160,7 @@
 			pid2 = FORK_OR_VFORK();
 			if (pid2 < 0) {
 				tst_brkm(TFAIL, cleanup, "Fork failed");
-			 /*NOTREACHED*/} else if (pid2 == 0) {
+			 } else if (pid2 == 0) {
 
 				/* Spend some cycles in userspace */
 
@@ -237,7 +237,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -303,4 +303,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/tkill/tkill02.c b/testcases/kernel/syscalls/tkill/tkill02.c
index 6b6ec3c..130cb75 100644
--- a/testcases/kernel/syscalls/tkill/tkill02.c
+++ b/testcases/kernel/syscalls/tkill/tkill02.c
@@ -58,7 +58,6 @@
 /* Global Variables */
 char *TCID = "tkill02";  /* Test program identifier.*/
 int  testno;
-int  TST_TOTAL = 2;		   /* total number of tests in this file.   */
 
 /* Extern Global Functions */
 /******************************************************************************/
@@ -117,55 +116,32 @@
 	{ 99999, ESRCH }
 };
 
+int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]);
+
 int main(int ac, char **av) {
 	int lc;		/* loop counter */
-	char *msg;	/* message returned from parse_opts */
-	int i, succeed=0, fail=0;
-	
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+	int i;
 
 	setup();
 
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		Tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
+	for (i = 0; i < TST_TOTAL; i++) {
 
-			for (i=0; i<2; i++) {
+		TEST(syscall(__NR_tkill, test_cases[i].tid, SIGUSR1));
 
-				TEST(syscall(__NR_tkill, test_cases[i].tid, SIGUSR1));
-
-				if (TEST_RETURN == -1) {
-				    	if (TEST_ERRNO == test_cases[i].exp_errno) {
-						tst_resm(TINFO|TTERRNO,
-							"tkill call with "
-							"tid=%d got expected "
-							"errno",
-							test_cases[i].tid);
-						succeed++;
-					} else {
-						tst_resm(TFAIL|TTERRNO,
-							"tkill call with "
-							"tid=%d got unexpected "
-							"errno",
-							test_cases[i].tid);
-						fail++;
-					}
-				} else {
-					tst_resm(TINFO,
-						"tkill with tid=%d succeeded "
-						"unexpectedly",
-						test_cases[i].tid);
-				}
-			}
-
-			if (fail != 0) {
-				tst_brkm(TFAIL|TERRNO, cleanup, "tkill failed");
+		if (TEST_RETURN == -1) {
+		    	if (TEST_ERRNO == test_cases[i].exp_errno) {
+				tst_resm(TINFO|TTERRNO,
+				    "tkill(%d, SIGUSR1) failed as expected",
+				    test_cases[i].tid);
 			} else {
-				tst_resm(TPASS, "tkill() passed");
+				tst_brkm(TFAIL|TTERRNO, cleanup,
+				    "tkill(%d, SIGUSR1) failed unexpectedly",
+				    test_cases[i].tid);
 			}
+		} else {
+			tst_brkm(TFAIL, cleanup,
+			    "tkill(%d) succeeded unexpectedly",
+			    test_cases[i].tid);
 		}
 	}
 	cleanup();
diff --git a/testcases/kernel/syscalls/truncate/truncate01.c b/testcases/kernel/syscalls/truncate/truncate01.c
index dd5398a..8a8b8c9 100644
--- a/testcases/kernel/syscalls/truncate/truncate01.c
+++ b/testcases/kernel/syscalls/truncate/truncate01.c
@@ -101,7 +101,11 @@
 	off_t file_length;	/* test file length */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -145,7 +149,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed, error:%d",
 						 TESTFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 				stat_buf.st_mode &= ~S_IFREG;
 				file_length = stat_buf.st_size;
 
@@ -172,7 +176,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -213,7 +217,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
 			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Write to the file 1k data from the buffer */
 	while (c_total < FILE_SIZE) {
@@ -221,7 +225,7 @@
 			tst_brkm(TBROK, cleanup,
 				 "write(2) on %s Failed, errno=%d : %s",
 				 TESTFILE, errno, strerror(errno));
-		 /*NOTREACHED*/} else {
+		 } else {
 			c_total += c;
 		}
 	}
@@ -231,7 +235,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s",
 			 TESTFILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 }				/* End setup() */
 
 /*
diff --git a/testcases/kernel/syscalls/truncate/truncate02.c b/testcases/kernel/syscalls/truncate/truncate02.c
index c08213a..db619f9 100644
--- a/testcases/kernel/syscalls/truncate/truncate02.c
+++ b/testcases/kernel/syscalls/truncate/truncate02.c
@@ -108,7 +108,11 @@
 	int err_flag = 0;	/* error indicator flag */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -152,7 +156,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed after 1st truncate, "
 						 "error:%d", TESTFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 				file_length1 = stat_buf.st_size;
 
 				/*
@@ -163,7 +167,7 @@
 					tst_brkm(TFAIL, cleanup, "lseek(2) on "
 						 "%s failed after 1st truncate, "
 						 "error:%d", TESTFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/* Read the testfile from the beginning. */
 				while ((rbytes = read(fd, tst_buff,
@@ -195,7 +199,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed after 2nd truncate, "
 						 "error:%d", TESTFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 				file_length2 = stat_buf.st_size;
 
 				/*
@@ -206,7 +210,7 @@
 					tst_brkm(TFAIL, cleanup, "lseek(2) on "
 						 "%s failed after 2nd truncate, "
 						 "error:%d", TESTFILE, errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/* Read the testfile contents till EOF */
 				while ((rbytes = read(fd, tst_buff,
@@ -243,7 +247,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -283,7 +287,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
 			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Write to the file 1k data from the buffer */
 	while (write_len < FILE_SIZE) {
diff --git a/testcases/kernel/syscalls/truncate/truncate03.c b/testcases/kernel/syscalls/truncate/truncate03.c
index b31f7b5..164b4b2 100644
--- a/testcases/kernel/syscalls/truncate/truncate03.c
+++ b/testcases/kernel/syscalls/truncate/truncate03.c
@@ -149,7 +149,11 @@
 	int ind;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -211,7 +215,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -234,7 +238,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -263,7 +267,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
 			 TEST_FILE1, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Write to the file 1k data from the buffer */
 	while (c_total < FILE_SIZE) {
@@ -271,7 +275,7 @@
 			tst_brkm(TBROK, cleanup,
 				 "write(2) on %s Failed, errno=%d : %s",
 				 TEST_FILE1, errno, strerror(errno));
-		 /*NOTREACHED*/} else {
+		 } else {
 			c_total += c;
 		}
 	}
@@ -281,7 +285,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s",
 			 TEST_FILE1, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 #if !defined(UCLINUX)
 	bad_addr = mmap(0, 1, PROT_NONE,
 			MAP_PRIVATE_EXCEPT_UCLINUX | MAP_ANONYMOUS, 0, 0);
@@ -322,7 +326,7 @@
 	/* Change mode permissions on test file */
 	if (chmod(TEST_FILE1, NEW_MODE) < 0) {
 		tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", TEST_FILE1);
-	 /*NOTREACHED*/}
+	 }
 
 	return 0;
 }				/* End setup() */
@@ -345,13 +349,13 @@
 		tst_brkm(TBROK, cleanup,
 			 "open(2) on t_file failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	/* Close the file created above */
 	if (close(fildes) == -1) {
 		tst_brkm(TBROK, cleanup,
 			 "close(t_file) Failed, errno=%d : %s",
 			 errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 	return 0;
 }
 
diff --git a/testcases/kernel/syscalls/truncate/truncate04.c b/testcases/kernel/syscalls/truncate/truncate04.c
index 5038734..0819404 100644
--- a/testcases/kernel/syscalls/truncate/truncate04.c
+++ b/testcases/kernel/syscalls/truncate/truncate04.c
@@ -106,7 +106,11 @@
 	char *file_name;	/* testfile name */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -152,7 +156,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -170,7 +174,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/umask/umask01.c b/testcases/kernel/syscalls/umask/umask01.c
index 430b2d8..5b981c6 100644
--- a/testcases/kernel/syscalls/umask/umask01.c
+++ b/testcases/kernel/syscalls/umask/umask01.c
@@ -135,7 +135,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/umask/umask02.c b/testcases/kernel/syscalls/umask/umask02.c
index 3d6ee91..e393fe8 100644
--- a/testcases/kernel/syscalls/umask/umask02.c
+++ b/testcases/kernel/syscalls/umask/umask02.c
@@ -72,7 +72,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	setup();
 
@@ -95,7 +95,7 @@
 				 "values");
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -129,4 +129,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/umask/umask03.c b/testcases/kernel/syscalls/umask/umask03.c
index 48ae193..8a127de 100644
--- a/testcases/kernel/syscalls/umask/umask03.c
+++ b/testcases/kernel/syscalls/umask/umask03.c
@@ -75,10 +75,16 @@
 	unsigned low9mode;
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(argc, argv, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+	if ((msg = parse_opts(argc, argv, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -106,7 +112,7 @@
 							 "mask didnot take",
 							 low9mode,
 							 (~mskval & 0777));
-					 /*NOTREACHED*/}
+					 }
 				}
 			}
 			close(fildes);
@@ -116,7 +122,7 @@
 				 "previous value for all masks");
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/umount/umount01.c b/testcases/kernel/syscalls/umount/umount01.c
index 66ac1a2..825a17f 100644
--- a/testcases/kernel/syscalls/umount/umount01.c
+++ b/testcases/kernel/syscalls/umount/umount01.c
@@ -178,7 +178,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -193,7 +193,7 @@
 		if (Fstype != NULL) {
 			free(Fstype);
 		}
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* make a temp directory */
diff --git a/testcases/kernel/syscalls/umount/umount02.c b/testcases/kernel/syscalls/umount/umount02.c
index d20711e..349a337 100644
--- a/testcases/kernel/syscalls/umount/umount02.c
+++ b/testcases/kernel/syscalls/umount/umount02.c
@@ -231,7 +231,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -348,7 +348,7 @@
 		if (Type != NULL) {
 			free(Type);
 		}
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* make a temp directory */
diff --git a/testcases/kernel/syscalls/umount/umount03.c b/testcases/kernel/syscalls/umount/umount03.c
index 21fd504..d449af6 100644
--- a/testcases/kernel/syscalls/umount/umount03.c
+++ b/testcases/kernel/syscalls/umount/umount03.c
@@ -182,7 +182,7 @@
 
 			/* Switch to nobody user */
 			if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-				tst_brkm(TBROK, tst_exit, "\"nobody\" user"
+				tst_brkm(TBROK, NULL, "\"nobody\" user"
 					 "not present");
 			}
 			if (setuid(ltpuser->pw_uid) == -1) {
@@ -221,7 +221,7 @@
 	/* cleanup and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -239,7 +239,7 @@
 		if (Type != NULL) {
 			free(Type);
 		}
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 
 	/* Switch to nobody user */
@@ -247,13 +247,13 @@
 		if (Type != NULL) {
 			free(Type);
 		}
-		tst_brkm(TBROK, tst_exit, "\"nobody\" user not present");
+		tst_brkm(TBROK, NULL, "\"nobody\" user not present");
 	}
 	if (seteuid(ltpuser->pw_uid) == -1) {
 		if (Type != NULL) {
 			free(Type);
 		}
-		tst_brkm(TBROK, tst_exit, "setuid failed to set the "
+		tst_brkm(TBROK, NULL, "setuid failed to set the "
 			 "effective uid to %d", ltpuser->pw_uid);
 	}
 	/* make a temp directory */
diff --git a/testcases/kernel/syscalls/uname/uname01.c b/testcases/kernel/syscalls/uname/uname01.c
index 53e7a95..fb38f75 100644
--- a/testcases/kernel/syscalls/uname/uname01.c
+++ b/testcases/kernel/syscalls/uname/uname01.c
@@ -136,7 +136,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/uname/uname02.c b/testcases/kernel/syscalls/uname/uname02.c
index fb8c91d..7b3fbc0 100644
--- a/testcases/kernel/syscalls/uname/uname02.c
+++ b/testcases/kernel/syscalls/uname/uname02.c
@@ -74,10 +74,16 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -114,7 +120,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/uname/uname03.c b/testcases/kernel/syscalls/uname/uname03.c
index 8c52aa8..0c6f754 100644
--- a/testcases/kernel/syscalls/uname/uname03.c
+++ b/testcases/kernel/syscalls/uname/uname03.c
@@ -75,8 +75,12 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
+	 }
 
 	setup();		/* global setup */
 
@@ -85,7 +89,7 @@
 	if ((buf = (struct utsname *)malloc((size_t)
 					    sizeof(struct utsname))) == NULL) {
 		tst_brkm(TBROK, cleanup, "malloc failed for buf");
-	 /*NOTREACHED*/}
+	 }
 
 	/* The following loop checks looping state if -i option given */
 
@@ -121,7 +125,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/unlink/unlink05.c b/testcases/kernel/syscalls/unlink/unlink05.c
index 2c4b8b0..545645d 100644
--- a/testcases/kernel/syscalls/unlink/unlink05.c
+++ b/testcases/kernel/syscalls/unlink/unlink05.c
@@ -139,7 +139,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
index 5d5945b..5fb89dc 100644
--- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
@@ -105,7 +105,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/unshare/unshare01.c b/testcases/kernel/syscalls/unshare/unshare01.c
index 01aea64..2a2c968 100644
--- a/testcases/kernel/syscalls/unshare/unshare01.c
+++ b/testcases/kernel/syscalls/unshare/unshare01.c
@@ -1,27 +1,27 @@
-/********************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007                                   	*/
-/*                                                                            	*/
-/* This program 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 Software Foundation; either version 2 of the License, or          	*/
-/* (at your option) any later version.                                        	*/
-/*                                                                            	*/
-/* This program is distributed in the hope that it will be useful,            	*/
-/* but WITHOUT ANY WARRANTY;  without even the implied warranty of            	*/
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See                  	*/
-/* the GNU General Public License for more details.                           	*/
-/*                                                                            	*/
-/* You should have received a copy of the GNU General Public License          	*/
-/* along with this program;  if not, write to the Free Software               	*/
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA    	*/
-/*                                                                            	*/
-/******************************************************************************	*/
-/******************************************************************************	*/
-/*                                                                            	*/
-/* File:        unshare01.c                                           	      	*/
-/*                                                                            	*/
-/* Description: This tests the unshare() syscall.                      	      	*/
-/*             unshare() allows a process to disassociate parts of its 		*/
+/*************************************************************************/
+/* Copyright (c) Crackerjack Project., 2007				 */
+/*									 */
+/* This program 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 Software Foundation; either version 2 of the License, or	 */
+/* (at your option) any later version.					 */
+/*									 */
+/* This program is distributed in the hope that it will be useful,	 */
+/* but WITHOUT ANY WARRANTY;  without even the implied warranty of	 */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See		 */
+/* the GNU General Public License for more details.			 */
+/*									 */
+/* You should have received a copy of the GNU General Public License	 */
+/* along with this program;  if not, write to the Free Software	       	 */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA*/
+/*									 */
+/*************************************************************************/
+/*************************************************************************/
+/*									 */
+/* File:	unshare01.c					   	 */
+/*									 */
+/* Description: This tests the unshare() syscall.		      	 */
+/*	     unshare() allows a process to disassociate parts of its	 */ 
 /*		execution context that are currently being shared with other 	*/
 /*		processes. Part of the execution context, such as the namespace	*/
 /*		,is shared implicitly when a new process is created using 	*/
@@ -31,7 +31,7 @@
 /*										*/
 /*		The main use of unshare() is to allow a process to control its	*/ 
 /*		shared execution context without creating a new process.	*/
-/*	         								*/
+/*		 								*/
 /*										*/
 /*		The flags argument is a bit mask that specifies which parts of	*/
 /*		the execution context should be unshared. This argument is 	*/
@@ -57,21 +57,21 @@
 /*										*/
 /*		If flags is specified as zero, then unshare() is a no-op; no 	*/
 /*		changes are made to the calling process's execution context. 	*/
-/*		                                                               	*/
-/* Usage:  <for command-line>                                                 	*/
-/* unshare01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                     		*/
-/*      where,  -c n : Run n copies concurrently.                             	*/
-/*              -e   : Turn on errno logging.                                 	*/
-/*              -i n : Execute test n times.                                  	*/
-/*              -I x : Execute test for x seconds.                            	*/
-/*              -P x : Pause for x seconds between iterations.                	*/
-/*              -t   : Turn on syscall timing.                                	*/
-/*                                                                            	*/
-/* Total Tests: 1                                                             	*/
-/*                                                                            	*/
-/* Test Name:   unshare01                                             		*/
-/* History:     Porting from Crackerjack to LTP is done by                    	*/
-/*              Manas Kumar Nayak maknayak@in.ibm.com>                        	*/
+/*									       	*/
+/* Usage:  <for command-line>						 	*/
+/* unshare01 [-c n] [-e][-i n] [-I x] [-p x] [-t]		     		*/
+/*      where,  -c n : Run n copies concurrently.			     	*/
+/*	      -e   : Turn on errno logging.				 	*/
+/*	      -i n : Execute test n times.				  	*/
+/*	      -I x : Execute test for x seconds.			    	*/
+/*	      -P x : Pause for x seconds between iterations.			*/
+/*	      -t   : Turn on syscall timing.					*/
+/*									    	*/
+/* Total Tests: 1							     	*/
+/*									    	*/
+/* Test Name:   unshare01					     		*/
+/* History:     Porting from Crackerjack to LTP is done by		    	*/
+/*	      Manas Kumar Nayak maknayak@in.ibm.com>				*/
 /********************************************************************************/
 
 #include <stdio.h>
@@ -95,168 +95,205 @@
 #include "config.h"
 
 /* Extern Global Variables */
-extern int Tst_count;           /* counter for tst_xxx routines.         */
-extern char *TESTDIR;           /* temporary dir created by tst_tmpdir() */
+extern int Tst_count;	   /* counter for tst_xxx routines.	 */
+extern char *TESTDIR;	   /* temporary dir created by tst_tmpdir() */
 
 /* Global Variables */
 char *TCID = "unshare01";  /* Test program identifier.*/
 int  testno;
-int  TST_TOTAL =1;                   /* total number of tests in this file.   */
+int  TST_TOTAL =1;		   /* total number of tests in this file.   */
 
 #ifdef HAVE_UNSHARE
 
 /* Extern Global Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    cleanup                                                       */
-/*                                                                            */
+/*									    */
+/* Function:    cleanup						       */
+/*									    */
 /* Description: Performs all one time clean up for this test on successful    */
-/*              completion,  premature exit or  failure. Closes all temporary */
-/*              files, removes all temporary directories exits the test with  */
-/*              appropriate TEST_RETURNurn code by calling tst_exit() function.       */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
+/*	      completion,  premature exit or  failure. Closes all temporary */
+/*	      files, removes all temporary directories exits the test with  */
+/*	      appropriate TEST_RETURNurn code by calling tst_exit() function.       */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
 /* Return:      On failure - Exits calling tst_exit(). Non '0' TEST_RETURNurn code.   */
-/*              On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
-/*                                                                            */
+/*	      On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
+/*									    */
 /******************************************************************************/
 extern void cleanup() {
-        /* Remove tmp dir and all files in it */
-        TEST_CLEANUP;
-        tst_rmdir();
-
-        /* Exit with appropriate TEST_RETURNurn code. */
-        tst_exit();
+	/* Remove tmp dir and all files in it */
+	TEST_CLEANUP;
+	tst_rmdir();
 }
 
 /* Local  Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    setup                                                         */
-/*                                                                            */
+/*									    */
+/* Function:    setup							 */
+/*									    */
 /* Description: Performs all one time setup for this test. This function is   */
-/*              typically used to capture signals, create temporary dirs      */
-/*              and temporary files that may be used in the course of this    */
-/*              test.                                                         */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits by calling cleanup().                      */
-/*              On success - TEST_RETURNurns 0.                                       */
-/*                                                                            */
+/*	      typically used to capture signals, create temporary dirs      */
+/*	      and temporary files that may be used in the course of this    */
+/*	      test.							 */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
+/* Return:      On failure - Exits by calling cleanup().		      */
+/*	      On success - TEST_RETURNurns 0.				       */
+/*									    */
 /******************************************************************************/
 void setup() {
-        /* Capture signals if any */
-        /* Create temporary directories */
-        TEST_PAUSE;
-        tst_tmpdir();
+	/* Capture signals if any */
+	/* Create temporary directories */
+	TEST_PAUSE;
+	tst_tmpdir();
 }
 
 int main(int ac, char **av) {
-        pid_t pid1;
-	int lc;                 /* loop counter */
-        char *msg;              /* message TEST_RETURNurned from parse_opts */
+	pid_t pid1;
+	int lc;			/* loop counter */
+	int rval;
+	char *msg;		/* message TEST_RETURNurned from parse_opts */
 	
-        /* parse standard options */
-        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-             tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-             tst_exit();
-           }
+	/* parse standard options */
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-        setup();
+	setup();
 
-        /* Check looping state if -i option given */
-        for (lc = 0; TEST_LOOPING(lc); ++lc) {
-                Tst_count = 0;
-                for (testno = 0; testno < TST_TOTAL; ++testno) {
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+		Tst_count = 0;
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
 
- /*
- *fork a child process;testing which one is a child or a parent;
- * */
-		        TEST(pid1=fork());    //call to fork()
+			TEST(pid1 = fork());    //call to fork()
 			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL|TTERRNO, "fork() failed.");
-				cleanup();
-				tst_exit();
+				tst_brkm(TFAIL|TTERRNO, cleanup, "fork failed");
 			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(CLONE_FS);
-				if (TEST_RETURN == 0)
-					tst_resm(TPASS,
-						"unshare with CLONE_FILES call "
-						"succeeded");
-				else if (TEST_RETURN == -1) {
-					if (errno == ENOSYS)
-						tst_resm(TCONF,
-							"unshare is not "
-							"implemented in kernel."
-							);
-					else
-						tst_resm(TFAIL|TERRNO,
-							"unshare failed.");
-				}
-				tst_exit();
-			}else{
-			}
-
-			TEST(pid1=fork());    //call to fork()
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL|TTERRNO, "fork() failed.");
-	                        cleanup();
-                        	tst_exit();
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(CLONE_FS);
-				if (TEST_RETURN == 0)
-					tst_resm(TPASS,
-						"unshare with CLONE_FS call "
-						"succeeded");
-				else if (TEST_RETURN == -1) {
-					if (errno == ENOSYS)
-						tst_resm(TCONF,
-							"unshare is not "
-							"implemented in kernel."
-							);
-					else
-						tst_resm(TFAIL|TERRNO,
-							"unshare failed 2.");
-				}
-				tst_exit();
-                        }else{
-			}
-
-			TEST(pid1=fork());    //call to fork()
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL|TTERRNO, "fork() failed.");
-	                        cleanup();
-                        	tst_exit();
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(CLONE_NEWNS);
+				TEST(unshare(CLONE_FS));
 				if (TEST_RETURN == 0) {
-					tst_resm(TPASS,
-						"unshare call with CLONE_NEWNS "
-						"succeeded");
+					printf("unshare with CLONE_FILES call "
+					    "succeeded\n");
+					rval = 0;
 				} else if (TEST_RETURN == -1) {
-					if (errno == ENOSYS)
-						tst_resm(TCONF,
-							"unshare is not "
-							"implemented in kernel."
-							);
-					else
-						tst_resm(TFAIL|TERRNO,
-							"unshare failed 2.");
+					if (TEST_ERRNO == ENOSYS) {
+						rval = 1;
+					} else {
+						errno = TEST_ERRNO;
+						perror("unshare failed");
+						rval = 2;
+					}
 				}
-				tst_exit();
-                        }else{
+				exit(rval);
+			} else {
+				if (wait(&rval) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
+				if (rval != 0 && WIFEXITED(rval)) {
+					switch (WEXITSTATUS(rval)) {
+					case 1:
+						tst_brkm(TCONF, cleanup,
+						    "unshare not supported in "
+						    "kernel");
+						break;
+					default:
+						tst_brkm(TFAIL, cleanup,
+						    "unshare failed");
+						break;
+					}
+				}
 			}
 
+			pid1 = fork();
+			if (TEST_RETURN == -1) {
+				tst_brkm(TFAIL|TERRNO, cleanup,
+				    "fork failed");
+			} else if (pid1 == 0) {
+				TEST(unshare(CLONE_FS));
+				if (TEST_RETURN == 0) {
+					printf("unshare with CLONE_FS call "
+					    "succeeded\n");
+					rval = 0;
+				} else if (TEST_RETURN == -1) {
+					if (TEST_ERRNO == ENOSYS) {
+						rval = 1;
+					} else {
+						errno = TEST_ERRNO;
+						perror("unshare failed");
+						rval = 2;
+					}
+				}
+				exit(rval);
+			} else {
+				if (wait(&rval) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
+				if (rval != 0 && WIFEXITED(rval)) {
+					switch (WEXITSTATUS(rval)) {
+					case 1:
+						tst_brkm(TCONF, cleanup,
+						    "unshare not supported in "
+						    "kernel");
+						break;
+					default:
+						tst_brkm(TFAIL, cleanup,
+						    "unshare failed");
+						break;
+					}
+				}
+			}
 
-                }
+			pid1 = fork();
+			if (pid1 == -1) {
+				tst_brkm(TFAIL|TERRNO, cleanup,
+				    "fork() failed.");
+			} else if (TEST_RETURN == 0) {
+				TEST(unshare(CLONE_NEWNS));
+				if (TEST_RETURN == 0) {
+					printf("unshare call with CLONE_NEWNS "
+					    "succeeded\n");
+					rval = 0;
+				} else if (TEST_RETURN == -1) {
+					if (TEST_ERRNO == ENOSYS) {
+						rval = 1;
+					} else {
+						errno = TEST_ERRNO;
+						perror("unshare failed");
+						rval = 2;
+					}
+				}
+			} else {
+				if (wait(&rval) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
+				if (rval != 0 && WIFEXITED(rval)) {
+					switch (WEXITSTATUS(rval)) {
+					case 1:
+						tst_brkm(TCONF, cleanup,
+						    "unshare not supported in "
+						    "kernel");
+						break;
+					default:
+						tst_brkm(TFAIL, cleanup,
+						    "unshare failed");
+						break;
+					}
 
-                }
+				}
+
+			}
+
+		}
+
+	}
 	cleanup();
 	tst_exit();
 }
diff --git a/testcases/kernel/syscalls/unshare/unshare02.c b/testcases/kernel/syscalls/unshare/unshare02.c
index 09fdf3c..c97e65b 100644
--- a/testcases/kernel/syscalls/unshare/unshare02.c
+++ b/testcases/kernel/syscalls/unshare/unshare02.c
@@ -1,41 +1,41 @@
 /******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007                                   */
-/*                                                                            */
+/* Copyright (c) Crackerjack Project., 2007				   */
+/*									    */
 /* This program 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 Software Foundation; either version 2 of the License, or          */
-/* (at your option) any later version.                                        */
-/*                                                                            */
-/* This program is distributed in the hope that it will be useful,            */
-/* but WITHOUT ANY WARRANTY;  without even the implied warranty of            */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See                  */
-/* the GNU General Public License for more details.                           */
-/*                                                                            */
-/* You should have received a copy of the GNU General Public License          */
-/* along with this program;  if not, write to the Free Software               */
+/* the Free Software Foundation; either version 2 of the License, or	  */
+/* (at your option) any later version.					*/
+/*									    */
+/* This program is distributed in the hope that it will be useful,	    */
+/* but WITHOUT ANY WARRANTY;  without even the implied warranty of	    */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See		  */
+/* the GNU General Public License for more details.			   */
+/*									    */
+/* You should have received a copy of the GNU General Public License	  */
+/* along with this program;  if not, write to the Free Software	       */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA    */
-/*                                                                            */
+/*									    */
 /******************************************************************************/
 /******************************************************************************/
-/*                                                                            */
-/* File:        unshare02.c                                                   */
-/*                                                                            */
-/* Description: This tests the unshare error() syscall                        */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* unshare02 [-c n] [-e][-i n] [-I x] [-p x] [-t]                             */
-/*      where,  -c n : Run n copies concurrently.                             */
-/*              -e   : Turn on errno logging.                                 */
-/*              -i n : Execute test n times.                                  */
-/*              -I x : Execute test for x seconds.                            */
-/*              -P x : Pause for x seconds between iterations.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 2                                                             */
-/*                                                                            */
-/* Test Name:   unshare02                                                     */
-/* History:     Porting from Crackerjack to LTP is done by                    */
-/*              Manas Kumar Nayak maknayak@in.ibm.com>                        */
+/*									    */
+/* File:	unshare02.c						   */
+/*									    */
+/* Description: This tests the unshare error() syscall			*/
+/*									    */
+/* Usage:  <for command-line>						 */
+/* unshare02 [-c n] [-e][-i n] [-I x] [-p x] [-t]			     */
+/*      where,  -c n : Run n copies concurrently.			     */
+/*	      -e   : Turn on errno logging.				 */
+/*	      -i n : Execute test n times.				  */
+/*	      -I x : Execute test for x seconds.			    */
+/*	      -P x : Pause for x seconds between iterations.		*/
+/*	      -t   : Turn on syscall timing.				*/
+/*									    */
+/* Total Tests: 2							     */
+/*									    */
+/* Test Name:   unshare02						     */
+/* History:     Porting from Crackerjack to LTP is done by		    */
+/*	      Manas Kumar Nayak maknayak@in.ibm.com>			*/
 /******************************************************************************/
 
 #include <stdio.h>
@@ -59,144 +59,168 @@
 #include "config.h"
 
 /* Extern Global Variables */
-extern int Tst_count;           /* counter for tst_xxx routines.         */
-extern char *TESTDIR;           /* temporary dir created by tst_tmpdir() */
+extern int Tst_count;	   /* counter for tst_xxx routines.	 */
+extern char *TESTDIR;	   /* temporary dir created by tst_tmpdir() */
 
 /* Global Variables */
 char *TCID = "unshare02";  /* Test program identifier.*/
 int  testno;
-int  TST_TOTAL = 2;                   /* total number of tests in this file.   */
+int  TST_TOTAL = 2;		   /* total number of tests in this file.   */
 
 #ifdef HAVE_UNSHARE
 
 /* Extern Global Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    cleanup                                                       */
-/*                                                                            */
+/*									    */
+/* Function:    cleanup						       */
+/*									    */
 /* Description: Performs all one time clean up for this test on successful    */
-/*              completion,  premature exit or  failure. Closes all temporary */
-/*              files, removes all temporary directories exits the test with  */
-/*              appropriate TEST_RETURNurn code by calling tst_exit() function.       */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
+/*	      completion,  premature exit or  failure. Closes all temporary */
+/*	      files, removes all temporary directories exits the test with  */
+/*	      appropriate TEST_RETURNurn code by calling tst_exit() function.       */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
 /* Return:      On failure - Exits calling tst_exit(). Non '0' TEST_RETURNurn code.   */
-/*              On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
-/*                                                                            */
+/*	      On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
+/*									    */
 /******************************************************************************/
 extern void cleanup() {
-        /* Remove tmp dir and all files in it */
-        TEST_CLEANUP;
-        tst_rmdir();
+	/* Remove tmp dir and all files in it */
+	TEST_CLEANUP;
+	tst_rmdir();
 
-        /* Exit with appropriate TEST_RETURNurn code. */
-        tst_exit();
+	/* Exit with appropriate TEST_RETURNurn code. */
+	tst_exit();
 }
 
 /* Local  Functions */
 /******************************************************************************/
-/*                                                                            */
-/* Function:    setup                                                         */
-/*                                                                            */
+/*									    */
+/* Function:    setup							 */
+/*									    */
 /* Description: Performs all one time setup for this test. This function is   */
-/*              typically used to capture signals, create temporary dirs      */
-/*              and temporary files that may be used in the course of this    */
-/*              test.                                                         */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits by calling cleanup().                      */
-/*              On success - TEST_RETURNurns 0.                                       */
-/*                                                                            */
+/*	      typically used to capture signals, create temporary dirs      */
+/*	      and temporary files that may be used in the course of this    */
+/*	      test.							 */
+/*									    */
+/* Input:       None.							 */
+/*									    */
+/* Output:      None.							 */
+/*									    */
+/* Return:      On failure - Exits by calling cleanup().		      */
+/*	      On success - TEST_RETURNurns 0.				       */
+/*									    */
 /******************************************************************************/
 void setup() {
-        /* Capture signals if any */
-        /* Create temporary directories */
-        TEST_PAUSE;
-        tst_tmpdir();
+	/* Capture signals if any */
+	/* Create temporary directories */
+	TEST_PAUSE;
+	tst_tmpdir();
 }
 
 int main(int ac, char **av) {
-        pid_t pid1;
-	int lc;                 /* loop counter */
-        char *msg;              /* message TEST_RETURNurned from parse_opts */
+	pid_t pid1;
+	int lc;		 /* loop counter */
+	int rval;
+	char *msg;	      /* message TEST_RETURNurned from parse_opts */
 	
-        /* parse standard options */
-        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-             tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-             tst_exit();
-           }
+	/* parse standard options */
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+	     tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-        setup();
+	setup();
 
-        /* Check looping state if -i option given */
-        for (lc = 0; TEST_LOOPING(lc); ++lc) {
-                Tst_count = 0;
-                for (testno = 0; testno < TST_TOTAL; ++testno) {
+	/* Check looping state if -i option given */
+	for (lc = 0; TEST_LOOPING(lc); ++lc) {
+		Tst_count = 0;
+		for (testno = 0; testno < TST_TOTAL; ++testno) {
 
- /*
- *fork a child process;testing which one is a child or a parent;
- * */
-		        TEST(pid1=fork());    //call to fork()
+			TEST(pid1 = fork());    //call to fork()
 			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL|TTERRNO,
+				tst_brkm(TFAIL|TTERRNO, cleanup,
 					"fork() failed.");
-				cleanup();
-				tst_exit();
 			} else if (TEST_RETURN == 0) {
 				TEST_RETURN = unshare(-1);
-				if (TEST_RETURN == 0)
-					tst_resm(TFAIL,
-						"Call unexpectedly succeeded.");
-				else if (TEST_RETURN == -1) {
-					if (errno == EINVAL)
-						tst_resm(TPASS|TERRNO,
-							"Expect EINVAL.");
-					else if (errno == ENOSYS)
-						tst_resm(TCONF,
-							"unshare is not "
-							"implemented in kernel."
-							);
-					else
-						tst_resm(TFAIL|TERRNO,
-							"Test failed.");
+				if (TEST_RETURN == 0) {
+					printf("Call unexpectedly succeeded\n");
+					rval = 1;
+				} else if (TEST_RETURN == -1) {
+					if (errno == EINVAL) {
+						printf("Got EINVAL\n");
+						rval = 0;
+					} else if (errno == ENOSYS) {
+						rval = 1;
+					} else {
+						perror("unshare failed");
+						rval = 2;
+					}
 				}
-				tst_exit();
+				exit(rval);
+			} else {
+				if (wait(&rval) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
+				if (rval != 0 && WIFEXITED(rval)) {
+					switch (WEXITSTATUS(rval)) {
+					case 1:
+						tst_brkm(TBROK, cleanup,
+						    "unshare call unsupported "
+						    "in kernel");
+						break;
+					case 2:
+						tst_brkm(TFAIL, cleanup,
+						    "unshare call failed");
+						break;
+					} 
+				}
 			}
 
 			TEST(pid1=fork());    //call to fork()
 			if (pid1 == -1) {
-				tst_resm(TFAIL|TTERRNO,
+				tst_brkm(TFAIL|TTERRNO, cleanup,
 					"fork() failed.");
-				cleanup();
-				tst_exit();
 			} else if (TEST_RETURN == 0) {
 				TEST_RETURN = unshare((int)NULL);
-				if (TEST_RETURN == 0)
+				if (TEST_RETURN == 0) {
 					tst_resm(TPASS, "Call succeeded");
-				else if (TEST_RETURN == -1) {
+					rval = 0;
+				} else if (TEST_RETURN == -1) {
 					if (errno == ENOSYS)
-						tst_resm(TCONF,
-							"unshare is not "
-							"implemented in kernel."
-							);
-					else
-						tst_resm(TFAIL|TERRNO,
-							"Test failed 2. ");
+						rval = 1;
+					else {
+						perror("unshare failed");
+						rval = 2;
+					}
 				}
-				tst_exit();
-                        }
+				exit(rval);
+			} else {
+				if (wait(&rval) == -1) {
+					tst_brkm(TBROK|TERRNO, cleanup,
+					    "wait failed");
+				}
+				if (rval != 0 && WIFEXITED(rval)) {
+					switch (WEXITSTATUS(rval)) {
+					case 1:
+						tst_brkm(TBROK, cleanup,
+						    "unshare call unsupported "
+						    "in kernel");
+						break;
+					case 2:
+						tst_brkm(TFAIL, cleanup,
+						    "unshare call failed");
+						break;
+					}
+				}
+			}
 
-
-                }
+		}
 	}
 	cleanup();
-        tst_exit();
+	tst_exit();
 }
 #else
 int main(void)
diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
index 2d293e3..dbb9243 100644
--- a/testcases/kernel/syscalls/ustat/ustat01.c
+++ b/testcases/kernel/syscalls/ustat/ustat01.c
@@ -88,9 +88,15 @@
 	char *msg;
 
 	/*parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(argc, argv, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(argc, argv, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -131,19 +137,19 @@
 
 	/* Allocate memory for stat and ustat structure variables */
 	if ((buf = (struct stat *)malloc(sizeof(struct stat))) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	if ((ubuf = (struct ustat *)malloc(sizeof(struct ustat))) == NULL) {
 		free(buf);
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	/*Find out device number for a file-system */
 	if (stat("/", buf) != 0) {
 		free(buf);
 		free(ubuf);
-		tst_brkm(TBROK, tst_exit, "Couldn't find device number");
+		tst_brkm(TBROK, NULL, "Couldn't find device number");
 	}
 
 	dev_num = buf->st_dev;
diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
index d72415d..3741d20 100644
--- a/testcases/kernel/syscalls/ustat/ustat02.c
+++ b/testcases/kernel/syscalls/ustat/ustat02.c
@@ -110,9 +110,15 @@
 	char *msg;		/* message returned from parse_opts */
 
 	/* parse standard options */
+<<<<<<< HEAD
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 	    != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
+	    != NULL) {
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	/* perform global setup for test */
@@ -152,7 +158,7 @@
 	/*Clean up and exit */
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 }				/*End of main */
 
 /* setup() - performs all ONE TIME setup for this test */
@@ -171,19 +177,19 @@
 
 	/* Allocating memory for ustat and stat structure variables */
 	if ((ubuf = (struct ustat *)malloc(sizeof(struct ustat))) == NULL) {
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	if ((buf = (struct stat *)malloc(sizeof(struct stat))) == NULL) {
 		free(ubuf);
-		tst_brkm(TBROK, tst_exit, "Failed to allocate Memory");
+		tst_brkm(TBROK, NULL, "Failed to allocate Memory");
 	}
 
 	/* Finding out a valid device number */
 	if (stat("/", buf) != 0) {
 		free(buf);
 		free(ubuf);
-		tst_brkm(TBROK, tst_exit, "stat(2) failed. Exiting without"
+		tst_brkm(TBROK, NULL, "stat(2) failed. Exiting without"
 			 "invoking ustat(2)");
 	}
 	dev_num[1] = buf->st_dev;
diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index 0c30475..55b5d2c 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -105,7 +105,11 @@
 	time_t pres_time;	/* file modification/access/present time */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -163,7 +167,7 @@
 						 "failed to get present time "
 						 "after utime, error=%d",
 						 errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/*
 				 * Get the modification and access times of
@@ -173,7 +177,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed, error:%d",
 						 TEMP_FILE, TEST_ERRNO);
-				 /*NOTREACHED*/}
+				 }
 				modf_time = stat_buf.st_mtime;
 				access_time = stat_buf.st_atime;
 
@@ -199,7 +203,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -233,20 +237,20 @@
 		tst_brkm(TBROK, cleanup,
 			 "creat(%s, %#o) Failed, errno=%d :%s",
 			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Close the temporary file created */
 	if (close(fildes) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s:",
 			 TEMP_FILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Get the current time */
 	if ((curr_time = time(&tloc)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "time() failed to get current time, errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Sleep for a second so that mod time and access times will be
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index 284802d..cfdbbbe 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -110,7 +110,11 @@
 	time_t pres_time;	/* file modification/access/present time */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -168,7 +172,7 @@
 						 "failed to get present time "
 						 "after utime, error=%d",
 						 errno);
-				 /*NOTREACHED*/}
+				 }
 
 				/*
 				 * Get the modification and access times of
@@ -178,7 +182,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed, errno:%d",
 						 TEMP_FILE, TEST_ERRNO);
-				 /*NOTREACHED*/}
+				 }
 				modf_time = stat_buf.st_mtime;
 				access_time = stat_buf.st_atime;
 
@@ -204,7 +208,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -223,7 +227,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
@@ -247,20 +251,20 @@
 		tst_brkm(TBROK, cleanup,
 			 "creat(%s, %#o) Failed, errno=%d :%s",
 			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Close the temporary file created */
 	if (close(fildes) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s:",
 			 TEMP_FILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Get the current time */
 	if ((curr_time = time(&tloc)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "time() failed to get current time, errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Sleep for a second so that mod time and access times will be
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index 3cca5d6..eb2c1ff 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -121,7 +121,11 @@
 	pid_t pid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -197,7 +201,7 @@
 							 "present time after "
 							 "utime, error=%d",
 							 errno);
-					 /*NOTREACHED*/}
+					 }
 
 					/*
 					 * Get the modification and access
@@ -209,7 +213,7 @@
 							 "stat(2) of %s failed, "
 							 "error:%d", TEMP_FILE,
 							 TEST_ERRNO);
-					 /*NOTREACHED*/}
+					 }
 					modf_time = stat_buf.st_mtime;
 					access_time = stat_buf.st_atime;
 
@@ -246,7 +250,7 @@
 	}
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -284,7 +288,7 @@
 
 	/* get the name of the temporary directory */
 	if ((tmpd = getcwd(tmpd, 0)) == NULL) {
-		tst_brkm(TBROK, tst_exit, "getcwd failed");
+		tst_brkm(TBROK, NULL, "getcwd failed");
 	}
 
 	/* Creat a temporary file under above directory */
@@ -292,14 +296,14 @@
 		tst_brkm(TBROK, cleanup,
 			 "creat(%s, %#o) Failed, errno=%d :%s",
 			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/* Close the temporary file created */
 	if (close(fildes) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "close(%s) Failed, errno=%d : %s:",
 			 TEMP_FILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Make sure that specified Mode permissions set as
@@ -309,7 +313,7 @@
 		tst_brkm(TBROK, cleanup,
 			 "chmod(%s) Failed, errno=%d : %s:",
 			 TEMP_FILE, errno, strerror(errno));
-	 /*NOTREACHED*/}
+	 }
 
 	if (chmod(tmpd, 0711) != 0) {
 		tst_brkm(TBROK, cleanup, "chmod() failed");
@@ -318,7 +322,7 @@
 	if ((ltpuser = getpwnam(LTPUSER2)) == NULL) {
 		tst_brkm(TBROK, cleanup, "%s not found in /etc/passwd",
 			 LTPUSER2);
-	 /*NOTREACHED*/}
+	 }
 
 	/* get uid/gid of user accordingly */
 	user_uid = ltpuser->pw_uid;
@@ -331,13 +335,13 @@
 	if (chown(TEMP_FILE, user_uid, group_gid) < 0) {
 		tst_brkm(TBROK, cleanup, "chown() of %s failed, error %d",
 			 TEMP_FILE, errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/* Get the current time */
 	if ((curr_time = time(&tloc)) < 0) {
 		tst_brkm(TBROK, cleanup,
 			 "time() failed to get current time, errno=%d", errno);
-	 /*NOTREACHED*/}
+	 }
 
 	/*
 	 * Sleep for a second so that mod time and access times will be
diff --git a/testcases/kernel/syscalls/utime/utime04.c b/testcases/kernel/syscalls/utime/utime04.c
index dd6d372..f9141c1 100644
--- a/testcases/kernel/syscalls/utime/utime04.c
+++ b/testcases/kernel/syscalls/utime/utime04.c
@@ -104,7 +104,11 @@
 	/* file modification/access time */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -148,7 +152,7 @@
 						 "stat(2) of %s failed, "
 						 "error:%d", TEMP_FILE,
 						 TEST_ERRNO);
-				 /*NOTREACHED*/}
+				 }
 				modf_time = stat_buf.st_mtime;
 				access_time = stat_buf.st_atime;
 
@@ -172,7 +176,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
diff --git a/testcases/kernel/syscalls/utime/utime05.c b/testcases/kernel/syscalls/utime/utime05.c
index 18a3777..eb41bc1 100644
--- a/testcases/kernel/syscalls/utime/utime05.c
+++ b/testcases/kernel/syscalls/utime/utime05.c
@@ -110,7 +110,11 @@
 	/* file modification/access time */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -153,7 +157,7 @@
 					tst_brkm(TFAIL, cleanup, "stat(2) of "
 						 "%s failed, error:%d",
 						 TEMP_FILE, TEST_ERRNO);
-				 /*NOTREACHED*/}
+				 }
 				modf_time = stat_buf.st_mtime;
 				access_time = stat_buf.st_atime;
 
@@ -177,7 +181,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	tst_exit();
 
 }				/* End main */
 
@@ -196,7 +200,7 @@
 
 	/* Switch to nobody user for correct error code collection */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	ltpuser = getpwnam(nobody_uid);
 	if (setuid(ltpuser->pw_uid) == -1) {
diff --git a/testcases/kernel/syscalls/utime/utime06.c b/testcases/kernel/syscalls/utime/utime06.c
index fd120ef..84acb53 100644
--- a/testcases/kernel/syscalls/utime/utime06.c
+++ b/testcases/kernel/syscalls/utime/utime06.c
@@ -137,7 +137,11 @@
 	int pid;
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -153,11 +157,11 @@
 
 	if (pid == -1) {
 		tst_brkm(TBROK, cleanup, "fork() failed");
-	 /*NOTREACHED*/} else if (pid == 0) {
+	 } else if (pid == 0) {
 		if ((ltpuser = getpwnam(LTPUSER1)) == NULL) {
 			tst_brkm(TBROK, cleanup, "%s not found in /etc/passwd",
 				 LTPUSER1);
-		 /*NOTREACHED*/}
+		 }
 
 		/* get uid of user */
 		user_uid = ltpuser->pw_uid;
@@ -219,7 +223,7 @@
 	}
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }				/* End main */
 
@@ -291,7 +295,7 @@
 	if ((ltpuser = getpwnam(LTPUSER2)) == NULL) {
 		tst_brkm(TBROK, cleanup, "%s not found in /etc/passwd",
 			 LTPUSER2);
-	 /*NOTREACHED*/}
+	 }
 
 	/* get uid/gid of user accordingly */
 	user_uid = ltpuser->pw_uid;
@@ -300,7 +304,7 @@
 	if (chown(TEMP_FILE, user_uid, group_gid) < 0) {
 		tst_brkm(TBROK, cleanup, "chown() of %s failed, error %d",
 			 TEMP_FILE, errno);
-	 /*NOTREACHED*/}
+	 }
 
 	return 0;
 }				/* End of setup1 */
diff --git a/testcases/kernel/syscalls/utimes/utimes01.c b/testcases/kernel/syscalls/utimes/utimes01.c
index a38525f..8377780 100644
--- a/testcases/kernel/syscalls/utimes/utimes01.c
+++ b/testcases/kernel/syscalls/utimes/utimes01.c
@@ -241,6 +241,7 @@
 	 * Execute system call
 	 */
 	memset(tv, 0, 2 * sizeof(struct timeval));
+<<<<<<< HEAD
 	tv[0].tv_sec = tc->a_sec;
 	tv[1].tv_sec = tc->m_sec;
 	TEST(len = strlen(fpath));
@@ -267,6 +268,34 @@
 		else
 			TEST(sys_ret = utimes(fpath, NULL));
 	}
+=======
+        tv[0].tv_sec = tc->a_sec;
+        tv[1].tv_sec = tc->m_sec;
+        TEST(len = strlen(fpath));
+        if (tc->ttype == FILE_NOT_EXIST) {
+                c = fpath[len - 1];
+                fpath[len - 1] = '\0';
+        }
+        errno = 0;
+        if (tc->ttype == NO_FNAME) {
+                /**
+                 * Note (garrcoop):
+                 *
+                 * If you do NULL directly, then gcc [4.3] will complain when
+                 * one specifies -Wnonnull in CPPFLAGS. This is a negative
+                 * test, but let's not allow the compiler to complain about
+                 * something trivial like this.
+                 **/
+                const char *dummy = NULL;
+                TEST(sys_ret = utimes(dummy, tv));
+        }
+        else {
+                if (tc->user == NULL)
+                        TEST(sys_ret = utimes(fpath, tv));
+                else
+                        TEST(sys_ret = utimes(fpath, NULL));
+        }
+>>>>>>> master
 	sys_errno = errno;
 	if (tc->ttype == FILE_NOT_EXIST)
 		fpath[len - 1] = c;
@@ -315,6 +344,7 @@
 
 int main(int ac, char **av) {
 	int result = RESULT_OK;
+<<<<<<< HEAD
 	int i;
 	int lc;		 /* loop counter */
 	char *msg;	      /* message returned from parse_opts */
@@ -341,6 +371,63 @@
 					i, (ret == 0) ? "OK" : "NG");
 				result |= ret;
 			}
+=======
+        int c;
+        int i;
+        int lc;                 /* loop counter */
+        char *msg;              /* message returned from parse_opts */
+
+	struct option long_options[] = {
+                { "debug", no_argument, 0, 'd' },
+                { "help",  no_argument, 0, 'h' },
+                { NULL, 0, NULL, 0 }
+        };
+
+	progname = strchr(av[0], '/');
+        progname = progname ? progname + 1 : av[0];	
+	
+        /* parse standard options */
+        if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+             tst_exit();
+           }
+
+        setup();
+
+        /* Check looping state if -i option given */
+        for (lc = 0; TEST_LOOPING(lc); ++lc) {
+                Tst_count = 0;
+                for (testno = 0; testno < TST_TOTAL; ++testno) {
+			 TEST(c = getopt_long(ac, av, "dh", long_options, NULL));
+			 while (TEST_RETURN != -1) {
+		                switch (c) {
+                		case 'd':
+		                        opt_debug = 1;
+                		        break;
+		                default:
+                		        usage(progname);
+                        		
+                		}
+		        }
+
+
+		if (ac != optind) {
+        	        tst_resm(TINFO,"Options are not match.");
+                	usage(progname);
+                	
+	        }
+
+		/*
+		* Execute test
+         	*/
+	        for (i = 0; i < (int)(sizeof(tcase) / sizeof(tcase[0])); i++) {
+        	        int ret;
+	                tst_resm(TINFO,"(case%02d) START", i);
+	                ret = do_test(&tcase[i]);
+	                tst_resm(TINFO,"(case%02d) END => %s", i, (ret == 0) ? "OK" : "NG");
+	                result |= ret;
+        	}
+>>>>>>> master
 		
 			/*
 			 * Check results
diff --git a/testcases/kernel/syscalls/vfork/vfork01.c b/testcases/kernel/syscalls/vfork/vfork01.c
index 718c536..9ac3b1a 100644
--- a/testcases/kernel/syscalls/vfork/vfork01.c
+++ b/testcases/kernel/syscalls/vfork/vfork01.c
@@ -115,7 +115,11 @@
 	int exit_status;	/* exit status of child process */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
@@ -299,7 +303,7 @@
 
 	/* Call cleanup() to undo setup done for the test. */
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }				/* End main */
 
 /*
diff --git a/testcases/kernel/syscalls/vfork/vfork02.c b/testcases/kernel/syscalls/vfork/vfork02.c
index d9601f4..386d2f8 100644
--- a/testcases/kernel/syscalls/vfork/vfork02.c
+++ b/testcases/kernel/syscalls/vfork/vfork02.c
@@ -98,7 +98,11 @@
 	sigset_t PendSig;	/* variable to hold pending signal */
 
 	/* Parse standard options given to run the test. */
+<<<<<<< HEAD
 	msg = parse_opts(ac, av, NULL, NULL);
+=======
+	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
+>>>>>>> master
 	if (msg != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
diff --git a/testcases/kernel/syscalls/vhangup/vhangup01.c b/testcases/kernel/syscalls/vhangup/vhangup01.c
index eb6df06..1ac45fd 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup01.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup01.c
@@ -90,7 +90,7 @@
 
 		if ((pid = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TFAIL, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid > 0) {	/* parent */
+		 } else if (pid > 0) {	/* parent */
 			waitpid(pid, &status, 0);
 			_exit(0);	/*
 					 * Exit here and let the child clean up.
@@ -105,12 +105,12 @@
 			if (retval < 0) {
 				perror("setreuid");
 				tst_brkm(TFAIL, cleanup, "setreuid failed");
-			 /*NOTREACHED*/}
+			 }
 			TEST(vhangup());
 			if (TEST_RETURN != -1) {
 				tst_brkm(TFAIL, cleanup, "vhangup() failed to "
 					 "fail");
-			 /*NOTREACHED*/} else if (TEST_ERRNO == EPERM) {
+			 } else if (TEST_ERRNO == EPERM) {
 				TEST_ERROR_LOG(TEST_ERRNO);
 				tst_resm(TPASS, "Got EPERM as expected.");
 			} else {
@@ -121,7 +121,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -155,4 +155,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/vhangup/vhangup02.c b/testcases/kernel/syscalls/vhangup/vhangup02.c
index 47afb3f..05ab94c 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup02.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup02.c
@@ -82,14 +82,14 @@
 
 		if ((pid = FORK_OR_VFORK()) < 0) {
 			tst_brkm(TFAIL, cleanup, "fork failed");
-		 /*NOTREACHED*/} else if (pid > 0) {	/* parent */
+		 } else if (pid > 0) {	/* parent */
 			waitpid(pid, &status, 0);
 			_exit(0);
 		} else {	/* child */
 			pid1 = setsid();
 			if (pid1 < 0) {
 				tst_brkm(TFAIL, cleanup, "setsid failed");
-			 /*NOTREACHED*/}
+			 }
 			TEST(vhangup());
 			if (TEST_RETURN == -1) {
 				tst_resm(TFAIL, "vhangup() failed, errno:%d",
@@ -100,7 +100,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -131,4 +131,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
index 7340655..b4690b6 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
@@ -101,7 +101,11 @@
 	 * parse standard options
 	 ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
 	/***************************************************************
 	 * perform global setup for test
diff --git a/testcases/kernel/syscalls/wait/wait02.c b/testcases/kernel/syscalls/wait/wait02.c
index bb4c9fc..aa21967 100644
--- a/testcases/kernel/syscalls/wait/wait02.c
+++ b/testcases/kernel/syscalls/wait/wait02.c
@@ -139,7 +139,11 @@
      * parse standard options
      ***************************************************************/
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 
     /***************************************************************
      * perform global setup for test
diff --git a/testcases/kernel/syscalls/wait4/wait401.c b/testcases/kernel/syscalls/wait4/wait401.c
index 74f4d53..0ff8976 100644
--- a/testcases/kernel/syscalls/wait4/wait401.c
+++ b/testcases/kernel/syscalls/wait4/wait401.c
@@ -81,7 +81,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -155,7 +159,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/wait4/wait402.c b/testcases/kernel/syscalls/wait4/wait402.c
index 83afb6a..e226f66 100644
--- a/testcases/kernel/syscalls/wait4/wait402.c
+++ b/testcases/kernel/syscalls/wait4/wait402.c
@@ -102,7 +102,11 @@
 
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 	}
 
 	setup();		/* global setup */
@@ -173,7 +177,7 @@
 
 	cleanup();
 
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
diff --git a/testcases/kernel/syscalls/waitid/waitid01.c b/testcases/kernel/syscalls/waitid/waitid01.c
index e2c6801..b1bc831 100644
--- a/testcases/kernel/syscalls/waitid/waitid01.c
+++ b/testcases/kernel/syscalls/waitid/waitid01.c
@@ -131,7 +131,11 @@
 	
         /* parse standard options */
         if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+<<<<<<< HEAD
              tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+             tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
              tst_exit();
            }
 
diff --git a/testcases/kernel/syscalls/waitid/waitid02.c b/testcases/kernel/syscalls/waitid/waitid02.c
index 862273f..1d610c2 100644
--- a/testcases/kernel/syscalls/waitid/waitid02.c
+++ b/testcases/kernel/syscalls/waitid/waitid02.c
@@ -124,7 +124,11 @@
         /* parse standard options */
 	msg = parse_opts(ac, av, NULL, NULL);
 	if (msg != NULL) {
+<<<<<<< HEAD
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+=======
+		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+>>>>>>> master
 		tst_exit();
 	}
 
diff --git a/testcases/kernel/syscalls/waitpid/waitpid01.c b/testcases/kernel/syscalls/waitpid/waitpid01.c
index 7ffad37..323bc63 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid01.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid01.c
@@ -72,7 +72,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	setup();
 
@@ -135,7 +135,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -169,4 +169,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/waitpid/waitpid02.c b/testcases/kernel/syscalls/waitpid/waitpid02.c
index bb3b4da..038a42d 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid02.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid02.c
@@ -153,7 +153,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -197,4 +197,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/waitpid/waitpid03.c b/testcases/kernel/syscalls/waitpid/waitpid03.c
index 074b7cb..15dd98f 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid03.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid03.c
@@ -85,7 +85,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_child, "d", &ikids_uclinux);
 #endif
@@ -162,7 +162,7 @@
 		condition_number++;
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -215,4 +215,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/waitpid/waitpid04.c b/testcases/kernel/syscalls/waitpid/waitpid04.c
index 8d1c30b..f9e4f61 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid04.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid04.c
@@ -73,7 +73,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	setup();
 
@@ -143,7 +143,7 @@
 		condition_number++;
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -177,4 +177,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/waitpid/waitpid05.c b/testcases/kernel/syscalls/waitpid/waitpid05.c
index 7001236..588bc4e 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid05.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid05.c
@@ -86,7 +86,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_child_uclinux, "d", &sig_uclinux);
 #endif
@@ -209,7 +209,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -279,4 +279,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/waitpid/waitpid06.c b/testcases/kernel/syscalls/waitpid/waitpid06.c
index 21a1b2f..2356455 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid06.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid06.c
@@ -87,7 +87,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	argv0 = argv[0];
 
@@ -134,7 +134,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -180,7 +180,7 @@
 #else
 			do_exit();
 #endif
-		 /*NOTREACHED*/} else if (ret_val < 0) {
+		 } else if (ret_val < 0) {
 			tst_resm(TFAIL, "Fork kid %d failed. "
 				 "errno = %d", kid_count, errno);
 			exit(ret_val);
@@ -315,7 +315,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid07.c b/testcases/kernel/syscalls/waitpid/waitpid07.c
index f5b2e19..68fba38 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid07.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid07.c
@@ -88,7 +88,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	argv0 = argv[0];
 
@@ -136,7 +136,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -184,7 +184,7 @@
 #else
 			do_exit();
 #endif
-		 /*NOTREACHED*/}
+		 }
 
 		if (ret_val < 0) {
 			tst_resm(TFAIL, "Fork kid %d failed. "
@@ -327,7 +327,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid08.c b/testcases/kernel/syscalls/waitpid/waitpid08.c
index d4ca1d9..06837e2 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid08.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid08.c
@@ -87,7 +87,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	argv0 = argv[0];
 
@@ -219,7 +219,7 @@
 			tst_resm(TFAIL, "Kill of child %d "
 				 "failed, errno = %d", i, errno);
 			tst_exit();
-		 /*NOTREACHED*/}
+		 }
 	}
 
 	/*
@@ -352,7 +352,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid09.c b/testcases/kernel/syscalls/waitpid/waitpid09.c
index f9ebf44..09a88f5 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid09.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid09.c
@@ -94,7 +94,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_exit_uclinux, "");
 #endif
@@ -103,7 +103,7 @@
 
 	if ((pid = FORK_OR_VFORK()) < 0) {
 		tst_brkm(TFAIL, cleanup, "Fork Failed");
-	 /*NOTREACHED*/} else if (pid == 0) {
+	 } else if (pid == 0) {
 		/*
 		 * Child:
 		 * Set up to catch SIGINT.  The kids will wait till a
@@ -121,12 +121,12 @@
 			fail = 0;
 			if ((pid = FORK_OR_VFORK()) < 0) {
 				tst_brkm(TFAIL, cleanup, "Fork failed.");
-			 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+			 } else if (pid == 0) {	/* child */
 #ifdef UCLINUX
 				if (self_exec(argv[0], "") < 0) {
 					tst_brkm(TFAIL, cleanup,
 						 "self_exec failed");
-				 /*NOTREACHED*/}
+				 }
 #else
 				do_exit();
 #endif
@@ -183,7 +183,7 @@
 
 			if ((pid = FORK_OR_VFORK()) < 0) {
 				tst_brkm(TFAIL, cleanup, "Second fork failed.");
-			 /*NOTREACHED*/} else if (pid == 0) {	/* child */
+			 } else if (pid == 0) {	/* child */
 				exit(0);
 			} else {	/* parent */
 				/* Give the child time to startup and exit */
@@ -251,13 +251,13 @@
 
 		}
 		cleanup();
-	 /*NOTREACHED*/} else {	/* parent */
+	 } else {	/* parent */
 		/* wait for the child to return */
 		waitpid(pid, &status, 0);
 		if (WEXITSTATUS(status) != 0) {
 			tst_brkm(TBROK, cleanup, "child returned bad "
 				 "status");
-		 /*NOTREACHED*/}
+		 }
 	}
 
 	return 0;
@@ -274,7 +274,7 @@
 		tst_brkm(TFAIL, cleanup, "signal SIGINT failed, errno = %d",
 			 errno);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -307,7 +307,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid10.c b/testcases/kernel/syscalls/waitpid/waitpid10.c
index 854df68..b90601d 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid10.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid10.c
@@ -424,7 +424,7 @@
 		}
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 
 }
 
@@ -458,7 +458,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void alrmhandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid11.c b/testcases/kernel/syscalls/waitpid/waitpid11.c
index 3ffc4be..9b96fdc 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid11.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid11.c
@@ -82,7 +82,7 @@
 	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_exit_uclinux, "");
 #endif
@@ -113,9 +113,9 @@
 				tst_resm(TPASS, "%s PASSED", TCID);
 			}
 			cleanup();
-		 /*NOTREACHED*/} else if (pid < 0) {
+		 } else if (pid < 0) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Set up to catch SIGINT.  The kids will wait till a SIGINT
@@ -138,17 +138,17 @@
 					tst_resm(TFAIL, "self_exec kid %d "
 						 "failed", kid_count);
 					tst_exit();
-				 /*NOTREACHED*/}
+				 }
 #else
 				do_exit();
 #endif
-			 /*NOTREACHED*/}
+			 }
 
 			if (ret_val < 0) {
 				tst_resm(TFAIL, "Fork kid %d failed. errno = "
 					 "%d", kid_count, errno);
 				tst_exit();
-			 /*NOTREACHED*/}
+			 }
 
 			/* parent */
 			fork_kid_pid[kid_count] = ret_val;
@@ -167,7 +167,7 @@
 				tst_resm(TFAIL, "Kill of child %d failed, "
 					 "errno = %d", i, errno);
 				tst_exit();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		/*
@@ -316,7 +316,7 @@
 	if ((sig_t) signal(SIGINT, inthandlr) == SIG_ERR) {
 		tst_resm(TFAIL, "signal SIGINT failed, errno = %d", errno);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -346,7 +346,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid12.c b/testcases/kernel/syscalls/waitpid/waitpid12.c
index 6567ffe..542eb7e 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid12.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid12.c
@@ -84,7 +84,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 #ifdef UCLINUX
 	maybe_run_child(&do_exit_uclinux, "");
 #endif
@@ -114,9 +114,9 @@
 				tst_resm(TPASS, "%s PASSED", TCID);
 			}
 			cleanup();
-		 /*NOTREACHED*/} else if (pid < 0) {
+		 } else if (pid < 0) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Set up to catch SIGINT.  The kids will wait till a SIGINT
@@ -139,17 +139,17 @@
 					tst_resm(TFAIL, "self_exec kid %d "
 						 "failed", kid_count);
 					tst_exit();
-				 /*NOTREACHED*/}
+				 }
 #else
 				do_exit();
 #endif
-			 /*NOTREACHED*/}
+			 }
 
 			if (ret_val < 0) {
 				tst_resm(TFAIL, "Fork kid %d failed. errno = "
 					 "%d", kid_count, errno);
 				tst_exit();
-			 /*NOTREACHED*/}
+			 }
 
 			/* parent */
 			fork_kid_pid[kid_count] = ret_val;
@@ -174,7 +174,7 @@
 				tst_resm(TFAIL, "Kill of child %d failed, "
 					 "errno = %d", i, errno);
 				tst_exit();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		/*
@@ -324,7 +324,7 @@
 	if ((sig_t) signal(SIGINT, inthandlr) == SIG_ERR) {
 		tst_resm(TFAIL, "signal SIGINT failed, errno = %d", errno);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -357,7 +357,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid13.c b/testcases/kernel/syscalls/waitpid/waitpid13.c
index 5b6f93b..37f5dc5 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid13.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid13.c
@@ -111,9 +111,9 @@
 				tst_resm(TPASS, "%s PASSED", TCID);
 			}
 			cleanup();
-		 /*NOTREACHED*/} else if (pid < 0) {
+		 } else if (pid < 0) {
 			tst_brkm(TBROK, cleanup, "fork failed");
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * Set up to catch SIGINT.  The kids will wait till a SIGINT
@@ -136,17 +136,17 @@
 					tst_resm(TFAIL, "self_exec kid %d "
 						 "failed", kid_count);
 					tst_exit();
-				 /*NOTREACHED*/}
+				 }
 #else
 				do_exit();
 #endif
-			 /*NOTREACHED*/}
+			 }
 
 			if (ret_val < 0) {
 				tst_resm(TFAIL, "Fork kid %d failed. errno = "
 					 "%d", kid_count, errno);
 				tst_exit();
-			 /*NOTREACHED*/}
+			 }
 
 			/* parent */
 			fork_kid_pid[kid_count] = ret_val;
@@ -377,7 +377,7 @@
 	if ((sig_t) signal(SIGINT, inthandlr) == SIG_ERR) {
 		tst_brkm(TFAIL, cleanup, "signal SIGINT failed, errno = %d",
 			 errno);
-	 /*NOTREACHED*/}
+	 }
 }
 
 /*
@@ -407,7 +407,7 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
 
 void inthandlr()
 {
diff --git a/testcases/kernel/syscalls/write/write02.c b/testcases/kernel/syscalls/write/write02.c
index 2518eed..8eea5b7 100644
--- a/testcases/kernel/syscalls/write/write02.c
+++ b/testcases/kernel/syscalls/write/write02.c
@@ -77,7 +77,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL))) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	setup();		/* global setup for test */
 
@@ -98,7 +98,7 @@
 
 		if ((fild = creat(pfiln, 0777)) == -1) {
 			tst_brkm(TBROK, cleanup, "Can't creat Xwrit");
-		 /*NOTREACHED*/}
+		 }
 		for (iws = BUFSIZ; iws > 0; iws--) {
 			if ((cwrite = write(fild, pwbuf, iws)) != iws) {
 				TEST_ERROR_LOG(errno);
@@ -115,7 +115,7 @@
 		close(fild);
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
diff --git a/testcases/kernel/syscalls/write/write03.c b/testcases/kernel/syscalls/write/write03.c
index 42c7c8a..37d06db 100644
--- a/testcases/kernel/syscalls/write/write03.c
+++ b/testcases/kernel/syscalls/write/write03.c
@@ -83,7 +83,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -102,31 +102,31 @@
 		if (fd < 0) {
 			tst_resm(TBROK, "creating a new file failed");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		(void)memset(wbuf, '0', 100);
 
 		if (write(fd, wbuf, 100) == -1) {
 			tst_resm(TFAIL, "failed to write to %s", filename);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (write(fd, bad_addr, 100) != -1) {
 			tst_resm(TFAIL, "write(2) failed to fail");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		TEST_ERROR_LOG(errno);
 		close(fd);
 
 		if ((fd = open(filename, O_RDONLY)) == -1) {
 			tst_resm(TBROK, "open(2) failed, errno: %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (read(fd, rbuf, 100) == -1) {
 			tst_resm(TBROK, "read(2) failed, errno: %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (memcmp(wbuf, rbuf, 100) == 0) {
 			tst_resm(TPASS, "failure of write(2) didnot corrupt "
@@ -139,7 +139,7 @@
 		close(fd);
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 #else
@@ -200,4 +200,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/write/write04.c b/testcases/kernel/syscalls/write/write04.c
index b063901..9e4ab2e 100644
--- a/testcases/kernel/syscalls/write/write04.c
+++ b/testcases/kernel/syscalls/write/write04.c
@@ -86,7 +86,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -101,15 +101,15 @@
 		if (mknod(fifo, S_IFIFO | 0777, 0) < 0) {
 			tst_resm(TBROK, "mknod() failed, errno: %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		if (stat(fifo, &buf) != 0) {
 			tst_resm(TBROK, "stat() failed, errno: %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		if ((buf.st_mode & S_IFIFO) == 0) {
 			tst_resm(TBROK, "Mode does not indicate fifo file");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 #if 0
 		sigset(SIGALRM, alarm_handler);
 #endif
@@ -148,7 +148,7 @@
 		if (sigsetjmp(jmp, 1)) {
 			tst_resm(TBROK, "setjmp() failed");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		(void)alarm(10);	/* set alarm for 10 seconds */
 		wfd = open(fifo, O_WRONLY | O_NONBLOCK);
 		(void)alarm(0);
@@ -207,7 +207,7 @@
 		unlink(fifo);
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 void alarm_handler()
@@ -256,4 +256,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/write/write05.c b/testcases/kernel/syscalls/write/write05.c
index 8345790..ece3fbd 100644
--- a/testcases/kernel/syscalls/write/write05.c
+++ b/testcases/kernel/syscalls/write/write05.c
@@ -89,7 +89,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* global setup */
 	setup();
@@ -119,19 +119,19 @@
 		if (fd < 0) {
 			tst_resm(TFAIL, "creating a new file failed");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 		if (write(fd, bad_addr, 10) != -1) {
 			tst_resm(TFAIL, "write() on an invalid buffer "
 				 "succeeded, but should have failed");
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			TEST_ERROR_LOG(errno);
 			if (errno != EFAULT) {
 				tst_resm(TFAIL, "write() returned illegal "
 					 "errno: expected EFAULT, got %d",
 					 errno);
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 			tst_resm(TPASS, "received EFAULT as expected.");
 		}
 		tst_resm(TINFO, "Exit Block 2");
@@ -180,7 +180,7 @@
 		close(fd);
 	}
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -236,4 +236,4 @@
 
 	/* exit with return code appropriate for results */
 	tst_exit();
- /*NOTREACHED*/}
+ }
diff --git a/testcases/kernel/syscalls/writev/writev01.c b/testcases/kernel/syscalls/writev/writev01.c
index 55406fd..d934052 100644
--- a/testcases/kernel/syscalls/writev/writev01.c
+++ b/testcases/kernel/syscalls/writev/writev01.c
@@ -141,7 +141,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	/* set "tstdir", and "testfile" vars */
 	setup();
@@ -162,12 +162,12 @@
 		if (signal(SIGTERM, sighandler) == SIG_ERR) {
 			perror("signal: SIGTERM");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal: SIGPIPE");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		init_buffs(buf_list);
 
@@ -175,24 +175,24 @@
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/} else
+		 } else
 		    if ((nbytes = write(fd[0], buf_list[2], K_1)) != K_1) {
 			tst_resm(TFAIL,
 				 "write failed: nbytes = %d, " "errno = %d",
 				 nbytes, errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (close(fd[0]) < 0) {
 			tst_resm(TFAIL, "close failed: errno: %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_RDWR, 0666)) < 0) {
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 //block1: /* given vector length -1, writev() return EINVAL. */
 		tst_resm(TINFO, "Enter Block 1");
 		fail = 0;
@@ -443,7 +443,7 @@
 	close(fd[0]);
 	close(fd[1]);
 	cleanup();
-	 /*NOTREACHED*/ return 0;
+	  return 0;
 }
 
 /*
@@ -521,7 +521,7 @@
 		default:
 			tst_resm(TFAIL, "Error detected: init_buffs()");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 	}
 	return 0;
 }
@@ -560,7 +560,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 	exit(sig);
 }
 
diff --git a/testcases/kernel/syscalls/writev/writev02.c b/testcases/kernel/syscalls/writev/writev02.c
index d361efe..3bd247e 100644
--- a/testcases/kernel/syscalls/writev/writev02.c
+++ b/testcases/kernel/syscalls/writev/writev02.c
@@ -108,7 +108,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	setup();		/* set "tstdir", and "testfile" vars */
 
@@ -131,37 +131,37 @@
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGTERM FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGPIPE FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_WRONLY | O_CREAT, 0666)) < 0) {
 			tst_resm(TFAIL, "open(2) failed: fname = %s, "
 				 "errno = %d", f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			l_seek(fd[0], K_1, 0);
 			if ((nbytes = write(fd[0], buf_list[1], K_1)) != K_1) {
 				tst_resm(TFAIL, "write(2) failed: nbytes "
 					 "= %d, errno = %d", nbytes, errno);
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		if (close(fd[0]) < 0) {
 			tst_resm(TFAIL, "close failed: errno = %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_RDWR, 0666)) < 0) {
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 //block1:
 		/*
 		 * In this block we are trying to call writev() with invalid
@@ -303,7 +303,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 	exit(sig);
 }
 
diff --git a/testcases/kernel/syscalls/writev/writev03.c b/testcases/kernel/syscalls/writev/writev03.c
index dd0ef3a..135d650 100644
--- a/testcases/kernel/syscalls/writev/writev03.c
+++ b/testcases/kernel/syscalls/writev/writev03.c
@@ -104,7 +104,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	/* set "tstdir", and "testfile" vars */
 	setup();
@@ -126,13 +126,13 @@
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGTERM FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGPIPE FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		memset(buf_list[0], 0, K_1);
 		memset(buf_list[1], 0, K_1);
@@ -141,24 +141,24 @@
 			tst_resm(TFAIL, "open(2) failed: fname = %s, "
 				 "errno = %d", f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			if ((nbytes = write(fd[0], buf_list[1], K_1)) != K_1) {
 				tst_resm(TFAIL, "write(2) failed: nbytes "
 					 "= %d, errno = %d", nbytes, errno);
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		if (close(fd[0]) < 0) {
 			tst_resm(TFAIL, "close failed: errno = %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_RDWR, 0666)) < 0) {
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 //block1:
 		tst_resm(TINFO, "Enter block 1");
 		fail = 0;
@@ -352,7 +352,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 	exit(sig);
 }
 
diff --git a/testcases/kernel/syscalls/writev/writev04.c b/testcases/kernel/syscalls/writev/writev04.c
index 634269a..2ca07af 100644
--- a/testcases/kernel/syscalls/writev/writev04.c
+++ b/testcases/kernel/syscalls/writev/writev04.c
@@ -104,7 +104,7 @@
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 		tst_exit();
-	 /*NOTREACHED*/}
+	 }
 
 	setup();		/* set "tstdir", and "testfile" vars */
 
@@ -125,13 +125,13 @@
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGTERM FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGPIPE FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		memset(buf_list[0], 0, K_1);
 		memset(buf_list[1], 0, K_1);
@@ -140,24 +140,24 @@
 			tst_resm(TFAIL, "open(2) failed: fname = %s, "
 				 "errno = %d", f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			if ((nbytes = write(fd[0], buf_list[1], K_1)) != K_1) {
 				tst_resm(TFAIL, "write(2) failed: nbytes "
 					 "= %d, errno = %d", nbytes, errno);
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		if (close(fd[0]) < 0) {
 			tst_resm(TFAIL, "close failed: errno = %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_RDWR, 0666)) < 0) {
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-			 /*NOTREACHED*/ return 0;
+			  return 0;
 		}
 //block1:
 		tst_resm(TINFO, "Enter block 1");
@@ -361,7 +361,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 	exit(sig);
 }
 
diff --git a/testcases/kernel/syscalls/writev/writev05.c b/testcases/kernel/syscalls/writev/writev05.c
index 476a80a..c4908e7 100644
--- a/testcases/kernel/syscalls/writev/writev05.c
+++ b/testcases/kernel/syscalls/writev/writev05.c
@@ -102,7 +102,7 @@
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) !=
 	    NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	 /*NOTREACHED*/}
+	 }
 
 	setup();		/* set "tstdir", and "testfile" vars */
 
@@ -121,13 +121,13 @@
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGTERM FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGPIPE FAILED");
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/* Fill the buf_list[0] and buf_list[1] with 0 zeros */
 		memset(buf_list[0], 0, K_1);
@@ -137,24 +137,24 @@
 			tst_resm(TFAIL, "open(2) failed: fname = %s, "
 				 "errno = %d", f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/} else {
+		 } else {
 			if ((nbytes = write(fd[0], buf_list[1], K_1)) != K_1) {
 				tst_resm(TFAIL, "write(2) failed: nbytes "
 					 "= %d, errno = %d", nbytes, errno);
 				cleanup();
-			 /*NOTREACHED*/}
+			 }
 		}
 
 		if (close(fd[0]) < 0) {
 			tst_resm(TFAIL, "close failed: errno = %d", errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		if ((fd[0] = open(f_name, O_RDWR, 0666)) < 0) {
 			tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
 				 f_name, errno);
 			cleanup();
-		 /*NOTREACHED*/}
+		 }
 
 		/*
 		 * In this block we are trying to call writev() with invalid
@@ -290,7 +290,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		cleanup();
-	 /*NOTREACHED*/}
+	 }
 	exit(sig);
 }
 
diff --git a/testcases/kernel/syscalls/writev/writev06.c b/testcases/kernel/syscalls/writev/writev06.c
index d40e711..2165c3d 100644
--- a/testcases/kernel/syscalls/writev/writev06.c
+++ b/testcases/kernel/syscalls/writev/writev06.c
@@ -88,7 +88,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		/* NOTREACHED */
+		
 	}
 
 	setup();		/* set "tstdir", and "testfile" vars */
@@ -105,21 +105,21 @@
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGTERM FAILED");
 			cleanup();
-			/* NOTREACHED */
+			
 		}
 
 		if (signal(SIGPIPE, sighandler) == SIG_ERR) {
 			perror("signal");
 			tst_resm(TFAIL, "signal() SIGPIPE FAILED");
 			cleanup();
-			/* NOTREACHED */
+			
 		}
 
 		if ((fd[0] = open(f_name, O_WRONLY | O_CREAT, 0666)) < 0) {
 			tst_resm(TFAIL, "open(2) failed: fname = %s, "
 				 "errno = %d", f_name, errno);
 			cleanup();
-			/* NOTREACHED */
+			
 		}
 
 		/*
@@ -261,7 +261,7 @@
 		tst_resm(TFAIL, "unlink Failed--file = %s, errno = %d",
 			 f_name, errno);
 		cleanup();
-		/* NOTREACHED */
+		
 	}
 	exit(sig);
 }
diff --git a/testcases/kernel/timers/clock_settime/clock_settime02.c b/testcases/kernel/timers/clock_settime/clock_settime02.c
index 0fb007b..d793e0e 100755
--- a/testcases/kernel/timers/clock_settime/clock_settime02.c
+++ b/testcases/kernel/timers/clock_settime/clock_settime02.c
@@ -122,11 +122,11 @@
 
 	/* Check whether we are root */
 	if (geteuid() != 0) {
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 	}
 	/* Save the current time specifications */
 	if (syscall(__NR_clock_gettime, CLOCK_REALTIME, &saved) < 0)
-		tst_brkm(TBROK, tst_exit, "Could not save the current time");
+		tst_brkm(TBROK, NULL, "Could not save the current time");
 
 	/* Pause if that option was specified */
 	TEST_PAUSE;
diff --git a/testcases/kernel/timers/clock_settime/clock_settime03.c b/testcases/kernel/timers/clock_settime/clock_settime03.c
index 4399a9f..664da83 100755
--- a/testcases/kernel/timers/clock_settime/clock_settime03.c
+++ b/testcases/kernel/timers/clock_settime/clock_settime03.c
@@ -246,10 +246,10 @@
 
 	/* Check whether we are root*/
 	if (geteuid() != 0)
-		tst_brkm(TBROK, tst_exit, "Test must be run as root");
+		tst_brkm(TBROK, NULL, "Test must be run as root");
 
 	if (syscall(__NR_clock_gettime, CLOCK_REALTIME, &saved) < 0)
-		tst_brkm(TBROK, tst_exit, "Clock gettime failed");
+		tst_brkm(TBROK, NULL, "Clock gettime failed");
 
 	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c
index bacc36c..837a77d 100755
--- a/testcases/kernel/timers/timer_create/timer_create03.c
+++ b/testcases/kernel/timers/timer_create/timer_create03.c
@@ -110,7 +110,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) !=
 			(char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
diff --git a/testcases/kernel/timers/timer_create/timer_create04.c b/testcases/kernel/timers/timer_create/timer_create04.c
index d710cc4..ca07968 100755
--- a/testcases/kernel/timers/timer_create/timer_create04.c
+++ b/testcases/kernel/timers/timer_create/timer_create04.c
@@ -124,9 +124,8 @@
 	};
 
 	/* parse standard options */
-	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
+	if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 	TST_TOTAL = sizeof(testcase) / sizeof(testcase[0]);
 
diff --git a/testcases/kernel/timers/timer_delete/timer_delete02.c b/testcases/kernel/timers/timer_delete/timer_delete02.c
index dec3358..07c7ae7 100755
--- a/testcases/kernel/timers/timer_delete/timer_delete02.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete02.c
@@ -89,7 +89,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts (ac, av, (option_t *) NULL, NULL)) !=
 			(char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
diff --git a/testcases/kernel/timers/timer_delete/timer_delete03.c b/testcases/kernel/timers/timer_delete/timer_delete03.c
index c7d2507..f59f4b9 100755
--- a/testcases/kernel/timers/timer_delete/timer_delete03.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete03.c
@@ -96,7 +96,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 		!= NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	TST_TOTAL = sizeof(testcase) / sizeof(testcase[0]);
diff --git a/testcases/kernel/timers/timer_settime/timer_settime02.c b/testcases/kernel/timers/timer_settime/timer_settime02.c
index d8744bd..77ac21d 100755
--- a/testcases/kernel/timers/timer_settime/timer_settime02.c
+++ b/testcases/kernel/timers/timer_settime/timer_settime02.c
@@ -92,7 +92,7 @@
 
 	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) !=
 			(char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
@@ -193,7 +193,7 @@
 	TEST_PAUSE;
 
 	if (syscall(__NR_timer_create, CLOCK_REALTIME, NULL, &timer) < 0)
-		tst_brkm(TBROK, tst_exit, "timer_create failed");
+		tst_brkm(TBROK, NULL, "timer_create failed");
 }
 
 /*
diff --git a/testcases/kernel/timers/timer_settime/timer_settime03.c b/testcases/kernel/timers/timer_settime/timer_settime03.c
index f9ac93e..9d2f491 100755
--- a/testcases/kernel/timers/timer_settime/timer_settime03.c
+++ b/testcases/kernel/timers/timer_settime/timer_settime03.c
@@ -103,7 +103,7 @@
 	/* parse standard options */
 	if ((msg = parse_opts(ac, av, NULL, NULL))
 		!= NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	/* perform global setup for test */
@@ -191,7 +191,7 @@
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
 	if (syscall(__NR_timer_create, CLOCK_REALTIME, NULL, &timer) < 0) {
-		tst_brkm(TBROK, tst_exit, "Timer create failed. Cannot"
+		tst_brkm(TBROK, NULL, "Timer create failed. Cannot"
 				" setup test");
 	}
 
diff --git a/testcases/misc/math/float/exp_log/genmodf.c b/testcases/misc/math/float/exp_log/genmodf.c
index 034b271..9baac40 100644
--- a/testcases/misc/math/float/exp_log/genmodf.c
+++ b/testcases/misc/math/float/exp_log/genmodf.c
@@ -63,7 +63,11 @@
 		TestInputValue = ((Inc*i) + Inc);
 		tabR[i] = modf(TestInputValue, &tabRI[i]);
 		// tabR[i] = modf( ((Inc*i) + Inc), &tabRI[i]);
+<<<<<<< HEAD
 		if ((TestChkSum = tabR[i] + tabRI[i]) != TestInputValue)
+=======
+		if ( (TestChkSum = tabR[i] + tabRI[i]) != TestInputValue)
+>>>>>>> master
 		  {
 		    return -1;
 		  }
diff --git a/testcases/misc/math/float/main.c b/testcases/misc/math/float/main.c
index 0d0fd70..6f423d1 100644
--- a/testcases/misc/math/float/main.c
+++ b/testcases/misc/math/float/main.c
@@ -286,7 +286,11 @@
 
 		/* test the result in TH_DATA : communication buffer */
 		pcom = * tabcour++; 
+<<<<<<< HEAD
 		if (pcom->th_result !=0) {
+=======
+		if (pcom->th_result !=0 ) {
+>>>>>>> master
 	           error++;
                    tst_resm(TFAIL, "thread %d (%s) terminated unsuccessfully %d errors/%d loops", th_num,pcom->th_func.fident,pcom->th_nerror,pcom->th_nloop);
                    tst_resm(TFAIL, "%s", pcom->detail_data);
diff --git a/testcases/network/lib6/asapi_01.c b/testcases/network/lib6/asapi_01.c
index 1be9102..3a8f3af 100644
--- a/testcases/network/lib6/asapi_01.c
+++ b/testcases/network/lib6/asapi_01.c
@@ -229,7 +229,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -260,7 +260,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/network/lib6/asapi_02.c b/testcases/network/lib6/asapi_02.c
index fc3afe9..69c5748 100644
--- a/testcases/network/lib6/asapi_02.c
+++ b/testcases/network/lib6/asapi_02.c
@@ -331,7 +331,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -362,7 +362,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/network/lib6/asapi_03.c b/testcases/network/lib6/asapi_03.c
index 6a02e1b..476af3a 100644
--- a/testcases/network/lib6/asapi_03.c
+++ b/testcases/network/lib6/asapi_03.c
@@ -210,7 +210,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -241,7 +241,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/network/lib6/asapi_04.c b/testcases/network/lib6/asapi_04.c
index 8859fac..21c7e0c 100644
--- a/testcases/network/lib6/asapi_04.c
+++ b/testcases/network/lib6/asapi_04.c
@@ -87,7 +87,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, 0, 0);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	pid = getpid();
@@ -98,7 +98,7 @@
 		do_tests();
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return(0);
 }	/* End main */
 
diff --git a/testcases/network/lib6/asapi_05.c b/testcases/network/lib6/asapi_05.c
index 8e3c47e..881b301 100644
--- a/testcases/network/lib6/asapi_05.c
+++ b/testcases/network/lib6/asapi_05.c
@@ -66,7 +66,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -77,7 +77,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/network/lib6/asapi_06.c b/testcases/network/lib6/asapi_06.c
index 9061012..b833f64 100644
--- a/testcases/network/lib6/asapi_06.c
+++ b/testcases/network/lib6/asapi_06.c
@@ -87,7 +87,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, 0, 0);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	pid = getpid();
@@ -98,7 +98,7 @@
 		do_tests();
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return(0);
 }	/* End main */
 
diff --git a/testcases/network/lib6/asapi_07.c b/testcases/network/lib6/asapi_07.c
index cee4db2..788f237 100644
--- a/testcases/network/lib6/asapi_07.c
+++ b/testcases/network/lib6/asapi_07.c
@@ -65,7 +65,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -75,7 +75,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return 0;
 }
 
diff --git a/testcases/network/lib6/getaddrinfo_01.c b/testcases/network/lib6/getaddrinfo_01.c
index 3f1af64..4b506e8 100644
--- a/testcases/network/lib6/getaddrinfo_01.c
+++ b/testcases/network/lib6/getaddrinfo_01.c
@@ -78,7 +78,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -90,7 +90,7 @@
 	}
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return(0);
 }	/* End main */
 
@@ -108,7 +108,7 @@
 	char *p;
 
 	if (gethostname(hostname, sizeof(hostname)) < 0)
-		tst_brkm(TBROK, tst_exit, "gethostname failed - %s",
+		tst_brkm(TBROK, NULL, "gethostname failed - %s",
 			strerror(errno));
 	strncpy(shortname, hostname, MAXHOSTNAMELEN);
 	shortname[MAXHOSTNAMELEN] = '\0';
@@ -514,7 +514,7 @@
 	char *p;
 
 	if (gethostname(hostname, sizeof(hostname)) < 0)
-		tst_brkm(TBROK, tst_exit, "gethostname failed - %s",
+		tst_brkm(TBROK, NULL, "gethostname failed - %s",
 			strerror(errno));
 	strncpy(shortname, hostname, MAXHOSTNAMELEN);
 	shortname[MAXHOSTNAMELEN] = '\0';
diff --git a/testcases/network/lib6/in6_01.c b/testcases/network/lib6/in6_01.c
index 762ff58..6c6d179 100644
--- a/testcases/network/lib6/in6_01.c
+++ b/testcases/network/lib6/in6_01.c
@@ -94,7 +94,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -182,7 +182,7 @@
 	}
 
 	cleanup();
-	/* NOTREACHED */
+	
 	return(0);
 }	/* End main */
 
diff --git a/testcases/network/lib6/in6_02.c b/testcases/network/lib6/in6_02.c
index 2aacdf6..bae846f 100644
--- a/testcases/network/lib6/in6_02.c
+++ b/testcases/network/lib6/in6_02.c
@@ -85,7 +85,7 @@
 	/* Parse standard options given to run the test. */
 	msg = parse_opts(argc, argv, NULL, NULL);
 	if (msg != NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 	}
 
 	setup();
@@ -98,7 +98,7 @@
 	}
 	cleanup();
 
-	/* NOTREACHED */
+	
 	return(0);
 }	/* End main */
 
diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
index 0723d78..fdc02db 100644
--- a/testcases/network/nfs/nfs_fsstress/fsstress.c
+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
@@ -522,7 +522,7 @@
 		fprintf(stderr, "fsstress: append_pathname failure\n");
 		chdir(homedir);
 		abort();
-		/* NOTREACHED */
+		
 	}
 #endif
 	name->path = realloc(name->path, name->len + 1 + len);
@@ -604,7 +604,7 @@
 	chdir(homedir);
 	fprintf(stderr, "fsstress: check_cwd failure\n");
 	abort();
-	/* NOTREACHED */
+	
 #endif
 }
 
@@ -865,7 +865,7 @@
 	abort();
 #endif
         return -1;
-	/* NOTREACHED */
+	
 }
 
 void
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_accept_close.c b/testcases/network/sctp/func_tests/test_1_to_1_accept_close.c
index b0fd259..b810c4b 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_accept_close.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_accept_close.c
@@ -128,7 +128,7 @@
 	/* accept() TEST1: Bad socket descriptor EBADF, Expected error */
         error = accept(-1, (struct sockaddr *) &acpt_addr, &len);
         if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "accept with a bad socket descriptor"
+		tst_brkm(TBROK, NULL, "accept with a bad socket descriptor"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() with a bad socket descriptor - EBADF");
@@ -136,7 +136,7 @@
         /*accept() TEST2: Invalid socket ENOTSOCK, Expected error*/
         error = accept(0, (struct sockaddr *) &acpt_addr, &len);
         if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "accept with invalid socket"
+		tst_brkm(TBROK, NULL, "accept with invalid socket"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() with invalid socket - ENOTSOCK");
@@ -144,7 +144,7 @@
         /*accept() TEST3: Invalid address EFAULT, Expected error*/
         error = accept(lstn_sk, (struct sockaddr *) -1, &len);
         if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "accept with invalid address"
+		tst_brkm(TBROK, NULL, "accept with invalid address"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() with invalid address - EFAULT");
@@ -154,7 +154,7 @@
         /*accept() TEST4: on a non-listening socket EINVAL, Expected error*/
         error = accept(sk, (struct sockaddr *) &acpt_addr, &len);
         if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "accept on a non-listening socket"
+		tst_brkm(TBROK, NULL, "accept on a non-listening socket"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() on a non-listening socket - EINVAL");
@@ -167,7 +167,7 @@
 	/*accept() TEST5: On a established socket EINVAL, Expected error*/
 	error = accept(acpt_sk, (struct sockaddr *) &acpt_addr, &len);
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "accept on an established socket"
+		tst_brkm(TBROK, NULL, "accept on an established socket"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() on an established socket - EINVAL");
@@ -180,7 +180,7 @@
 	/*accept() TEST6: On the CLOSED association should succeed*/
 	acpt_sk = accept(lstn_sk, (struct sockaddr *) &acpt_addr, &len);
         if (acpt_sk < 0)
-		tst_brkm(TBROK, tst_exit, "accept a closed association"
+		tst_brkm(TBROK, NULL, "accept a closed association"
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept() a closed association - SUCCESS");
@@ -202,7 +202,7 @@
         /*close() TEST8: Bad socket descriptor, EBADF Expected error*/
 	error = close(-1);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "close with a bad socket descriptor "
+		tst_brkm(TBROK, NULL, "close with a bad socket descriptor "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "close() with a bad socket descriptor - EBADF");
@@ -210,7 +210,7 @@
 	/*close() TEST9: valid socket descriptor should succeed*/
 	error = close(sk);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "close with a valid socket descriptor"
+		tst_brkm(TBROK, NULL, "close with a valid socket descriptor"
                          " error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "close() with a valid socket descriptor - SUCCESS");
@@ -218,7 +218,7 @@
 	/*close() TEST10: closed socket descriptor, EBADF Expected error*/
         error = close(sk);
         if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "close with a closed socket "
+		tst_brkm(TBROK, NULL, "close with a closed socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "close() with a closed socket descriptor - EBADF");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_addrs.c b/testcases/network/sctp/func_tests/test_1_to_1_addrs.c
index fdd9694..55aa701 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_addrs.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_addrs.c
@@ -177,7 +177,7 @@
 	/*sctp_getladdrs() TEST1: Bad socket descriptor, EBADF Expected error*/
 	error = sctp_getladdrs(-1, 0, &laddrs);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "sctp_getladdrs with a bad socket "
+		tst_brkm(TBROK, NULL, "sctp_getladdrs with a bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getladdrs() with a bad socket descriptor - "
@@ -186,7 +186,7 @@
 	/*sctp_getladdrs() TEST2: Invalid socket, ENOTSOCK Expected error*/
 	error = sctp_getladdrs(0, 0, &laddrs);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "sctp_getladdrs with invalid socket "
+		tst_brkm(TBROK, NULL, "sctp_getladdrs with invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getladdrs() with invalid socket - ENOTSOCK");
@@ -196,7 +196,7 @@
         sk1 = socket(pf_class, SOCK_STREAM, IPPROTO_IP);
 	error = sctp_getladdrs(sk1, 0, &laddrs);
 	if (error != -1 || errno != EOPNOTSUPP)
-		tst_brkm(TBROK, tst_exit, "sctp_getladdrs with socket of "
+		tst_brkm(TBROK, NULL, "sctp_getladdrs with socket of "
 			 "different protocol error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getladdrs() with socket of different protocol - "
@@ -205,20 +205,20 @@
 	/*sctp_getladdrs() TEST4: Getting the local addresses*/
 	error = sctp_getladdrs(lstn_sk, 0, &laddrs);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "sctp_getladdrs with valid socket "
+		tst_brkm(TBROK, NULL, "sctp_getladdrs with valid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	addr = (struct sockaddr_in *)laddrs;
 	if (addr->sin_port != lstn_addr.sin_port || 
 	    addr->sin_family != lstn_addr.sin_family || 
 	    addr->sin_addr.s_addr != lstn_addr.sin_addr.s_addr)
-		tst_brkm(TBROK, tst_exit, "sctp_getladdrs comparision failed");
+		tst_brkm(TBROK, NULL, "sctp_getladdrs comparision failed");
 
 	tst_resm(TPASS, "sctp_getladdrs() - SUCCESS");
 
 	/*sctp_freealddrs() TEST5: freeing the local address*/
 	if ((sctp_freeladdrs(laddrs)) < 0)
-		tst_brkm(TBROK, tst_exit, "sctp_freeladdrs "
+		tst_brkm(TBROK, NULL, "sctp_freeladdrs "
 			 "error:%d, errno:%d", error, errno);
 		
 	tst_resm(TPASS, "sctp_freeladdrs() - SUCCESS");
@@ -226,7 +226,7 @@
 	/*sctp_getpaddrs() TEST6: Bad socket descriptor, EBADF Expected error*/
 	error = sctp_getpaddrs(-1, 0, &paddrs);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs with a bad socket "
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs with a bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getpaddrs() with a bad socket descriptor - "
@@ -235,7 +235,7 @@
 	/*sctp_getpaddrs() TEST7: Invalid socket, ENOTSOCK Expected error*/
 	error = sctp_getpaddrs(0, 0, &paddrs);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs with invalid socket "
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs with invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getpaddrs() with invalid socket - ENOTSOCK");
@@ -244,7 +244,7 @@
 	EOPNOTSUPP Expected error*/
 	error = sctp_getpaddrs(sk1, 0, &laddrs);
 	if (error != -1 || errno != EOPNOTSUPP)
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs with socket of "
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs with socket of "
 			 "different protocol error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_getpaddrs() with socket of different protocol - "
@@ -253,20 +253,20 @@
 	/*sctp_getpaddrs() TEST9: Getting the peer addresses*/
 	error = sctp_getpaddrs(acpt_sk, 0, &paddrs);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs with valid socket "
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs with valid socket "
 			 "error:%d, errno:%d", error, errno);
 	
 	addr = (struct sockaddr_in *)paddrs;
 	if (addr->sin_port != acpt_addr.sin_port ||
             addr->sin_family != acpt_addr.sin_family || 
             addr->sin_addr.s_addr != acpt_addr.sin_addr.s_addr)
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs comparision failed");
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs comparision failed");
 
 	tst_resm(TPASS, "sctp_getpaddrs() - SUCCESS");
 
 	/*sctp_freeapddrs() TEST10: freeing the peer address*/
 	if ((sctp_freepaddrs(paddrs)) < 0)
-		tst_brkm(TBROK, tst_exit, "sctp_freepaddrs "
+		tst_brkm(TBROK, NULL, "sctp_freepaddrs "
 			 "error:%d, errno:%d", error, errno);
 		
 	tst_resm(TPASS, "sctp_freepaddrs() - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_connect.c b/testcases/network/sctp/func_tests/test_1_to_1_connect.c
index 4decfca..e91d863 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_connect.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_connect.c
@@ -114,7 +114,7 @@
 	len = sizeof(struct sockaddr_in);
 	error = connect(-1, (const struct sockaddr *) &conn_addr, len);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "connect with bad socket "
+		tst_brkm(TBROK, NULL, "connect with bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() with bad socket descriptor - EBADF");
@@ -122,7 +122,7 @@
 	/*connect () TEST2: Invalid socket, ENOTSOCK Expected error*/
 	error = connect(0, (const struct sockaddr *) &conn_addr, len);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "connect with invalid socket "
+		tst_brkm(TBROK, NULL, "connect with invalid socket "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() with invalid socket - ENOTSOCK");
@@ -130,7 +130,7 @@
 	/*connect () TEST3: Invalid address, EFAULT Expected error*/
 	error = connect(sk, (const struct sockaddr *) -1, len);
 	if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "connect with invalid address "
+		tst_brkm(TBROK, NULL, "connect with invalid address "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() with invalid address - EFAULT");
@@ -138,7 +138,7 @@
 	/*connect () TEST4: Invalid address length, EINVAL Expected error*/
 	error = connect(sk, (const struct sockaddr *) &conn_addr, (len - 3));
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "connect with invalid address length "
+		tst_brkm(TBROK, NULL, "connect with invalid address length "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() with invalid address length - EINVAL");
@@ -147,7 +147,7 @@
 	conn_addr.sin_family = 9090; /*Assigning invalid address family*/
         error = connect(sk, (const struct sockaddr *) &conn_addr, len);
         if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "connect with invalid address family "
+		tst_brkm(TBROK, NULL, "connect with invalid address family "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() with invalid address family - EINVAL");
@@ -161,7 +161,7 @@
 		error = connect(clnt_sk[i], (const struct sockaddr *)&conn_addr,
 			      len);
 		if (error < 0)
-			tst_brkm(TBROK, tst_exit, "valid blocking connect "
+			tst_brkm(TBROK, NULL, "valid blocking connect "
 				 "error:%d, errno:%d", error, errno);
 	}
 
@@ -172,7 +172,7 @@
 	/*Now that accept queue is full, the below connect should fail*/
 	error = connect(clnt2_sk, (const struct sockaddr *) &conn_addr, len);
 	if (error != -1 || errno != ECONNREFUSED)
-		tst_brkm(TBROK, tst_exit, "connect when accept queue is full "
+		tst_brkm(TBROK, NULL, "connect when accept queue is full "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() when accept queue is full - ECONNREFUSED");
@@ -185,7 +185,7 @@
 	/*connect () TEST8: from a listening socket, EISCONN Expect error*/
 	error = connect(lstn_sk, (const struct sockaddr *) &lstn_addr, len);
 	if (error != -1 || errno != EISCONN)
-		tst_brkm(TBROK, tst_exit, "connect on a listening socket "
+		tst_brkm(TBROK, NULL, "connect on a listening socket "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() on a listening socket - EISCONN");
@@ -194,7 +194,7 @@
 	i=0;
 	error = connect(acpt_sk[i], (const struct sockaddr *) &lstn_addr, len);
         if (error != -1 || errno != EISCONN)
-		tst_brkm(TBROK, tst_exit, "connect on an established socket "
+		tst_brkm(TBROK, NULL, "connect on an established socket "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() on an established socket - EISCONN");
@@ -209,7 +209,7 @@
 	 */
 	error = connect(sk1, (const struct sockaddr *)&conn_addr, len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "Re-establish an association that "
+		tst_brkm(TBROK, NULL, "Re-establish an association that "
 				 "is closed error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect() to re-establish a closed association - "
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_connectx.c b/testcases/network/sctp/func_tests/test_1_to_1_connectx.c
index ef8736f..abd785e 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_connectx.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_connectx.c
@@ -115,7 +115,7 @@
 	len = sizeof(struct sockaddr_in);
 	error = sctp_connectx(-1, (struct sockaddr *) &conn_addr, 1);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx with bad socket "
+		tst_brkm(TBROK, NULL, "sctp_connectx with bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() with bad socket descriptor - EBADF");
@@ -123,7 +123,7 @@
 	/*sctp_connectx () TEST2: Invalid socket, ENOTSOCK Expected error*/
 	error = sctp_connectx(0, (struct sockaddr *) &conn_addr, 1);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx with invalid socket "
+		tst_brkm(TBROK, NULL, "sctp_connectx with invalid socket "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() with invalid socket - ENOTSOCK");
@@ -133,7 +133,7 @@
 	tmp_addr->sa_family = AF_INET;
 	error = sctp_connectx(sk, tmp_addr, 1);
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx with invalid address "
+		tst_brkm(TBROK, NULL, "sctp_connectx with invalid address "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() with invalid address - EINVAL");
@@ -141,7 +141,7 @@
 	/*sctp_connectx () TEST4: Invalid address length, EINVAL Expected error*/
 	error = sctp_connectx(sk, (struct sockaddr *) &conn_addr, 0);
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx with invalid address length "
+		tst_brkm(TBROK, NULL, "sctp_connectx with invalid address length "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() with invalid address length - EINVAL");
@@ -150,7 +150,7 @@
 	conn_addr.sin_family = 9090; /*Assigning invalid address family*/
 	error = sctp_connectx(sk, (struct sockaddr *) &conn_addr, 1);
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx with invalid address family "
+		tst_brkm(TBROK, NULL, "sctp_connectx with invalid address family "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() with invalid address family - EINVAL");
@@ -164,7 +164,7 @@
 		error = sctp_connectx(clnt_sk[i], (struct sockaddr *)&conn_addr,
 			      1);
 		if (error < 0)
-			tst_brkm(TBROK, tst_exit, "valid blocking sctp_connectx "
+			tst_brkm(TBROK, NULL, "valid blocking sctp_connectx "
 				 "error:%d, errno:%d", error, errno);
 	}
 
@@ -175,7 +175,7 @@
 	/*Now that accept queue is full, the below sctp_connectx should fail*/
 	error = sctp_connectx(clnt2_sk, (struct sockaddr *) &conn_addr, 1);
 	if (error != -1 || errno != ECONNREFUSED)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx when accept queue is full "
+		tst_brkm(TBROK, NULL, "sctp_connectx when accept queue is full "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() when accept queue is full - ECONNREFUSED");
@@ -188,7 +188,7 @@
 	/*sctp_connectx () TEST8: from a listening socket, EISCONN Expect error*/
 	error = sctp_connectx(lstn_sk, (struct sockaddr *) &lstn_addr, 1);
 	if (error != -1 || errno != EISCONN)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx on a listening socket "
+		tst_brkm(TBROK, NULL, "sctp_connectx on a listening socket "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() on a listening socket - EISCONN");
@@ -197,7 +197,7 @@
 	i=0;
 	error = sctp_connectx(acpt_sk[i], (struct sockaddr *) &lstn_addr, 1);
 	if (error != -1 || errno != EISCONN)
-		tst_brkm(TBROK, tst_exit, "sctp_connectx on an established socket "
+		tst_brkm(TBROK, NULL, "sctp_connectx on an established socket "
 	                 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() on an established socket - EISCONN");
@@ -212,7 +212,7 @@
 	 */
 	error = sctp_connectx(sk1, (struct sockaddr *)&conn_addr, 1);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "Re-establish an association that "
+		tst_brkm(TBROK, NULL, "Re-establish an association that "
 				 "is closed error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sctp_connectx() to re-establish a closed association - "
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_nonblock.c b/testcases/network/sctp/func_tests/test_1_to_1_nonblock.c
index cb9ecce..d436b36 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_nonblock.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_nonblock.c
@@ -114,18 +114,18 @@
 	/*Setting server socket non-blocking*/
 	sflag = fcntl(lstn_sk, F_GETFL, 0);
 	if (sflag < 0)
-		tst_brkm(TBROK, tst_exit, "fcnt F_GETFL failed "
+		tst_brkm(TBROK, NULL, "fcnt F_GETFL failed "
                          "sflag:%d, errno:%d", sflag, errno);
 
 	error = fcntl(lstn_sk, F_SETFL, sflag | O_NONBLOCK);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "fcnt F_SETFL failed "
+		tst_brkm(TBROK, NULL, "fcnt F_SETFL failed "
                          "error:%d, errno:%d", error, errno);
 
 	/* TEST1: accept should return EAGAIN instead blocking. */
 	error = accept(lstn_sk, (struct sockaddr *)&svr_addr, &len);
 	if (error != -1 || errno != EAGAIN)
-		tst_brkm(TBROK, tst_exit, "non-blocking accept "
+		tst_brkm(TBROK, NULL, "non-blocking accept "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "non-blocking accept() - EAGAIN");
@@ -134,17 +134,17 @@
 	/*Set client socket as non-blocking*/
 	cflag = fcntl(sk, F_GETFL, 0);
 	if (cflag < 0)
-		tst_brkm(TBROK, tst_exit, "fcnt F_GETFL failed "
+		tst_brkm(TBROK, NULL, "fcnt F_GETFL failed "
                          "cflag:%d, errno:%d", cflag, errno);
 
 	error = fcntl(sk, F_SETFL, sflag | O_NONBLOCK);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "fcnt F_SETFL failed "
+		tst_brkm(TBROK, NULL, "fcnt F_SETFL failed "
                          "error:%d, errno:%d", error, errno);
 
 	error = connect(sk, (const struct sockaddr *) &conn_addr, len);
 	if (error != -1 || errno != EINPROGRESS)
-		tst_brkm(TBROK, tst_exit, "non-blocking connect "
+		tst_brkm(TBROK, NULL, "non-blocking connect "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "non-blocking connect() - EINPROGRESS");
@@ -152,7 +152,7 @@
 	/* TEST3: Now that connect() called, accept will succeed */
 	acpt_sk = accept(lstn_sk, (struct sockaddr *)&svr_addr, &len);
 	if (acpt_sk < 0)
-		tst_brkm(TBROK, tst_exit, "accept after a non-blocking connect "
+		tst_brkm(TBROK, NULL, "accept after a non-blocking connect "
                          "error:%d, errno:%d", error, errno);
 	
 	tst_resm(TPASS, "accept() after a non-blocking connect - SUCCESS");
@@ -197,7 +197,7 @@
 	/* TEST4: recvmsg() should return EAGAIN instead blocking */
 	error = recvmsg(sk, &inmessage, MSG_WAITALL);
 	if (error != -1 || errno != EAGAIN)
-		tst_brkm(TBROK, tst_exit, "non-blocking recvmsg "
+		tst_brkm(TBROK, NULL, "non-blocking recvmsg "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "non-blocking recvmsg() - EAGAIN");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_recvfrom.c b/testcases/network/sctp/func_tests/test_1_to_1_recvfrom.c
index 120fe39..74cf46f 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_recvfrom.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_recvfrom.c
@@ -116,7 +116,7 @@
 	count = recvfrom(-1, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "recvfrom with a bad socket "
+		tst_brkm(TBROK, NULL, "recvfrom with a bad socket "
 			 "descriptor count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvfrom() with a bad socket descriptor - EBADF");
@@ -125,7 +125,7 @@
 	count = recvfrom(0, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "recvfrom with invalid socket "
+		tst_brkm(TBROK, NULL, "recvfrom with invalid socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvfrom() with invalid socket - ENOTSOCK");
@@ -134,7 +134,7 @@
 	count = recvfrom(acpt_sk, (char *)-1, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "recvfrom with invalid message "
+		tst_brkm(TBROK, NULL, "recvfrom with invalid message "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvfrom() with invalid message ptr - EFAULT");
@@ -143,7 +143,7 @@
 	count = recvfrom(lstn_sk, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count != -1 || errno != ENOTCONN)
-		tst_brkm(TBROK, tst_exit, "recvfrom on listening socket "
+		tst_brkm(TBROK, NULL, "recvfrom on listening socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvfrom() on listening socket - ENOTCONN");
@@ -156,7 +156,7 @@
 	count = recvfrom(acpt_sk, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count < 0)
-		tst_brkm(TBROK, tst_exit, "recvfrom on a socket that has "
+		tst_brkm(TBROK, NULL, "recvfrom on a socket that has "
 			 "received shutdown count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvfrom() on a socket that has received shutdown - "
@@ -167,7 +167,7 @@
 	count = recvfrom(sk, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count < 0)
-		tst_brkm(TBROK, tst_exit, "recvfrom on a socket with pending "
+		tst_brkm(TBROK, NULL, "recvfrom on a socket with pending "
 			 "message that has sent shutdown count:%d, errno:%d",
 			 count, errno);
 
@@ -179,7 +179,7 @@
 	count = recvfrom(sk, message_rcv, msg_count, flag,
 			 (struct sockaddr *)&svr_addr, &len);
 	if (count != -1 || errno != ENOTCONN)
-		tst_brkm(TBROK, tst_exit, "recvfrom on a socket with no "
+		tst_brkm(TBROK, NULL, "recvfrom on a socket with no "
 			 "pending messages and has sent shutdown count:%d, "
 			 "errno:%d", count, errno);
 
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_recvmsg.c b/testcases/network/sctp/func_tests/test_1_to_1_recvmsg.c
index 83da25a..9c6e877 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_recvmsg.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_recvmsg.c
@@ -123,7 +123,7 @@
 	/*recvmsg () TEST1: Bad socket descriptor, EBADF Expected error*/
 	count = recvmsg(-1, &inmessage, flag);
 	if (count != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "recvmsg with a bad socket "
+		tst_brkm(TBROK, NULL, "recvmsg with a bad socket "
 			 "descriptor count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() with a bad socket descriptor - EBADF");
@@ -131,7 +131,7 @@
 	/*recvmsg () TEST2: Invalid socket , ENOTSOCK Expected error*/
 	count = recvmsg(0, &inmessage, flag);
 	if (count != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "recvmsg with invalid socket "
+		tst_brkm(TBROK, NULL, "recvmsg with invalid socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() with invalid socket - ENOTSOCK");
@@ -140,7 +140,7 @@
 	inmessage.msg_iov = (struct iovec *)-1;
 	count = recvmsg(acpt_sk, &inmessage, flag);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "recvmsg with invalid iovec "
+		tst_brkm(TBROK, NULL, "recvmsg with invalid iovec "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() with invalid iovec ptr - EFAULT");
@@ -150,7 +150,7 @@
 	/*recvmsg () TEST4: Invalid msghdr pointer EFAULT, Expected error*/
 	count = recvmsg(acpt_sk, (struct msghdr *)-1, flag);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "recvmsg with invalid msghdr "
+		tst_brkm(TBROK, NULL, "recvmsg with invalid msghdr "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() with invalid msghdr ptr - EFAULT");
@@ -158,7 +158,7 @@
 	/*recvmsg () TEST5:recvmsg on listening socket,ENOTCONN Expected error*/
 	count = recvmsg(lstn_sk, &inmessage, flag);
 	if (count != -1 || errno != ENOTCONN)
-		tst_brkm(TBROK, tst_exit, "recvmsg on listening socket "
+		tst_brkm(TBROK, NULL, "recvmsg on listening socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() on listening socket - ENOTCONN");
@@ -171,7 +171,7 @@
 	/*recvmsg () TEST6:reading on a socket that received SHUTDOWN*/
 	count = recvmsg(acpt_sk, &inmessage, flag);
 	if (count < 0)
-		tst_brkm(TBROK, tst_exit, "recvmsg on a socket that has "
+		tst_brkm(TBROK, NULL, "recvmsg on a socket that has "
 			 "received shutdown count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "recvmsg() on a socket that has received shutdown - "
@@ -181,7 +181,7 @@
 	SHUTDOWN*/
 	count = recvmsg(sk, &inmessage, flag);
 	if (count < 0)
-		tst_brkm(TBROK, tst_exit, "recvmsg on a socket with pending "
+		tst_brkm(TBROK, NULL, "recvmsg on a socket with pending "
 			 "message that has sent shutdown count:%d, errno:%d",
 			 count, errno);
 
@@ -192,7 +192,7 @@
 	ENOTCONN Expected error*/
 	count = recvmsg(sk, &inmessage, flag);
 	if (count != -1 || errno != ENOTCONN)
-		tst_brkm(TBROK, tst_exit, "recvmsg on a socket with no "
+		tst_brkm(TBROK, NULL, "recvmsg on a socket with no "
 			 "pending messages and has sent shutdown count:%d, "
 			 "errno:%d", count, errno);
 
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_rtoinfo.c b/testcases/network/sctp/func_tests/test_1_to_1_rtoinfo.c
index b1e2625..777304e 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_rtoinfo.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_rtoinfo.c
@@ -73,7 +73,7 @@
 	/*TEST1 Getting the default values using getsockopt()*/
 	ret = getsockopt(sd, IPPROTO_SCTP, SCTP_RTOINFO, &grtoinfo, &len);
 	if (ret < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_RTOINFO "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_RTOINFO "
 			 "ret:%d, errno:%d", ret, errno);
 
 	tst_resm(TPASS, "getsockopt() SCTP_RTOINFO - SUCCESS");
@@ -87,7 +87,7 @@
 	ret = setsockopt(sd, IPPROTO_SCTP, SCTP_RTOINFO, &srtoinfo, 
 		sizeof(struct sctp_rtoinfo));
 	if (ret < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SCTP_RTOINFO "
+		tst_brkm(TBROK, NULL, "setsockopt SCTP_RTOINFO "
 			 "ret:%d, errno:%d", ret, errno);
 
 	tst_resm(TPASS, "setsockopt() SCTP_RTOINFO - SUCCESS");
@@ -95,14 +95,14 @@
 	/*Getting the values which are set using setsockopt()*/
 	ret = getsockopt(sd, IPPROTO_SCTP, SCTP_RTOINFO, &grtoinfo, &len);
 	if (ret < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_RTOINFO "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_RTOINFO "
 			 "ret:%d, errno:%d", ret, errno);
 
 	/* TEST3 Compare the get values with the set values. */ 
 	if (srtoinfo.srto_initial != grtoinfo.srto_initial &&
             srtoinfo.srto_max != grtoinfo.srto_max &&
             srtoinfo.srto_min != grtoinfo.srto_min)
-		tst_brkm(TBROK, tst_exit, "setsockopt/getsockopt SCTP_RTOINFO "
+		tst_brkm(TBROK, NULL, "setsockopt/getsockopt SCTP_RTOINFO "
 			 "compare failed");
 
 	tst_resm(TPASS, "setsockopt()/getsockopt SCTP_RTOINFO compare - "
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_send.c b/testcases/network/sctp/func_tests/test_1_to_1_send.c
index 35d38a4..d3d0916 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_send.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_send.c
@@ -112,7 +112,7 @@
 	/*send () TEST1: Bad socket descriptor, EBADF Expected error*/
 	count = send(-1, message, len_snd, flag);
 	if (count != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "send with a bad socket "
+		tst_brkm(TBROK, NULL, "send with a bad socket "
 			 "descriptor count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() with a bad socket descriptor - EBADF");
@@ -120,7 +120,7 @@
 	/*send () TEST2: Invalid socket, ENOTSOCK Expected error*/
 	count = send(0, message, len_snd, flag);
 	if (count != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "send with invalid socket "
+		tst_brkm(TBROK, NULL, "send with invalid socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() with invalid socket - ENOTSOCK");
@@ -128,7 +128,7 @@
 	/*send () TEST3: send on listening socket, EPIPE Expected error*/
 	count = send(lstn_sk, message, len_snd, flag);
 	if (count != -1 || errno != EPIPE)
-		tst_brkm(TBROK, tst_exit, "send on a listening socket "
+		tst_brkm(TBROK, NULL, "send on a listening socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() on a listening socket - EPIPE");
@@ -137,7 +137,7 @@
        /* FIXME this test should pass. Don't catch why...  */
 	count = send(sk, (char *)0x1, len_snd, flag);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "send with invalid message "
+		tst_brkm(TBROK, NULL, "send with invalid message "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() with invalid message ptr - EFAULT");
@@ -154,7 +154,7 @@
 	/*send () TEST5: send on closed association, EPIPE Expected error*/
 	count = send(acpt1_sk, message, len_snd, flag);
 	if (count != -1 || errno != EPIPE)
-		tst_brkm(TBROK, tst_exit, "send on a closed association "
+		tst_brkm(TBROK, NULL, "send on a closed association "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() on a closed association - EPIPE");
@@ -190,7 +190,7 @@
 	/*send() TEST6: Sending data from client socket to server socket*/
 	count = send(sk, message, msg_count, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "send from client to server "
+		tst_brkm(TBROK, NULL, "send from client to server "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() from client to server - SUCCESS");
@@ -202,7 +202,7 @@
 	/*send() TEST7: Sending data from accept socket to client socket*/
 	count = send(acpt_sk, message, msg_count, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "send from accept socket to client "
+		tst_brkm(TBROK, NULL, "send from accept socket to client "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "send() from accept socket to client - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_sendmsg.c b/testcases/network/sctp/func_tests/test_1_to_1_sendmsg.c
index 0c5970e..7bdc9f0 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_sendmsg.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_sendmsg.c
@@ -153,7 +153,7 @@
 	/*sendmsg () TEST1: Bad socket descriptor, EBADF Expected error*/
 	count = sendmsg(-1, &outmessage, flag);
 	if (count != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "sendmsg with a bad socket "
+		tst_brkm(TBROK, NULL, "sendmsg with a bad socket "
 			 "descriptor count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with a bad socket descriptor - EBADF");
@@ -161,7 +161,7 @@
 	/*sendmsg () TEST2: Invalid socket, ENOTSOCK Expected error*/
 	count = sendmsg(0, &outmessage, flag);
 	if (count != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "sendmsg with invalid socket "
+		tst_brkm(TBROK, NULL, "sendmsg with invalid socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with invalid socket - ENOTSOCK");
@@ -169,7 +169,7 @@
 	/*sendmsg () TEST3: sendmsg on listening socket, EPIPE Expected error*/
 	count = sendmsg(lstn_sk, &outmessage, flag);
 	if (count != -1 || errno != EPIPE)
-		tst_brkm(TBROK, tst_exit, "sendmsg on a listening socket "
+		tst_brkm(TBROK, NULL, "sendmsg on a listening socket "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() on a listening socket - EPIPE");
@@ -178,7 +178,7 @@
 	outmessage.msg_iov = (struct iovec *)-1;
 	count = sendmsg(sk, &outmessage, flag);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "sendmsg with invalid iovec "
+		tst_brkm(TBROK, NULL, "sendmsg with invalid iovec "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with invalid iovec ptr - EFAULT");
@@ -189,7 +189,7 @@
         outmessage.msg_iovlen = 0;
 	count = sendmsg(sk, &outmessage, flag);
 	if (count != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sendmsg with invalid iovec "
+		tst_brkm(TBROK, NULL, "sendmsg with invalid iovec "
 			 "length count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with invalid iovec length - EINVAL");
@@ -199,7 +199,7 @@
 	/*sendmsg () TEST6: Invalid msghdr pointer EFAULT, Expected error*/
 	count = sendmsg(sk, (struct msghdr *)-1, flag);
 	if (count != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "sendmsg with invalid msghdr "
+		tst_brkm(TBROK, NULL, "sendmsg with invalid msghdr "
 			 "pointer count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with invalid msghdr ptr - EFAULT");
@@ -208,7 +208,7 @@
 	sinfo->sinfo_flags = 999;
 	count = sendmsg(sk, &outmessage, -1);
 	if (count != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sendmsg with invalid sinfo "
+		tst_brkm(TBROK, NULL, "sendmsg with invalid sinfo "
 			 "flags count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with invalid sinfo flags - EINVAL");
@@ -217,7 +217,7 @@
 	sinfo->sinfo_flags = SCTP_EOF;
 	count = sendmsg(sk, &outmessage, flag);
 	if (count != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sendmsg with SCTP_EOF flag "
+		tst_brkm(TBROK, NULL, "sendmsg with SCTP_EOF flag "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with SCTP_EOF flag - EINVAL");
@@ -226,7 +226,7 @@
 	sinfo->sinfo_flags = SCTP_ABORT;
 	count = sendmsg(sk, &outmessage, flag);
 	if (count != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "sendmsg with SCTP_ABORT flag "
+		tst_brkm(TBROK, NULL, "sendmsg with SCTP_ABORT flag "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() with SCTP_ABORT flag - EINVAL");
@@ -243,7 +243,7 @@
 	/*sendmsg () TEST10:sendmsg on closed association, EPIPE Expected error*/
 	count = sendmsg(acpt1_sk, &outmessage, flag);
 	if (count != -1 || errno != EPIPE)
-		tst_brkm(TBROK, tst_exit, "sendmsg on a closed association "
+		tst_brkm(TBROK, NULL, "sendmsg on a closed association "
 			 "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() on a closed association - EPIPE");
@@ -317,7 +317,7 @@
 	/*sendmsg() TEST11: Sending data from server socket to client socket*/
 	count = sendmsg(acpt_sk, &outmessage, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendmsg from accept socket to "
+		tst_brkm(TBROK, NULL, "sendmsg from accept socket to "
 			 "client count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() from accept socket to client - SUCCESS");
@@ -330,7 +330,7 @@
 	/*sendmsg() TEST12: Sending data from client socket to server socket*/
 	count = sendmsg(sk, &outmessage, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendmsg from client to server "
+		tst_brkm(TBROK, NULL, "sendmsg from client to server "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() from client to server - SUCCESS");
@@ -348,7 +348,7 @@
 	server socket*/
 	count = sendmsg(sk1, &outmessage, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendmsg from unconnected client to "
+		tst_brkm(TBROK, NULL, "sendmsg from unconnected client to "
 			 "server count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() from unconnected clt to server - SUCCESS");
@@ -363,7 +363,7 @@
 	/*sendmsg() TEST14: Sending a message on SHUT_RD socket*/
 	count = sendmsg(sk1, &outmessage, flag);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendmsg on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "sendmsg on a SHUT_RD socket "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendmsg() on a SHUT_RD socket - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_sendto.c b/testcases/network/sctp/func_tests/test_1_to_1_sendto.c
index 4c5e2df..0f648fa 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_sendto.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_sendto.c
@@ -109,7 +109,7 @@
 	count = sendto(sk, message, msg_count, flag,
 		       (const struct sockaddr *) &conn_addr, len);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendto from client to server "
+		tst_brkm(TBROK, NULL, "sendto from client to server "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendto() from client to server - SUCCESS");
@@ -122,7 +122,7 @@
 	count = sendto(acpt_sk, message, msg_count, flag,
 		       (const struct sockaddr *) &svr_addr, len);
 	if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendto from accept socket to client "
+		tst_brkm(TBROK, NULL, "sendto from accept socket to client "
                          "count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendto() from accept socket to client - SUCCESS");
@@ -139,7 +139,7 @@
         count = sendto(sk1, message, msg_count, flag,
 		       (const struct sockaddr *) &conn_addr, len);
         if (count != msg_count)
-		tst_brkm(TBROK, tst_exit, "sendto from unconnected client to "
+		tst_brkm(TBROK, NULL, "sendto from unconnected client to "
 			 "server count:%d, errno:%d", count, errno);
 
 	tst_resm(TPASS, "sendto() from unconnected client to server - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_shutdown.c b/testcases/network/sctp/func_tests/test_1_to_1_shutdown.c
index e51f950..66815ec 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_shutdown.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_shutdown.c
@@ -106,7 +106,7 @@
 	/*shutdown() TEST1: Bad socket descriptor, EBADF Expected error*/
 	error = shutdown(-1, SHUT_WR);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "shutdown with a bad socket "
+		tst_brkm(TBROK, NULL, "shutdown with a bad socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() with a bad socket descriptor - EBADF");
@@ -114,7 +114,7 @@
 	/*shutdown() TEST2: Invalid socket, ENOTSOCK Expected error*/
         error = shutdown(0, SHUT_WR);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "shutdown with an invalid socket "
+		tst_brkm(TBROK, NULL, "shutdown with an invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() with an invalid socket - ENOTSOCK");
@@ -126,7 +126,7 @@
 	/*shutdown() TEST3: shutdown with SHUT_WR flag to disable new send*/
 	error = shutdown(clnt_sk[0], SHUT_WR);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "shutdown with SHUT_WR flag "
+		tst_brkm(TBROK, NULL, "shutdown with SHUT_WR flag "
 			 "error:%d, errno:%d", error, errno);
 
 	/* Reading on a socket that has received SHUTDOWN should return 0 
@@ -134,7 +134,7 @@
 	 */
 	error = recv(acpt_sk[0], msgbuf, 100, 0);
 	if ((error != 0) || (errno != 0))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUTDOWN received socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUTDOWN received socket "
 			 "error:%d, errno:%d", error, errno);
 
 	/* Read the pending message on clnt_sk[0] that was received before
@@ -145,7 +145,7 @@
 	/* No more messages and the association is SHUTDOWN, should fail. */
 	error = recv(clnt_sk[0], msgbuf, 100, 0);
 	if ((error != -1) || (errno != ENOTCONN))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_WR socket with no "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_WR socket with no "
 			 "messages error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() with SHUT_WR flag - SUCCESS");
@@ -157,13 +157,13 @@
 
 	error = recv(clnt_sk[1], msgbuf, 100, 0);
 	if ((error != 0) || (errno != 0))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RD socket "
 			 "error:%d, errno:%d", error, errno);
 
 	/* Sending a message on SHUT_RD socket. */
 	error = test_send(clnt_sk[1], message, strlen(message), 0);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "send on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "send on a SHUT_RD socket "
 			 "error:%d, errno:%d", error, errno);
 
 	/* Receive the message sent on SHUT_RD socket. */
@@ -175,7 +175,7 @@
 	/* We should not receive the message as the socket is SHUT_RD */ 
 	error = recv(clnt_sk[1], msgbuf, 100, 0);
 	if ((error != 0) || (errno != 0))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RD socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() with SHUT_RD flag - SUCCESS");
@@ -186,12 +186,12 @@
 
 	error = recv(acpt_sk[2], msgbuf, 100, 0);
 	if ((error != 0) || (errno != 0))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUTDOWN received socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUTDOWN received socket "
 			 "error:%d, errno:%d", error, errno);
 
 	error = recv(clnt_sk[2], msgbuf, 100, 0);
 	if ((error != 0) || (errno != 0))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RDWR socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RDWR socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() with SHUT_RDWR flag - SUCCESS");
@@ -199,7 +199,7 @@
 	/*shutdown() TEST6: Unconnected socket, ENOTCONN Expected error*/
 	error = shutdown(sk, SHUT_RD);
 	if ((error != -1) || (errno != ENOTCONN))
-		tst_brkm(TBROK, tst_exit, "shutdown on an unconnected socket "
+		tst_brkm(TBROK, NULL, "shutdown on an unconnected socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "shutdown() on an unconnected socket - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_socket_bind_listen.c b/testcases/network/sctp/func_tests/test_1_to_1_socket_bind_listen.c
index cce43ff..292f620 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_socket_bind_listen.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_socket_bind_listen.c
@@ -99,7 +99,7 @@
         /* socket() TEST1: Invalid domain, EAFNOSUPPORT Expected error */
         sk = socket(-1, SOCK_STREAM, IPPROTO_SCTP);
         if (sk != -1 || errno != EAFNOSUPPORT)
-		tst_brkm(TBROK, tst_exit, "socket() with invalid domain "
+		tst_brkm(TBROK, NULL, "socket() with invalid domain "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "socket() with invalid domain - EAFNOSUPPORT");
@@ -107,7 +107,7 @@
 	/*socket() TEST2 : Invalid type, EINVAL Expected error*/
         sk = socket(pf_class, -1, IPPROTO_SCTP);
         if (sk != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "socket() with invalid type "
+		tst_brkm(TBROK, NULL, "socket() with invalid type "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "socket() with invalid type - EINVAL");
@@ -115,7 +115,7 @@
 	/*socket() TEST3: opening a socket*/
         sk = socket(pf_class, SOCK_STREAM, IPPROTO_SCTP);
         if (sk < 0)
-		tst_brkm(TBROK, tst_exit, "valid socket() call "
+		tst_brkm(TBROK, NULL, "valid socket() call "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "socket() - SUCCESS");
@@ -123,7 +123,7 @@
 	/*bind() TEST4: Invalid structure, EFAULT Expected error */
         error = bind(sk, (struct sockaddr *)-1, sizeof(struct sockaddr_in));
         if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "bind() with invalid address ptr "
+		tst_brkm(TBROK, NULL, "bind() with invalid address ptr "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with invalid address ptr - EFAULT");
@@ -135,7 +135,7 @@
 
 	error = bind(sk, (struct sockaddr *) &bind_addr, sizeof(bind_addr)-2);
         if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "bind() with invalid address length "
+		tst_brkm(TBROK, NULL, "bind() with invalid address length "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with invalid address length - EINVAL");
@@ -143,7 +143,7 @@
 	/*bind() TEST6: Invalid socket descriptor, ENOTSOCK Expect Error*/
 	error = bind(0, (struct sockaddr *) &bind_addr, sizeof(bind_addr));
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "bind() with invalid socket "
+		tst_brkm(TBROK, NULL, "bind() with invalid socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with invalid socket descriptor - ENOTSOCK");
@@ -153,7 +153,7 @@
 	bind_addr.sin_addr.s_addr = inet_addr(SCTP_INV_LOOPBACK);
 	error = bind(sk, (struct sockaddr *) &bind_addr, sizeof(bind_addr));
         if (error != -1 || errno != EADDRNOTAVAIL)
-		tst_brkm(TBROK, tst_exit, "bind() with invalid local "
+		tst_brkm(TBROK, NULL, "bind() with invalid local "
 			 "address error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with invalid local address - EADDRNOTAVAIL");
@@ -166,7 +166,7 @@
 
 	error = bind(sk, (struct sockaddr *) &bind_addr, sizeof(bind_addr));
 	if (error != -1 || errno != EINVAL)
-		tst_brkm(TBROK, tst_exit, "bind() on an already bound socket "
+		tst_brkm(TBROK, NULL, "bind() on an already bound socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() on an already bound socket - EINVAL");
@@ -185,7 +185,7 @@
 		error = bind(sk, (struct sockaddr *) &bind_addr,
 			     sizeof(bind_addr));
 		if (error != -1 || errno != EACCES)
-			tst_brkm(TBROK, tst_exit, "bind() on reserverd port "
+			tst_brkm(TBROK, NULL, "bind() on reserverd port "
 			 "error:%d, errno:%d", error, errno);
 
 		tst_resm(TPASS, "bind() on reserved port - EACCESS");
@@ -197,7 +197,7 @@
         bind_addr.sin_port = htons(SCTP_TESTPORT_1);
 	error = bind(sk, (struct sockaddr *) &bind_addr,sizeof(bind_addr));
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "bind() with INADDR_ANY address and "
+		tst_brkm(TBROK, NULL, "bind() with INADDR_ANY address and "
 			 "non-zero port error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with INADDR_ANY address and non-zero port - "
@@ -214,7 +214,7 @@
         bind_addr.sin_port = 0;
 	error = bind(sk, (struct sockaddr *) &bind_addr,sizeof(bind_addr));
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "bind() with INADDR_ANY address and "
+		tst_brkm(TBROK, NULL, "bind() with INADDR_ANY address and "
 			 "zero port error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with INADDR_ANY address and zero port - "
@@ -232,7 +232,7 @@
         bind_addr.sin_port = 0;
 	error = bind(sk, (struct sockaddr *) &bind_addr,sizeof(bind_addr));
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "bind() with local address and "
+		tst_brkm(TBROK, NULL, "bind() with local address and "
 			 "zero port error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "bind() with local address and zero port - "
@@ -241,7 +241,7 @@
 	/*listen() TEST13: Bad socket descriptor EBADF, Expected error*/
 	error = listen(-1, 3);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "listen() with bad socket descriptor "
+		tst_brkm(TBROK, NULL, "listen() with bad socket descriptor "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "listen() with bad socket descriptor - EBADF");
@@ -249,7 +249,7 @@
 	/*listen() TEST14: Invalid socket ENOTSOCK, Expected error*/
 	error = listen(0, 3);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "listen() with invalid socket "
+		tst_brkm(TBROK, NULL, "listen() with invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "listen() with invalid socket - ENOTSOCK");
@@ -257,7 +257,7 @@
 	/*listen() TEST15:listen on a bound socket, should succeed*/
 	error = listen(sk, 3);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "listen() on a bound socket "
+		tst_brkm(TBROK, NULL, "listen() on a bound socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "listen() on a bound socket - SUCCESS");
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_sockopt.c b/testcases/network/sctp/func_tests/test_1_to_1_sockopt.c
index 01ec2a3..856617d 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_sockopt.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_sockopt.c
@@ -112,7 +112,7 @@
 	/*setsockopt() TEST1: Bad socket descriptor EBADF, Expected error*/
         error = setsockopt(-1, IPPROTO_SCTP, 0, 0, 0);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "setsockopt with a bad socket "
+		tst_brkm(TBROK, NULL, "setsockopt with a bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() with a bad socket descriptor - EBADF");
@@ -120,7 +120,7 @@
 	/*setsockopt() TEST2: Invalid socket ENOTSOCK, Expected error*/
         error = setsockopt(0, IPPROTO_SCTP, 0, 0, 0);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "setsockopt with an invalid socket "
+		tst_brkm(TBROK, NULL, "setsockopt with an invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() with an invalid socket - ENOTSOCK");
@@ -128,7 +128,7 @@
 	/*setsockopt() TEST3: Invalid level ENOPROTOOPT, Expected error*/
         error = setsockopt(sk, -1, SCTP_RTOINFO, 0, 0);
 	if (error != -1 || errno != ENOPROTOOPT)
-		tst_brkm(TBROK, tst_exit, "setsockopt with invalid level "
+		tst_brkm(TBROK, NULL, "setsockopt with invalid level "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() with an invalid level - ENOPROTOOPT");
@@ -137,7 +137,7 @@
         error = setsockopt(sk, IPPROTO_SCTP, SCTP_RTOINFO, 
 		(const struct sctp_rtoinfo *)-1, sizeof(struct sctp_rtoinfo));
 	if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "setsockopt with invalid option "
+		tst_brkm(TBROK, NULL, "setsockopt with invalid option "
 			 "buffer error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() with invalid option buffer - EFAULT");
@@ -145,7 +145,7 @@
 	/*setsockopt() TEST5: Invalid option Name EOPNOTSUPP, Expected error*/
         error = setsockopt(sk, IPPROTO_SCTP, SCTP_AUTOCLOSE, 0, 0);
 	if (error != -1 || errno != EOPNOTSUPP)
-		tst_brkm(TBROK, tst_exit, "setsockopt with invalid option "
+		tst_brkm(TBROK, NULL, "setsockopt with invalid option "
 			 "name error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() with invalid option name - EOPNOTSUPP");
@@ -153,7 +153,7 @@
 	/*getsockopt() TEST6: Bad socket descriptor EBADF, Expected error*/
         error = getsockopt(-1, IPPROTO_SCTP, 0, 0, 0);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "getsockopt with a bad socket "
+		tst_brkm(TBROK, NULL, "getsockopt with a bad socket "
 			 "descriptor error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() with a bad socket descriptor - EBADF");
@@ -161,7 +161,7 @@
 	/*getsockopt() TEST7: Invalid socket ENOTSOCK, Expected error*/
         error = getsockopt(0, IPPROTO_SCTP, 0, 0, 0);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "getsockopt with an invalid socket "
+		tst_brkm(TBROK, NULL, "getsockopt with an invalid socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() with an invalid socket - ENOTSOCK");
@@ -173,7 +173,7 @@
 	
         error = getsockopt(sk, -1, SCTP_RTOINFO, 0, 0);
 	if (error != -1 || errno != ENOPROTOOPT)
-		tst_brkm(TBROK, tst_exit, "getsockopt with invalid level "
+		tst_brkm(TBROK, NULL, "getsockopt with invalid level "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() with an invalid level - ENOPROTOOPT");
@@ -184,7 +184,7 @@
         error = getsockopt(sk, IPPROTO_SCTP, SCTP_RTOINFO, 
 			   (struct sctp_rtoinfo *)-1, &len);
 	if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "getsockopt with invalid option "
+		tst_brkm(TBROK, NULL, "getsockopt with invalid option "
 			 "buffer error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() with invalid option buffer - EFAULT");
@@ -192,7 +192,7 @@
 	/*getsockopt() TEST9: Invalid option Name EOPNOTSUPP, Expected error*/
         error = getsockopt(sk, IPPROTO_SCTP, SCTP_AUTOCLOSE, &grtinfo, &len);
 	if (error != -1 || errno != EOPNOTSUPP)
-		tst_brkm(TBROK, tst_exit, "getsockopt with invalid option "
+		tst_brkm(TBROK, NULL, "getsockopt with invalid option "
 			 "name error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() with invalid option name - EOPNOTSUPP");
@@ -230,7 +230,7 @@
 	    sinmsg.sinit_max_instreams != ginmsg.sinit_max_instreams &&
 	    sinmsg.sinit_max_attempts != ginmsg.sinit_max_attempts &&
 	    sinmsg.sinit_max_init_timeo != ginmsg.sinit_max_init_timeo)
-		tst_brkm(TBROK, tst_exit, "setsockopt/getsockopt SCTP_INITMSG "
+		tst_brkm(TBROK, NULL, "setsockopt/getsockopt SCTP_INITMSG "
 			 "compare failed");
 
 	tst_resm(TPASS, "setsockopt() SCTP_INITMSG - SUCCESS");
@@ -243,7 +243,7 @@
 	    sinmsg.sinit_max_instreams == ginmsg.sinit_max_instreams &&
 	    sinmsg.sinit_max_attempts == ginmsg.sinit_max_attempts &&
 	    sinmsg.sinit_max_init_timeo == ginmsg.sinit_max_init_timeo)
-		tst_brkm(TBROK, tst_exit, "setsockopt/getsockopt SCTP_INITMSG "
+		tst_brkm(TBROK, NULL, "setsockopt/getsockopt SCTP_INITMSG "
 			 "unexpected compare success");
 
 	/* SO_LINGER Test with l_onff = 0 and l_linger = 0 */
@@ -260,7 +260,7 @@
 	/* TEST12: Test case for setsockopt SO_LINGER */
 	error = setsockopt(sk2, SOL_SOCKET, SO_LINGER, &slinger, len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SO_LINGER "
+		tst_brkm(TBROK, NULL, "setsockopt SO_LINGER "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() SO_LINGER - SUCCESS");
@@ -268,14 +268,14 @@
 	/* TEST13: Test case for getsockopt SO_LINGER */
 	error = getsockopt(sk2, SOL_SOCKET, SO_LINGER, &glinger, &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SO_LINGER "
+		tst_brkm(TBROK, NULL, "getsockopt SO_LINGER "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SO_LINGER - SUCCESS");
 
 	if (slinger.l_onoff != glinger.l_onoff || 
 	    slinger.l_linger != glinger.l_linger)
-		tst_brkm(TBROK, tst_exit, "setsockopt/getsockopt SO_LINGER "
+		tst_brkm(TBROK, NULL, "setsockopt/getsockopt SO_LINGER "
 			 "compare failed");
 	
 	/*First gets the default SO_RCVBUF value and comapres with the
@@ -284,7 +284,7 @@
 	/* TEST14: Test case for getsockopt SO_RCVBUF */
 	error = getsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &rcvbuf_val_get, &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SO_RCVBUF "
+		tst_brkm(TBROK, NULL, "getsockopt SO_RCVBUF "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SO_RCVBUF - SUCCESS");
@@ -293,7 +293,7 @@
 	/* TEST15: Test case for getsockopt SCTP_STATUS */
 	error = getsockopt(sk2, IPPROTO_SCTP, SCTP_STATUS, &gstatus, &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_STATUS "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_STATUS "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SCTP_STATUS - SUCCESS");
@@ -305,18 +305,18 @@
 	/* TEST16: Test case for setsockopt SO_RCVBUF */
 	error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &rcvbuf_val_set, len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SO_RCVBUF "
+		tst_brkm(TBROK, NULL, "setsockopt SO_RCVBUF "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() SO_RCVBUF - SUCCESS");
 
 	error = getsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &rcvbuf_val_get, &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SO_RCVBUF "
+		tst_brkm(TBROK, NULL, "getsockopt SO_RCVBUF "
                          "error:%d, errno:%d", error, errno);
 
 	if ((2 * rcvbuf_val_set) != rcvbuf_val_get)
-		tst_brkm(TBROK, tst_exit, "Comparison failed:Set value and "
+		tst_brkm(TBROK, NULL, "Comparison failed:Set value and "
 			 "got value differs Set Value=%d Get Value=%d",
 			 (2*rcvbuf_val_set), rcvbuf_val_get);
 
@@ -324,7 +324,7 @@
 	/* TEST17: Test case for setsockopt SO_SNDBUF */
 	error = setsockopt(sk2, SOL_SOCKET, SO_SNDBUF, &sndbuf_val_set, len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SO_SNDBUF "
+		tst_brkm(TBROK, NULL, "setsockopt SO_SNDBUF "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() SO_SNDBUF - SUCCESS");
@@ -332,13 +332,13 @@
 	/* TEST18: Test case for getsockopt SO_SNDBUF */
 	error = getsockopt(sk2, SOL_SOCKET, SO_SNDBUF, &sndbuf_val_get, &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SO_SNDBUF "
+		tst_brkm(TBROK, NULL, "getsockopt SO_SNDBUF "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SO_SNDBUF - SUCCESS");
 
 	if ((2 * sndbuf_val_set) != sndbuf_val_get)
-		tst_brkm(TBROK, tst_exit, "Comparison failed:Set value and "
+		tst_brkm(TBROK, NULL, "Comparison failed:Set value and "
 			 "got value differs Set Value=%d Get Value=%d\n",
 			 (2*sndbuf_val_set), sndbuf_val_get);
 
@@ -349,7 +349,7 @@
 	error = getsockopt(sk2,IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &gprimaddr,
 			   &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_PRIMARY_ADDR "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_PRIMARY_ADDR "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SCTP_PRIMARY_ADDR - SUCCESS");
@@ -358,7 +358,7 @@
 	if (htons(gaddr->sin_port) != lstn_addr.sin_port &&
 	   gaddr->sin_family != lstn_addr.sin_family &&
 	   gaddr->sin_addr.s_addr != lstn_addr.sin_addr.s_addr)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_PRIMARY_ADDR value "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_PRIMARY_ADDR value "
 			 "mismatch");
 
 	memcpy(&sprimaddr, &gprimaddr, sizeof(struct sctp_prim));
@@ -367,7 +367,7 @@
 	error = setsockopt(sk2,IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &sprimaddr,
 			   len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SCTP_PRIMARY_ADDR "
+		tst_brkm(TBROK, NULL, "setsockopt SCTP_PRIMARY_ADDR "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "setsockopt() SCTP_PRIMARY_ADDR - SUCCESS");
@@ -378,7 +378,7 @@
 	error = getsockopt(sk2, IPPROTO_SCTP, SCTP_ASSOCINFO, &gassocparams,
 			   &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_ASSOCINFO "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_ASSOCINFO "
                          "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt() SCTP_ASSOCINFO - SUCCESS");
@@ -391,18 +391,18 @@
 	error = setsockopt(sk2, IPPROTO_SCTP, SCTP_ASSOCINFO, &sassocparams,
 			   len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "setsockopt SCTP_ASSOCINFO "
+		tst_brkm(TBROK, NULL, "setsockopt SCTP_ASSOCINFO "
                          "error:%d, errno:%d", error, errno);
 
 	error = getsockopt(sk2, IPPROTO_SCTP, SCTP_ASSOCINFO, &gassocparams,
 			   &len);
 	if (error < 0)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_ASSOCINFO "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_ASSOCINFO "
                          "error:%d, errno:%d", error, errno);
 
 	if (sassocparams.sasoc_asocmaxrxt != gassocparams.sasoc_asocmaxrxt ||
 	    sassocparams.sasoc_cookie_life != gassocparams.sasoc_cookie_life)
-		tst_brkm(TBROK, tst_exit, "getsockopt SCTP_ASSOCINFO value "
+		tst_brkm(TBROK, NULL, "getsockopt SCTP_ASSOCINFO value "
 			 "mismatch");
 	tst_resm(TPASS, "setsockopt() SCTP_ASSOCINFO - SUCCESS");
 
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_threads.c b/testcases/network/sctp/func_tests/test_1_to_1_threads.c
index 083c537..86ebed1 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_threads.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_threads.c
@@ -178,7 +178,7 @@
 			status = pthread_create(&thread[cnt], &attr,
 						relay, (void*)(uintptr_t)cnt);
 			if (status)
-				tst_brkm(TBROK, tst_exit, "pthread_create "
+				tst_brkm(TBROK, NULL, "pthread_create "
                          		 "failed status:%d, errno:%d", status,
 					 errno);
 		}
@@ -187,7 +187,7 @@
 		for (cnt = 1; cnt < THREADS ; cnt++) {
 			exit_status = pthread_join (thread[cnt], &result);
 			if (exit_status == -1)
-				tst_brkm(TBROK, tst_exit, "pthread_join "
+				tst_brkm(TBROK, NULL, "pthread_join "
                          		 "Thread #%d exited with status:%d",
 					 cnt, exit_status);
 		}
diff --git a/testcases/network/sctp/func_tests/test_assoc_abort.c b/testcases/network/sctp/func_tests/test_assoc_abort.c
index a332bf2..8077603 100644
--- a/testcases/network/sctp/func_tests/test_assoc_abort.c
+++ b/testcases/network/sctp/func_tests/test_assoc_abort.c
@@ -204,7 +204,7 @@
 		error = getsockopt(svr_sk, SOL_SCTP, SCTP_STATUS,
 				   &status, &status_len);
 		if (error)
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "getsockopt(SCTP_STATUS): %s",
 				 strerror(errno));
 
@@ -218,7 +218,7 @@
 		error = getsockopt(svr_sk, SOL_SCTP, SCTP_STATUS, 
 				   &status, &status_len);
 		if ((error != -1) && (errno != EINVAL))
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "getsockopt(SCTP_STATUS) "
 				 "error:%d errno:%d", error, errno);
 	}
@@ -239,5 +239,5 @@
 	tst_resm(TPASS, "ABORT an association using SCTP_ABORT"); 
 
         /* Indicate successful completion.  */
-        return 0;
+      tst_exit();
 }
diff --git a/testcases/network/sctp/func_tests/test_assoc_shutdown.c b/testcases/network/sctp/func_tests/test_assoc_shutdown.c
index c5be461..84698f7 100644
--- a/testcases/network/sctp/func_tests/test_assoc_shutdown.c
+++ b/testcases/network/sctp/func_tests/test_assoc_shutdown.c
@@ -205,7 +205,7 @@
 		error = getsockopt(svr_sk, SOL_SCTP, SCTP_STATUS,
 				   &status, &status_len);
 		if (error)
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "getsockopt(SCTP_STATUS): %s",
 				 strerror(errno));
 
@@ -219,7 +219,7 @@
 		error = getsockopt(svr_sk, SOL_SCTP, SCTP_STATUS, 
 				   &status, &status_len);
 		if ((error != -1) && (errno != EINVAL))
-			tst_brkm(TBROK, tst_exit,
+			tst_brkm(TBROK, NULL,
 				 "getsockopt(SCTP_STATUS) "
 				 "error:%d errno:%d", error, errno);
 	}
@@ -241,5 +241,5 @@
 	tst_resm(TPASS, "Graceful shutdown of associations using SCTP_EOF"); 
 
         /* Indicate successful completion.  */
-        return 0;
+      tst_exit();
 }
diff --git a/testcases/network/sctp/func_tests/test_basic.c b/testcases/network/sctp/func_tests/test_basic.c
index 85b32c1..ce20a8e 100644
--- a/testcases/network/sctp/func_tests/test_basic.c
+++ b/testcases/network/sctp/func_tests/test_basic.c
@@ -151,7 +151,7 @@
         inmessage.msg_controllen = sizeof(incmsg);
         error = recvmsg(sk2, &inmessage, MSG_WAITALL);
         if (error > 0)
-                tst_brkm(TBROK, tst_exit, "recvmsg on a socket neither"
+                tst_brkm(TBROK, NULL, "recvmsg on a socket neither"
 			 "listening nor established error: %d", error);
 
 	tst_resm(TPASS, "recvmsg on a socket neither listening nor "
@@ -302,7 +302,7 @@
 	outmessage.msg_namelen = 0;
 	bytes_sent = sendmsg(sk1, &outmessage, MSG_NOSIGNAL);
 	if ((bytes_sent > 0) || (EPIPE != errno))
-		tst_brkm(TBROK, tst_exit, "sendmsg with NULL associd and "
+		tst_brkm(TBROK, NULL, "sendmsg with NULL associd and "
 			 "NULL msg_name error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "sendmsg with NULL associd and NULL msg_name");
@@ -311,7 +311,7 @@
 	sinfo->sinfo_assoc_id = associd2;
 	bytes_sent = sendmsg(sk1, &outmessage, MSG_NOSIGNAL);
 	if ((bytes_sent > 0) || (EPIPE != errno))
-		tst_brkm(TBROK, tst_exit, "sendmsg with incorrect associd "
+		tst_brkm(TBROK, NULL, "sendmsg with incorrect associd "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "sendmsg with incorrect associd");
@@ -344,7 +344,7 @@
 
 	n_laddrs = sctp_getladdrs(sk1, associd1, &laddrs); 
 	if (n_laddrs <= 0)
-                tst_brkm(TBROK, tst_exit, "sctp_getladdrs: %s",
+                tst_brkm(TBROK, NULL, "sctp_getladdrs: %s",
 			 strerror(errno));
 
 	tst_resm(TPASS, "sctp_getladdrs");
@@ -374,7 +374,7 @@
 
 	n_paddrs = sctp_getpaddrs(sk1, associd1, &paddrs); 
 	if (n_paddrs <= 0)
-                tst_brkm(TBROK, tst_exit, "sctp_getpaddrs: %s",
+                tst_brkm(TBROK, NULL, "sctp_getpaddrs: %s",
 			 strerror(errno));
 
 	tst_resm(TPASS, "sctp_getpaddrs");
diff --git a/testcases/network/sctp/func_tests/test_connect.c b/testcases/network/sctp/func_tests/test_connect.c
index 56dbc27..e4e8c74 100644
--- a/testcases/network/sctp/func_tests/test_connect.c
+++ b/testcases/network/sctp/func_tests/test_connect.c
@@ -107,15 +107,15 @@
 	/* Set clt_sk1 as non-blocking. */
 	flags = fcntl(clt_sk1, F_GETFL, 0);
 	if (flags < 0)
-		tst_brkm(TBROK, tst_exit, "fcntl F_GETFL: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "fcntl F_GETFL: %s", strerror(errno));
 	if (fcntl(clt_sk1, F_SETFL, flags | O_NONBLOCK) < 0)
-		tst_brkm(TBROK, tst_exit, "fcntl F_SETFL: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "fcntl F_SETFL: %s", strerror(errno));
 
 	/* Do a non-blocking connect from clt_sk1 to svr_sk */      
 	error = connect(clt_sk1, &svr_loop.sa, sizeof(svr_loop));
 	/* Non-blocking connect should return immediately with EINPROGRESS. */
 	if ((error != -1) || (EINPROGRESS != errno))
-		tst_brkm(TBROK, tst_exit, "non-blocking connect error: %d"
+		tst_brkm(TBROK, NULL, "non-blocking connect error: %d"
 			 "errno:%d", error, errno);
 
 	tst_resm(TPASS, "non-blocking connect");
@@ -125,7 +125,7 @@
 	 */
 	error = connect(clt_sk1, &svr_loop.sa, sizeof(svr_loop));
 	if ((error != -1) || (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connect on a socket to create an "
+		tst_brkm(TBROK, NULL, "connect on a socket to create an "
 			 "assoc that is already established error:%d errno:%d",
 			 error, errno);
 
@@ -186,7 +186,7 @@
 	/* Doing a connect on a peeled off socket should fail. */
 	error = connect(peeloff_sk, &clt_loop3.sa, sizeof(clt_loop3));
 	if ((error != -1) || (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connect on a peeled off socket "
+		tst_brkm(TBROK, NULL, "connect on a peeled off socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect on a peeled off socket");
@@ -196,7 +196,7 @@
 	 */
 	error = connect(svr_sk, &clt_loop1.sa, sizeof(clt_loop1));
 	if ((error != -1) || (EADDRNOTAVAIL != errno))
-		tst_brkm(TBROK, tst_exit, "connect to create an assoc that "
+		tst_brkm(TBROK, NULL, "connect to create an assoc that "
 			 "matches a peeled off assoc error:%d errno:%d",
 			 error, errno);
 
diff --git a/testcases/network/sctp/func_tests/test_connectx.c b/testcases/network/sctp/func_tests/test_connectx.c
index 36030f8..05a1d17 100644
--- a/testcases/network/sctp/func_tests/test_connectx.c
+++ b/testcases/network/sctp/func_tests/test_connectx.c
@@ -143,15 +143,15 @@
 	/* Set clt_sk1 as non-blocking. */
 	flags = fcntl(clt_sk1, F_GETFL, 0);
 	if (flags < 0)
-		tst_brkm(TBROK, tst_exit, "fcntl F_GETFL: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "fcntl F_GETFL: %s", strerror(errno));
 	if (fcntl(clt_sk1, F_SETFL, flags | O_NONBLOCK) < 0)
-		tst_brkm(TBROK, tst_exit, "fcntl F_SETFL: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "fcntl F_SETFL: %s", strerror(errno));
 
 	/* Do a non-blocking connectx from clt_sk1 to svr_sk */      
 	error = sctp_connectx(clt_sk1, (struct sockaddr *)svr_try, NUMADDR);
 	/* Non-blocking connectx should return immediately with EINPROGRESS. */
 	if ((error != -1) || (EINPROGRESS != errno))
-		tst_brkm(TBROK, tst_exit, "non-blocking connectx error: %d"
+		tst_brkm(TBROK, NULL, "non-blocking connectx error: %d"
 			 "errno:%d", error, errno);
 
 	tst_resm(TPASS, "non-blocking connectx");
@@ -161,7 +161,7 @@
 	 */
 	error = sctp_connectx(clt_sk1, (struct sockaddr *)svr_try, NUMADDR);
 	if ((error != -1) || (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connectx on a socket to create an "
+		tst_brkm(TBROK, NULL, "connectx on a socket to create an "
 			 "assoc that is already established error:%d errno:%d",
 			 error, errno);
 
@@ -222,7 +222,7 @@
 	/* Doing a connectx on a peeled off socket should fail. */
 	error = sctp_connectx(peeloff_sk, (struct sockaddr *)clt_loop3, NUMADDR);
 	if ((error != -1) || (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connectx on a peeled off socket "
+		tst_brkm(TBROK, NULL, "connectx on a peeled off socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connectx on a peeled off socket");
@@ -232,7 +232,7 @@
 	 */
 	error = sctp_connectx(svr_sk, (struct sockaddr *)clt_loop1, NUMADDR);
 	if ((error != -1) || (EADDRNOTAVAIL != errno))
-		tst_brkm(TBROK, tst_exit, "connectx to create an assoc that "
+		tst_brkm(TBROK, NULL, "connectx to create an assoc that "
 			 "matches a peeled off assoc error:%d errno:%d",
 			 error, errno);
 
diff --git a/testcases/network/sctp/func_tests/test_fragments.c b/testcases/network/sctp/func_tests/test_fragments.c
index 968208e..bc43917 100644
--- a/testcases/network/sctp/func_tests/test_fragments.c
+++ b/testcases/network/sctp/func_tests/test_fragments.c
@@ -214,7 +214,7 @@
 	error = test_getsockopt(sk1, SCTP_DISABLE_FRAGMENTS, &disable_frag,
 				&optlen);
 	if ((error != 0) && (disable_frag != 1))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DISABLE_FRAGMENTS) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DISABLE_FRAGMENTS) "
 			 "error:%d errno:%d disable_frag:%d",
 			 error, errno, disable_frag);
 
@@ -229,7 +229,7 @@
 	outmessage.msg_iov->iov_len = msg_len;
 	error = sendmsg(sk1, &outmessage, 0);
 	if ((error != -1) || (errno != EMSGSIZE))
-       		tst_brkm(TBROK, tst_exit, "Send a message that exceeds "
+       		tst_brkm(TBROK, NULL, "Send a message that exceeds "
 			 "assoc frag point error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "Send a message that exceeds assoc frag point");
diff --git a/testcases/network/sctp/func_tests/test_getname.c b/testcases/network/sctp/func_tests/test_getname.c
index afa31a6..1bfc33c 100644
--- a/testcases/network/sctp/func_tests/test_getname.c
+++ b/testcases/network/sctp/func_tests/test_getname.c
@@ -94,7 +94,7 @@
 	/* Verify that getsockname() on an unconnected socket works fine. */
 	error = getsockname(svr_sk, (struct sockaddr *)&svr_local_addr, &len);
 	if (0 != error)
-		tst_brkm(TBROK, tst_exit, "getsockname: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "getsockname: %s", strerror(errno));
 
 	tst_resm(TPASS, "getsockname on an unconnected socket");
 
@@ -103,7 +103,7 @@
 	/* Verify that getpeername() on an unconnected socket fails. */
 	error = getpeername(svr_sk, (struct sockaddr *)&svr_peer_addr, &len);
 	if ((-1 != error) || (ENOTCONN != errno))
-		tst_brkm(TBROK, tst_exit, "getpeername on an unconnected "
+		tst_brkm(TBROK, NULL, "getpeername on an unconnected "
 			 "socket error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "getpeername on an unconnected socket");
@@ -127,7 +127,7 @@
 	/* Get the client's local address. */
 	error = getsockname(clt_sk, (struct sockaddr *)&clt_local_addr, &len);
 	if (0 != error)
-		tst_brkm(TBROK, tst_exit, "getsockname on a connected client "
+		tst_brkm(TBROK, NULL, "getsockname on a connected client "
 			 "socket: %s", strerror(errno));
 
 	tst_resm(TPASS, "getsockname on a connected client socket");
@@ -137,7 +137,7 @@
 	/* Get the client's peer address. */
 	error = getpeername(clt_sk, (struct sockaddr *)&clt_peer_addr, &len);
 	if (0 != error)
-		tst_brkm(TBROK, tst_exit, "getpeername on a connected client "
+		tst_brkm(TBROK, NULL, "getpeername on a connected client "
 			 "socket: %s", strerror(errno));
 
 	tst_resm(TPASS, "getpeername on a connected client socket");
@@ -152,7 +152,7 @@
 	error = getsockname(accept_sk, (struct sockaddr *)&svr_local_addr,
 				&len);
 	if (0 != error)
-		tst_brkm(TBROK, tst_exit, "getsockname on a connected server "
+		tst_brkm(TBROK, NULL, "getsockname on a connected server "
 			 "socket: %s", strerror(errno));
 
 	tst_resm(TPASS, "getsockname on a connected server socket");
@@ -163,36 +163,36 @@
 	error = getpeername(accept_sk, (struct sockaddr *)&svr_peer_addr,
 				&len);
 	if (0 != error)
-		tst_brkm(TBROK, tst_exit, "getpeername on a connected server "
+		tst_brkm(TBROK, NULL, "getpeername on a connected server "
 			 "socket: %s", strerror(errno));
 
 	tst_resm(TPASS, "getpeername on a connected server socket");
 
 	if (svr_local_addr.v4.sin_port != clt_peer_addr.v4.sin_port)
-		tst_brkm(TBROK, tst_exit, "Server's local port(%d) doesn't "
+		tst_brkm(TBROK, NULL, "Server's local port(%d) doesn't "
 			 "match Client's peer port(%d)\n",
 			 svr_local_addr.v4.sin_port, clt_peer_addr.v4.sin_port);
 
 	if (svr_peer_addr.v4.sin_port != clt_local_addr.v4.sin_port)
-		tst_brkm(TBROK, tst_exit, "Server's peer port(%d) doesn't "
+		tst_brkm(TBROK, NULL, "Server's peer port(%d) doesn't "
 			 "match Client's local port(%d)\n",
 			 svr_peer_addr.v4.sin_port, clt_local_addr.v4.sin_port);
 #if TEST_V6
 	if (memcmp(&svr_local_addr, &clt_peer_addr, len) != 0)
-		tst_brkm(TBROK, tst_exit, "Server's local address and client's "
+		tst_brkm(TBROK, NULL, "Server's local address and client's "
 			 "peer addresses do not match\n");
 
 	if (memcmp(&svr_peer_addr, &clt_local_addr, len) != 0)
-		tst_brkm(TBROK, tst_exit, "Server's peer address and client's "
+		tst_brkm(TBROK, NULL, "Server's peer address and client's "
 			 "local addresses do not match\n");
 #else
 	if (svr_local_addr.v4.sin_addr.s_addr !=
 		 		clt_peer_addr.v4.sin_addr.s_addr)
-		tst_brkm(TBROK, tst_exit, "Server's local address and client's "
+		tst_brkm(TBROK, NULL, "Server's local address and client's "
 			 "peer addresses do not match\n");
 	if (svr_peer_addr.v4.sin_addr.s_addr !=
 		 		clt_local_addr.v4.sin_addr.s_addr)
-		tst_brkm(TBROK, tst_exit, "Server's peer address and client's "
+		tst_brkm(TBROK, NULL, "Server's peer address and client's "
 			 "local addresses do not match\n");
 #endif
 	tst_resm(TPASS, "getsockname/getpeername server/client match");
@@ -202,7 +202,7 @@
 	/*getsockname():  Bad socket descriptor, EBADF expected error*/
 	error = getsockname(-1, (struct sockaddr *)&clt_local_addr, &len);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "getsockname on a bad socket "
+		tst_brkm(TBROK, NULL, "getsockname on a bad socket "
 			 "descriptor. error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockname on a bad socket descriptor - EBADF");
@@ -210,7 +210,7 @@
 	/*getsockname(): Invalid socket, ENOTSOCK expected error*/
 	error = getsockname(0, (struct sockaddr *)&clt_local_addr, &len);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "getsockname on an invalid socket "
+		tst_brkm(TBROK, NULL, "getsockname on an invalid socket "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockname on an invalid socket - ENOTSOCK");
@@ -218,7 +218,7 @@
 	/*getsockname(): Invalid structure, EFAULT expected error*/
 	error = getsockname(clt_sk, (struct sockaddr *)-1, &len);
 	if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "getsockname with invalid buffer "
+		tst_brkm(TBROK, NULL, "getsockname with invalid buffer "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockname with invalid buffer - EFAULT");
@@ -228,7 +228,7 @@
 	/*getpeername():  Bad socket descriptor, EBADF expected error*/
 	error = getpeername(-1, (struct sockaddr *)&clt_local_addr, &len);
 	if (error != -1 || errno != EBADF)
-		tst_brkm(TBROK, tst_exit, "getpeername on a bad socket "
+		tst_brkm(TBROK, NULL, "getpeername on a bad socket "
 			 "descriptor. error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getpeername on a bad socket descriptor - EBADF");
@@ -236,7 +236,7 @@
 	/*getpeername(): Invalid socket, ENOTSOCK expected error*/
 	error = getpeername(0, (struct sockaddr *)&clt_local_addr, &len);
 	if (error != -1 || errno != ENOTSOCK)
-		tst_brkm(TBROK, tst_exit, "getpeername on an invalid socket "
+		tst_brkm(TBROK, NULL, "getpeername on an invalid socket "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getpeername on an invalid socket - ENOTSOCK");
@@ -244,7 +244,7 @@
 	/*getpeername(): Invalid structure, EFAULT expected error*/
 	error = getpeername(clt_sk, (struct sockaddr *)-1, &len);
 	if (error != -1 || errno != EFAULT)
-		tst_brkm(TBROK, tst_exit, "getpeername with invalid buffer "
+		tst_brkm(TBROK, NULL, "getpeername with invalid buffer "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getpeername with invalid buffer - EFAULT");
diff --git a/testcases/network/sctp/func_tests/test_inaddr_any.c b/testcases/network/sctp/func_tests/test_inaddr_any.c
index 365fd2a..b529f02 100644
--- a/testcases/network/sctp/func_tests/test_inaddr_any.c
+++ b/testcases/network/sctp/func_tests/test_inaddr_any.c
@@ -135,12 +135,12 @@
 	namelen = sizeof(loop);
 	error = getsockname(sk1, &loop.sa, &namelen);
 	if (error != 0)
-		tst_brkm(TBROK, tst_exit, "getsockname: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "getsockname: %s", strerror(errno));
 
 	namelen = sizeof(anyaddr);
 	error = getsockname(sk2, &anyaddr.sa, &namelen);
 	if (error != 0)
-		tst_brkm(TBROK, tst_exit, "getsockname: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "getsockname: %s", strerror(errno));
         
 #if TEST_V6
 	loop.v6.sin6_port = anyaddr.v6.sin6_port;
@@ -249,5 +249,5 @@
 	tst_resm(TPASS, "send msgs from a socket with INADDR_ANY bind address");
 
         /* Indicate successful completion.  */
-        return 0;
+      tst_exit();
 }
diff --git a/testcases/network/sctp/func_tests/test_peeloff.c b/testcases/network/sctp/func_tests/test_peeloff.c
index 1ba3057..903cea8 100644
--- a/testcases/network/sctp/func_tests/test_peeloff.c
+++ b/testcases/network/sctp/func_tests/test_peeloff.c
@@ -202,7 +202,7 @@
 	/* Verify that a peeled off socket is not allowed to do a listen().  */
 	error = listen(peeloff_sk[0], 1);
 	if (error != -1)
-		tst_brkm(TBROK, tst_exit, "listen on a peeled off socket "
+		tst_brkm(TBROK, NULL, "listen on a peeled off socket "
 			 "error: %d, errno: %d", error, errno); 
 
 	tst_resm(TPASS, "listen on a peeled off socket");
@@ -213,7 +213,7 @@
 	 */
 	if ((-1 != sctp_peeloff(peeloff_sk[0], svr_associd[0])) ||
 	    (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "sctp_peeloff on a peeled off "
+		tst_brkm(TBROK, NULL, "sctp_peeloff on a peeled off "
 			 "socket error:%d, errno:%d",
 			 error, errno);
 
diff --git a/testcases/network/sctp/func_tests/test_sctp_sendrecvmsg.c b/testcases/network/sctp/func_tests/test_sctp_sendrecvmsg.c
index f90c4bd..5d3113c 100644
--- a/testcases/network/sctp/func_tests/test_sctp_sendrecvmsg.c
+++ b/testcases/network/sctp/func_tests/test_sctp_sendrecvmsg.c
@@ -150,14 +150,14 @@
 	error = getsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &oldlen, &len);
        
 	if (error)
-		tst_brkm(TBROK, tst_exit, "can't get rcvbuf size: %s",
+		tst_brkm(TBROK, NULL, "can't get rcvbuf size: %s",
 			 strerror(errno));
 
 	len = SMALL_RCVBUF; /* Really becomes 2xlen when set. */
 
 	error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &len, sizeof(len));
 	if (error)
-		tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s",
+		tst_brkm(TBROK, NULL, "setsockopt(SO_RCVBUF): %s",
 			 strerror(errno));
 
        /* Mark sk2 as being able to accept new associations.  */
@@ -190,7 +190,7 @@
 			   sizeof(oldlen));
 
 	if (error)
-		tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s",
+		tst_brkm(TBROK, NULL, "setsockopt(SO_RCVBUF): %s",
 			 strerror(errno));
 
 	/* Get the communication up message on sk1.  */
@@ -224,7 +224,7 @@
 	error = getsockopt(sk1, IPPROTO_SCTP, SCTP_STATUS, &gstatus, &len);
 
 	if (error)
-		tst_brkm(TBROK, tst_exit, "can't get rwnd size: %s",
+		tst_brkm(TBROK, NULL, "can't get rwnd size: %s",
 			strerror(errno));
 	tst_resm(TINFO, "creating a fillmsg of size %d",
 		gstatus.sstat_rwnd+RWND_SLOP);
@@ -284,7 +284,7 @@
 	test_check_buf_data(big_buffer, error, msg_flags, &sinfo,
 			    strlen(nottlmsg) + 1, MSG_EOR, stream, ppid); 
 	if (0 != strncmp(big_buffer, nottlmsg, strlen(nottlmsg)))
-		tst_brkm(TBROK, tst_exit, "sctp_recvmsg: Wrong Message !!!");
+		tst_brkm(TBROK, NULL, "sctp_recvmsg: Wrong Message !!!");
 
 	tst_resm(TPASS, "sctp_recvmsg msg with zero ttl");
 
@@ -302,7 +302,7 @@
 				    SCTP_SEND_FAILED, 0);
 	ssf = (struct sctp_send_failed *)big_buffer;
 	if (0 != strncmp(ttlmsg, (char *)ssf->ssf_data, strlen(ttlmsg) + 1))
-		tst_brkm(TBROK, tst_exit, "SEND_FAILED data mismatch");
+		tst_brkm(TBROK, NULL, "SEND_FAILED data mismatch");
 
 	tst_resm(TPASS, "sctp_recvmsg SEND_FAILED for message with ttl");
 
@@ -324,7 +324,7 @@
 		ssf = (struct sctp_send_failed *)big_buffer;
 		if (0 != strncmp(&ttlfrag[offset], (char *)ssf->ssf_data,
 				 SMALL_MAXSEG))
-			tst_brkm(TBROK, tst_exit, "SEND_FAILED data mismatch");
+			tst_brkm(TBROK, NULL, "SEND_FAILED data mismatch");
 		offset += SMALL_MAXSEG;
 	} while (!(ssf->ssf_info.sinfo_flags & 0x01)); /* LAST FRAG */
 
diff --git a/testcases/network/sctp/func_tests/test_sockopt.c b/testcases/network/sctp/func_tests/test_sockopt.c
index da9b03d..231b6d7 100644
--- a/testcases/network/sctp/func_tests/test_sockopt.c
+++ b/testcases/network/sctp/func_tests/test_sockopt.c
@@ -168,7 +168,7 @@
 	error = getsockopt(udp_svr_sk, SOL_SCTP, SCTP_STATUS, &status,
 			   &optlen);
 	if ((error != -1) && (errno != EINVAL))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_STATUS) on a "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_STATUS) on a "
 			 "socket with no assoc error:%d errno:%d",
 			 error, errno);
 
@@ -245,7 +245,7 @@
 	error = getsockopt(udp_clt_sk, SOL_SCTP, SCTP_STATUS, &status,
 			   &optlen); 
 	if ((error != -1) && (errno != EINVAL))
-        	tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_STATUS) with "
+        	tst_brkm(TBROK, NULL, "getsockopt(SCTP_STATUS) with "
 			 "associd error: %d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt(SCTP_STATUS) with invalid associd");
@@ -257,7 +257,7 @@
 	error = getsockopt(udp_svr_sk, SOL_SCTP, SCTP_STATUS, &status,
 			   &optlen);
 	if ((error != -1) && (errno != EINVAL))
-        	tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_STATUS) with "
+        	tst_brkm(TBROK, NULL, "getsockopt(SCTP_STATUS) with "
 			 "NULL associd error: %d errno:%d", error, errno);
 
 	tst_resm(TPASS, "getsockopt(SCTP_STATUS) with NULL associd");
@@ -332,7 +332,7 @@
 			    MSG_EOR, 0, 0);
 	/* Verify that we received the msg without any ancillary data. */
 	if (inmessage.msg_controllen != 0)
-		tst_brkm(TBROK, tst_exit, "Receive unexpected ancillary"
+		tst_brkm(TBROK, NULL, "Receive unexpected ancillary"
 			 "data");
 
 	/* Enable SCTP_SHUTDOWN_EVENTs on udp_svr_sk. */
@@ -418,7 +418,7 @@
 		error = sctp_opt_info(udp_clt_sk,udp_clt_associd,SCTP_STATUS,
 				(char *)&status1, &optlen);
 		if (error != 0)
-	                tst_brkm(TBROK, tst_exit,
+	                tst_brkm(TBROK, NULL,
 				 "sctp_opt_info(SCTP_STATUS): %s", 
 				 strerror(errno));
 
@@ -426,11 +426,11 @@
 		error = getsockopt(udp_clt_sk, IPPROTO_SCTP, SCTP_STATUS,
                 		(char *)&status2, &optlen);
 		if (error != 0)
-	                tst_brkm(TBROK, tst_exit,
+	                tst_brkm(TBROK, NULL,
 				 "getsockopt(SCTP_STATUS): %s", 
 				 strerror(errno));
 		if (strncmp((char *)&status1, (char *)&status2, optlen))
-	                tst_brkm(TBROK, tst_exit, "sctp_opt_info(SCTP_STAUS)"
+	                tst_brkm(TBROK, NULL, "sctp_opt_info(SCTP_STAUS)"
 			       "doesn't match getsockopt(SCTP_STATUS)");
 
                 tst_resm(TPASS, "sctp_opt_info(SCTP_STATUS)");
@@ -519,7 +519,7 @@
 	/* Verify that the get param matches set param. */
 	if (set_udp_sk_dflt_param.sinfo_ppid !=
 			get_udp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	/* Get default send parameters on the unconnected UDP-style socket. */
@@ -531,7 +531,7 @@
 	/* Verify that the get param matches set param. */
 	if (set_udp_sk_dflt_param.sinfo_ppid !=
 			get_udp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -548,7 +548,7 @@
 			   &set_udp_sk_dflt_param,
 			   sizeof(set_udp_sk_dflt_param));
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "setsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "setsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "invalid associd error:%d, errno:%d\n",
 			 error, errno);
 
@@ -585,7 +585,7 @@
 			   &set_udp_assoc_dflt_param,
 			   sizeof(set_udp_assoc_dflt_param));
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "setsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "setsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "associd belonging to another socket "
 			 "error:%d, errno:%d", error, errno);
 
@@ -617,7 +617,7 @@
 	/* Verify that the get param matches the set param. */
 	if (get_udp_assoc_dflt_param.sinfo_ppid !=
 			set_udp_assoc_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -636,7 +636,7 @@
 	/* Verify that the get param matches the socket-wide set param. */
 	if (get_udp_sk_dflt_param.sinfo_ppid !=
 			set_udp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -658,7 +658,7 @@
 	/* Verify that the get param matches the association's set param. */
 	if (get_peeloff_assoc_dflt_param.sinfo_ppid !=
 			set_udp_assoc_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -694,7 +694,7 @@
 	/* Verify that the get param matches set param. */
 	if (set_tcp_sk_dflt_param.sinfo_ppid !=
 			get_tcp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	/* Get default send parameters on the unconnected TCP-style socket. */
@@ -706,7 +706,7 @@
 	/* Verify that the get param matches set param. */
 	if (set_tcp_sk_dflt_param.sinfo_ppid !=
 			get_tcp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -738,7 +738,7 @@
 
 	if (set_tcp_assoc_dflt_param.sinfo_ppid !=
 			get_tcp_assoc_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	/* Get default send parameters on the connected TCP-style socket.  */ 
@@ -754,7 +754,7 @@
 			set_tcp_sk_dflt_param.sinfo_ppid) ||
 	    (get_tcp_sk_dflt_param.sinfo_ppid !=
 	    		set_tcp_assoc_dflt_param.sinfo_ppid))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	/* Get default send parameters on the listening TCP-style socket.  */ 
@@ -768,7 +768,7 @@
 	 */
 	if (get_tcp_sk_dflt_param.sinfo_ppid !=
 			set_tcp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -791,7 +791,7 @@
 	 */
 	if (get_tcp_sk_dflt_param.sinfo_ppid !=
 			set_tcp_sk_dflt_param.sinfo_ppid)
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_DEFAULT_SEND_PARAM) "
 			 "mismatch.");
 
 	tst_resm(TPASS, "getsockopt(SCTP_DEFAULT_SEND_PARAM) - "
@@ -804,7 +804,7 @@
 	error = getsockopt(udp_clt_sk, SOL_SCTP, SCTP_GET_PEER_ADDR_INFO,
 			   &pinfo, &optlen);			   
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
 			 "null associd, null addr error:%d, errno:%d\n",
 			error, errno);
 
@@ -818,7 +818,7 @@
 	error = getsockopt(udp_clt_sk, SOL_SCTP, SCTP_GET_PEER_ADDR_INFO,
 			   &pinfo, &optlen);			   
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
 			 "valid associd, null addr error:%d, errno:%d\n",
 			error, errno);
 
@@ -833,7 +833,7 @@
 	error = getsockopt(udp_clt_sk, SOL_SCTP, SCTP_GET_PEER_ADDR_INFO,
 			   &pinfo, &optlen);			   
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
+		tst_brkm(TBROK, NULL, "getsockopt(SCTP_GET_PEER_ADDR_INFO) "
 			 "valid associd, invalid addr error:%d, errno:%d\n",
 			error, errno);
 
@@ -879,5 +879,5 @@
 	close(peeloff_sk);
 
         /* Indicate successful completion.  */
-        return 0;
+      tst_exit();
 }
diff --git a/testcases/network/sctp/func_tests/test_tcp_style.c b/testcases/network/sctp/func_tests/test_tcp_style.c
index cfd561e..e19d945 100644
--- a/testcases/network/sctp/func_tests/test_tcp_style.c
+++ b/testcases/network/sctp/func_tests/test_tcp_style.c
@@ -134,7 +134,7 @@
 	/* Try to do accept on a non-listening socket. It should fail. */
 	error = accept(clt_sk[0], &accept_loop.sa, &addrlen);
 	if ((-1 != error) && (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "accept on non-listening socket "
+		tst_brkm(TBROK, NULL, "accept on non-listening socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept on non-listening socket");
@@ -143,7 +143,7 @@
 	error = connect(listen_sk, (struct sockaddr *)&clt_loop[0],
 			sizeof(clt_loop[0]));
 	if ((-1 != error) && (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connect to non-listening socket "
+		tst_brkm(TBROK, NULL, "connect to non-listening socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect to non-listening socket");
@@ -159,7 +159,7 @@
 	 */
 	error = connect(clt2_sk, &svr_loop.sa, sizeof(svr_loop));
 	if ((-1 != error) && (ECONNREFUSED != errno))
-		tst_brkm(TBROK, tst_exit, "connect after max backlog "
+		tst_brkm(TBROK, NULL, "connect after max backlog "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect after max backlog");
@@ -171,7 +171,7 @@
 		poll_fd.revents = 0;
 		error = poll(&poll_fd, 1, -1);
 		if ((1 != error) && (1 != poll_fd.revents))
-			tst_brkm(TBROK, tst_exit, "Unexpected return value "
+			tst_brkm(TBROK, NULL, "Unexpected return value "
 				 "with poll, error:%d errno:%d, revents:%d",
 				 error, errno, poll_fd.revents);
 
@@ -185,7 +185,7 @@
 	/* Try to do a connect on an established socket. It should fail. */
 	error = connect(accept_sk[0], &clt_loop[0].sa, sizeof(clt_loop[0]));
 	if ((-1 != error) || (EISCONN != errno))
-		tst_brkm(TBROK, tst_exit, "connect on an established socket "
+		tst_brkm(TBROK, NULL, "connect on an established socket "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "connect on an established socket");
@@ -193,12 +193,12 @@
 	/* Try to do accept on an established socket. It should fail. */
 	error = accept(accept_sk[0], &accept_loop.sa, &addrlen);
 	if ((-1 != error) && (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "accept on an established socket "
+		tst_brkm(TBROK, NULL, "accept on an established socket "
 			 "error:%d errno:%d", error, errno);
 
 	error = accept(clt_sk[0], &accept_loop.sa, &addrlen);
 	if ((-1 != error) && (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "accept on an established socket "
+		tst_brkm(TBROK, NULL, "accept on an established socket "
 			 "failure: error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "accept on an established socket");
@@ -226,7 +226,7 @@
 	/* Sending a message on a listening socket should fail. */
 	error = send(listen_sk, message, strlen(message), MSG_NOSIGNAL);
 	if ((-1 != error) || (EPIPE != errno))
-		tst_brkm(TBROK, tst_exit, "send on a listening socket "
+		tst_brkm(TBROK, NULL, "send on a listening socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "send on a listening socket");
@@ -234,7 +234,7 @@
 	/* Trying to receive a message on a listening socket should fail. */
 	error = recv(listen_sk, msgbuf, 100, 0);
 	if ((-1 != error) || (ENOTCONN != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a listening socket "
+		tst_brkm(TBROK, NULL, "recv on a listening socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "recv on a listening socket");
@@ -254,7 +254,7 @@
 	 */
 	error = recv(accept_sk[0], msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUTDOWN received socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUTDOWN received socket "
 			 "error:%d errno:%d", error, errno);
 
 	tst_resm(TPASS, "recv on a SHUTDOWN received socket");
@@ -285,7 +285,7 @@
 	/* No more messages and the association is SHUTDOWN, should fail. */
 	error = recv(clt_sk[0], msgbuf, 100, 0);
 	if ((-1 != error) || (ENOTCONN != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUTDOWN sent socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUTDOWN sent socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "recv on a SHUTDOWN sent socket");
@@ -297,7 +297,7 @@
 
 	error = recv(clt_sk[1], msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RD socket "
 			 "error:%d, errno:%d", error, errno);
 
 	/* Sending a message on SHUT_RD socket. */
@@ -312,7 +312,7 @@
 	/* We should not receive the message as the socket is SHUT_RD */ 
 	error = recv(clt_sk[1], msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RD socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RD socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "recv on a SHUT_RD socket");
@@ -322,12 +322,12 @@
 
 	error = recv(accept_sk[2], msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RDWR socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RDWR socket "
 			 "error:%d, errno:%d", error, errno);
 
 	error = recv(clt_sk[2], msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "recv on a SHUT_RDWR socket "
+		tst_brkm(TBROK, NULL, "recv on a SHUT_RDWR socket "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "recv on a SHUT_RDWR socket");
@@ -354,7 +354,7 @@
 
 	error = select(listen_sk + 1, &set, NULL, NULL, NULL);
 	if (1 != error)
-		tst_brkm(TBROK, tst_exit, "select error:%d, "
+		tst_brkm(TBROK, NULL, "select error:%d, "
 			 "errno: %d", error, errno);
 
 	/* Now accept the CLOSED association waiting on the listening 
@@ -370,7 +370,7 @@
 	 */
 	error = recv(accept2_sk, msgbuf, 100, 0);
 	if ((0 != error) || (0 != errno))
-		tst_brkm(TBROK, tst_exit, "Unexpected error return on "
+		tst_brkm(TBROK, NULL, "Unexpected error return on "
 			 "recv(error:%d, errno:%d)", error, errno);
 
 	tst_resm(TPASS, "accept of a CLOSED association");
@@ -380,7 +380,7 @@
 	 */
 	error = send(accept2_sk, message, strlen(message), MSG_NOSIGNAL);
 	if ((-1 != error) || (EPIPE != errno))
-		tst_brkm(TBROK, tst_exit, "send to a CLOSED association "
+		tst_brkm(TBROK, NULL, "send to a CLOSED association "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "send to a CLOSED association");
@@ -426,7 +426,7 @@
 	sinfo->sinfo_flags |= SCTP_EOF;
 	error = sendmsg(clt2_sk, &outmessage, 0);
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "sendmsg with SCTP_EOF flag "
+		tst_brkm(TBROK, NULL, "sendmsg with SCTP_EOF flag "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sendmsg with SCTP_EOF flag");
@@ -437,7 +437,7 @@
 	sinfo->sinfo_flags |= SCTP_ABORT;
 	error = sendmsg(clt2_sk, &outmessage, 0);
 	if ((-1 != error) || (EINVAL != errno))
-		tst_brkm(TBROK, tst_exit, "sendmsg with SCTP_ABORT flag "
+		tst_brkm(TBROK, NULL, "sendmsg with SCTP_ABORT flag "
 			 "error:%d, errno:%d", error, errno);
 
 	tst_resm(TPASS, "sendmsg with SCTP_ABORT flag");
diff --git a/testcases/network/sctp/func_tests/test_timetolive.c b/testcases/network/sctp/func_tests/test_timetolive.c
index 45ec5cd..c1974ff 100644
--- a/testcases/network/sctp/func_tests/test_timetolive.c
+++ b/testcases/network/sctp/func_tests/test_timetolive.c
@@ -151,7 +151,7 @@
 	error = getsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &orig_len,
 			   &len);
 	if (error)
-		tst_brkm(TBROK, tst_exit, "can't get rcvbuf size: %s",
+		tst_brkm(TBROK, NULL, "can't get rcvbuf size: %s",
 			strerror(errno));
 	/* Set the MAXSEG to something smallish. */
 	{
@@ -183,7 +183,7 @@
 	error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &len,
 			   sizeof(len));
 	if (error)
-		tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s",
+		tst_brkm(TBROK, NULL, "setsockopt(SO_RCVBUF): %s",
 			 strerror(errno));
 
        /* Mark sk2 as being able to accept new associations.  */
@@ -244,7 +244,7 @@
 			   sizeof(orig_len));
 
 	if (error)
-		tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s",
+		tst_brkm(TBROK, NULL, "setsockopt(SO_RCVBUF): %s",
 			strerror(errno));
 
         /* Get the first data message which was sent.  */
@@ -260,7 +260,7 @@
 	error = getsockopt(sk1, IPPROTO_SCTP, SCTP_STATUS, &gstatus, &len);
 	
 	if (error)
-		tst_brkm(TBROK, tst_exit, "can't get rwnd size: %s",
+		tst_brkm(TBROK, NULL, "can't get rwnd size: %s",
 			strerror(errno));
 	tst_resm(TINFO, "Creating fillmsg of size %d",
 		 gstatus.sstat_rwnd+RWND_SLOP);
@@ -348,7 +348,7 @@
 	test_check_msg_data(&inmessage, error, strlen(nottlmsg) + 1,
 			    MSG_EOR, stream, ppid);
 	if (0 != strncmp(iov.iov_base, nottlmsg, strlen(nottlmsg)+1))
-		tst_brkm(TBROK, tst_exit, "Received Wrong Message !!!");
+		tst_brkm(TBROK, NULL, "Received Wrong Message !!!");
 
 	tst_resm(TPASS, "Receive message with no timeout");
 
@@ -363,7 +363,7 @@
 				    SCTP_SEND_FAILED, 0);
 	ssf = (struct sctp_send_failed *)iov.iov_base;
 	if (0 != strncmp(ttlmsg, (char *)ssf->ssf_data, strlen(ttlmsg) + 1))
-		tst_brkm(TBROK, tst_exit, "SEND_FAILED data mismatch");
+		tst_brkm(TBROK, NULL, "SEND_FAILED data mismatch");
 
 	tst_resm(TPASS, "Receive SEND_FAILED for message with timeout");
 
@@ -381,7 +381,7 @@
 		ssf = (struct sctp_send_failed *)iov.iov_base;
 		if (0 != strncmp(&ttlfrag[offset], (char *)ssf->ssf_data,
 				 SMALL_MAXSEG))
-			tst_brkm(TBROK, tst_exit, "SEND_FAILED data mismatch");
+			tst_brkm(TBROK, NULL, "SEND_FAILED data mismatch");
 		offset += SMALL_MAXSEG;
 	} while (!(ssf->ssf_info.sinfo_flags & 0x01)); /* LAST_FRAG */
 
@@ -401,5 +401,5 @@
         close(sk2);
 
         /* Indicate successful completion.  */
-        return 0;
+      tst_exit();
 }
diff --git a/testcases/network/sctp/testlib/sctputil.c b/testcases/network/sctp/testlib/sctputil.c
index 4ed6068..8e5f832 100644
--- a/testcases/network/sctp/testlib/sctputil.c
+++ b/testcases/network/sctp/testlib/sctputil.c
@@ -183,27 +183,26 @@
 	union sctp_notification *sn;
 	
 	if (!(msg_flags & MSG_NOTIFICATION))
-		tst_brkm(TBROK, tst_exit, "Got a datamsg, expecting "
-			 "notification");
-	
+		tst_brkm(TBROK, NULL, "Got a datamsg, expecting notification");
+
 	if (expected_datalen <= 0)
 		return;
 
 	if (datalen != expected_datalen)
-		tst_brkm(TBROK, tst_exit, "Got a notification of unexpected "
-			 "length:%d, expected length:%d", datalen,
+		tst_brkm(TBROK, NULL, "Got a notification of unexpected "
+			 "length (%d); expected length was %d", datalen,
 			 expected_datalen);
 		
 	sn = (union sctp_notification *)buf;
 	if (sn->sn_header.sn_type != expected_sn_type)
-		tst_brkm(TBROK, tst_exit, "Unexpected notification:%d"
+		tst_brkm(TBROK, NULL, "Unexpected notification:%d "
 			 "expected:%d", sn->sn_header.sn_type,
 			  expected_sn_type);
 	
 	switch(sn->sn_header.sn_type) {
 	case SCTP_ASSOC_CHANGE:
 		if (sn->sn_assoc_change.sac_state != expected_additional)
-			tst_brkm(TBROK, tst_exit, "Unexpected sac_state:%d "
+			tst_brkm(TBROK, NULL, "Unexpected sac_state:%d "
 				 "expected:%d", sn->sn_assoc_change.sac_state,
 				  expected_additional);
 		break;
@@ -235,34 +234,34 @@
 		    uint32_t expected_ppid)
 {
 	if (msg_flags & MSG_NOTIFICATION)
-		tst_brkm(TBROK, tst_exit, "Got a notification, expecting a"
+		tst_brkm(TBROK, NULL, "Got a notification, expecting a"
 			 "datamsg");
 
 	if (expected_datalen <= 0)
 		return;
 
 	if (datalen != expected_datalen)
-		tst_brkm(TBROK, tst_exit, "Got a datamsg of unexpected "
+		tst_brkm(TBROK, NULL, "Got a datamsg of unexpected "
 			 "length:%d, expected length:%d", datalen,
 			 expected_datalen);
 
 	if ((msg_flags & ~0x80000000) != expected_msg_flags)
-		tst_brkm(TBROK, tst_exit, "Unexpected msg_flags:0x%x "
+		tst_brkm(TBROK, NULL, "Unexpected msg_flags:0x%x "
 			 "expecting:0x%x", msg_flags, expected_msg_flags);
 
 	if ((0 == expected_stream) && (0 == expected_ppid))
 		return; 
 
 	if (!sinfo)
-		tst_brkm(TBROK, tst_exit, "Null sinfo, but expected "
+		tst_brkm(TBROK, NULL, "Null sinfo, but expected "
 			 "stream:%d expected ppid:%d", expected_stream,
 			 expected_ppid);
 
 	if (sinfo->sinfo_stream != expected_stream)
-		tst_brkm(TBROK, tst_exit, "stream mismatch: expected:%x "
+		tst_brkm(TBROK, NULL, "stream mismatch: expected:%x "
 			 "got:%x", expected_stream, sinfo->sinfo_stream);
 	if (sinfo->sinfo_ppid != expected_ppid)
-		tst_brkm(TBROK, tst_exit, "ppid mismatch: expected:%x "
+		tst_brkm(TBROK, NULL, "ppid mismatch: expected:%x "
 			 "got:%x\n", expected_ppid, sinfo->sinfo_ppid);
 }
 
@@ -310,7 +309,7 @@
 
 	msg_buf = (char *)malloc(len);
 	if (!msg_buf)
-		tst_brkm(TBROK, tst_exit, "malloc failed");
+		tst_brkm(TBROK, NULL, "malloc failed");
 
 	p = msg_buf;
 
@@ -354,7 +353,7 @@
 		return memcmp(&addr1->v4.sin_addr, &addr2->v4.sin_addr,
 			      sizeof(addr1->v4.sin_addr));
 	default:
-		tst_brkm(TBROK, tst_exit, "invalid address type %d",
+		tst_brkm(TBROK, NULL, "invalid address type %d",
 			 addr1->sa.sa_family);
 		return -1;
 	}
@@ -373,12 +372,12 @@
 
 	error = sctp_getpaddrs(sk, asoc, &addrs);
 	if (-1 == error) {
-		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "sctp_getpaddrs: %s", strerror(errno));
 		return error;
 	}
 	if (error != count) {
 		sctp_freepaddrs(addrs);
-		tst_brkm(TBROK, tst_exit, "peer count %d mismatch, expected %d",
+		tst_brkm(TBROK, NULL, "peer count %d mismatch, expected %d",
 			 error, count);
 	}
 	addrbuf = addrs;
@@ -396,7 +395,7 @@
 		default:
 			errno = EINVAL;
 			sctp_freepaddrs(addrs);
-			tst_brkm(TBROK, tst_exit, "sctp_getpaddrs: %s", strerror(errno));
+			tst_brkm(TBROK, NULL, "sctp_getpaddrs: %s", strerror(errno));
 			return -1;
 		}
 		for (j = 0; j < count; j++) {
@@ -408,7 +407,7 @@
 	}
 	for (j = 0; j < count; j++) {
 		if (found[j] == 0) {
-			tst_brkm(TBROK, tst_exit, "peer address %d not found", j);
+			tst_brkm(TBROK, NULL, "peer address %d not found", j);
 		}
 	}
 	sctp_freepaddrs(addrs);
diff --git a/testcases/network/sctp/testlib/sctputil.h b/testcases/network/sctp/testlib/sctputil.h
index 940b606..487dbe9 100644
--- a/testcases/network/sctp/testlib/sctputil.h
+++ b/testcases/network/sctp/testlib/sctputil.h
@@ -134,7 +134,7 @@
 {
 	int sk = socket(domain, type, protocol);
         if (-1 == sk)
-                tst_brkm(TBROK, tst_exit, "socket: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "socket: %s", strerror(errno));
 	return sk;
 }
 
@@ -146,7 +146,7 @@
 	setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &true_const, sizeof(int));
 	error = bind(sk, addr, addrlen);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "bind: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "bind: %s", strerror(errno));
 	return error;
 }
 
@@ -154,7 +154,7 @@
 {
 	int error = sctp_bindx(sk, addr, count, SCTP_BINDX_ADD_ADDR);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "bindx (add): %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "bindx (add): %s", strerror(errno));
 	return error;
 }
 
@@ -162,7 +162,7 @@
 {
 	int error = listen(sk, backlog);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "listen: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "listen: %s", strerror(errno));
 	return error;
 }
 
@@ -170,7 +170,7 @@
 {
 	int error = connect(sk, addr, addrlen);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "connect: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "connect: %s", strerror(errno));
 	return error;
 }
 
@@ -178,7 +178,7 @@
 {
 	int error = sctp_connectx(sk, addr, count);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "connectx: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "connectx: %s", strerror(errno));
 	return error;
 }
 
@@ -186,7 +186,7 @@
 {
 	int error = accept(sk, addr, addrlen);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "accept: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "accept: %s", strerror(errno));
 	return error;
 }
 
@@ -194,7 +194,7 @@
 {
 	int error = send(sk, msg, len, flags);
         if (len != error)
-                tst_brkm(TBROK, tst_exit, "send: error:%d errno:%d",
+                tst_brkm(TBROK, NULL, "send: error:%d errno:%d",
 			 error, errno);
 	return error;
 }
@@ -204,7 +204,7 @@
 {
 	int error = sendto(sk, msg, len, flags, to, tolen);
         if (len != error)
-                tst_brkm(TBROK, tst_exit, "sendto: error:%d errno:%d",
+                tst_brkm(TBROK, NULL, "sendto: error:%d errno:%d",
 			 error, errno);
 	return error;
 }
@@ -214,7 +214,7 @@
 {
 	int error = sendmsg(sk, msg, flags);
         if (msglen != error)
-                tst_brkm(TBROK, tst_exit, "sendmsg: error:%d errno:%d",
+                tst_brkm(TBROK, NULL, "sendmsg: error:%d errno:%d",
 			 error, errno);
 	return error;
 }
@@ -223,7 +223,7 @@
 {
 	int error = recv(sk, buf, len, flags);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "recv: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "recv: %s", strerror(errno));
 	return error;
 }
 
@@ -231,7 +231,7 @@
 {
 	int error = recvmsg(sk, msg, flags);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "recvmsg: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "recvmsg: %s", strerror(errno));
 	return error;
 }
 
@@ -239,7 +239,7 @@
 {
 	int error = shutdown(sk, how);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "shutdown: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "shutdown: %s", strerror(errno));
 	return error;
 }
 
@@ -248,7 +248,7 @@
 {
 	int error = getsockopt(sk, SOL_SCTP, optname, optval, optlen);
 	if (error)
-		tst_brkm(TBROK, tst_exit, "getsockopt(%d): %s", optname,
+		tst_brkm(TBROK, NULL, "getsockopt(%d): %s", optname,
 			 strerror(errno));
 	return error;
 }
@@ -258,7 +258,7 @@
 {
 	int error = setsockopt(sk, SOL_SCTP, optname, optval, optlen);
 	if (error)
-		tst_brkm(TBROK, tst_exit, "setsockopt(%d): %s", optname,
+		tst_brkm(TBROK, NULL, "setsockopt(%d): %s", optname,
 			 strerror(errno));
 	return error;
 }
@@ -267,7 +267,7 @@
 {
 	int error = sctp_peeloff(sk, assoc_id);
         if (-1 == error)
-                tst_brkm(TBROK, tst_exit, "sctp_peeloff: %s", strerror(errno));
+                tst_brkm(TBROK, NULL, "sctp_peeloff: %s", strerror(errno));
 	return error;
 }
 
@@ -280,7 +280,7 @@
 	int error = sctp_sendmsg(s, msg, len, to, tolen, ppid, flags, stream_no,
 	  		         timetolive, context);
 	if (len != error)
-		tst_brkm(TBROK, tst_exit, "sctp_sendmsg: error:%d errno:%d",
+		tst_brkm(TBROK, NULL, "sctp_sendmsg: error:%d errno:%d",
 			 error, errno);
 	return error;			
 }
@@ -291,7 +291,7 @@
 {
 	int error = sctp_send(s, msg, len, sinfo, flags);
 	if (len != error)
-		tst_brkm(TBROK, tst_exit, "sctp_send: error:%d errno:%d",
+		tst_brkm(TBROK, NULL, "sctp_send: error:%d errno:%d",
 			 error, errno);
 	return error;			
 }
@@ -303,7 +303,7 @@
 {
 	int error = sctp_recvmsg(sk, msg, len, from, fromlen, sinfo, msg_flags);
 	if (-1 == error)
-		tst_brkm(TBROK, tst_exit, "sctp_recvmsg: %s", strerror(errno));
+		tst_brkm(TBROK, NULL, "sctp_recvmsg: %s", strerror(errno));
 	return error;			
 }
 
@@ -311,7 +311,7 @@
 {
 	void *buf = malloc(size);
         if (NULL == buf)
-                tst_brkm(TBROK, tst_exit, "malloc failed");
+                tst_brkm(TBROK, NULL, "malloc failed");
 	return buf;
 }
 
diff --git a/testcases/network/sockets/ltpServer.c b/testcases/network/sockets/ltpServer.c
index 8881772..6ab2e86 100644
--- a/testcases/network/sockets/ltpServer.c
+++ b/testcases/network/sockets/ltpServer.c
@@ -75,9 +75,9 @@
 char ServerProg [MAX_HOSTNAME_LEN];
 
 
-void ltp_udp_server_queue (void);
-void ltp_tcp_server_queue (void);
-void ltp_multi_server_queue (void);
+void* ltp_udp_server_queue (void*);
+void* ltp_tcp_server_queue (void*);
+void* ltp_multi_server_queue (void*);
 int  tcp_receive_buffer(int, char *);
 
 int main(int argc, char *argv[]) {
@@ -149,7 +149,8 @@
         }
 
         rc = pthread_attr_init(&multithread_attr);
-        rc = pthread_create(&multi_server_queue, &multithread_attr, NULL);
+        rc = pthread_create(&multi_server_queue, &multithread_attr,
+		ltp_multi_server_queue, NULL);
     }
 
 
@@ -203,22 +204,22 @@
     }
 
     rc = pthread_attr_init(&udpthread_attr);
-    rc = pthread_create(&udp_server_queue, &udpthread_attr, NULL);
+    rc = pthread_create(&udp_server_queue, &udpthread_attr,
+	    ltp_udp_server_queue, NULL);
 
     rc = pthread_attr_init(&tcpthread_attr);
-    rc = pthread_create(&tcp_server_queue, &tcpthread_attr, NULL);
+    rc = pthread_create(&tcp_server_queue, &tcpthread_attr,
+	    ltp_tcp_server_queue, NULL);
 
     while (1);
 
-
-
     return 0;
 }
 /*
  * Function:     ltp_udp_server_queue
  * Description:  This function grabs the udp message from the queue and outputs to stdio
  */
-void ltp_udp_server_queue ()
+void* ltp_udp_server_queue (void *junk)
 {
 
   printf("%s: waiting for data on port UDP %u\n", 
@@ -249,13 +250,15 @@
     
   }/* end of server infinite loop */
 
+  return NULL;
+
 }
 
 /*
  * Function:     ltp_tcp_server_queue
  * Description:  This function grabs the tcp message from the queue and outputs to stdio
  */
-void ltp_tcp_server_queue ()
+void* ltp_tcp_server_queue (void *junk)
 {
 
     listen(tcpSocketHandle,5);
@@ -294,6 +297,8 @@
 
     } /* while (1) */
 
+    return NULL;
+
 }
 /*
  * Function:     tcp_receive_buffer
@@ -365,12 +370,13 @@
     } 
 
   } /* while */
+
 }
 /*
  * Function:     ltp_multi_server_queue
  * Description:  This function grabs the multiCast message from the queue and outputs to stdio
  */
-void ltp_multi_server_queue ()
+void* ltp_multi_server_queue (void *junk)
 {
 
     printf("%s: waiting for data on port Multicast %u\n", 
@@ -395,4 +401,6 @@
 
     }/* end of infinite server loop */
 
+    return NULL;
+
 }
diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong6.c b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
index 3d5e0a6..bd74cb2 100644
--- a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
+++ b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
@@ -235,7 +235,7 @@
 		i = sendto( s, outpack, cc, 0, &whereto, sizeof(whereto) );
 
 		if (i < 0 || i != cc)  {
-			if (i<0)  perror("sendto");
+			if (i < 0)  perror("sendto");
 			printf("pingpong6: wrote %s %d chars, ret=%d\n",hostname,cc,i);
 			fflush(stdout);
 			}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
index ae7dcc1..b29df65 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-1.c
@@ -66,8 +66,12 @@
 	act.sa_handler=handler;
 	act.sa_flags=0;
 
+<<<<<<< HEAD
 	if ((sigemptyset(&set) != 0) ||
 	    (sigemptyset(&act.sa_mask) != 0)) {
+=======
+	if (sigemptyset(&set) != 0 || sigemptyset(&act.sa_mask) != 0) {
+>>>>>>> master
 		perror("sigemptyset() was not successful\n");
 		return PTS_UNRESOLVED;
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
index 81a170f..95f1661 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
@@ -66,8 +66,12 @@
 	act.sa_handler=handler;
 	act.sa_flags=0;
 
+<<<<<<< HEAD
 	if ((sigemptyset(&set) != 0) ||
 	    (sigemptyset(&act.sa_mask) != 0)) {
+=======
+	if (sigemptyset(&set) != 0 || sigemptyset(&act.sa_mask) != 0) {
+>>>>>>> master
 		perror("sigemptyset() was not successful\n");
 		return PTS_UNRESOLVED;
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/11-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/11-1.c
index 1ed25b7..93b9d08 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/11-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/11-1.c
@@ -158,7 +158,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/12-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/12-1.c
index e18bd24..046a58e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/12-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/12-1.c
@@ -269,7 +269,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/13-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/13-1.c
index a60195f..f9d58e2 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/13-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/13-1.c
@@ -189,7 +189,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/14-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/14-1.c
index 9c65824..4eaf3fa 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/14-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/14-1.c
@@ -160,7 +160,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/16-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/16-1.c
index f98f357..1ddc5e4 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/16-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/16-1.c
@@ -158,7 +158,6 @@
 		UNRESOLVED(errno, "Failed to fork");
 	}
 
-	/* child */
 	if (child == 0)
 	{
 		/* Check the values are read -- so that the mappings were inherited */
@@ -186,7 +185,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
@@ -220,4 +219,3 @@
 #endif
 	PASSED;
 }
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/17-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/17-1.c
index 2c35009..a0c7fb5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/17-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/17-1.c
@@ -159,7 +159,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/17-2.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/17-2.c
index 3277780..c321dee 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/17-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/17-2.c
@@ -159,7 +159,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/19-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/19-1.c
index 9f6c2bd..4bfd5c8 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/19-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/19-1.c
@@ -183,7 +183,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
index ce64e5b..34fce2a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
@@ -187,8 +187,13 @@
 	{
 		/* Check the struct was copied */
 
+<<<<<<< HEAD
 		if ((mystruct.one != 1) || (mystruct.two != 2) ||
 		    (mystruct.three != 3) || (mystruct.four != (void *) 4))
+=======
+		if ((mystruct.one != 1) || (mystruct.two != 2) || (mystruct.three != 3) || (mystruct.four != (void *) 4))
+>>>>>>> f4b7b4f00f2c5def7898c62f58d09b454eabd2ca
+>>>>>>> master
 		{
 			FAILED("The struct data was not copied to the child process");
 		}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
index c7e46ec..1832f6a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/21-1.c
@@ -124,7 +124,7 @@
 	/* Initialize the semaphore */
 	sem = sem_open("/fork_21_1", O_CREAT, O_RDWR, 0);
 
-	if (sem == (sem_t *) SEM_FAILED)
+	if (sem == (sem_t*) SEM_FAILED)
 	{
 		UNRESOLVED(errno, "Failed to open the semaphore");
 	}
@@ -179,7 +179,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/22-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/22-1.c
index f311726..75c9d44 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/22-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/22-1.c
@@ -216,7 +216,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/6-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/6-1.c
index d4d1eb4..698317b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/6-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/6-1.c
@@ -174,7 +174,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally -- dir stream not copied?");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
index a041a2a..98525a0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/8-1.c
@@ -100,7 +100,7 @@
 	/* Initialize first times */
 	st_time = times(&ini_tms);
 
-	if (st_time == (clock_t) -1)
+	if (st_time == -1)
 	{
 		UNRESOLVED(errno, "times failed");
 	}
@@ -158,7 +158,7 @@
 			UNRESOLVED(errno, "times failed");
 		}
 
-		if (child_tms.tms_utime + child_tms.tms_stime >= sysconf(_SC_CLK_TCK))
+		if ((child_tms.tms_utime + child_tms.tms_stime) >= sysconf(_SC_CLK_TCK))
 		{
 			FAILED("The tms struct was not reset during fork() operation");
 		}
@@ -167,7 +167,7 @@
 		{
 			cur_time = times(&child_tms);
 
-			if (cur_time == (clock_t) -1)
+			if (cur_time == -1)
 			{
 				UNRESOLVED(errno, "times failed");
 			}
@@ -184,14 +184,12 @@
 
 	if (ctl != child)
 	{
-		UNRESOLVED(errno, "Waitpid returned the wrong PID")
-		;
+		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
-		FAILED("Child exited abnormally")
-		;
+		FAILED("Child exited abnormally");
 	}
 
 	/* Check the children times were reported as expected */
@@ -213,7 +211,7 @@
 
 #endif
 
-	if (cur_time == (clock_t) -1)
+	if (cur_time == -1)
 	{
 		UNRESOLVED(errno, "times failed");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/fork/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/fork/9-1.c
index 6fab821..4ae5102 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/9-1.c
@@ -133,7 +133,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mlock/speculative/12-1.c b/testcases/open_posix_testsuite/conformance/interfaces/mlock/speculative/12-1.c
index 4bf3b72..fd5f61b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mlock/speculative/12-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mlock/speculative/12-1.c
@@ -12,6 +12,7 @@
  * (Linux 2.6.9 and later) and its RLIMIT_MEMLOCK soft resource limit set to 0.
  */
 
+#define _GNU_SOURCE 1 /* XXX: Read baloney below about CAP_* */
 #define _XOPEN_SOURCE 600
 
 #include <sys/mman.h>
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mlockall/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/mlockall/8-1.c
index b2b853f..028979a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/mlockall/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/mlockall/8-1.c
@@ -19,7 +19,7 @@
 	int result;
 
 	result = mlockall(MCL_CURRENT);
-	if (result == 0 && errno == 0){
+	if (result == 0 && errno == 0) {
 		printf("Test PASSED\n");
 		return PTS_PASS;
 	} else if (errno == 0) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
index d739be6..9fa49a2 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
@@ -62,7 +62,11 @@
 
 	result = munlockall();
 	
+<<<<<<< HEAD
 	if ((result == 0 && memlock > 0) || (result == -1 && memlock <= 0)) {
+=======
+	if ((result == 0 && memlock > 0) || (result == -1 && memlock <= 0)){
+>>>>>>> master
 		printf("Test PASSED\n");
 		return PTS_PASS;
 	} else if (errno == EPERM) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
index 0dca6b7..f61b250 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
@@ -53,8 +53,12 @@
 			slepts = slepts-1;
 		}
 
+<<<<<<< HEAD
 		if ((slepts >= 1) ||
 		    (sleptns > sleepnsec[i])) {
+=======
+		if (slepts >= 1 || sleptns > sleepnsec[i]) {
+>>>>>>> master
 			printf("PASS slept %ds %dns >= %d\n", 
 				slepts, sleptns, sleepnsec[i]);
 		} else {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/1-2.c
index eae9b35..b922168 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/1-2.c
@@ -159,7 +159,7 @@
 		exit(PTS_PASS);
 	}
 
-	if (!pthread_equal(ch, threads[ 0 ]))
+	if (!pthread_equal(ch, threads[0]))
 	{
 		FAILED("prepare handler was not called in the thread s context");
 	}
@@ -177,7 +177,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/2-2.c
index 2034c02..241530c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/2-2.c
@@ -204,7 +204,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-2.c
index 4f86317..9da6498 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-2.c
@@ -164,7 +164,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-3.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-3.c
index 7a03933..50c233d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/3-3.c
@@ -289,14 +289,12 @@
 	arg2.sem = &semsig2;
 #endif
 
-
-
-	if ((ret = pthread_create(&th_sig1, NULL, sendsig, (void *) & arg1)))
+	if ((ret = pthread_create(&th_sig1, NULL, sendsig, (void *) &arg1)))
 	{
 		UNRESOLVED(ret, "Signal 1 sender thread creation failed");
 	}
 
-	if ((ret = pthread_create(&th_sig2, NULL, sendsig, (void *) & arg2)))
+	if ((ret = pthread_create(&th_sig2, NULL, sendsig, (void *) &arg2)))
 	{
 		UNRESOLVED(ret, "Signal 2 sender thread creation failed");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/4-1.c
index b4cf639..f7bc478 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/4-1.c
@@ -199,7 +199,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedpolicy/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedpolicy/2-1.c
index 64740ef..b662929 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedpolicy/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedpolicy/2-1.c
@@ -99,7 +99,3 @@
 	printf("Test PASS\n");
 	return PTS_PASS;
 }
-
-
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/1-1.c
index 830f17e..56e004f 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setinheritsched/1-1.c
@@ -85,7 +85,3 @@
 	printf("Test PASS\n");
 	return PTS_PASS;
 }
-
-
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/speculative/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/speculative/5-1.c
index 3fbbc2f..098c1f0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/speculative/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_setschedpolicy/speculative/5-1.c
@@ -49,7 +49,3 @@
 	printf("Test PASS\n");
 	return PTS_PASS;
 }
-
-
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cancel/5-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cancel/5-2.c
index 6916312..4321052 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cancel/5-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cancel/5-2.c
@@ -358,4 +358,3 @@
 #endif
 	PASSED;
 }
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/4-1.c
index eae3cb0..7d92b38 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_getschedparam/4-1.c
@@ -121,7 +121,7 @@
 	{
 #ifdef WITH_SYNCHRO
 
-		if ((ret = sem_wait(thearg->sem)))
+		if ((ret = sem_wait(thearg->sem)) == -1)
 		{
 			UNRESOLVED(errno, "Sem_wait in sendsig");
 		}
@@ -147,7 +147,7 @@
 {
 #ifdef WITH_SYNCHRO
 
-	if (sem_post(&semsig1))
+	if (sem_post(&semsig1) == -1)
 	{
 		UNRESOLVED(errno, "Sem_post in signal handler 1");
 	}
@@ -160,7 +160,7 @@
 {
 #ifdef WITH_SYNCHRO
 
-	if (sem_post(&semsig2))
+	if (sem_post(&semsig2) == -1)
 	{
 		UNRESOLVED(errno, "Sem_post in signal handler 2");
 	}
@@ -222,14 +222,14 @@
 	sa.sa_flags = 0;
 	sa.sa_handler = sighdl1;
 
-	if ((ret = sigaction (SIGUSR1, &sa, NULL)))
+	if ((ret = sigaction (SIGUSR1, &sa, NULL)) == -1)
 	{
 		UNRESOLVED(ret, "Unable to register signal handler1");
 	}
 
 	sa.sa_handler = sighdl2;
 
-	if ((ret = sigaction (SIGUSR2, &sa, NULL)))
+	if ((ret = sigaction (SIGUSR2, &sa, NULL)) == -1)
 	{
 		UNRESOLVED(ret, "Unable to register signal handler2");
 	}
@@ -255,19 +255,19 @@
 	}
 
 #ifdef WITH_SYNCHRO
-	if (sem_init(&semsig1, 0, 1))
+	if (sem_init(&semsig1, 0, 1) == -1)
 	{
 		UNRESOLVED(errno, "Semsig1  init");
 	}
 
-	if (sem_init(&semsig2, 0, 1))
+	if (sem_init(&semsig2, 0, 1) == -1)
 	{
 		UNRESOLVED(errno, "Semsig2  init");
 	}
 
 #endif
 
-	if ((ret = pthread_create(&th_work, NULL, test, NULL)))
+	if ((ret = pthread_create(&th_work, NULL, test, NULL)) == -1)
 	{
 		UNRESOLVED(ret, "Worker thread creation failed");
 	}
@@ -281,7 +281,7 @@
 
 
 
-	if ((ret = pthread_create(&th_sig1, NULL, sendsig, (void *) & arg1)))
+	if ((ret = pthread_create(&th_sig1, NULL, sendsig, (void *) & arg1)) != 0)
 	{
 		UNRESOLVED(ret, "Signal 1 sender thread creation failed");
 	}
@@ -298,12 +298,9 @@
 
 
 	/* Now stop the threads and join them */
-	do
-	{
+	do {
 		do_it = 0;
-	}
-	while (do_it);
-
+	} while (do_it);
 
 	if ((ret = pthread_join(th_sig1, NULL)))
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/6-3.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/6-3.c
index 58336b3..d28b2aa 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/6-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/6-3.c
@@ -210,12 +210,12 @@
 		{
 			ret = pthread_create(&child, &scenarii[ sc ].ta, threaded, NULL);
 
-			if ((scenarii[ sc ].result == 0) && (ret != 0))
+			if ((scenarii[sc].result == 0) && (ret != 0))
 			{
 				UNRESOLVED(ret, "Failed to create this thread");
 			}
 
-			if ((scenarii[ sc ].result == 1) && (ret == 0))
+			if ((scenarii[sc].result == 1) && (ret == 0))
 			{
 
 				UNRESOLVED(-1, "An error was expected but the thread creation succeeded");
@@ -262,14 +262,14 @@
 	sa.sa_flags = 0;
 	sa.sa_handler = sighdl1;
 
-	if ((ret = sigaction (SIGUSR1, &sa, NULL)))
+	if ((ret = sigaction(SIGUSR1, &sa, NULL)) == -1)
 	{
 		UNRESOLVED(ret, "Unable to register signal handler1");
 	}
 
 	sa.sa_handler = sighdl2;
 
-	if ((ret = sigaction (SIGUSR2, &sa, NULL)))
+	if ((ret = sigaction(SIGUSR2, &sa, NULL)) == -1)
 	{
 		UNRESOLVED(ret, "Unable to register signal handler2");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
index 1efb1c3..5945021 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c
@@ -155,9 +155,9 @@
 		{
 
 			if (scenarii[ i ].explicitsched == 1)
-				ret = pthread_attr_setinheritsched(&scenarii[ i ].ta, PTHREAD_EXPLICIT_SCHED);
+				ret = pthread_attr_setinheritsched(&scenarii[i].ta, PTHREAD_EXPLICIT_SCHED);
 			else
-				ret = pthread_attr_setinheritsched(&scenarii[ i ].ta, PTHREAD_INHERIT_SCHED);
+				ret = pthread_attr_setinheritsched(&scenarii[i].ta, PTHREAD_INHERIT_SCHED);
 
 			if (ret != 0)
 			{
@@ -289,22 +289,26 @@
 #endif
 
 		/* Stack related attributes */
+<<<<<<< HEAD
 		if ((tss > 0) && (tsa > 0))     /* This routine is dependent on the Thread Stack Address Attribute and Thread Stack Size Attribute options */
+=======
+		if (tss > 0 && tsa > 0)     /* This routine is dependent on the Thread Stack Address Attribute and Thread Stack Size Attribute options */
+>>>>>>> master
 		{
 
-			if (scenarii[ i ].altstack != 0)
+			if (scenarii[i].altstack != 0)
 			{
 				/* This is slightly more complicated. We need to alloc a new stack
 				and free it upon test termination */
 				/* We will alloc with a simulated guardsize of 1 pagesize */
-				scenarii[ i ].bottom = malloc(minstacksize + pagesize);
+				scenarii[i].bottom = malloc(minstacksize + pagesize);
 
-				if (scenarii[ i ].bottom == NULL)
+				if (scenarii[i].bottom == NULL)
 				{
 					UNRESOLVED(errno, "Unable to alloc enough memory for alternative stack");
 				}
 
-				ret = pthread_attr_setstack(&scenarii[ i ].ta, scenarii[ i ].bottom, minstacksize);
+				ret = pthread_attr_setstack(&scenarii[i].ta, scenarii[ i ].bottom, minstacksize);
 
 				if (ret != 0)
 				{
@@ -329,6 +333,10 @@
 		if (scenarii[ i ].guard != 0)
 		{
 			if (scenarii[ i ].guard == 1)
+				ret = pthread_attr_setguardsize( &scenarii[ i ].ta, 0 );
+
+			if (scenarii[ i ].guard == 2)
+				ret = pthread_attr_setguardsize( &scenarii[ i ].ta, pagesize );
 				ret = pthread_attr_setguardsize(&scenarii[ i ].ta, 0);
 
 			if (scenarii[ i ].guard == 2)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c
index 4571fa3..fe6fbab 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c
@@ -254,9 +254,9 @@
 	}
 	/* we expect the reader get the lock when writer has release the lock*/
 	cnt = 0;
-	do{
+	do {
 		sleep(1);
-	}while (rd_thread_state !=EXITING_THREAD && cnt++ < 3); 
+	} while (rd_thread_state != EXITING_THREAD && cnt++ < 3); 
 	
 	if (rd_thread_state == ENTERED_THREAD)
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-3.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-3.c
index adfad72..3a3ba2e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-3.c
@@ -184,10 +184,10 @@
 	
 	/* We expect the wr_thread to block */
 	cnt = 0;
-	do{
+	do {
 		sleep(1);
-	}while (wr_thread_state !=EXITING_THREAD && cnt++ < 3); 
-	
+	} while (wr_thread_state !=EXITING_THREAD && cnt++ < 3); 
+
 	if (wr_thread_state == EXITING_THREAD)
 	{
 		printf("wr_thread did not block on write lock, when a reader owns the lock\n");
@@ -210,9 +210,9 @@
 	
 	/* We expect the rd_thread get the read lock*/
 	cnt = 0;
-	do{
+	do {
 		sleep(1);
-	}while (rd_thread_state !=EXITING_THREAD && cnt++ < 3); 
+	} while (rd_thread_state != EXITING_THREAD && cnt++ < 3); 
 	
 	if (rd_thread_state == ENTERED_THREAD)
 	{
@@ -234,9 +234,9 @@
 	
 	/* we expect the writer get the lock */
 	cnt = 0;
-	do{
+	do {
 		sleep(1);
-	}while (wr_thread_state !=EXITING_THREAD && cnt++ < 3); 
+	} while (wr_thread_state !=EXITING_THREAD && cnt++ < 3); 
 	
 	if (wr_thread_state == ENTERED_THREAD)
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/1-2.c
index 75186dc..b7ad8ba 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/1-2.c
@@ -121,7 +121,7 @@
 	/* Wait until the policy has been changed. */
 	ret = pthread_barrier_wait(arg);
 
-	if ((ret != 0) && (ret != PTHREAD_BARRIER_SERIAL_THREAD))
+	if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
 	{
 		UNRESOLVED(ret, "barrier wait failed");
 	}
@@ -203,7 +203,7 @@
 	/* let the controler control */
 	ret = pthread_barrier_wait(&bar);
 
-	if ((ret != 0) && (ret != PTHREAD_BARRIER_SERIAL_THREAD))
+	if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
 	{
 		UNRESOLVED(ret, "barrier wait failed");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/5-1.c
index f1ef8dc..2d6872e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_setschedparam/5-1.c
@@ -288,8 +288,6 @@
 	arg2.sem = &semsig2;
 #endif
 
-
-
 	if ((ret = pthread_create(&th_sig1, NULL, sendsig, (void *) & arg1)))
 	{
 		UNRESOLVED(ret, "Signal 1 sender thread creation failed");
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
index 82e05ab..6133e40 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/18-1.c
@@ -213,7 +213,11 @@
 			j %= 2 * NSIG;
 
 			if (j >= NSIG)
+<<<<<<< HEAD
 				ret = sigdelset(&set, signals[j - NSIG]);
+=======
+				ret = sigdelset(&set, signals[j-NSIG]);
+>>>>>>> master
 			else
 				ret = sigaddset(&set, signals[j]);
 
@@ -368,4 +372,3 @@
 #endif
 	PASSED;
 }
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/5-1.c
index acf8fac..587f20d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_sigmask/5-1.c
@@ -87,13 +87,13 @@
 
 	if (sigismember(&pending_set, SIGABRT) == -1)
 	{
-		perror("Unexpected error while attempting to use sigismember.\n");
+		perror("Unexpected error while attempting to use sigismember.");
 		pthread_exit((void*) - 1);
 	}
 
 	if (sigismember(&pending_set, SIGABRT) != 1)
 	{
-		perror("FAIL: sigismember did not return 1\n");
+		perror("FAIL: sigismember did not return 1");
 		pthread_exit((void*) 1);
 	}
 
@@ -102,7 +102,7 @@
 
 	if (pthread_sigmask(SIG_SETMASK, &blocked_set, NULL) == -1)
 	{
-		perror("Unexpected error while attempting to use pthread_sigmask.\n");
+		perror("Unexpected error while attempting to use pthread_sigmask.");
 		pthread_exit((void*) 1);
 	}
 
@@ -111,7 +111,7 @@
 	if (!handler_called)
 	{
 		printf("FAIL: Old signal was not removed from mask.\n");
-		pthread_exit((void*) - 1);
+		pthread_exit((void*) -1);
 	}
 
 	pthread_exit((void*) 0);
@@ -122,7 +122,7 @@
 int main()
 {
 
-	int * thread_return_value;
+	int *thread_return_value;
 
 	pthread_t new_thread;
 
@@ -132,7 +132,7 @@
 		return PTS_UNRESOLVED;
 	}
 
-	if (pthread_join(new_thread, (void*) & thread_return_value) != 0)
+	if (pthread_join(new_thread, (void*) &thread_return_value) != 0)
 	{
 		perror("Error in pthread_join()\n");
 		return PTS_UNRESOLVED;
@@ -160,4 +160,3 @@
 	printf("Test PASSED\n");
 	return PTS_PASS;
 }
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
index 7ba70a9..5c1d29a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/raise/2-1.c
@@ -62,8 +62,12 @@
 		return PTS_FAIL;
 	}
 
+<<<<<<< HEAD
 	if ((INHANDLER == globalStatus) ||
 	    (BEFOREHANDLER == globalStatus)) {
+=======
+	if (INHANDLER == globalStatus || BEFOREHANDLER == globalStatus) {
+>>>>>>> master
 		printf("Test FAILED\n");
 		return PTS_FAIL;
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
index 4d30bcd..efa23e4 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
@@ -25,7 +25,7 @@
 	
 	result = sched_get_priority_min(SCHED_SPORADIC);
 	
-	if (result != -1 && errno == 0) {
+	if (result != -1 && errno == 0 ) {
 		printf("The minimum priority for policy SCHED_SPORADIC is %i.\n",
 		       result);
 		printf("Test PASSED\n");
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
index 3d6d51e..9529f47 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/4-1.c
@@ -31,16 +31,28 @@
 	/* Create a child process which exit immediately */
 	child_pid = fork();
 	if (child_pid == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling fork()");
 	  return PTS_UNRESOLVED;
 	} else if (child_pid == 0) {
 	  exit(0);
+=======
+		perror("An error occurs when calling fork()");
+		return PTS_UNRESOLVED;
+	} else if (child_pid == 0) {
+		exit(0);
+>>>>>>> master
 	}
 
 	/* Wait for the child process to exit */
 	if (wait(&stat_loc) == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling wait()");
 	  return PTS_UNRESOLVED;
+=======
+		perror("An error occurs when calling wait()");
+		return PTS_UNRESOLVED;
+>>>>>>> master
 	}
 	
 	/* Assume the pid is not yet reatributed to an other process */
@@ -63,5 +75,3 @@
 	}        
 
 }
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/3-1.c
index 35df624..6d88a86 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/3-1.c
@@ -58,7 +58,7 @@
 		printf("Returned code is -1.\n");
 		return PTS_FAIL;
 	}
-	if (errno != 0) {
+	if (errno != 0 ) {
 		perror("Unexpected error");
 		return PTS_FAIL;
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
index 8bdb1c6..8194292 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/5-1.c
@@ -30,16 +30,28 @@
 	/* Create a child process which exit immediately */
 	child_pid = fork();
 	if (child_pid == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling fork()");
 	  return PTS_UNRESOLVED;
 	} else if (child_pid == 0) {
 	  exit(0);
+=======
+		perror("An error occurs when calling fork()");
+		return PTS_UNRESOLVED;
+	} else if (child_pid == 0) {
+		exit(0);
+>>>>>>> master
 	}
 
 	/* Wait for the child process to exit */
 	if (wait(&stat_loc) == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling wait()");
 	  return PTS_UNRESOLVED;
+=======
+		perror("An error occurs when calling wait()");
+		return PTS_UNRESOLVED;
+>>>>>>> master
 	}
 
 	/* Assume the pid is not yet reatributed to an other process */
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/2-1.c
index bfc89dc..e23ef3a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/2-1.c
@@ -58,5 +58,3 @@
 	}
 	
 }
-
-
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
index dc7a864..67db14d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_rr_get_interval/3-1.c
@@ -31,16 +31,28 @@
 	/* Create a child process which exit immediately */
 	child_pid = fork();
 	if (child_pid == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling fork()");
 	  return PTS_UNRESOLVED;
 	} else if (child_pid == 0) {
 	  exit(0);
+=======
+		perror("An error occurs when calling fork()");
+		return PTS_UNRESOLVED;
+	} else if (child_pid == 0) {
+		exit(0);
+>>>>>>> master
 	}
 
 	/* Wait for the child process to exit */
 	if (wait(&stat_loc) == -1) {
+<<<<<<< HEAD
 	  perror("An error occurs when calling wait()");
 	  return PTS_UNRESOLVED;
+=======
+		perror("An error occurs when calling wait()");
+		return PTS_UNRESOLVED;
+>>>>>>> master
 	}
 	
 	/* Assume the pid is not yet reatributed to an other process */
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
index a3cfc85..47353b2 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-1.c
@@ -188,7 +188,11 @@
 	while (scanf("*%i*",&child_count) == 0) 
 		sched_yield();
 
+<<<<<<< HEAD
 	for (i=0; i<nb_child-1; i++) {
+=======
+	for (i = 0; i < (nb_child-1); i++) {
+>>>>>>> master
 		if (kill(child_pid[i], SIGKILL) != 0) {
 			perror("An error occurs when calling kill()");
 			return PTS_UNRESOLVED;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
index a60ceb8..d7d9d89 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/2-2.c
@@ -92,7 +92,11 @@
 	int i;
 	struct sched_param param;
 
+<<<<<<< HEAD
 	if (id == nb_child-1) {
+=======
+	if (id == (nb_child-1)) {
+>>>>>>> master
 		param.sched_priority = sched_get_priority_min(SCHED_RR);
 		sched_setparam(getpid(), &param);
 	}
@@ -126,7 +130,10 @@
 		return PTS_UNRESOLVED;
 	}
 	child_pid = malloc(nb_child);
-
+	if (child_pid == NULL) {
+		printf("malloc failed\n");
+		return PTS_UNRESOLVED;
+	}
 	param.sched_priority = (sched_get_priority_min(SCHED_RR) +
 				 sched_get_priority_max(SCHED_RR)) / 2;
 	
@@ -188,7 +195,11 @@
 	while (scanf("*%i*",&child_count) == 0) 
 		sched_yield();
 
+<<<<<<< HEAD
 	for (i=0; i<nb_child-1; i++) {
+=======
+	for (i = 0; i < (nb_child-1); i++) {
+>>>>>>> master
 		if (kill(child_pid[i], SIGKILL) != 0) {
 			perror("An error occurs when calling kill()");
 			return PTS_UNRESOLVED;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
index aa51aec..606b10e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-1.c
@@ -48,7 +48,11 @@
 		perror("An error occurs when calling sched_getparam()");
 		return PTS_UNRESOLVED;
 	}
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> master
 	if (param.sched_priority == old_priority) {
 		printf("Test PASSED\n");
 		return PTS_PASS;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-2.c
index 896bd82..110bc8c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-2.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include "posixtest.h"
 
-#if defined(_POSIX_SPORADIC_SERVER)&&(_POSIX_SPORADIC_SERVER != -1)
+#if defined(_POSIX_SPORADIC_SERVER) && (_POSIX_SPORADIC_SERVER != -1)
 
 int main() {
 	int policy, invalid_priority, old_priority;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
index 8049966..c22359c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
@@ -38,7 +38,11 @@
 		perror("An error occurs when calling sched_getparam()");
 		return PTS_UNRESOLVED;
 	}
+<<<<<<< HEAD
 	
+=======
+
+>>>>>>> master
 	if (param.sched_priority == old_priority) {
 		printf("Test PASSED\n");
 		return PTS_PASS;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
index ab8738b..ce76089 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/9-1.c
@@ -158,11 +158,19 @@
 		return PTS_UNRESOLVED;
 	}
 
+<<<<<<< HEAD
 	for (i = 0; i < (nb_cpu - 1); i++) {
 		child_pid[i] = fork();
 		if (child_pid[i] == -1) {
 			perror("An error occurs when calling fork()");
 			for (j = 0; j < i; j++) {
+=======
+	for (i=0; i<nb_cpu-1; i++) {
+		child_pid[i] = fork();
+		if (child_pid[i] == -1) {
+			perror("An error occurs when calling fork()");
+			for (j=0; j<i; j++) {
+>>>>>>> master
 				kill(child_pid[j], SIGTERM);		
 			}
 			return PTS_UNRESOLVED;
@@ -178,7 +186,11 @@
 	child_pid[i] = fork();
 	if (child_pid[i] == -1) {
 		perror("An error occurs when calling fork()");
+<<<<<<< HEAD
 		for (j = 0; j < i; j++) {
+=======
+		for (j=0; j<i; j++) {
+>>>>>>> master
 			kill(child_pid[j], SIGTERM);		
 		}
 		return PTS_UNRESOLVED;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
index 1d80c71..7897fca 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
@@ -67,7 +67,11 @@
 		
 		if (tmp == -1 || errno != 0) {
 			if (errno == EPERM) {
+<<<<<<< HEAD
 				printf("  The process do not have permission to change its own scheduler\n  Try to run this test as root.\n");
+=======
+				printf("  The process does not have permission to change its own scheduler\n  Try to run this test as root.\n");
+>>>>>>> master
 			} else {
 				printf("  Error calling sched_setscheduler() for %s policy\n", tst->name);
 			}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
index aa9d672..668be40 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_close/3-2.c
@@ -102,7 +102,7 @@
 	/* Create the semaphore */
 	sem = sem_open(SEM_NAME, O_CREAT | O_EXCL, 0777, 2);
 
-	if ((sem == SEM_FAILED) && (errno == EEXIST))
+	if (sem == SEM_FAILED && errno == EEXIST)
 	{
 		sem_unlink(SEM_NAME);
 		sem = sem_open(SEM_NAME, O_CREAT | O_EXCL, 0777, 2);
@@ -116,7 +116,11 @@
 	/* Use the semaphore to change its value. */
 	do {
 		ret = sem_wait(sem);
+<<<<<<< HEAD
 	} while ((ret != 0) && (errno == EINTR));
+=======
+	} while (ret != 0 && errno == EINTR);
+>>>>>>> master
 
 	if (ret != 0)
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
index 18c5279..9ab0df3 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-2.c
@@ -161,7 +161,12 @@
 	/* Wait the sempahore */
 	do {
 		ret = sem_wait(sem);
+<<<<<<< HEAD
 	} while ((ret != 0) && (errno == EINTR));
+=======
+	}
+	while (ret != 0 && errno == EINTR);
+>>>>>>> master
 
 	if (ret != 0)
 	{
@@ -176,7 +181,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-3.c
index 1258711..c03cabc 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_init/3-3.c
@@ -165,7 +165,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != PTS_PASS))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != PTS_PASS))
 	{
 		FAILED("Child exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/2-1.c
index 3c94d03..29a4f10 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/2-1.c
@@ -45,7 +45,7 @@
 		return PTS_UNRESOLVED; 
 	}
 
-	if ((  sem_post(mysemp)) == 0) {
+	if (sem_post(mysemp) == 0) {
 		puts("TEST PASSED");
 		sem_close(mysemp);
 		sem_unlink(semname);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-2.c
index 7870c20..ca19798 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/2-2.c
@@ -38,13 +38,13 @@
 	int sts, val;
 
 
-        if (sem_init (&mysemp, 0, 0) == -1) {
-                perror(ERROR_PREFIX "sem_init");
-                return PTS_UNRESOLVED;
-        }
+	if (sem_init (&mysemp, 0, 0) == -1) {
+		perror(ERROR_PREFIX "sem_init");
+		return PTS_UNRESOLVED;
+	}
 
 	ts.tv_sec=time(NULL)+1;
-        ts.tv_nsec=0;
+	ts.tv_nsec=0;
 
 	/* Try to lock Semaphore */
 	sts = sem_timedwait(&mysemp, &ts);
@@ -54,17 +54,17 @@
 		return PTS_UNRESOLVED;
 	}
 
-        if (sem_getvalue(&mysemp, &val) == -1) {
-                perror(ERROR_PREFIX "sem_getvalue");
-                return PTS_UNRESOLVED;
-        }
+	if (sem_getvalue(&mysemp, &val) == -1) {
+		perror(ERROR_PREFIX "sem_getvalue");
+		return PTS_UNRESOLVED;
+	}
 
-       if ((val == 1) && (sts == -1)) {
-                 puts("TEST PASSED");
-                 sem_destroy(&mysemp);
-                 return PTS_PASS;
-       } else {
-                 puts("TEST FAILED");
-                 return PTS_FAIL;
-       }
+	if ((val == 1) && (sts == -1)) {
+		puts("TEST PASSED");
+		sem_destroy(&mysemp);
+		return PTS_PASS;
+	} else {
+		puts("TEST FAILED");
+		return PTS_FAIL;
+	}
 }
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/4-1.c
index 050cf5f..9f948ab 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/4-1.c
@@ -32,29 +32,29 @@
 int main() {
 	sem_t mysemp;
 	struct timespec ts;
-	int unresolved=0, sts;
+	int unresolved = 0, sts;
 
 
         if (sem_init (&mysemp, 0, 1) == -1) {
                 perror(ERROR_PREFIX "sem_init");
-		unresolved=1;
+		unresolved = 1;
         }
 
-	ts.tv_sec=time(NULL)+1;
-        ts.tv_nsec=0;
+	ts.tv_sec = time(NULL) + 1;
+        ts.tv_nsec = 0;
 
 	/* Lock Semaphore */
 	sts = sem_timedwait(&mysemp, &ts);
         if (sts == -1) {
 		perror(ERROR_PREFIX "sem_timedwait");
-		unresolved=1;
+		unresolved = 1;
 	}
 
 
 	/* unlock Semaphore */
 	if (sem_post(&mysemp) == -1) {
 		perror(ERROR_PREFIX "sem_post");
-		unresolved=1;
+		unresolved = 1;
 	}
 
 	if ((sts == 0) && (unresolved == 0)) {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/9-1.c
index 71f7276..1969409 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_timedwait/9-1.c
@@ -33,68 +33,68 @@
 
 void handler(int signo)
 {
-        printf("In handler\n");
+	printf("In handler\n");
 }
 
 int main()
 {
-        sem_t mysemp;
+	sem_t mysemp;
 	struct timespec ts;
-        int pid, status;
+	int pid, status;
 
 
-        if (sem_init (&mysemp, 0, 1) == -1) {
-                perror(ERROR_PREFIX "sem_init");
-                return PTS_UNRESOLVED;
-        }
+	if (sem_init (&mysemp, 0, 1) == -1) {
+		perror(ERROR_PREFIX "sem_init");
+		return PTS_UNRESOLVED;
+	}
 
 
-        if (sem_wait(&mysemp) == -1) {
-                perror(ERROR_PREFIX "sem_wait");
-                return PTS_UNRESOLVED;
-        }
+	if (sem_wait(&mysemp) == -1) {
+		perror(ERROR_PREFIX "sem_wait");
+		return PTS_UNRESOLVED;
+	}
 
-        pid = fork();
-        if (pid == 0) { // child create the semaphore.
-                struct sigaction act;
+	pid = fork();
+	if (pid == 0) { // child create the semaphore.
+		struct sigaction act;
 
-                act.sa_handler=handler;
-                act.sa_flags=0;
-                if (sigemptyset(&act.sa_mask) == -1) {
-                        perror("Error calling sigemptyset\n");
-                        return CHILDFAIL;
-                }
-                if (sigaction(SIGABRT, &act, 0) == -1) {
-                        perror("Error calling sigaction\n");
-                        return CHILDFAIL;
-                }
+		act.sa_handler=handler;
+		act.sa_flags=0;
+		if (sigemptyset(&act.sa_mask) == -1) {
+			perror("Error calling sigemptyset\n");
+			return CHILDFAIL;
+		}
+		if (sigaction(SIGABRT, &act, 0) == -1) {
+			perror("Error calling sigaction\n");
+			return CHILDFAIL;
+		}
 
 		ts.tv_sec = time(NULL)+3;
 		ts.tv_nsec = 0;
 
-        	sem_timedwait(&mysemp, &ts);
+		sem_timedwait(&mysemp, &ts);
 
-               if (errno == EINTR) {
-                        printf("Test PASSED\n");
-                        return (CHILDPASS);
-                }
-                puts("TEST FAILED: errno != EINTR");
-                return (CHILDFAIL);
+	       if (errno == EINTR) {
+			printf("Test PASSED\n");
+			return (CHILDPASS);
+		}
+		puts("TEST FAILED: errno != EINTR");
+		return (CHILDFAIL);
 
-        } else { // parent to send a signal to child
-                int i;
-                sleep(1);
-                status = kill(pid,SIGABRT);  // send signal to child
-                if (wait(&i) == -1) {
-                        perror("Error waiting for child to exit\n");
-                        return PTS_UNRESOLVED;
-                }
+	} else { // parent to send a signal to child
+		int i;
+		sleep(1);
+		status = kill(pid,SIGABRT);  // send signal to child
+		if (wait(&i) == -1) {
+			perror("Error waiting for child to exit\n");
+			return PTS_UNRESOLVED;
+		}
 
-                if (!WEXITSTATUS(i)) {
-                        return PTS_FAIL;
-                }
+		if (!WEXITSTATUS(i)) {
+			return PTS_FAIL;
+		}
 		puts("TEST PASSED");
-                return PTS_PASS;
-        }
-        return PTS_UNRESOLVED;
+		return PTS_PASS;
+	}
+	return PTS_UNRESOLVED;
 }
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
index 43a78fd..d20d601 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/2-2.c
@@ -108,7 +108,7 @@
 	{
 		ret = sem_wait(sem);
 	}
-	while ((ret != 0) && (errno == EINTR));
+	while (ret != 0 && errno == EINTR);
 
 	if (ret != 0)
 	{
@@ -241,7 +241,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
 	{
 		FAILED("Child 'sem_close' exited abnormally");
 	}
@@ -253,7 +253,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
 	{
 		FAILED("Child '_exit' exited abnormally");
 	}
@@ -265,7 +265,7 @@
 		UNRESOLVED(errno, "Waitpid returned the wrong PID");
 	}
 
-	if ((!WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
+	if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
 	{
 		FAILED("Child 'exec' exited abnormally");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/9-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/9-1.c
index b4bf511..e2410c8 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/9-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_unlink/9-1.c
@@ -95,7 +95,7 @@
 	{
 		ret = sem_wait(arg);
 	}
-	while ((ret != 0) && (errno == EINTR));
+	while (ret != 0 && errno == EINTR);
 
 	if (ret != 0)
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-2.c
index 883d8e2..5a028f3 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/1-2.c
@@ -57,7 +57,6 @@
 	if (sem_getvalue(mysemp, &val) == -1) {
 		perror(ERROR_PREFIX "sem_getvalue");
 		return PTS_UNRESOLVED;
-
 	} else if (val == 0) {
 		puts("TEST PASSED");
 		sem_unlink(semname);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/13-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/13-1.c
index 7797ee1..45e2c40 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/13-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_wait/13-1.c
@@ -153,7 +153,7 @@
 	/* Wait for the semaphore */
 	ret = sem_wait(&sem);
 
-	if ((ret != 0) && (errno != EINTR))
+	if (ret != 0 && errno != EINTR)
 	{
 		UNRESOLVED(errno, "Failed to wait for the semaphore");
 	}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/shm_open/34-1.c b/testcases/open_posix_testsuite/conformance/interfaces/shm_open/34-1.c
index 4d1ede6..ad4c1e1 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/shm_open/34-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/shm_open/34-1.c
@@ -34,7 +34,7 @@
 	struct passwd *pw;
 	setpwent();
 	/* search for the first user which is non root */ 
-	while((pw = getpwent()) != NULL)
+	while ((pw = getpwent()) != NULL)
 		if (strcmp(pw->pw_name, "root"))
 			break;
 	endpwent();
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
index 9d33759..7a7b8ff 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
@@ -56,8 +56,13 @@
 		exit(-1);
 	}
 
+<<<<<<< HEAD
 	if ((sigismember(&pendingset, SIGALRM) == 1) &&
 	    (sigismember(&pendingset, SIGCONT) == 1)) {
+=======
+	if (sigismember(&pendingset, SIGALRM) == 1 &&
+	    sigismember(&pendingset, SIGCONT) == 1) {
+>>>>>>> master
 		printf("All pending signals found\n");
 		if ((sigismember(&pendingset, SIGHUP) == 0) &&
 			(sigismember(&pendingset, SIGABRT) == 0) &&
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/1-1.c
index 20c0667..8dd5242 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/1-1.c
@@ -69,7 +69,6 @@
 		return PTS_FAIL;
 	}
 
-
 	/* Call sigwait and test if it passed/failed*/
 	if (sigwait(&newmask, &sig) != 0)
 	{
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/4-1.c
index a083731..c480dbe 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/4-1.c
@@ -31,8 +31,7 @@
 
 	/* Empty set of blocked signals */
 
-	if ((sigemptyset(&newmask) == -1) ||
-	        (sigemptyset(&pendingset) == -1))
+	if (sigemptyset(&newmask) == -1 || sigemptyset(&pendingset) == -1)
 	{
 		printf("Error in sigemptyset()\n");
 		return PTS_UNRESOLVED;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
index e1f039d..d944212 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigwait/8-1.c
@@ -28,8 +28,12 @@
 	int sig;
 
 	/* Empty set of blocked signals */
+<<<<<<< HEAD
 	if ((sigemptyset(&newmask) == -1) || 
 	    (sigemptyset(&pendingset) == -1))
+=======
+	if (sigemptyset(&newmask) == -1 || sigemptyset(&pendingset) == -1)
+>>>>>>> master
 	{
 		printf("Error in sigemptyset()\n");
 		return PTS_UNRESOLVED;
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
index a5ab488..31506ac 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-1.c
@@ -40,8 +40,12 @@
 		return PTS_UNRESOLVED;
 	}
 
+<<<<<<< HEAD
 	if ((0 == its.it_value.tv_sec) &&
 	    (0 == its.it_value.tv_nsec)) {
+=======
+	if (0 == its.it_value.tv_sec && 0 == its.it_value.tv_nsec) {
+>>>>>>> master
 		printf("Test PASSED\n");
 		return PTS_PASS;
 	} else {
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
index b946245..edc5917 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
@@ -61,8 +61,12 @@
 	}
 
 
+<<<<<<< HEAD
 	if ((0 == itsget.it_value.tv_sec) &&
 	    (0 == itsget.it_value.tv_nsec)) {
+=======
+	if (0 == itsget.it_value.tv_sec && 0 == itsget.it_value.tv_nsec) {
+>>>>>>> master
 		printf("Test PASSED\n");
 		return PTS_PASS;
 	} else {
diff --git a/testcases/open_posix_testsuite/functional/mqueues/send_rev_1.c b/testcases/open_posix_testsuite/functional/mqueues/send_rev_1.c
index de7f63a..a4bee2e 100644
--- a/testcases/open_posix_testsuite/functional/mqueues/send_rev_1.c
+++ b/testcases/open_posix_testsuite/functional/mqueues/send_rev_1.c
@@ -87,7 +87,7 @@
 			}
 		}
 		exit(ret_code);
-		/* NOTREACHED */
+		
 		break;
 	}
 
diff --git a/testcases/open_posix_testsuite/functional/mqueues/send_rev_2.c b/testcases/open_posix_testsuite/functional/mqueues/send_rev_2.c
index e6e217c..274fee9 100644
--- a/testcases/open_posix_testsuite/functional/mqueues/send_rev_2.c
+++ b/testcases/open_posix_testsuite/functional/mqueues/send_rev_2.c
@@ -108,11 +108,11 @@
 	mqstat.mq_msgsize = MSG_SIZE;
 	mqstat.mq_flags = 0;
   
-  	if (((mqd_t) -1) == (mq1 = mq_open(MQ_NAME_1,oflag,0777, &mqstat))) {
+  	if ((mq1 = mq_open(MQ_NAME_1,oflag,0777, &mqstat)) == -1) {
 		printf("mq_open doesn't return success \n");
 		return PTS_UNRESOLVED;
 	}
-  	if (((mqd_t) -1) == (mq2 = mq_open(MQ_NAME_2,oflag,0777, &mqstat))) {
+  	if ((mq2 = mq_open(MQ_NAME_2,oflag,0777, &mqstat)) == -1) {
 		printf("mq_open doesn't return success \n");
 		return PTS_UNRESOLVED;
 	}
diff --git a/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_1.c b/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_1.c
index 4d68aff..e6cdc6f 100644
--- a/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_1.c
+++ b/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_1.c
@@ -102,9 +102,9 @@
 	mqstat.mq_flags = 0;
   
 	for (i = 0; i < num; i++) {
-	  	if (((mqd_t) -1) == (mq[i] = mq_open(MQ_NAME[i],oflag,0777, &mqstat))) {
-		perror("mq_open doesn't return success \n");
-		return PTS_UNRESOLVED;
+	  	if ((mq[i] = mq_open(MQ_NAME[i],oflag,0777, &mqstat)) != -1) {
+			perror("mq_open doesn't return success \n");
+			return PTS_UNRESOLVED;
 		}
 		printf("mq[%i] created \n", i);
 	}
@@ -127,4 +127,3 @@
 	}
 	return PTS_PASS;
 }
-
diff --git a/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_2.c b/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_2.c
index a4733b7..725a161 100644
--- a/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_2.c
+++ b/testcases/open_posix_testsuite/stress/mqueues/multi_send_rev_2.c
@@ -92,8 +92,8 @@
 	mqstat.mq_msgsize = MSG_SIZE;
 	mqstat.mq_flags = 0;
   
-  	if (((mqd_t) -1) == (mq = mq_open(MQ_NAME,oflag,0777, &mqstat))) {
-		printf("mq_open doesn't return success \n");
+  	if ((mq = mq_open(MQ_NAME,oflag,0777, &mqstat)) == -1) {
+		printf("mq_open doesn't return success\n");
 		return PTS_UNRESOLVED;
 	}
 	
diff --git a/testcases/open_posix_testsuite/stress/threads/fork/s-c1.c b/testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
index 132e7a8..b5a4f23 100644
--- a/testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
+++ b/testcases/open_posix_testsuite/stress/threads/fork/s-c1.c
@@ -192,7 +192,7 @@
 		}
 
 		/* create a new child */
-		pr[ nprocesses ] = fork();
+		pr[nprocesses] = fork();
 
 		if (pr[nprocesses] == -1)
 		{
@@ -219,7 +219,12 @@
 			}
 		}
 
+<<<<<<< HEAD
 		if (pr[nprocesses] == 0) {
+=======
+		if (pr[nprocesses] == 0)
+		{
+>>>>>>> master
 			/* Child */
 			/* Post the synchro semaphore*/
 
diff --git a/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c b/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
index b5ae7fa..4473844 100644
--- a/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
+++ b/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
@@ -101,7 +101,7 @@
 }
 
 /* Signals flood receiver thread */
-void * flood_receiver(void *arg)
+void* flood_receiver(void *arg)
 {
 	int ret = 0;
 	/* register the signal handler for this one thread */
@@ -189,10 +189,13 @@
 	}
 
 	/* wait until termination */
-	do
-	{
+	do {
 		sched_yield();
+<<<<<<< HEAD
 	} while (*(int *) arg);
+=======
+	} while (*( int * ) arg);
+>>>>>>> master
 
 	return NULL;
 }
diff --git a/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c b/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
index b1001e5..27cf66d 100644
--- a/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
+++ b/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
@@ -29,12 +29,6 @@
 */
 
 
-/* We are testing conformance to IEEE Std 1003.1, 2003 Edition */
-#define _POSIX_C_SOURCE 200112L
-
-/********************************************************************************************/
-/****************************** standard includes *****************************************/
-/********************************************************************************************/
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -46,11 +40,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h> 
-/********************************************************************************************/
-/******************************   Test framework   *****************************************/
-/********************************************************************************************/
+
 #include "testfrmw.h"
- #include "testfrmw.c" 
+#include "testfrmw.c" 
 /* This header is responsible for defining the following macros:
  * UNRESOLVED(ret, descr);  
  *    where descr is a description of the error and ret is an int (error code for example)
@@ -69,9 +61,6 @@
  * Those may be used to output information.
  */
 
-/********************************************************************************************/
-/********************************** Configuration ******************************************/
-/********************************************************************************************/
 #ifndef VERBOSE
 #define VERBOSE 1
 #endif
@@ -80,10 +69,6 @@
 
 #define INIT_VAL 0
 
-/********************************************************************************************/
-/***********************************    Test case  *****************************************/
-/********************************************************************************************/
-
 char do_it = 1;
 long long iterations = 0;
 
@@ -92,16 +77,18 @@
 {
 	/* do_it = 0 */
 
-	do
-	{
+	do {
 		do_it = 0;
-	}
-	while (do_it);
+	} while (do_it);
 }
 
 
 /* Thread function */
+<<<<<<< HEAD
 void* threaded(void *arg)
+=======
+void* threaded(void * arg)
+>>>>>>> master
 {
 	int ret = 0;
 
@@ -109,8 +96,7 @@
 		/* sem_post */
 		ret = sem_post(arg);
 
-		if (ret != 0)
-		{
+		if (ret != 0) {
 			UNRESOLVED(errno, "Failed to post the semaphore");
 		}
 
@@ -119,8 +105,7 @@
 			ret = sem_wait(arg);
 		} while ((ret != 0) && (errno == EINTR));
 
-		if (ret != 0)
-		{
+		if (ret != 0) {
 			UNRESOLVED(errno, "Failed to wait for the semaphore");
 		}
 
@@ -150,13 +135,11 @@
 
 	sa.sa_handler = sighdl;
 
-	if ((ret = sigaction (SIGUSR1, &sa, NULL)))
-	{
+	if ((ret = sigaction (SIGUSR1, &sa, NULL))) {
 		UNRESOLVED(ret, "Unable to register signal handler");
 	}
 
-	if ((ret = sigaction (SIGALRM, &sa, NULL)))
-	{
+	if ((ret = sigaction (SIGALRM, &sa, NULL))) {
 		UNRESOLVED(ret, "Unable to register signal handler");
 	}
 
@@ -213,8 +196,7 @@
 			UNRESOLVED(errno, "Failed to get sem value");
 		}
 
-		if ((value != INIT_VAL) && (value != INIT_VAL + 1))
-		{
+		if ((value != INIT_VAL) && (value != INIT_VAL + 1)) {
 			output("Got value %d, expected %d or %d only\n",
 			        value, INIT_VAL, INIT_VAL + 1);
 			FAILED("sem_getvalue returned an invalid value for the named semaphore");
@@ -227,8 +209,7 @@
 			UNRESOLVED(errno, "Failed to get sem value");
 		}
 
-		if ((value != INIT_VAL) && (value != INIT_VAL + 1))
-		{
+		if ((value != INIT_VAL) && (value != INIT_VAL + 1)) {
 			output("Got value %d, expected %d or %d only\n",
 			        value, INIT_VAL, INIT_VAL + 1);
 			FAILED("sem_getvalue returned an invalid value for the unnamed semaphore");
@@ -273,5 +254,3 @@
 
 	PASSED;
 }
-
-
diff --git a/tools/netpipe-2.4-ipv6/PVM.c b/tools/netpipe-2.4-ipv6/PVM.c
index f513f6e..bb39341 100644
--- a/tools/netpipe-2.4-ipv6/PVM.c
+++ b/tools/netpipe-2.4-ipv6/PVM.c
@@ -50,12 +50,12 @@
     it a message containing our tid. If we are the receiving side,
     just wait for a message.
     */
-    if ( p->tr ) {
+    if (p->tr) {
 #ifdef DEBUG
 	printf("this is the transmitter\n");
 #endif
 	tasks_status = pvm_tasks( 0, &ntasks, &taskp );
-	if ( ntasks != 2 ) {
+	if (ntasks != 2) {
 	    printf("Error, too many processes in parallel machine \n");
 	    printf("Start a clean machine.  n=%d\n", ntasks);
 	    exit(-1);
@@ -63,13 +63,13 @@
 
 	/* Since there are two tasks, one is ours the other is the receiver */
 	p->prot.othertid = -1;
-	if ( taskp[0].ti_tid == p->prot.mytid ) {
+	if (taskp[0].ti_tid == p->prot.mytid) {
 	    p->prot.othertid = taskp[1].ti_tid;
 	}
-	if ( taskp[1].ti_tid == p->prot.mytid ) {
+	if (taskp[1].ti_tid == p->prot.mytid) {
 	    p->prot.othertid = taskp[0].ti_tid;
 	}
-	if ( p->prot.othertid == -1 ) {
+	if (p->prot.othertid == -1) {
 	    printf("Error, cannot find other (receiving) task \n");
 	    printf("Id's:  %d %d  \n",taskp[0].ti_tid,taskp[1].ti_tid);
 	}
@@ -91,7 +91,7 @@
 	/* Receive any message from any task */
 	buffer_id = pvm_recv(-1, -1);
 
-	if ( buffer_id < 0 ) {
+	if (buffer_id < 0) {
 	    printf("Error on receive in receiver\n");
 	    exit(-1);
 	}
diff --git a/tools/netpipe-2.4-ipv6/TCP.c b/tools/netpipe-2.4-ipv6/TCP.c
index 36b2b80..b6bd35b 100644
--- a/tools/netpipe-2.4-ipv6/TCP.c
+++ b/tools/netpipe-2.4-ipv6/TCP.c
@@ -43,34 +43,34 @@
  memset(&p->prot.sin1, 0, sizeof(p->prot.sin1));
  memset(&p->prot.sin2, 0, sizeof(p->prot.sin2));
 
- if ( (sockfd = socket(AF_INET6, SOCK_STREAM, 0)) < 0){
+ if ((sockfd = socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
    printf("NetPIPE: can't open stream socket! errno=%d\n", errno);
    exit(-4);
  }
 
- if(!(proto = getprotobyname("tcp"))){
+ if (!(proto = getprotobyname("tcp"))) {
    printf("NetPIPE: protocol 'tcp' unknown!\n");
    exit(555);
  }
 
  /* Attempt to set TCP_NODELAY */
- if(setsockopt(sockfd, proto->p_proto, TCP_NODELAY, &one, sizeof(one)) < 0)
+ if (setsockopt(sockfd, proto->p_proto, TCP_NODELAY, &one, sizeof(one)) < 0)
  {
    printf("NetPIPE: setsockopt: TCP_NODELAY failed! errno=%d\n", errno);
    exit(556);
  }
 
  /* If requested, set the send and receive buffer sizes */
- if(p->prot.sndbufsz > 0)
+ if (p->prot.sndbufsz > 0)
  {
       printf("Send and Receive Buffers set to %d bytes\n", p->prot.sndbufsz);
-     if(setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
+     if (setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
                                        sizeof(p->prot.sndbufsz)) < 0)
      {
           printf("NetPIPE: setsockopt: SO_SNDBUF failed! errno=%d\n", errno);
           exit(556);
      }
-     if(setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
+     if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
                                        sizeof(p->prot.rcvbufsz)) < 0)
      {
           printf("NetPIPE: setsockopt: SO_RCVBUF failed! errno=%d\n", errno);
@@ -78,13 +78,13 @@
      }
  }
 
- if (tr){                                  /* if client i.e., Sender */
+ if (tr) {                                  /* if client i.e., Sender */
 
    if (host) {
      getaddrinfo(host, NULL, &hints, &addr);
      memcpy(&p->prot.sin1, addr->ai_addr, addr->ai_addrlen);
    } else {
-     if ((getaddrinfo(host,NULL,&hints,&addr)) != 0){
+     if ((getaddrinfo(host,NULL,&hints,&addr)) != 0) {
        printf("NetPIPE: invalid hostname '%s'\n", host);
        exit(-5);
    }
@@ -94,11 +94,11 @@
 } else {                                 /* we are the receiver (server) */
 
    memset(&p->prot.sin1, 0, sizeof(p->prot.sin1));
-   if (sr==0){
+   if (sr==0) {
      p->prot.sin1.sin6_addr = in6addr_any;
      p->prot.sin1.sin6_port = htons(p->port);
      lsin1=(struct sockaddr*)&p->prot.sin1;
-     if (bind(sockfd, (struct sockaddr*)lsin1, sizeof(p->prot.sin1)) < 0){
+     if (bind(sockfd, (struct sockaddr*)lsin1, sizeof(p->prot.sin1)) < 0) {
        printf("NetPIPE: server: bind on local address failed! errno=%d", errno);
        exit(-6);
      }
@@ -106,21 +106,21 @@
    else{
        getaddrinfo(server_host, NULL, NULL, &server_addr);
        memcpy(&p->prot.sin1, server_addr->ai_addr, server_addr->ai_addrlen);
-       if ((getaddrinfo(server_host, NULL, NULL, &server_addr)) != 0){
+       if ((getaddrinfo(server_host, NULL, NULL, &server_addr)) != 0) {
   	  printf("NetPIPE: invalid hostname '%s'\n", host);
 	  exit(-5);
        }
        memcpy(&p->prot.sin1, server_addr->ai_addr, server_addr->ai_addrlen);
        p->prot.sin1.sin6_port = htons(p->port);
        lsin1=(struct sockaddr*)&p->prot.sin1;
-       if (bind(sockfd, (struct sockaddr*)lsin1, sizeof(p->prot.sin1)) < 0){
+       if (bind(sockfd, (struct sockaddr*)lsin1, sizeof(p->prot.sin1)) < 0) {
          printf("NetPIPE: server: bind on %s failed! errno=%d", server_host, errno);
          exit(-6);
        }
    }
  }
 
- if(tr)
+ if (tr)
    p->commfd = sockfd;
  else
    p->servicefd = sockfd;
@@ -305,9 +305,9 @@
  struct protoent *proto;
 
  clen = sizeof(p->prot.sin2);
- if(p->tr){
-   if(connect(p->commfd, (struct sockaddr *) &(p->prot.sin1),
-	      sizeof(p->prot.sin1)) < 0){
+ if (p->tr) {
+   if (connect(p->commfd, (struct sockaddr *) &(p->prot.sin1),
+	      sizeof(p->prot.sin1)) < 0) {
      printf("Client: Cannot Connect! errno=%d\n",errno);
      exit(-10);
    }
@@ -318,7 +318,7 @@
     p->commfd = accept(p->servicefd, (struct sockaddr *) &(p->prot.sin2),
 		       &clen);
 
-    if(p->commfd < 0){
+    if (p->commfd < 0) {
       printf("Server: Accept Failed! errno=%d\n",errno);
       exit(-12);
     }
@@ -327,12 +327,12 @@
       Attempt to set TCP_NODELAY. TCP_NODELAY may or may not be propagated
       to accepted sockets.
      */
-    if(!(proto = getprotobyname("tcp"))){
+    if (!(proto = getprotobyname("tcp"))) {
       printf("unknown protocol!\n");
       exit(555);
     }
 
-    if(setsockopt(p->commfd, proto->p_proto, TCP_NODELAY,
+    if (setsockopt(p->commfd, proto->p_proto, TCP_NODELAY,
 		  &one, sizeof(one)) < 0)
     {
       printf("setsockopt: TCP_NODELAY failed! errno=%d\n", errno);
@@ -340,17 +340,17 @@
     }
 
     /* If requested, set the send and receive buffer sizes */
-    if(p->prot.sndbufsz > 0)
+    if (p->prot.sndbufsz > 0)
     {
       printf("Send and Receive Buffers on accepted socket set to %d bytes\n",
 	     p->prot.sndbufsz);
-      if(setsockopt(p->commfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
+      if (setsockopt(p->commfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
                                        sizeof(p->prot.sndbufsz)) < 0)
       {
 	printf("setsockopt: SO_SNDBUF failed! errno=%d\n", errno);
 	exit(556);
       }
-      if(setsockopt(p->commfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
+      if (setsockopt(p->commfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
                                        sizeof(p->prot.rcvbufsz)) < 0)
       {
 	printf("setsockopt: SO_RCVBUF failed! errno=%d\n", errno);
diff --git a/tools/netpipe-2.4-ipv6/netpipe.c b/tools/netpipe-2.4-ipv6/netpipe.c
index 246ba8d..b91ddbb 100644
--- a/tools/netpipe-2.4-ipv6/netpipe.c
+++ b/tools/netpipe-2.4-ipv6/netpipe.c
@@ -109,7 +109,7 @@
 
     strcpy(s, "NetPIPE.out");
 #ifndef MPI
-    if(argc < 2)
+    if (argc < 2)
      PrintUsage();
 #endif
     /* Parse the arguments. See Usage for description */
@@ -343,13 +343,13 @@
 
             /* Allocate the buffer */
             args.bufflen = len + pert;
-            if((args.buff=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
+            if ((args.buff=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
             {
                 fprintf(stderr,"Couldn't allocate memory\n");
 		errFlag = -1;
                 break;
             }
-            if((args.buff1=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
+            if ((args.buff1=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
             {
                 fprintf(stderr,"Couldn't allocate memory\n");
 		errFlag = -1;
diff --git a/tools/netpipe-2.4/PVM.c b/tools/netpipe-2.4/PVM.c
index 29746b0..72208c2 100644
--- a/tools/netpipe-2.4/PVM.c
+++ b/tools/netpipe-2.4/PVM.c
@@ -49,12 +49,12 @@
     it a message containing our tid. If we are the receiving side,
     just wait for a message.
     */
-    if ( p->tr ) {
+    if (p->tr) {
 #ifdef DEBUG
 	printf("this is the transmitter\n");
 #endif
 	tasks_status = pvm_tasks( 0, &ntasks, &taskp );
-	if ( ntasks != 2 ) {
+	if (ntasks != 2) {
 	    printf("Error, too many processes in parallel machine \n");
 	    printf("Start a clean machine.  n=%d\n", ntasks);
 	    exit(-1);
@@ -62,13 +62,13 @@
 
 	/* Since there are two tasks, one is ours the other is the receiver */
 	p->prot.othertid = -1;
-	if ( taskp[0].ti_tid == p->prot.mytid ) {
+	if (taskp[0].ti_tid == p->prot.mytid) {
 	    p->prot.othertid = taskp[1].ti_tid;
 	}
-	if ( taskp[1].ti_tid == p->prot.mytid ) {
+	if (taskp[1].ti_tid == p->prot.mytid) {
 	    p->prot.othertid = taskp[0].ti_tid;
 	}
-	if ( p->prot.othertid == -1 ) {
+	if (p->prot.othertid == -1) {
 	    printf("Error, cannot find other (receiving) task \n");
 	    printf("Id's:  %d %d  \n",taskp[0].ti_tid,taskp[1].ti_tid);
 	}
@@ -90,7 +90,7 @@
 	/* Receive any message from any task */
 	buffer_id = pvm_recv(-1, -1);
 
-	if ( buffer_id < 0 ) {
+	if (buffer_id < 0) {
 	    printf("Error on receive in receiver\n");
 	    exit(-1);
 	}
diff --git a/tools/netpipe-2.4/TCP.c b/tools/netpipe-2.4/TCP.c
index fa3b35c..8a9480e 100644
--- a/tools/netpipe-2.4/TCP.c
+++ b/tools/netpipe-2.4/TCP.c
@@ -31,34 +31,34 @@
  memset((char *) lsin1, 0x00, sizeof(*lsin1));
  memset((char *) lsin2, 0x00, sizeof(*lsin2));
 
- if ( (sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0){
+ if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
    printf("NetPIPE: can't open stream socket! errno=%d\n", errno);
    exit(-4);
  }
 
- if(!(proto = getprotobyname("tcp"))){
+ if (!(proto = getprotobyname("tcp"))) {
    printf("NetPIPE: protocol 'tcp' unknown!\n");
    exit(555);
  }
 
  /* Attempt to set TCP_NODELAY */
- if(setsockopt(sockfd, proto->p_proto, TCP_NODELAY, &one, sizeof(one)) < 0)
+ if (setsockopt(sockfd, proto->p_proto, TCP_NODELAY, &one, sizeof(one)) < 0)
  {
    printf("NetPIPE: setsockopt: TCP_NODELAY failed! errno=%d\n", errno);
    exit(556);
  }
 
  /* If requested, set the send and receive buffer sizes */
- if(p->prot.sndbufsz > 0)
+ if (p->prot.sndbufsz > 0)
  {
       printf("Send and Receive Buffers set to %d bytes\n", p->prot.sndbufsz);
-     if(setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
+     if (setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
                                        sizeof(p->prot.sndbufsz)) < 0)
      {
           printf("NetPIPE: setsockopt: SO_SNDBUF failed! errno=%d\n", errno);
           exit(556);
      }
-     if(setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
+     if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
                                        sizeof(p->prot.rcvbufsz)) < 0)
      {
           printf("NetPIPE: setsockopt: SO_RCVBUF failed! errno=%d\n", errno);
@@ -67,7 +67,7 @@
  }
 
 
- if (tr){                                  /* if client i.e., Sender */
+ if (tr) {                                  /* if client i.e., Sender */
 
    if (atoi(host) > 0) {                   /* Numerical IP address */
      lsin1->sin_family = AF_INET;
@@ -75,7 +75,7 @@
 
    } else {
 
-     if ((addr = gethostbyname(host)) == NULL){
+     if ((addr = gethostbyname(host)) == NULL) {
        printf("NetPIPE: invalid hostname '%s'\n", host);
        exit(-5);
      }
@@ -93,14 +93,14 @@
    lsin1->sin_addr.s_addr = htonl(INADDR_ANY);
    lsin1->sin_port        = htons(p->port);
 
-   if (bind(sockfd, (struct sockaddr *) lsin1, sizeof(*lsin1)) < 0){
+   if (bind(sockfd, (struct sockaddr *) lsin1, sizeof(*lsin1)) < 0) {
      printf("NetPIPE: server: bind on local address failed! errno=%d", errno);
      exit(-6);
    }
 
  }
 
- if(tr)
+ if (tr)
    p->commfd = sockfd;
  else
    p->servicefd = sockfd;
@@ -284,9 +284,9 @@
  struct protoent *proto;
 
  clen = sizeof(p->prot.sin2);
- if(p->tr){
-   if(connect(p->commfd, (struct sockaddr *) &(p->prot.sin1),
-	      sizeof(p->prot.sin1)) < 0){
+ if (p->tr) {
+   if (connect(p->commfd, (struct sockaddr *) &(p->prot.sin1),
+	      sizeof(p->prot.sin1)) < 0) {
      printf("Client: Cannot Connect! errno=%d\n",errno);
      exit(-10);
    }
@@ -297,7 +297,7 @@
     p->commfd = accept(p->servicefd, (struct sockaddr *) &(p->prot.sin2),
 		       &clen);
 
-    if(p->commfd < 0){
+    if (p->commfd < 0) {
       printf("Server: Accept Failed! errno=%d\n",errno);
       exit(-12);
     }
@@ -306,12 +306,12 @@
       Attempt to set TCP_NODELAY. TCP_NODELAY may or may not be propagated
       to accepted sockets.
      */
-    if(!(proto = getprotobyname("tcp"))){
+    if (!(proto = getprotobyname("tcp"))) {
       printf("unknown protocol!\n");
       exit(555);
     }
 
-    if(setsockopt(p->commfd, proto->p_proto, TCP_NODELAY,
+    if (setsockopt(p->commfd, proto->p_proto, TCP_NODELAY,
 		  &one, sizeof(one)) < 0)
     {
       printf("setsockopt: TCP_NODELAY failed! errno=%d\n", errno);
@@ -319,17 +319,17 @@
     }
 
     /* If requested, set the send and receive buffer sizes */
-    if(p->prot.sndbufsz > 0)
+    if (p->prot.sndbufsz > 0)
     {
       printf("Send and Receive Buffers on accepted socket set to %d bytes\n",
 	     p->prot.sndbufsz);
-      if(setsockopt(p->commfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
+      if (setsockopt(p->commfd, SOL_SOCKET, SO_SNDBUF, &(p->prot.sndbufsz),
                                        sizeof(p->prot.sndbufsz)) < 0)
       {
 		 printf("setsockopt: SO_SNDBUF failed! errno=%d\n", errno);
 	exit(556);
       }
-      if(setsockopt(p->commfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
+      if (setsockopt(p->commfd, SOL_SOCKET, SO_RCVBUF, &(p->prot.rcvbufsz),
                                        sizeof(p->prot.rcvbufsz)) < 0)
       {
 		 printf("setsockopt: SO_RCVBUF failed! errno=%d\n", errno);
diff --git a/tools/netpipe-2.4/netpipe.c b/tools/netpipe-2.4/netpipe.c
index 0fee782..5bdad64 100644
--- a/tools/netpipe-2.4/netpipe.c
+++ b/tools/netpipe-2.4/netpipe.c
@@ -71,7 +71,7 @@
 
     strcpy(s, "NetPIPE.out");
 #ifndef MPI
-    if(argc < 2)
+    if (argc < 2)
      PrintUsage();
 #endif
 
@@ -290,13 +290,13 @@
 
             /* Allocate the buffer */
             args.bufflen = len + pert;
-            if((args.buff=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
+            if ((args.buff=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
             {
                 fprintf(stderr,"Couldn't allocate memory\n");
 		errFlag = -1;
                 break;
             }
-            if((args.buff1=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
+            if ((args.buff1=(char *)malloc(args.bufflen+bufalign))==(char *)NULL)
             {
                 fprintf(stderr,"Couldn't allocate memory\n");
 		errFlag = -1;
diff --git a/tools/pounder21/src/mem_alloc_test/mem_alloc.c b/tools/pounder21/src/mem_alloc_test/mem_alloc.c
index 2e937b5..b61611c 100644
--- a/tools/pounder21/src/mem_alloc_test/mem_alloc.c
+++ b/tools/pounder21/src/mem_alloc_test/mem_alloc.c
@@ -115,9 +115,9 @@
 void 
 TELL_WAIT(void)
 {
-	if(signal(SIGUSR1, sig_usr) == SIG_ERR)
+	if (signal(SIGUSR1, sig_usr) == SIG_ERR)
 		unix_error("signal (SIGUSR1) FAILED");
-	if(signal(SIGUSR2, sig_usr) == SIG_ERR)
+	if (signal(SIGUSR2, sig_usr) == SIG_ERR)
 		unix_error("signal (SIGUSR2) FAILED");
 
 	sigemptyset(&zeromask);
@@ -125,7 +125,7 @@
 	sigaddset(&newmask, SIGUSR1);
 	sigaddset(&newmask, SIGUSR2);
 
-	if(sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0)
+	if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0)
 		unix_error("signal (SIG_BLOCK) FAILED");
 }
 
@@ -161,12 +161,12 @@
 void 
 WAIT_PARENT(void)
 {
-	while(sigflag == 0)
+	while (sigflag == 0)
 		sigsuspend(&zeromask);		// wait for child
 	sigflag = 0;
 
 	// reset signal mask to original value
-	if(sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
+	if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
 		unix_error("signal (SIG_SETMASK) FAILED");
 }
 
@@ -178,12 +178,12 @@
 void
 WAIT_CHILD(void)
 {
-	while(sigflag == 0)
+	while (sigflag == 0)
 		sigsuspend(&zeromask);		// wait for parent
 	sigflag = 0;
 
 	// reset signal mask to original value
-	if(sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
+	if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
 		unix_error("signal (SIG_SETMASK) FAILED");
 }
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -264,13 +264,13 @@
 
 	src   = sbrk(incr);
 
-	if(((void *) src == (void *) -1) && (errno == ENOMEM))  {	// error handling
+	if (((void *) src == (void *) -1) && (errno == ENOMEM))  {	// error handling
 		src      = sbrk(-(2*incr)); 	// freeing some space for later library calls
 		sbrk_num-= 2;
 		end_addr = src + (-(2*incr));	// update end of heap
 	} else {							// sucess case
 		// must write to data, write once for each 1KB
-		for(i = 0x0; i < incr ; i += PAGE_SIZE)		
+		for (i = 0x0; i < incr ; i += PAGE_SIZE)		
 			src[i] = '*';
 		++sbrk_num;			// update global sbrk() call counter when success 
 		return_value = 1;		// update return value to true
@@ -296,11 +296,11 @@
 	long i;					// loop counter
 	long old_sbrk_num = sbrk_num;		// save old sbrk_num counter, because sbrk_num will be updated
 
-	for(i = 0; i < old_sbrk_num; ++i) {
+	for (i = 0; i < old_sbrk_num; ++i) {
 		src = sbrk(-incr);
 
 		// error handling: Fatal Fail
-		if(((void *) src == (void *) -1) && (errno == ENOMEM)) 
+		if (((void *) src == (void *) -1) && (errno == ENOMEM)) 
 			goto OUT;		// error
 
 		--sbrk_num;			// update # of sbrk() call
@@ -334,28 +334,28 @@
 	char * i;				// loop counter
 
 	// error handling: Make sure the start_addr is not NULL
-	if(start_addr == NULL) {
+	if (start_addr == NULL) {
 		user_error("start_addr from parent is not initialized");
 		goto OUT;
  	}
 
 	// error handling: Make sure the end_addr is not NULL
-	if(end_addr == NULL) {
+	if (end_addr == NULL) {
 		user_error("end_addr from parent is not initialized");
 		goto OUT;
 	}
 
 	// Writing to heap
-	if(start_addr < end_addr) {		// Heap grows up to higher address
-		for(i = start_addr; i < end_addr; i += PAGE_SIZE) {
-			if((freeswap() + freeram()) < COMMITTED_AS) 
+	if (start_addr < end_addr) {		// Heap grows up to higher address
+		for (i = start_addr; i < end_addr; i += PAGE_SIZE) {
+			if ((freeswap() + freeram()) < COMMITTED_AS) 
 				goto OUT;
 			*i = 'u';
 		}
 		return_value = 1;
-	} else if(start_addr > end_addr) {	// Heap grows down to lower address
-		for(i = end_addr; i > start_addr; i -= PAGE_SIZE) {
-			if((freeswap() + freeram()) < COMMITTED_AS) 
+	} else if (start_addr > end_addr) {	// Heap grows down to lower address
+		for (i = end_addr; i > start_addr; i -= PAGE_SIZE) {
+			if ((freeswap() + freeram()) < COMMITTED_AS) 
 				goto OUT;
 			*i = 'd';	
 		}
@@ -382,8 +382,8 @@
 	start_addr = sbrk(0);
 
 	// eating memory
-	while((freeswap() + freeram()) > COMMITTED_AS) {
-		if(!malloc_data()) 
+	while ((freeswap() + freeram()) > COMMITTED_AS) {
+		if (!malloc_data()) 
 			return;
 	}
 
@@ -405,8 +405,8 @@
 	start_addr = sbrk(0);
 
 	// eating memory
-	while((freeswap() + freeram()) > COMMITTED_AS) {
-		if(!malloc_data()) 
+	while ((freeswap() + freeram()) > COMMITTED_AS) {
+		if (!malloc_data()) 
 			break;
 	}		
 }
@@ -431,17 +431,17 @@
 	pid = pid < 0 ? -1 : pid;
 	
 	switch(pid) {
-		case -1: if(!dealloc_data())			
+		case -1: if (!dealloc_data())			
 				unix_error("SBRK(-incr) FROM DEALLOC_DATA() FAILED. FATAL!!!");
 		         goto LAST_CONDITION;
 
-		case 0 : if(!handle_COW()) {		// Re-touch child pages
+		case 0 : if (!handle_COW()) {		// Re-touch child pages
 				print_sysinfo();	// FINAL RESULT, LAST RESOURCES
 				exit(0);		// child can't allocate no more, DONE!!!
 			 }
 			 goto START;
 
-		default: if(waitpid(-1,NULL,0) != pid) 	// Parent Waiting
+		default: if (waitpid(-1,NULL,0) != pid) 	// Parent Waiting
 				unix_error("WAIT_PID FAILED. FATAL!!!");
 			 exit(0);
 	}
diff --git a/tools/pounder21/src/memxfer5b/memxfer5b.c b/tools/pounder21/src/memxfer5b/memxfer5b.c
index 6092368..e96466d 100644
--- a/tools/pounder21/src/memxfer5b/memxfer5b.c
+++ b/tools/pounder21/src/memxfer5b/memxfer5b.c
@@ -76,31 +76,31 @@
 	double t;
 
 	progname = av[0];
-	if(strrchr(progname,SLASHC))
+	if (strrchr(progname,SLASHC))
 		progname = strrchr(progname,SLASHC) + 1;
 
-	while(ac > 1) {
-		if(equal(av[1], "-f")) {
+	while (ac > 1) {
+		if (equal(av[1], "-f")) {
 			ac--;
 			fflag = 1;
 			av++;
 		}
-		else if(equal(av[1], "-w")) {
+		else if (equal(av[1], "-w")) {
 			ac--;
 			wflag = 1;
 			av++;
 		}
-		else if(equal(av[1], "-s")) {
+		else if (equal(av[1], "-s")) {
 			ac--;
 			sflag = 1;
 			av++;
 		}
-		else if(equal(av[1], "-p")) {
+		else if (equal(av[1], "-p")) {
 			ac--;
 			pflag = 1;
 			av++;
 		}
-		else if(equal(av[1], "-csv")) {
+		else if (equal(av[1], "-csv")) {
 			ac--;
 			csvflag++;
 			av++;
@@ -108,7 +108,7 @@
 		else
 			break;
 	}
-	if(ac < 3) {
+	if (ac < 3) {
 		(void)printf("Usage: %s [-f] [-w] [-s] [-p] size cnt [method]\n",progname);
 		(void)printf("\t-f flag says to malloc and free of the \"cnt\" times.\n");
 		(void)printf("\t-w = set process min and max working set size to \"size\"\n");
@@ -117,7 +117,7 @@
 		(void)printf("\t-csv = print output in CSV format\n");
 
 		(void)printf("\tmethods:\n");
-		for(i = 0; i < nmethods; i++)
+		for (i = 0; i < nmethods; i++)
 			printf("\t%2d:\t%s\n",i,methods[i]);
 		return 0;
 	}
@@ -127,50 +127,50 @@
 	//
 	// Round size up to 4*sizeof(double) bytes.
 	//
-	if(size != ((size/ (4*sizeof(double)) ) * (4*sizeof(double)) )) {
+	if (size != ((size/ (4*sizeof(double)) ) * (4*sizeof(double)) )) {
 		size += (4*sizeof(double));
 		size /= (4*sizeof(double));
 		size *= (4*sizeof(double));
 	}
 	cnt = (unsigned)atoik(av[2]);
 
-	if(fflag == 0) {
+	if (fflag == 0) {
 		p1 = (char *)Malloc(size);
 		p2 = (char *)Malloc(size);
-		if(pflag)
+		if (pflag)
 			memcpy(p1,p2,size);
 	}
 
 	printf("%s ",progname);
-	if(fflag) printf("-f ");
-	if(wflag) printf("-w ");
-	if(sflag) printf("-s ");
-	if(pflag) printf("-p ");
-	if(csvflag) printf("-csv ");
+	if (fflag) printf("-f ");
+	if (wflag) printf("-w ");
+	if (sflag) printf("-s ");
+	if (pflag) printf("-p ");
+	if (csvflag) printf("-csv ");
 	printf("%u %u ", size, cnt);
-	if(csvflag) {
+	if (csvflag) {
 		printf("Linux");
 	}
 	printf("\n");
 
-	if(ac == 3) {
+	if (ac == 3) {
 		ac = 4;
 		av[3] = "0";
 	}
 
-	for(; ac > 3; ac--, av++) {
-		if(isdigit(*av[3])) method = *av[3] - '0';
-		if(method < 0 || method >= nmethods)
+	for (; ac > 3; ac--, av++) {
+		if (isdigit(*av[3])) method = *av[3] - '0';
+		if (method < 0 || method >= nmethods)
 			method = 0;
-		if(sflag)
+		if (sflag)
 			tstart();
-		for(ui = 0; ui < cnt; ui++) {
-			if(!sflag) {
+		for (ui = 0; ui < cnt; ui++) {
+			if (!sflag) {
 				(void)printf("%s %d %d %-18.18s\t",
 						progname, size, cnt, methods[method]);
 				tstart();
 			}
-			if(fflag == 1) {
+			if (fflag == 1) {
 				p1 = (char *)Malloc(size);
 				p2 = (char *)Malloc(size);
 			}
@@ -181,37 +181,37 @@
 			case 1:
 				p = p1;
 				q = p2;
-				for(j = 0; j < size; j++)
+				for (j = 0; j < size; j++)
 					*p++ = *q++;
 				break;
 			case 2:
 				sp = (short *)p1;
 				sq = (short *)p2;
-				for(j = 0; j < size; j += sizeof(short))
+				for (j = 0; j < size; j += sizeof(short))
 					*sp++ = *sq++;
 				break;
 			case 3:
 				ip = (int *)p1;
 				iq = (int *)p2;
-				for(j = 0; j < size; j += sizeof(int))
+				for (j = 0; j < size; j += sizeof(int))
 					*ip++ = *iq++;
 				break;
 			case 4:
 				lp = (long *)p1;
 				lq = (long *)p2;
-				for(j = 0; j < size; j += sizeof(long))
+				for (j = 0; j < size; j += sizeof(long))
 					*lp++ = *lq++;
 				break;
 			case 5:
 				llp = (__int64 *)p1;
 				llq = (__int64 *)p2;
-				for(j = 0; j < size; j += sizeof(__int64))
+				for (j = 0; j < size; j += sizeof(__int64))
 					*llp++ = *llq++;
 				break;
 			case 6:
 				dp = (double *)p1;
 				dq = (double *)p2;
-				for(j = 0; j < size; j += 4*sizeof(double)) {
+				for (j = 0; j < size; j += 4*sizeof(double)) {
 					*dp++ = *dq++;
 					*dp++ = *dq++;
 					*dp++ = *dq++;
@@ -220,26 +220,26 @@
 				break;
 
 			}
-			if(fflag == 1) {
+			if (fflag == 1) {
 				free(p1);
 				free(p2);
 			}
-			if(!sflag) {
+			if (!sflag) {
 				tend();
 				t = tval();
 				tottim += t;
-				if(t == 0.0)
+				if (t == 0.0)
 					t = .0001;
 				printf(" %8.6f seconds %8.3f MB/s\n",
 					t,
 					(double)size/t/1000000.);
 			}
 		}
-		if(sflag) {
+		if (sflag) {
 			tend();
 			tottim = tval();
 		}
-		if(csvflag) {
+		if (csvflag) {
 			printf("%s,%u,%u,%8.3f,%8.3f\n",
 				methods[method],size,size*cnt,tottim,(double)size/(tottim/cnt)/1000000.);
 		}
@@ -258,9 +258,9 @@
 	size_t ret = 0;
 	size_t base;
 
-	if(*s == '0') {
+	if (*s == '0') {
 		base = 8;
-		if(*++s == 'x' || *s == 'X') {
+		if (*++s == 'x' || *s == 'X') {
 			base = 16;
 			s++;
 		}
@@ -268,18 +268,18 @@
 	else
 		base = 10;
 
-	for(; isxdigit(*s); s++) {
-		if(base == 16)
-			if(isalpha(*s))
+	for (; isxdigit(*s); s++) {
+		if (base == 16)
+			if (isalpha(*s))
 				ret = base*ret + (toupper(*s) - 'A');
 			else
 				ret = base*ret + (*s - '0');
-		else if(isdigit(*s))
+		else if (isdigit(*s))
 				ret = base*ret + (*s - '0');
 		else
 			break;
 	}
-	for(; isalpha(*s); s++) {
+	for (; isalpha(*s); s++) {
 		switch(toupper(*s)) {
 		case 'K': ret *= 1024; break;
 		case 'M': ret *= 1024*1024; break;
@@ -294,7 +294,7 @@
 	char *p;
 
 	p = (char *)malloc(sz);
-	if(p == NULL) {
+	if (p == NULL) {
 		(void)printf("malloc(%d) failed\n",sz);
 		exit(1);
 	}
diff --git a/tools/pounder21/src/ramsnake/snake.c b/tools/pounder21/src/ramsnake/snake.c
index 33edabc..8f0d529 100644
--- a/tools/pounder21/src/ramsnake/snake.c
+++ b/tools/pounder21/src/ramsnake/snake.c
@@ -154,7 +154,7 @@
 	num_nodes = ram_size / sizeof(void *);
 
 	/* Parse command line args */
-	while ( (c = getopt(argc, argv, "a:p:n:d:s:t")) != -1) {
+	while ((c = getopt(argc, argv, "a:p:n:d:s:t")) != -1) {
 		switch (c) {
 			case 'p':
 				num_forks = atoi(optarg);
diff --git a/tools/pounder21/src/randasyscall/randasys.c b/tools/pounder21/src/randasyscall/randasys.c
index 3133ca9..bf2c7bf 100644
--- a/tools/pounder21/src/randasyscall/randasys.c
+++ b/tools/pounder21/src/randasyscall/randasys.c
@@ -213,7 +213,7 @@
 	for (i = 1; i < argc; i++) {
 		if (!strcmp(argv[i], "-d"))
 			debug = 1;
-		else if(!strcmp(argv[i], "-z"))
+		else if (!strcmp(argv[i], "-z"))
 			zero_mode = 1;
 	}
 
@@ -221,7 +221,7 @@
 
 	install_signal_handlers();
 
-	while(1) {
+	while (1) {
 		callnum = find_syscall();
 		if (!zero_mode)
 			get_big_randnum(&args[0], sizeof(unsigned long) * 6);
diff --git a/tools/pounder21/src/time_tests/inconsistency-check.c b/tools/pounder21/src/time_tests/inconsistency-check.c
index b54a211..26d5514 100644
--- a/tools/pounder21/src/time_tests/inconsistency-check.c
+++ b/tools/pounder21/src/time_tests/inconsistency-check.c
@@ -32,11 +32,11 @@
 /* returns 1 if a <= b, 0 otherwise */
 static inline int in_order(struct timespec a, struct timespec b)
 {
-	if(a.tv_sec < b.tv_sec)
+	if (a.tv_sec < b.tv_sec)
 		return 1;
-	if(a.tv_sec > b.tv_sec)
+	if (a.tv_sec > b.tv_sec)
 		return 0;
-	if(a.tv_nsec > b.tv_nsec)
+	if (a.tv_nsec > b.tv_nsec)
 		return 0;
 	return 1;
 }
@@ -49,7 +49,7 @@
 	long now, then;
 	int clock_type = CLOCK_MONOTONIC;
 	
-	if(argc > 1)
+	if (argc > 1)
 		seconds = atol(argv[1]);	
 
 	/* make sure CLOCK_MONOTONIC is supported */
@@ -64,27 +64,27 @@
 	
 	/* timestamp start of test */
 	system("date");
-	while(seconds == -1 || now - then < seconds){
+	while (seconds == -1 || now - then < seconds) {
 		inconsistent = 0;
 
 		/* Fill list */
-		for(i=0; i < CALLS_PER_LOOP; i++)
+		for (i=0; i < CALLS_PER_LOOP; i++)
 			clock_gettime(clock_type, &list[i]);
 		
 		/* Check for inconsistencies */
-		for(i=0; i < CALLS_PER_LOOP-1; i++)
-			if(!in_order(list[i],list[i+1]))
+		for (i=0; i < CALLS_PER_LOOP-1; i++)
+			if (!in_order(list[i],list[i+1]))
 				inconsistent = i;
 
 		/* display inconsistency */
-		if(inconsistent){
+		if (inconsistent) {
 			unsigned long long delta;
-			for(i=0; i < CALLS_PER_LOOP; i++){
-				if(i == inconsistent)
+			for (i=0; i < CALLS_PER_LOOP; i++) {
+				if (i == inconsistent)
 					printf("--------------------\n");
 				printf("%lu:%lu\n",list[i].tv_sec,
 							list[i].tv_nsec);
-				if(i == inconsistent + 1 )
+				if (i == inconsistent + 1 )
 					printf("--------------------\n");
 			}
 			delta = list[inconsistent].tv_sec*NSEC_PER_SEC;
diff --git a/tools/pounder21/src/xbonkers/xbonkers.c b/tools/pounder21/src/xbonkers/xbonkers.c
index 2e5d28c..3586971 100644
--- a/tools/pounder21/src/xbonkers/xbonkers.c
+++ b/tools/pounder21/src/xbonkers/xbonkers.c
@@ -265,7 +265,7 @@
 	w = clamp_value(w, 0, desk_w);
 	h = clamp_value(h, 0, desk_h);
 
-	if (wm_supports(disp, "_NET_MOVERESIZE_WINDOW")){
+	if (wm_supports(disp, "_NET_MOVERESIZE_WINDOW")) {
 		send_client_msg(disp, *win, "_NET_MOVERESIZE_WINDOW", 
 			0, x, y, w, h);
 	} else {
@@ -281,7 +281,7 @@
 	w = get_randnum(150, desk_w);
 	h = get_randnum(150, desk_h);
 	
-	if (wm_supports(disp, "_NET_MOVERESIZE_WINDOW")){
+	if (wm_supports(disp, "_NET_MOVERESIZE_WINDOW")) {
 		send_client_msg(disp, *win, "_NET_MOVERESIZE_WINDOW", 
 			0, x, y, w, h);
 	} else {
diff --git a/tools/rand_lines.c b/tools/rand_lines.c
index ff29786..e3a343c 100644
--- a/tools/rand_lines.c
+++ b/tools/rand_lines.c
@@ -149,21 +149,21 @@
     else
 	Progname++;
 
-    while ((c = getopt (argc, argv, "hgS:l:")) != EOF){
+    while ((c = getopt (argc, argv, "hgS:l:")) != EOF) {
 	switch(c) {
 	case 'h':
 	    help();
 	    exit(0);
 	    break;
 	case 'S':	/* seed */
-	    if ( sscanf(optarg, "%li", &seed) != 1 ) {
+	    if (sscanf(optarg, "%li", &seed) != 1) {
 		fprintf(stderr, "%s: --S option argument is invalid\n", Progname);
 		exit(1);
 	    }
 	    break;
 
 	case 'l':	/* number of lines */
-	    if ( sscanf(optarg, "%i", &lsize) != 1 ) {
+	    if (sscanf(optarg, "%i", &lsize) != 1) {
 		fprintf(stderr, "%s: --s option argument is invalid\n", Progname);
 		exit(1);
 	    }
@@ -180,17 +180,17 @@
 	}
     }
 
-    if ( optind + 1 != argc ) {
+    if (optind + 1 != argc) {
 	fprintf(stderr, "%s: Missing argument.\n", Progname);
 	usage(stderr);
 	exit(1);
     }
 
-    if ( seed == -1 ) {
+    if (seed == -1) {
 	seed = time(0);
     }
     
-    if ( strcmp(argv[argc-1],"-") == 0 ) {
+    if (strcmp(argv[argc-1],"-") == 0) {
 	infile = stdin;
 	fprintf(stderr, "%s: Can not support stdin processing.\n",
 	    Progname);
@@ -204,7 +204,7 @@
 	    exit(1);
 	}
 
-        if ( getfilelines ) {
+        if (getfilelines) {
 	    lsize=get_numlines(infile);
 	}
 
@@ -253,7 +253,7 @@
     char line[MAX_LN_SZ];		/* max size of a line */
     int cnt=0;
 
-    while ( fgets(line, MAX_LN_SZ, infile) != NULL ) {
+    while (fgets(line, MAX_LN_SZ, infile) != NULL) {
 	cnt++;
     }
 
@@ -287,7 +287,7 @@
     struct offset_t *offsets;
     int memsize;
 
-    if ( numlines <= 0 ) {	/*use default */
+    if (numlines <= 0) {	/*use default */
 	numlines = DEF_SIZE;
     }
 
@@ -297,7 +297,7 @@
      */
     memsize = sizeof(struct offset_t)*numlines;
 
-    if ((offsets=(struct offset_t *)malloc(memsize)) == NULL ) {
+    if ((offsets=(struct offset_t *)malloc(memsize)) == NULL) {
 	fprintf(stderr, "Unable to malloc(%d): errno:%d\n", memsize, errno);
 	return -1;
     }
@@ -306,7 +306,7 @@
 
     coffset=0;
 
-    while ( ! feof(infile) ) {
+    while (! feof(infile)) {
 
         fseek(infile, coffset, SEEK_SET);
         coffset=ftell(infile);
@@ -318,9 +318,9 @@
 	 * into offsets array.  Only numlines line can be randomized
 	 * at a time.
 	 */
-        while ( cnt < numlines && fgets(line, MAX_LN_SZ, infile) != NULL ) {
+        while (cnt < numlines && fgets(line, MAX_LN_SZ, infile) != NULL) {
 
-	    if ( rnd_insert(offsets, coffset, numlines) < 0 ) {
+	    if (rnd_insert(offsets, coffset, numlines) < 0) {
 	      fprintf(stderr, "%s:%d rnd_insert() returned -1 (fatal error)!\n",
 		  __FILE__, __LINE__);
 	      abort();
@@ -330,7 +330,7 @@
 	    coffset=ftell(infile);
         }
 
-        if ( cnt == 0 ) {
+        if (cnt == 0) {
 	    continue;
         }
 
@@ -339,7 +339,7 @@
          */
         for (cnt=0; cnt<numlines; cnt++) {
 
-	    if ( offsets[cnt].used ) {
+	    if (offsets[cnt].used) {
 	        fseek(infile, offsets[cnt].offset, SEEK_SET);
 	        fgets(line, MAX_LN_SZ, infile);
 	        fputs(line, stdout);
@@ -372,11 +372,11 @@
      * Loop looking for random unused index.
      * It will only be attempted 75 times.
      */
-    while ( quick < 75 ) {
+    while (quick < 75) {
 
 	rand_num=random_range(0, size-1, 1, NULL);
 
-	if ( ! offsets[rand_num].used ) {
+	if (! offsets[rand_num].used) {
 	    offsets[rand_num].offset=offset;
 	    offsets[rand_num].used++;
 	    return rand_num;
@@ -391,7 +391,7 @@
     for (ind=0; ind < size && offsets[ind].used != 0; ind++) 
       ; /* do nothing */
 
-    if ( ind >= size ) {
+    if (ind >= size) {
       /*
        * If called with an array where all offsets are used,
        * we won't be able to find an open array location.
@@ -444,14 +444,14 @@
     int memsize;			/* amount of offset space to malloc */
     int newbuffer = 1;			/* need new buffer */
 
-    if ( numlines <= 0 ) {		/*use default */
+    if (numlines <= 0) {		/*use default */
 	numlines = DEF_SIZE;
     }
 
     /*
      * Malloc space for file contents
      */
-    if ((buffer=(char *)malloc(space)) == NULL ) {
+    if ((buffer=(char *)malloc(space)) == NULL) {
 	fprintf(stderr, "Unable to malloc(%d): errno:%d\n", space, errno);
 	return -1;
     }
@@ -462,7 +462,7 @@
      */
     memsize = sizeof(struct offset_t)*numlines;
 
-    if ((offsets=(struct offset_t *)malloc(memsize)) == NULL ) {
+    if ((offsets=(struct offset_t *)malloc(memsize)) == NULL) {
 	fprintf(stderr, "Unable to malloc(%d): errno:%d\n", memsize, errno);
 	return -1;
     }
@@ -475,7 +475,7 @@
      *  Loop until read doesn't read anything
      *  If last line does not end in newline, it is not printed
      */
-    while ( loopcntl ) {
+    while (loopcntl) {
         /*
          *  read in file up to space size
 	 *  only works if used as filter.
@@ -484,7 +484,7 @@
          */
 
         chr = buffer;
-        if ((rdsz=fread((void *)rdbuff, sztord, 1, infile)) == 0 ) {
+        if ((rdsz=fread((void *)rdbuff, sztord, 1, infile)) == 0) {
 	    fprintf(stderr, "input file is empty, done randomizing\n");
 	    loopcntl=0;
 	    return 0;
@@ -494,14 +494,14 @@
 
         loffset= (long)buffer;
 
-	while ( ! newbuffer ) {
+	while (! newbuffer) {
 
-            while ( (long)chr < stopaddr && *chr != '\n' )
+            while ((long)chr < stopaddr && *chr != '\n')
 	        chr++;
 
 	    chr++;
 
-	    if ( (long)chr >= stopaddr ) {
+	    if ((long)chr >= stopaddr) {
 
 	        fprintf(stderr, "end of read in buffer\n");
 
@@ -510,13 +510,13 @@
 		 */
 		for (cnt=0; cnt<numlines; cnt++) {
 
-		    if ( offsets[cnt].used ) {
+		    if (offsets[cnt].used) {
 			ptr = (char *)offsets[cnt].offset;
 			/*
 			 * copy buffer characters into line for printing
 			 */
 			lptr = line;
-			while ( *ptr != '\n' ) 
+			while (*ptr != '\n') 
 			    *lptr++ = *ptr++;
 				
 			printf("%s\n", line);
@@ -534,7 +534,7 @@
 	        newbuffer++;
 	    }
 
-	    if ( rnd_insert(offsets, loffset, numlines) < 0 ) {
+	    if (rnd_insert(offsets, loffset, numlines) < 0) {
 	      fprintf(stderr, "%s:%d rnd_insert() returned -1 (fatal error)!\n",
 		  __FILE__, __LINE__);
 	      abort();
diff --git a/tools/top-LTP/proc/compare.c b/tools/top-LTP/proc/compare.c
index e072794..53338ee 100644
--- a/tools/top-LTP/proc/compare.c
+++ b/tools/top-LTP/proc/compare.c
@@ -59,7 +59,7 @@
 
 int mult_lvl_cmp(void* a, void* b) {
     int i, cmp_val;
-    for(i = 0; i < sort_depth; i++) {
+    for (i = 0; i < sort_depth; i++) {
         cmp_val = sort_direction[i] * (*sort_function[i])(a,b);
         if (cmp_val != 0)
             return cmp_val;
@@ -205,7 +205,7 @@
 */
 const char *parse_sort_opt(const char* opt) {
     int i, next_dir=1;
-    for(; *opt ; ++opt) {
+    for (; *opt ; ++opt) {
         if (*opt == '-' || *opt == '+') {
             if (*opt == '-')
                 next_dir = -1;
@@ -217,7 +217,7 @@
                 break;
         if (!cmp[i].letter) { /* failed, clear and return */
             sort_depth=0;
-            for (i=0;i<10;i++){
+            for (i=0;i<10;i++) {
               sort_direction[i]=0;
               sort_function[i]=(cmp_t)NULL;
             }
@@ -251,12 +251,12 @@
 	                      /* keys are ',' delimited */
         if (more_keys)
             *comma='\0';      /* terminate for strcmp() */
-        for(i = 0; cmp[i].letter; ++i)
+        for (i = 0; cmp[i].letter; ++i)
             if (strcmp(opt, cmp[i].name) == 0)
                 break;
         if (!cmp[i].letter) { /* failed, clear and return */
             sort_depth=0;
-            for (i=0;i<10;i++){
+            for (i=0;i<10;i++) {
               sort_direction[i]=0;
               sort_function[i]=(cmp_t)NULL;
             }
@@ -281,7 +281,7 @@
   int i;
 
   sort_depth=0;
-  for (i=0;i<10;i++){
+  for (i=0;i<10;i++) {
     sort_direction[i]=0;
     sort_function[i]=(cmp_t)NULL;
   }
diff --git a/tools/top-LTP/proc/devname.c b/tools/top-LTP/proc/devname.c
index 06fa981..ee78f96 100644
--- a/tools/top-LTP/proc/devname.c
+++ b/tools/top-LTP/proc/devname.c
@@ -42,41 +42,41 @@
 static tty_map_node *tty_map = NULL;
 
 /* Load /proc/tty/drivers for device name mapping use. */
-static void load_drivers(void){
+static void load_drivers(void) {
   char buf[10000];
   char *p;
   int fd;
   int bytes;
   fd = open("/proc/tty/drivers",O_RDONLY);
-  if(fd == -1) goto fail;
+  if (fd == -1) goto fail;
   bytes = read(fd, buf, sizeof(buf) - 1);
-  if(bytes == -1) goto fail;
+  if (bytes == -1) goto fail;
   buf[bytes] = '\0';
   p = buf;
-  while(( p = strstr(p, " /dev/") )){
+  while (( p = strstr(p, " /dev/") )) {
     tty_map_node *tmn;
     int len;
     char *end;
     p += 6;
     end = strchr(p, ' ');
-    if(!end) continue;
+    if (!end) continue;
     len = end - p;
     tmn = calloc(1, sizeof(tty_map_node));
     tmn->next = tty_map;
     tty_map = tmn;
     /* if we have a devfs type name such as /dev/tts/%d then strip the %d but
        keep a flag. */
-    if(len >= 3 && !strncmp(end - 2, "%d", 2)){
+    if (len >= 3 && !strncmp(end - 2, "%d", 2)) {
       len -= 2;
       tmn->devfs_type = 1;
     }
     strncpy(tmn->name, p, len);
     p = end; /* set p to point past the %d as well if there is one */
-    while(*p == ' ') p++;
+    while (*p == ' ') p++;
     tmn->major_number = atoi(p);
     p += strspn(p, "0123456789");
-    while(*p == ' ') p++;
-    switch(sscanf(p, "%d-%d", &tmn->minor_first, &tmn->minor_last)){
+    while (*p == ' ') p++;
+    switch(sscanf(p, "%d-%d", &tmn->minor_first, &tmn->minor_last)) {
     default:
       /* Can't finish parsing this line so we remove it from the list */
       tty_map = tty_map->next;
@@ -90,45 +90,45 @@
     }
   }
 fail:
-  if(fd != -1) close(fd);
-  if(!tty_map) tty_map = (tty_map_node *)-1;
+  if (fd != -1) close(fd);
+  if (!tty_map) tty_map = (tty_map_node *)-1;
 }
 
 /* Try to guess the device name from /proc/tty/drivers info. */
-static int driver_name(char *restrict const buf, int maj, int min){
+static int driver_name(char *restrict const buf, int maj, int min) {
   struct stat sbuf;
   tty_map_node *tmn;
-  if(!tty_map) load_drivers();
-  if(tty_map == (tty_map_node *)-1) return 0;
+  if (!tty_map) load_drivers();
+  if (tty_map == (tty_map_node *)-1) return 0;
   tmn = tty_map;
-  for(;;){
-    if(!tmn) return 0;
-    if(tmn->major_number == maj && tmn->minor_first <= min && tmn->minor_last >= min) break;
+  for (;;) {
+    if (!tmn) return 0;
+    if (tmn->major_number == maj && tmn->minor_first <= min && tmn->minor_last >= min) break;
     tmn = tmn->next;
   }
   sprintf(buf, "/dev/%s%d", tmn->name, min);  /* like "/dev/ttyZZ255" */
-  if(stat(buf, &sbuf) < 0){
-    if(tmn->devfs_type) return 0;
+  if (stat(buf, &sbuf) < 0) {
+    if (tmn->devfs_type) return 0;
     sprintf(buf, "/dev/%s", tmn->name);  /* like "/dev/ttyZZ255" */
-    if(stat(buf, &sbuf) < 0) return 0;
+    if (stat(buf, &sbuf) < 0) return 0;
   }
-  if(min != minor(sbuf.st_rdev)) return 0;
-  if(maj != major(sbuf.st_rdev)) return 0;
+  if (min != minor(sbuf.st_rdev)) return 0;
+  if (maj != major(sbuf.st_rdev)) return 0;
   return 1;
 }
 
 /* Try to guess the device name (useful until /proc/PID/tty is added) */
-static int guess_name(char *restrict const buf, int maj, int min){
+static int guess_name(char *restrict const buf, int maj, int min) {
   struct stat sbuf;
   int t0, t1;
   int tmpmin = min;
-  switch(maj){
+  switch(maj) {
   case   4:
-    if(min<64){
+    if (min<64) {
       sprintf(buf, "/dev/tty%d", min);
       break;
     }
-    if(min<128){  /* to 255 on newer systems */
+    if (min<128) {  /* to 255 on newer systems */
       sprintf(buf, "/dev/ttyS%d", min-64);
       break;
     }
@@ -165,9 +165,9 @@
   case 188:  sprintf(buf, "/dev/ttyUSB%d", min); break; /* bummer, 9-char */
   default: return 0;
   }
-  if(stat(buf, &sbuf) < 0) return 0;
-  if(min != minor(sbuf.st_rdev)) return 0;
-  if(maj != major(sbuf.st_rdev)) return 0;
+  if (stat(buf, &sbuf) < 0) return 0;
+  if (min != minor(sbuf.st_rdev)) return 0;
+  if (maj != major(sbuf.st_rdev)) return 0;
   return 1;
 }
 
@@ -175,17 +175,17 @@
  * Useful names could be in /proc/PID/fd/2 (stderr, seldom redirected)
  * and in /proc/PID/fd/255 (used by bash to remember the tty).
  */
-static int link_name(char *restrict const buf, int maj, int min, int pid, const char *restrict name){
+static int link_name(char *restrict const buf, int maj, int min, int pid, const char *restrict name) {
   struct stat sbuf;
   char path[32];
   int count;
   sprintf(path, "/proc/%d/%s", pid, name);  /* often permission denied */
   count = readlink(path,buf,PAGE_SIZE-1);
-  if(count == -1) return 0;
+  if (count == -1) return 0;
   buf[count] = '\0';
-  if(stat(buf, &sbuf) < 0) return 0;
-  if(min != minor(sbuf.st_rdev)) return 0;
-  if(maj != major(sbuf.st_rdev)) return 0;
+  if (stat(buf, &sbuf) < 0) return 0;
+  if (min != minor(sbuf.st_rdev)) return 0;
+  if (maj != major(sbuf.st_rdev)) return 0;
   return 1;
 }
 
@@ -195,33 +195,33 @@
   char *restrict tmp = buf;
   unsigned i = 0;
   int c;
-  if((short)dev == (short)0) goto no_tty;
-  if(linux_version_code > LINUX_VERSION(2, 7, 0)){  // not likely to make 2.6.xx
-    if(link_name(tmp, major(dev), minor(dev), pid, "tty"   )) goto abbrev;
+  if ((short)dev == (short)0) goto no_tty;
+  if (linux_version_code > LINUX_VERSION(2, 7, 0)) {  // not likely to make 2.6.xx
+    if (link_name(tmp, major(dev), minor(dev), pid, "tty"   )) goto abbrev;
   }
-  if(driver_name(tmp, major(dev), minor(dev)               )) goto abbrev;
-  if(  link_name(tmp, major(dev), minor(dev), pid, "fd/2"  )) goto abbrev;
-  if( guess_name(tmp, major(dev), minor(dev)               )) goto abbrev;
-  if(  link_name(tmp, major(dev), minor(dev), pid, "fd/255")) goto abbrev;
+  if (driver_name(tmp, major(dev), minor(dev)               )) goto abbrev;
+  if (  link_name(tmp, major(dev), minor(dev), pid, "fd/2"  )) goto abbrev;
+  if ( guess_name(tmp, major(dev), minor(dev)               )) goto abbrev;
+  if (  link_name(tmp, major(dev), minor(dev), pid, "fd/255")) goto abbrev;
   // fall through if unable to find a device file
 no_tty:
   strcpy(ret, "?");
   return 1;
 abbrev:
-  if((flags&ABBREV_DEV) && !strncmp(tmp,"/dev/",5) && tmp[5]) tmp += 5;
-  if((flags&ABBREV_TTY) && !strncmp(tmp,"tty",  3) && tmp[3]) tmp += 3;
-  if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4;
+  if ((flags&ABBREV_DEV) && !strncmp(tmp,"/dev/",5) && tmp[5]) tmp += 5;
+  if ((flags&ABBREV_TTY) && !strncmp(tmp,"tty",  3) && tmp[3]) tmp += 3;
+  if ((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4;
   /* gotta check before we chop or we may chop someone else's memory */
-  if(chop + (unsigned long)(tmp-buf) <= sizeof buf)
+  if (chop + (unsigned long)(tmp-buf) <= sizeof buf)
     tmp[chop] = '\0';
   /* replace non-ASCII characters with '?' and return the number of chars */
-  for(;;){
+  for (;;) {
     c = *tmp;
     tmp++;
-    if(!c) break;
+    if (!c) break;
     i++;
-    if(c<=' ') c = '?';
-    if(c>126)  c = '?';
+    if (c<=' ') c = '?';
+    if (c>126)  c = '?';
     *ret = c;
     ret++;
   }
@@ -233,12 +233,12 @@
 int tty_to_dev(const char *restrict const name) {
   struct stat sbuf;
   static char buf[32];
-  if(name[0]=='/' && stat(name, &sbuf) >= 0) return sbuf.st_rdev;
+  if (name[0]=='/' && stat(name, &sbuf) >= 0) return sbuf.st_rdev;
   snprintf(buf,32,"/dev/%s",name);
-  if(stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
+  if (stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
   snprintf(buf,32,"/dev/tty%s",name);
-  if(stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
+  if (stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
   snprintf(buf,32,"/dev/pts/%s",name);
-  if(stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
+  if (stat(buf, &sbuf) >= 0) return sbuf.st_rdev;
   return -1;
 }
diff --git a/tools/top-LTP/proc/escape.c b/tools/top-LTP/proc/escape.c
index 060e0a3..d001661 100644
--- a/tools/top-LTP/proc/escape.c
+++ b/tools/top-LTP/proc/escape.c
@@ -30,7 +30,7 @@
 #if 0
 /* sanitize a string, without the nice BSD library function:     */
 /* strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH)  */
-int octal_escape_str(char *restrict dst, const char *restrict src, size_t n){
+int octal_escape_str(char *restrict dst, const char *restrict src, size_t n) {
   unsigned char c;
   char d;
   size_t i;
@@ -43,10 +43,10 @@
   "********************************"
   "********************************"
   "********************************";
-  for(i=0; i<n;){
+  for (i=0; i<n;) {
     c = (unsigned char) *(src++);
     d = codes[c];
-    switch(d){
+    switch(d) {
     case 'Z':
       goto leave;
     case '*':
@@ -54,7 +54,7 @@
       *(dst++) = c;
       break;
     case '-':
-      if(i+4 > n) goto leave;
+      if (i+4 > n) goto leave;
       i += 4;
       *(dst++) = '\\';
       *(dst++) = "01234567"[c>>6];
@@ -62,7 +62,7 @@
       *(dst++) = "01234567"[c&07];
       break;
     default:
-      if(i+2 > n) goto leave;
+      if (i+2 > n) goto leave;
       i += 2;
       *(dst++) = '\\';
       *(dst++) = d;
@@ -76,7 +76,7 @@
 #endif
 
 /* sanitize a string via one-way mangle */
-int escape_str(char *restrict dst, const char *restrict src, int bufsize, int maxglyphs){
+int escape_str(char *restrict dst, const char *restrict src, int bufsize, int maxglyphs) {
   unsigned char c;
   int my_glyphs = 0;
   int my_bytes = 0;
@@ -90,14 +90,14 @@
   "********************************"
   "********************************";
 
-  if(bufsize > maxglyphs+1) bufsize=maxglyphs+1; // FIXME: assumes 8-bit locale
+  if (bufsize > maxglyphs+1) bufsize=maxglyphs+1; // FIXME: assumes 8-bit locale
 
-  for(;;){
-    if(my_glyphs >= maxglyphs) break;
-    if(my_bytes+1 >= bufsize) break;
+  for (;;) {
+    if (my_glyphs >= maxglyphs) break;
+    if (my_bytes+1 >= bufsize) break;
     c = (unsigned char) *(src++);
-    if(!c) break;
-    if(codes[c]=='-') c='?';
+    if (!c) break;
+    if (codes[c]=='-') c='?';
     my_glyphs++;
     my_bytes++;
     *(dst++) = c;
@@ -111,18 +111,18 @@
 // escape an argv or environment string array
 //
 // bytes arg means sizeof(buf)
-int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes){
+int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes) {
   size_t i = 0;
 
-//if(!*src){        just never call this function without checking first
+//if (!*src) {        just never call this function without checking first
 //  do something nice
 //}
 
-  for(;;){
+  for (;;) {
     i += escape_str(dst+i, *src, bytes-i, bytes-i);   // FIXME: byte/glyph
-    if(bytes-i < 3) break;  // need room for space, a character, and the NUL
+    if (bytes-i < 3) break;  // need room for space, a character, and the NUL
     src++;
-    if(!*src) break;  // need something to print
+    if (!*src) break;  // need something to print
     dst[i++] = ' ';
   }
   return i;    // bytes of text, excluding the NUL
@@ -130,39 +130,39 @@
 
 ///////////////////////////////////////////////////
 
-int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int glyphs, unsigned flags){
+int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int glyphs, unsigned flags) {
   int overhead = 1;  // the trailing NUL
   int end = 0;
 
-  if(bytes > glyphs+1) bytes=glyphs+1; // FIXME: assumes 8-bit locale
+  if (bytes > glyphs+1) bytes=glyphs+1; // FIXME: assumes 8-bit locale
 
-  if(flags & ESC_ARGS){
+  if (flags & ESC_ARGS) {
     const char **lc = (const char**)pp->cmdline;
-    if(lc && *lc) return escape_strlist(outbuf, lc, bytes);
+    if (lc && *lc) return escape_strlist(outbuf, lc, bytes);
   }
-  if(flags & ESC_BRACKETS){
+  if (flags & ESC_BRACKETS) {
     overhead += 2;
   }
-  if(flags & ESC_DEFUNCT){
-    if(pp->state=='Z') overhead += 10;    // chars in " <defunct>"
+  if (flags & ESC_DEFUNCT) {
+    if (pp->state=='Z') overhead += 10;    // chars in " <defunct>"
     else flags &= ~ESC_DEFUNCT;
   }
-  if(overhead >= bytes){  // if no room for even one byte of the command name
+  if (overhead >= bytes) {  // if no room for even one byte of the command name
     // you'd damn well better have _some_ space
     outbuf[0] = '-';
     outbuf[1] = '\0';
     return 1;
   }
-  if(flags & ESC_BRACKETS){
+  if (flags & ESC_BRACKETS) {
     outbuf[end++] = '[';
   }
   end += escape_str(outbuf+end, pp->cmd, bytes-overhead, glyphs-overhead+1);
 
   // Hmmm, do we want "[foo] <defunct>" or "[foo <defunct>]"?
-  if(flags & ESC_BRACKETS){
+  if (flags & ESC_BRACKETS) {
     outbuf[end++] = ']';
   }
-  if(flags & ESC_DEFUNCT){
+  if (flags & ESC_DEFUNCT) {
     memcpy(outbuf+end, " <defunct>", 10);
     end += 10;
   }
diff --git a/tools/top-LTP/proc/ksym.c b/tools/top-LTP/proc/ksym.c
index c8a326c..4e1b4fb 100644
--- a/tools/top-LTP/proc/ksym.c
+++ b/tools/top-LTP/proc/ksym.c
@@ -139,17 +139,17 @@
  * /proc/ksyms and System.map data files.
  */
 #if 0
-static void chop_version(char *arg){
+static void chop_version(char *arg) {
   char *cp;
   cp = strchr(arg,'\t');
-  if(cp) *cp = '\0';  /* kill trailing module name first */
-  for(;;){
+  if (cp) *cp = '\0';  /* kill trailing module name first */
+  for (;;) {
     char *p;
     int len = 0;
     cp = strrchr(arg, 'R');
-    if(!cp || cp<=arg+1 || cp[-1]!='_') break;
-    for(p=cp; *++p; ){
-      switch(*p){
+    if (!cp || cp<=arg+1 || cp[-1]!='_') break;
+    for (p=cp; *++p; ) {
+      switch(*p) {
       default:
         return;
       case '0' ... '9':
@@ -162,45 +162,45 @@
         continue;
       }
     }
-    if(len<8) break;
+    if (len<8) break;
     cp[-1] = '\0';
   }
 }
 #endif
-static void chop_version(char *arg){
+static void chop_version(char *arg) {
   char *cp;
   cp = strchr(arg,'\t');
-  if(cp) *cp = '\0';  /* kill trailing module name first */
-  for(;;){
+  if (cp) *cp = '\0';  /* kill trailing module name first */
+  for (;;) {
     int len;
     cp = strrchr(arg, 'R');
-    if(!cp || cp<=arg+1 || cp[-1]!='_') break;
+    if (!cp || cp<=arg+1 || cp[-1]!='_') break;
     len=strlen(cp);
-    if(len<9) break;
-    if(strpbrk(cp+1,"ABCDEFGHIJKLMNOPQRSTUVWXYZ")) break;
-    if(strspn(cp+len-8,"0123456789abcdef")!=8) break;
+    if (len<9) break;
+    if (strpbrk(cp+1,"ABCDEFGHIJKLMNOPQRSTUVWXYZ")) break;
+    if (strspn(cp+len-8,"0123456789abcdef")!=8) break;
     cp[-1] = '\0';
   }
 }
 
 /***********************************/
 
-static const symb *search(unsigned long address, symb *idx, unsigned count){
+static const symb *search(unsigned long address, symb *idx, unsigned count) {
   unsigned left;
   unsigned mid;
   unsigned right;
-  if(!idx) return NULL;   /* maybe not allocated */
-  if(address < idx[0].addr) return NULL;
-  if(address >= idx[count-1].addr) return idx+count-1;
+  if (!idx) return NULL;   /* maybe not allocated */
+  if (address < idx[0].addr) return NULL;
+  if (address >= idx[count-1].addr) return idx+count-1;
   left  = 0;
   right = count-1;
-  for(;;){
+  for (;;) {
     mid = (left + right) / 2;
-    if(address >= idx[mid].addr) left  = mid;
-    if(address <= idx[mid].addr) right = mid;
-    if(right-left <= 1) break;
+    if (address >= idx[mid].addr) left  = mid;
+    if (address <= idx[mid].addr) right = mid;
+    if (right-left <= 1) break;
   }
-  if(address == idx[right].addr) return idx+right;
+  if (address == idx[right].addr) return idx+right;
   return idx+left;
 }
 
@@ -214,13 +214,13 @@
   ssize_t total = 0;
   unsigned room = *roomp;
 
-  if(!room) goto hell;     /* failed before */
-  if(!buf) buf = malloc(room);
-  if(!buf) goto hell;
+  if (!room) goto hell;     /* failed before */
+  if (!buf) buf = malloc(room);
+  if (!buf) goto hell;
 open_again:
   fd = open(filename, O_RDONLY|O_NOCTTY|O_NONBLOCK);
-  if(fd<0){
-    switch(errno){
+  if (fd<0) {
+    switch(errno) {
     case EINTR:  goto open_again;
     default:     _exit(101);
     case EACCES:   /* somebody screwing around? */
@@ -229,25 +229,25 @@
     }
     goto hell;
   }
-  for(;;){
+  for (;;) {
     done = read(fd, buf+total, room-total-1);
-    if(done==0) break;  /* nothing left */
-    if(done==-1){
-      if(errno==EINTR) continue;  /* try again */
+    if (done==0) break;  /* nothing left */
+    if (done==-1) {
+      if (errno==EINTR) continue;  /* try again */
       perror("");
       goto hell;
     }
-    if(done==(ssize_t)room-total-1){
+    if (done==(ssize_t)room-total-1) {
       char *tmp;
       total += done;
       /* more to go, but no room in buffer */
       room *= 2;
       tmp = realloc(buf, room);
-      if(!tmp) goto hell;
+      if (!tmp) goto hell;
       buf = tmp;
       continue;
     }
-    if(done>0 && done<(ssize_t)room-total-1){
+    if (done>0 && done<(ssize_t)room-total-1) {
       total += done; 
       continue;   /* OK, we read some. Go do more. */
     }
@@ -260,7 +260,7 @@
   close(fd);
   return;
 hell:
-  if(buf) free(buf);
+  if (buf) free(buf);
   *bufp = NULL;
   *roomp = 0;   /* this function will never work again */
   total = 0;
@@ -272,49 +272,49 @@
 
 static int parse_ksyms(void) {
   char *endp;
-  if(!ksyms_room || !ksyms_data) goto quiet_goodbye;
+  if (!ksyms_room || !ksyms_data) goto quiet_goodbye;
   endp = ksyms_data;
   ksyms_count = 0;
-  if(idx_room) goto bypass;  /* some space already allocated */
+  if (idx_room) goto bypass;  /* some space already allocated */
   idx_room = 512;
-  for(;;){
+  for (;;) {
     void *vp;
     idx_room *= 2;
     vp = realloc(ksyms_index, sizeof(symb)*idx_room);
-    if(!vp) goto bad_alloc;
+    if (!vp) goto bad_alloc;
     ksyms_index = vp;
 bypass:
-    for(;;){
+    for (;;) {
       char *saved;
-      if(!*endp) return 1;
+      if (!*endp) return 1;
       saved = endp;
       ksyms_index[ksyms_count].addr = strtoul(endp, &endp, 16);
-      if(endp==saved || *endp != ' ') goto bad_parse;
+      if (endp==saved || *endp != ' ') goto bad_parse;
       endp++;
       ksyms_index[ksyms_count].name = endp;
       saved = endp;
       endp = strchr(endp,'\n');
-      if(!endp) goto bad_parse;   /* no newline */
+      if (!endp) goto bad_parse;   /* no newline */
       *endp = '\0';
       chop_version(saved);
       ++endp;
-      if(++ksyms_count >= idx_room) break;  /* need more space */
+      if (++ksyms_count >= idx_room) break;  /* need more space */
     }
   }
 
-  if(0){
+  if (0) {
 bad_alloc:
     fprintf(stderr, "Warning: not enough memory available\n");
   }
-  if(0){
+  if (0) {
 bad_parse:
     fprintf(stderr, "Warning: "KSYMS_FILENAME" not normal\n");
   }
 quiet_goodbye:
   idx_room = 0;
-  if(ksyms_data) free(ksyms_data) , ksyms_data = NULL;
+  if (ksyms_data) free(ksyms_data) , ksyms_data = NULL;
   ksyms_room = 0;
-  if(ksyms_index) free(ksyms_index) , ksyms_index = NULL;
+  if (ksyms_index) free(ksyms_index) , ksyms_index = NULL;
   ksyms_count = 0;
   return 0;
 }
@@ -329,39 +329,39 @@
   int fd;
   char Version[32];
   fd = open(filename, O_RDONLY|O_NOCTTY|O_NONBLOCK);
-  if(fd<0) return 0;
-  if(fstat(fd, &sbuf) < 0) goto bad_open;
-  if(!S_ISREG(sbuf.st_mode)) goto bad_open;
-  if(sbuf.st_size < 5000) goto bad_open;  /* if way too small */
+  if (fd<0) return 0;
+  if (fstat(fd, &sbuf) < 0) goto bad_open;
+  if (!S_ISREG(sbuf.st_mode)) goto bad_open;
+  if (sbuf.st_size < 5000) goto bad_open;  /* if way too small */
   /* Would be shared read-only, but we want '\0' after each name. */
   endp = mmap(0, sbuf.st_size + 1, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
   sysmap_data = endp;
-  while(*endp==' '){  /* damn Alpha machine types */
-    if(strncmp(endp,"                 w ", 19)) goto bad_parse;
+  while (*endp==' ') {  /* damn Alpha machine types */
+    if (strncmp(endp,"                 w ", 19)) goto bad_parse;
     endp += 19;
     endp = strchr(endp,'\n');
-    if(!endp) goto bad_parse;   /* no newline */
-    if(strncmp(endp-3, "_mv\n", 4)) goto bad_parse;
+    if (!endp) goto bad_parse;   /* no newline */
+    if (strncmp(endp-3, "_mv\n", 4)) goto bad_parse;
     endp++;
   }
-  if(sysmap_data == (caddr_t) -1) goto bad_open;
+  if (sysmap_data == (caddr_t) -1) goto bad_open;
   close(fd);
   fd = -1;
   sprintf(Version, "Version_%d", linux_version_code);
   sysmap_room = 512;
-  for(;;){
+  for (;;) {
     void *vp;
     sysmap_room *= 2;
     vp = realloc(sysmap_index, sizeof(symb)*sysmap_room);
-    if(!vp) goto bad_alloc;
+    if (!vp) goto bad_alloc;
     sysmap_index = vp;
-    for(;;){
+    for (;;) {
       char *vstart;
-      if(endp - sysmap_data >= sbuf.st_size){   /* if we reached the end */
+      if (endp - sysmap_data >= sbuf.st_size) {   /* if we reached the end */
         int i = VCNT;            /* check VCNT times to verify this file */
-        if(*Version) goto bad_version;
-        if(!ksyms_index) return 1; /* if can not verify, assume success */
-        while(i--){
+        if (*Version) goto bad_version;
+        if (!ksyms_index) return 1; /* if can not verify, assume success */
+        while (i--) {
 #if 1
           const symb *findme;
           const symb *map_symb;
@@ -369,15 +369,15 @@
           findme = ksyms_index + (ksyms_count*i/VCNT);
           /* Search for them in the System.map */
           map_symb = search(findme->addr, sysmap_index, sysmap_count);
-          if(map_symb){
-            if(map_symb->addr != findme->addr) continue;
+          if (map_symb) {
+            if (map_symb->addr != findme->addr) continue;
             /* backup to first matching address */
-            while (map_symb != sysmap_index){
+            while (map_symb != sysmap_index) {
               if (map_symb->addr != (map_symb-1)->addr) break;
               map_symb--;
             }
             /* search for name in symbols with same address */
-            while (map_symb != (sysmap_index+sysmap_count)){
+            while (map_symb != (sysmap_index+sysmap_count)) {
               if (map_symb->addr != findme->addr) break;
               if (!strcmp(map_symb->name,findme->name)) goto good_match;
               map_symb++;
@@ -392,60 +392,60 @@
         return 1; /* success */
       }
       sysmap_index[sysmap_count].addr = strtoul(endp, &endp, 16);
-      if(*endp != ' ') goto bad_parse;
+      if (*endp != ' ') goto bad_parse;
       endp++;
-      if(!strchr(SYMBOL_TYPE_CHARS, *endp)) goto bad_parse;
+      if (!strchr(SYMBOL_TYPE_CHARS, *endp)) goto bad_parse;
       endp++;
-      if(*endp != ' ') goto bad_parse;
+      if (*endp != ' ') goto bad_parse;
       endp++;
       sysmap_index[sysmap_count].name = endp;
       vstart = endp;
       endp = strchr(endp,'\n');
-      if(!endp) goto bad_parse;   /* no newline */
+      if (!endp) goto bad_parse;   /* no newline */
       *endp = '\0';
       ++endp;
       chop_version(vstart);
-      if(*vstart=='V' && *Version && !strcmp(Version,vstart)) *Version='\0';
-      if(++sysmap_count >= sysmap_room) break;  /* need more space */
+      if (*vstart=='V' && *Version && !strcmp(Version,vstart)) *Version='\0';
+      if (++sysmap_count >= sysmap_room) break;  /* need more space */
     }
   }
 
-  if(0){
+  if (0) {
 bad_match:
     message("Warning: %s does not match kernel data.\n", filename);
   }
-  if(0){
+  if (0) {
 bad_version:
     message("Warning: %s has an incorrect kernel version.\n", filename);
   }
-  if(0){
+  if (0) {
 bad_alloc:
     message("Warning: not enough memory available\n");
   }
-  if(0){
+  if (0) {
 bad_parse:
     message("Warning: %s not parseable as a System.map\n", filename);
   }
-  if(0){
+  if (0) {
 bad_open:
     message("Warning: %s could not be opened as a System.map\n", filename);
   }
 
   sysmap_room=0;
   sysmap_count=0;
-  if(sysmap_index) free(sysmap_index);
+  if (sysmap_index) free(sysmap_index);
   sysmap_index = NULL;
-  if(fd>=0) close(fd);
-  if(sysmap_data) munmap(sysmap_data, sbuf.st_size + 1);
+  if (fd>=0) close(fd);
+  if (sysmap_data) munmap(sysmap_data, sbuf.st_size + 1);
   sysmap_data = NULL;
   return 0;
 }
 
 /*********************************/
 
-static void read_and_parse(void){
+static void read_and_parse(void) {
   static time_t stamp;    /* after data gets old, load /proc/ksyms again */
-  if(time(NULL) != stamp){
+  if (time(NULL) != stamp) {
     read_file(KSYMS_FILENAME, &ksyms_data, &ksyms_room);
     parse_ksyms();
     memset((void*)hashtable,0,sizeof(hashtable)); /* invalidate cache */
@@ -487,21 +487,21 @@
 #endif
 
   // first allow for a user-selected System.map file
-  if(
+  if (
     (sm=override)
     ||
     (sm=getenv("PS_SYSMAP"))
     ||
     (sm=getenv("PS_SYSTEM_MAP"))
-  ){
+  ) {
     read_and_parse();
-    if(sysmap_mmap(sm, message)) return 0;
+    if (sysmap_mmap(sm, message)) return 0;
     /* failure is better than ignoring the user & using bad data */
     return -1;           /* ought to return "Namelist not found." */
   }
 
   // next try the Linux 2.5.xx method
-  if(!stat("/proc/self/wchan", &sbuf)){
+  if (!stat("/proc/self/wchan", &sbuf)) {
     use_wchan_file = 1; // hack
     return 0;
   }
@@ -511,11 +511,11 @@
   do{
     int did_ksyms = 0;
     snprintf(path, sizeof path, *fmt, uts.release);
-    if(!stat(path, &sbuf)){
+    if (!stat(path, &sbuf)) {
       if (did_ksyms++) read_and_parse();
       if (sysmap_mmap(path, message)) return 0;
     }
-  }while(*++fmt);
+  }while (*++fmt);
   /* TODO: Without System.map, no need to keep ksyms loaded. */
   return -1;
 }
@@ -528,7 +528,7 @@
 
 /***************************************/
 
-const char * read_wchan_file(unsigned pid){
+const char * read_wchan_file(unsigned pid) {
   static char buf[64];
   const char *ret = buf;
   ssize_t num;
@@ -536,20 +536,20 @@
 
   snprintf(buf, sizeof buf, "/proc/%d/wchan", pid);
   fd = open(buf, O_RDONLY);
-  if(fd==-1) return "?";
+  if (fd==-1) return "?";
   num = read(fd, buf, sizeof buf - 1);
   close(fd);
-  if(num<1) return "?"; // allow for "0"
+  if (num<1) return "?"; // allow for "0"
   buf[num] = '\0';
 
-  if(buf[0]=='0' && buf[1]=='\0') return "-";
+  if (buf[0]=='0' && buf[1]=='\0') return "-";
 
   // would skip over numbers if they existed -- but no
 
-  switch(*ret){
-    case 's': if(!strncmp(ret, "sys_", 4)) ret += 4;   break;
-    case 'd': if(!strncmp(ret, "do_",  3)) ret += 3;   break;
-    case '_': while(*ret=='_') ret++;                  break;
+  switch(*ret) {
+    case 's': if (!strncmp(ret, "sys_", 4)) ret += 4;   break;
+    case 'd': if (!strncmp(ret, "do_",  3)) ret += 3;   break;
+    case '_': while (*ret=='_') ret++;                  break;
   }
   return ret;
 }
@@ -567,33 +567,33 @@
   unsigned hash;
 
   // can't cache it due to a race condition :-(
-  if(use_wchan_file) return read_wchan_file(pid);
+  if (use_wchan_file) return read_wchan_file(pid);
 
-  if(!address) return dash;
+  if (!address) return dash;
 
   read_and_parse();
   hash = (address >> 4) & 0xff;  /* got 56/63 hits & 7/63 misses */
-  if(hashtable[hash].addr == address) return hashtable[hash].name;
+  if (hashtable[hash].addr == address) return hashtable[hash].name;
   mod_symb = search(address, ksyms_index,  ksyms_count);
-  if(!mod_symb) mod_symb = &fail;
+  if (!mod_symb) mod_symb = &fail;
   map_symb = search(address, sysmap_index, sysmap_count);
-  if(!map_symb) map_symb = &fail;
+  if (!map_symb) map_symb = &fail;
 
   /* which result is closest? */
   good_symb = (mod_symb->addr > map_symb->addr)
             ? mod_symb
             : map_symb
   ;
-  if(address > good_symb->addr + MAX_OFFSET) good_symb = &fail;
+  if (address > good_symb->addr + MAX_OFFSET) good_symb = &fail;
 
   /* good_symb->name has the data, but needs to be trimmed */
   ret = good_symb->name;
-  switch(*ret){
-    case 's': if(!strncmp(ret, "sys_", 4)) ret += 4;   break;
-    case 'd': if(!strncmp(ret, "do_",  3)) ret += 3;   break;
-    case '_': while(*ret=='_') ret++;                  break;
+  switch(*ret) {
+    case 's': if (!strncmp(ret, "sys_", 4)) ret += 4;   break;
+    case 'd': if (!strncmp(ret, "do_",  3)) ret += 3;   break;
+    case '_': while (*ret=='_') ret++;                  break;
   }
-  /* if(!*ret) ret = fail.name; */  /* not likely (name was "sys_", etc.) */
+  /* if (!*ret) ret = fail.name; */  /* not likely (name was "sys_", etc.) */
 
   /* cache name after abbreviation */
   hashtable[hash].addr = address;
diff --git a/tools/top-LTP/proc/procps.h b/tools/top-LTP/proc/procps.h
index 8fbaa50..fba3397 100644
--- a/tools/top-LTP/proc/procps.h
+++ b/tools/top-LTP/proc/procps.h
@@ -24,7 +24,7 @@
 #if __GNUC__ > 2 || __GNUC_MINOR__ >= 96
 // won't alias anything, and aligned enough for anything
 #define MALLOC __attribute__ ((__malloc__))
-// tell gcc what to expect:   if(unlikely(err)) die(err);
+// tell gcc what to expect:   if (unlikely(err)) die(err);
 #define likely(x)       __builtin_expect(!!(x),1)
 #define unlikely(x)     __builtin_expect(!!(x),0)
 #define expected(x,y)   __builtin_expect((x),(y))
diff --git a/tools/top-LTP/proc/readproc.c b/tools/top-LTP/proc/readproc.c
index 356c6a6..6add27d 100644
--- a/tools/top-LTP/proc/readproc.c
+++ b/tools/top-LTP/proc/readproc.c
@@ -56,7 +56,7 @@
 /* terminate a process table scan
  */
 void closeproc(PROCTAB* PT) {
-    if (PT){
+    if (PT) {
         if (PT->procfs) closedir(PT->procfs);
         free(PT);
     }
@@ -85,56 +85,56 @@
 // "PPid:\t%d\n"
 // "TracerPid:\t%d\n"
 
-static void status2proc(const char *S, proc_t *restrict P){
+static void status2proc(const char *S, proc_t *restrict P) {
     char* tmp;
     unsigned i;
 
     // The cmd is escaped, with \\ and \n for backslash and newline.
     // It certainly may contain "VmSize:" and similar crap.
-    if(unlikely(strncmp("Name:\t",S,6))) fprintf(stderr, "Internal error!\n");
+    if (unlikely(strncmp("Name:\t",S,6))) fprintf(stderr, "Internal error!\n");
     S += 6;
     i = 0;
-    while(i < sizeof P->cmd - 1){
+    while (i < sizeof P->cmd - 1) {
       int c = *S++;
-      if(unlikely(c=='\n')) break;
-      if(unlikely(c=='\0')) return; // should never happen
-      if(unlikely(c=='\\')){
+      if (unlikely(c=='\n')) break;
+      if (unlikely(c=='\0')) return; // should never happen
+      if (unlikely(c=='\\')) {
         c = *S++;
-        if(c=='\n') break; // should never happen
-        if(!c) break; // should never happen
-        if(c=='n') c='\n'; // else we assume it is '\\'
+        if (c=='\n') break; // should never happen
+        if (!c) break; // should never happen
+        if (c=='n') c='\n'; // else we assume it is '\\'
       }
       P->cmd[i++] = c;
     }
     P->cmd[i] = '\0';
 
     tmp = strstr (S,"State:\t");
-    if(likely(tmp)) P->state = tmp[7];
+    if (likely(tmp)) P->state = tmp[7];
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"PPid:");
-    if(likely(tmp)) sscanf (tmp,
+    if (likely(tmp)) sscanf (tmp,
         "PPid:\t%d\n",
         &P->ppid
     );
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"Uid:");
-    if(likely(tmp)) sscanf (tmp,
+    if (likely(tmp)) sscanf (tmp,
         "Uid:\t%d\t%d\t%d\t%d",
         &P->ruid, &P->euid, &P->suid, &P->fuid
     );
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"Gid:");
-    if(likely(tmp)) sscanf (tmp,
+    if (likely(tmp)) sscanf (tmp,
         "Gid:\t%d\t%d\t%d\t%d",
         &P->rgid, &P->egid, &P->sgid, &P->fgid
     );
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"VmSize:");
-    if(likely(tmp)) sscanf (tmp,
+    if (likely(tmp)) sscanf (tmp,
         "VmSize: %lu kB\n"
         "VmLck: %lu kB\n"
         "VmRSS: %lu kB\n"
@@ -157,7 +157,7 @@
     }
 
     tmp = strstr (S,"SigPnd:");
-    if(likely(tmp)) sscanf (tmp,
+    if (likely(tmp)) sscanf (tmp,
 #ifdef SIGNAL_STRING
         "SigPnd: %s SigBlk: %s SigIgn: %s %*s %s",
         P->signal, P->blocked, P->sigignore, P->sigcatch
@@ -186,7 +186,7 @@
     S = strchr(S, '(') + 1;
     tmp = strrchr(S, ')');
     num = tmp - S;
-    if(unlikely(num >= sizeof P->cmd)) num = sizeof P->cmd - 1;
+    if (unlikely(num >= sizeof P->cmd)) num = sizeof P->cmd - 1;
     memcpy(P->cmd, S, num);
     P->cmd[num] = '\0';
     S = tmp + 2;                 // skip ") "
@@ -237,9 +237,9 @@
 
     sprintf(filename, "%s/%s", directory, what);
     fd = open(filename, O_RDONLY, 0);
-    if(unlikely(fd==-1)) return -1;
+    if (unlikely(fd==-1)) return -1;
     num_read = read(fd, ret, cap - 1);
-    if(unlikely(num_read<=0)) num_read = -1;
+    if (unlikely(num_read<=0)) num_read = -1;
     else ret[num_read] = 0;
     close(fd);
     return num_read;
@@ -253,7 +253,7 @@
 
     sprintf(buf, "%s/%s", directory, what);
     fd = open(buf, O_RDONLY, 0);
-    if(fd==-1) return NULL;
+    if (fd==-1) return NULL;
 
     /* read whole file into a memory buffer, allocating as we go */
     while ((n = read(fd, buf, sizeof buf - 1)) > 0) {
@@ -300,32 +300,32 @@
 }
 
 // warning: interface may change
-int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid){
+int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid) {
     char name[32];
     int fd;
     unsigned n = 0;
     dst[0] = '\0';
     snprintf(name, sizeof name, "/proc/%u/cmdline", pid);
     fd = open(name, O_RDONLY);
-    if(fd==-1) return 0;
-    for(;;){
+    if (fd==-1) return 0;
+    for (;;) {
         ssize_t r = read(fd,dst+n,sz-n);
-        if(r==-1){
-            if(errno==EINTR) continue;
+        if (r==-1) {
+            if (errno==EINTR) continue;
             break;
         }
         n += r;
-        if(n==sz) break; // filled the buffer
-        if(r==0) break;  // EOF
+        if (n==sz) break; // filled the buffer
+        if (r==0) break;  // EOF
     }
-    if(n){
+    if (n) {
         int i;
-        if(n==sz) n--;
+        if (n==sz) n--;
         dst[n] = '\0';
         i=n;
-        while(i--){
+        while (i--) {
           int c = dst[i];
-          if(c<' ' || c>'~') dst[i]=' ';
+          if (c<' ' || c>'~') dst[i]=' ';
         }
     }
     return n;
@@ -384,8 +384,8 @@
     } else {					/* get next numeric /proc ent */
 	for (;;) {
 	    ent = readdir(PT->procfs);
-	    if(unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return NULL;
-	    if(likely( likely(*ent->d_name > '0') && likely(*ent->d_name <= '9') )) break;
+	    if (unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return NULL;
+	    if (likely( likely(*ent->d_name > '0') && likely(*ent->d_name <= '9') )) break;
 	}
 	pid = strtoul(ent->d_name, NULL, 10);
 	memcpy(path, "/proc/", 6);
@@ -393,7 +393,7 @@
 //	snprintf(path, sizeof path, "/proc/%s", ent->d_name);
     }
 #ifdef FLASK_LINUX
-    if ( stat_secure(path, &sb, &secsid) == -1 ) /* no such dirent (anymore) */
+    if (stat_secure(path, &sb, &secsid) == -1 ) /* no such dirent (anymore) */
 #else
     if (unlikely(stat(path, &sb) == -1))	/* no such dirent (anymore) */
 #endif
@@ -423,15 +423,15 @@
     }						/* statm fields just zero */
 
     if (flags & PROC_FILLSTATUS) {         /* read, parse /proc/#/status */
-       if (likely( file2str(path, "status", sbuf, sizeof sbuf) != -1 )){
+       if (likely( file2str(path, "status", sbuf, sizeof sbuf) != -1 )) {
            status2proc(sbuf, p);
        }
     }
 
     /* some number->text resolving which is time consuming */
-    if (flags & PROC_FILLUSR){
+    if (flags & PROC_FILLUSR) {
 	strncpy(p->euser,   user_from_uid(p->euid), sizeof p->euser);
-        if(flags & PROC_FILLSTATUS) {
+        if (flags & PROC_FILLSTATUS) {
             strncpy(p->ruser,   user_from_uid(p->ruid), sizeof p->ruser);
             strncpy(p->suser,   user_from_uid(p->suid), sizeof p->suser);
             strncpy(p->fuser,   user_from_uid(p->fuid), sizeof p->fuser);
@@ -439,9 +439,9 @@
     }
 
     /* some number->text resolving which is time consuming */
-    if (flags & PROC_FILLGRP){
+    if (flags & PROC_FILLGRP) {
         strncpy(p->egroup, group_from_gid(p->egid), sizeof p->egroup);
-        if(flags & PROC_FILLSTATUS) {
+        if (flags & PROC_FILLSTATUS) {
             strncpy(p->rgroup, group_from_gid(p->rgid), sizeof p->rgroup);
             strncpy(p->sgroup, group_from_gid(p->sgid), sizeof p->sgroup);
             strncpy(p->fgroup, group_from_gid(p->fgid), sizeof p->fgroup);
@@ -490,8 +490,8 @@
 
     for (;;) {
 	ent = readdir(PT->procfs);
-	if(unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return NULL;
-	if(likely( likely(*ent->d_name > '0') && likely(*ent->d_name <= '9') )) break;
+	if (unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return NULL;
+	if (likely( likely(*ent->d_name > '0') && likely(*ent->d_name <= '9') )) break;
     }
     pid = strtoul(ent->d_name, NULL, 10);
     memcpy(path, "/proc/", 6);
@@ -519,20 +519,20 @@
     stat2proc(sbuf, p);				/* parse /proc/#/stat */
 
     if (flags & PROC_FILLMEM) {				/* read, parse /proc/#/statm */
-	if ((file2str(path, "statm", sbuf, sizeof sbuf)) != -1 )
+	if ((file2str(path, "statm", sbuf, sizeof sbuf)) != -1)
 	    statm2proc(sbuf, p);		/* ignore statm errors here */
     }						/* statm fields just zero */
 
   /*  if (flags & PROC_FILLSTATUS) { */        /* read, parse /proc/#/status */
-       if ((file2str(path, "status", sbuf, sizeof sbuf)) != -1 ){
+       if ((file2str(path, "status", sbuf, sizeof sbuf)) != -1) {
            status2proc(sbuf, p);
        }
 /*    }*/
 
     /* some number->text resolving which is time consuming */
-    if (flags & PROC_FILLUSR){
+    if (flags & PROC_FILLUSR) {
 	strncpy(p->euser,   user_from_uid(p->euid), sizeof p->euser);
-/*        if(flags & PROC_FILLSTATUS) { */
+/*        if (flags & PROC_FILLSTATUS) { */
             strncpy(p->ruser,   user_from_uid(p->ruid), sizeof p->ruser);
             strncpy(p->suser,   user_from_uid(p->suid), sizeof p->suser);
             strncpy(p->fuser,   user_from_uid(p->fuid), sizeof p->fuser);
@@ -540,9 +540,9 @@
     }
 
     /* some number->text resolving which is time consuming */
-    if (flags & PROC_FILLGRP){
+    if (flags & PROC_FILLGRP) {
         strncpy(p->egroup, group_from_gid(p->egid), sizeof p->egroup);
-/*        if(flags & PROC_FILLSTATUS) { */
+/*        if (flags & PROC_FILLSTATUS) { */
             strncpy(p->rgroup, group_from_gid(p->rgid), sizeof p->rgroup);
             strncpy(p->sgroup, group_from_gid(p->sgid), sizeof p->sgroup);
             strncpy(p->fgroup, group_from_gid(p->fgid), sizeof p->fgroup);
diff --git a/tools/top-LTP/proc/sig.c b/tools/top-LTP/proc/sig.c
index ca41c6a..63ae639 100644
--- a/tools/top-LTP/proc/sig.c
+++ b/tools/top-LTP/proc/sig.c
@@ -97,21 +97,21 @@
 
 static const int number_of_signals = sizeof(sigtable)/sizeof(mapstruct);
 
-static int compare_signal_names(const void *a, const void *b){
+static int compare_signal_names(const void *a, const void *b) {
   return strcasecmp( ((const mapstruct*)a)->name, ((const mapstruct*)b)->name );
 }
 
 /* return -1 on failure */
-int signal_name_to_number(const char *restrict name){
+int signal_name_to_number(const char *restrict name) {
   long val;
   int offset;
 
   /* clean up name */
-  if(!strncasecmp(name,"SIG",3)) name += 3;
+  if (!strncasecmp(name,"SIG",3)) name += 3;
 
-  if(!strcasecmp(name,"CLD")) return SIGCHLD;
-  if(!strcasecmp(name,"IO"))  return SIGPOLL;
-  if(!strcasecmp(name,"IOT")) return SIGABRT;
+  if (!strcasecmp(name,"CLD")) return SIGCHLD;
+  if (!strcasecmp(name,"IO"))  return SIGPOLL;
+  if (!strcasecmp(name,"IOT")) return SIGABRT;
 
   /* search the table */
   {
@@ -123,15 +123,15 @@
       sizeof(mapstruct),
       compare_signal_names
     );
-    if(ptr) return ptr->num;
+    if (ptr) return ptr->num;
   }
 
-  if(!strcasecmp(name,"RTMIN")) return SIGRTMIN;
-  if(!strcasecmp(name,"EXIT"))  return 0;
-  if(!strcasecmp(name,"NULL"))  return 0;
+  if (!strcasecmp(name,"RTMIN")) return SIGRTMIN;
+  if (!strcasecmp(name,"EXIT"))  return 0;
+  if (!strcasecmp(name,"NULL"))  return 0;
 
   offset = 0;
-  if(!strncasecmp(name,"RTMIN+",6)){
+  if (!strncasecmp(name,"RTMIN+",6)) {
     name += 6;
     offset = SIGRTMIN;
   }
@@ -140,39 +140,39 @@
   {
     char *endp;
     val = strtol(name,&endp,10);
-    if(*endp || endp==name) return -1; /* not valid */
+    if (*endp || endp==name) return -1; /* not valid */
   }
-  if(val+SIGRTMIN>127) return -1; /* not valid */
+  if (val+SIGRTMIN>127) return -1; /* not valid */
   return val+offset;
 }
 
-static const char *signal_number_to_name(int signo){
+static const char *signal_number_to_name(int signo) {
   static char buf[32];
   int n = number_of_signals;
   signo &= 0x7f; /* need to process exit values too */
-  while(n--){
-    if(sigtable[n].num==signo) return sigtable[n].name;
+  while (n--) {
+    if (sigtable[n].num==signo) return sigtable[n].name;
   }
-  if(signo == SIGRTMIN) return "RTMIN";
-  if(signo) sprintf(buf, "RTMIN+%d", signo-SIGRTMIN);
+  if (signo == SIGRTMIN) return "RTMIN";
+  if (signo) sprintf(buf, "RTMIN+%d", signo-SIGRTMIN);
   else      strcpy(buf,"0");  /* AIX has NULL; Solaris has EXIT */
   return buf;
 }
 
-int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line){
+int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line) {
   char buf[1280]; /* 128 signals, "RTMIN+xx" is largest */
   int ret = 0;  /* to be used as exit code by caller */
   int place = 0; /* position on this line */
   int amt;
-  if(argc > 128) return 1;
-  while(argc--){
+  if (argc > 128) return 1;
+  while (argc--) {
     char tmpbuf[16];
     const char *restrict const txt = *argv;
-    if(*txt >= '0' && *txt <= '9'){
+    if (*txt >= '0' && *txt <= '9') {
       long val;
       char *endp;
       val = strtol(txt,&endp,10);
-      if(*endp){
+      if (*endp) {
         fprintf(stderr, "Signal \"%s\" not known.\n", txt);
         ret = 1;
         goto end;
@@ -181,7 +181,7 @@
     }else{
       int sno;
       sno = signal_name_to_number(txt);
-      if(sno == -1){
+      if (sno == -1) {
         fprintf(stderr, "Signal \"%s\" not known.\n", txt);
         ret = 1;
         goto end;
@@ -189,12 +189,12 @@
       amt = sprintf(tmpbuf, "%d", sno);
     }
 
-    if(!place){
+    if (!place) {
       strcpy(buf,tmpbuf);
       place = amt;
       goto end;
     }
-    if(amt+place+1 > max_line){
+    if (amt+place+1 > max_line) {
       printf("%s\n", buf);
       strcpy(buf,tmpbuf);
       place = amt;
@@ -205,26 +205,26 @@
 end:
     argv++;
   }
-  if(place) printf("%s\n", buf);
+  if (place) printf("%s\n", buf);
   return ret;
 }
 
-void pretty_print_signals(void){
+void pretty_print_signals(void) {
   int i = 0;
-  while(++i <= number_of_signals){
+  while (++i <= number_of_signals) {
     int n;
     n = printf("%2d %s", i, signal_number_to_name(i));
-    if(i%7) printf("           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
+    if (i%7) printf("           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
     else printf("\n");
   }
-  if((i-1)%7) printf("\n");
+  if ((i-1)%7) printf("\n");
 }
 
-void unix_print_signals(void){
+void unix_print_signals(void) {
   int pos = 0;
   int i = 0;
-  while(++i <= number_of_signals){
-    if(i-1) printf("%c", (pos>73)?(pos=0,'\n'):(pos++,' ') );
+  while (++i <= number_of_signals) {
+    if (i-1) printf("%c", (pos>73)?(pos=0,'\n'):(pos++,' ') );
     pos += printf("%s", signal_number_to_name(i));
   }
   printf("\n");
@@ -232,8 +232,8 @@
 
 /* sanity check */
 static int init_signal_list(void) __attribute__((constructor));
-static int init_signal_list(void){
-  if(number_of_signals != 31){
+static int init_signal_list(void) {
+  if (number_of_signals != 31) {
     fprintf(stderr, "WARNING: %d signals -- adjust and recompile.\n", number_of_signals);
   }
   return 0;
diff --git a/tools/top-LTP/proc/sysinfo.c b/tools/top-LTP/proc/sysinfo.c
index fd5bfe8..fcd3f3d 100644
--- a/tools/top-LTP/proc/sysinfo.c
+++ b/tools/top-LTP/proc/sysinfo.c
@@ -61,10 +61,10 @@
 	_exit(103);						\
     }								\
     buf[local_n] = '\0';					\
-}while(0)
+}while (0)
 
 /* evals 'x' twice */
-#define SET_IF_DESIRED(x,y) do{  if(x) *(x) = (y); }while(0)
+#define SET_IF_DESIRED(x,y) do{  if (x) *(x) = (y); }while (0)
 
 
 /***********************************************************************/
@@ -119,7 +119,7 @@
 
 unsigned long long Hertz;
 
-static void old_Hertz_hack(void){
+static void old_Hertz_hack(void) {
   unsigned long long user_j, nice_j, sys_j, other_j;  /* jiffies (clock ticks) */
   double up_1, up_2, seconds;
   unsigned long long jiffies;
@@ -135,13 +135,13 @@
     sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j);
     FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_2);
     /* uptime(&up_2, NULL); */
-  } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
+  } while ((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
   setlocale(LC_NUMERIC, savelocale);
   jiffies = user_j + nice_j + sys_j + other_j;
   seconds = (up_1 + up_2) / 2;
   h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
   /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */
-  switch(h){
+  switch(h) {
   case    9 ...   11 :  Hertz =   10; break; /* S/390 (sometimes) */
   case   18 ...   22 :  Hertz =   20; break; /* user-mode Linux */
   case   30 ...   34 :  Hertz =   32; break; /* ia64 emulator */
@@ -175,27 +175,27 @@
 extern char** environ;
 
 /* for ELF executables, notes are pushed before environment and args */
-static unsigned long find_elf_note(unsigned long findme){
+static unsigned long find_elf_note(unsigned long findme) {
   unsigned long *ep = (unsigned long *)environ;
-  while(*ep++);
-  while(*ep){
-    if(ep[0]==findme) return ep[1];
+  while (*ep++);
+  while (*ep) {
+    if (ep[0]==findme) return ep[1];
     ep+=2;
   }
   return 42;
 }
 
 static void init_libproc(void) __attribute__((constructor));
-static void init_libproc(void){
+static void init_libproc(void) {
   /* ought to count CPUs in /proc/stat instead of relying
    * on glibc, which foolishly tries to parse /proc/cpuinfo
    */
   smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); // or _SC_NPROCESSORS_ONLN
-  if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
+  if (smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
 
-  if(linux_version_code > LINUX_VERSION(2, 4, 0)){ 
+  if (linux_version_code > LINUX_VERSION(2, 4, 0)) { 
     Hertz = find_elf_note(AT_CLKTCK);
-    if(Hertz!=42) return;
+    if (Hertz!=42) return;
     fprintf(stderr, "2.4 kernel w/o ELF notes? -- report to albert@users.sf.net\n");
   }
   old_Hertz_hack();
@@ -211,7 +211,7 @@
 #define NAN (-0.0)
 #endif
 #define JT unsigned long long
-void five_cpu_numbers(double *restrict uret, double *restrict nret, double *restrict sret, double *restrict iret, double *restrict wret){
+void five_cpu_numbers(double *restrict uret, double *restrict nret, double *restrict sret, double *restrict iret, double *restrict wret) {
     double tmp_u, tmp_n, tmp_s, tmp_i, tmp_w;
     double scale;  /* scale values to % */
     static JT old_u, old_n, old_s, old_i, old_w;
@@ -224,7 +224,7 @@
     FILE_TO_BUF(STAT_FILE,stat_fd);
     sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w);
     ticks_past = (new_u+new_n+new_s+new_i+new_w)-(old_u+old_n+old_s+old_i+old_w);
-    if(ticks_past){
+    if (ticks_past) {
       scale = 100.0 / (double)ticks_past;
       tmp_u = ( (double)new_u - (double)old_u ) * scale;
       tmp_n = ( (double)new_n - (double)old_n ) * scale;
@@ -286,7 +286,7 @@
   unsigned *slot; /* slot in return struct */
 } mem_table_struct;
 
-static int compare_mem_table_structs(const void *a, const void *b){
+static int compare_mem_table_structs(const void *a, const void *b) {
   return strcmp(((const mem_table_struct*)a)->name,((const mem_table_struct*)b)->name);
 }
 
@@ -352,7 +352,7 @@
 unsigned kb_mapped;
 unsigned kb_pagetables;
 
-void meminfo(void){
+void meminfo(void) {
   char namebuf[16]; /* big enough to hold any row name */
   mem_table_struct findme = { namebuf, NULL};
   mem_table_struct *found;
@@ -392,11 +392,11 @@
   kb_inactive = ~0U;
 
   head = buf;
-  for(;;){
+  for (;;) {
     tail = strchr(head, ':');
-    if(!tail) break;
+    if (!tail) break;
     *tail = '\0';
-    if(strlen(head) >= sizeof(namebuf)){
+    if (strlen(head) >= sizeof(namebuf)) {
       head = tail+1;
       goto nextline;
     }
@@ -405,18 +405,18 @@
         sizeof(mem_table_struct), compare_mem_table_structs
     );
     head = tail+1;
-    if(!found) goto nextline;
+    if (!found) goto nextline;
     *(found->slot) = strtoul(head,&tail,10);
 nextline:
     tail = strchr(head, '\n');
-    if(!tail) break;
+    if (!tail) break;
     head = tail+1;
   }
-  if(!kb_low_total){  /* low==main except with large-memory support */
+  if (!kb_low_total) {  /* low==main except with large-memory support */
     kb_low_total = kb_main_total;
     kb_low_free  = kb_main_free;
   }
-  if(kb_inactive==~0U){
+  if (kb_inactive==~0U) {
     kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry;
   }
   kb_swap_used = kb_swap_total - kb_swap_free;
@@ -432,7 +432,7 @@
   unsigned *slot;       /* slot in return struct */
 } vm_table_struct;
 
-static int compare_vm_table_structs(const void *a, const void *b){
+static int compare_vm_table_structs(const void *a, const void *b) {
   return strcmp(((const vm_table_struct*)a)->name,((const vm_table_struct*)b)->name);
 }
 
@@ -462,7 +462,7 @@
 unsigned vm_allocstall; // times a page allocator ran direct reclaim
 unsigned vm_pgrotated; // pages rotated to the tail of the LRU for immediate reclaim
 
-void vminfo(void){
+void vminfo(void) {
   char namebuf[16]; /* big enough to hold any row name */
   vm_table_struct findme = { namebuf, NULL};
   vm_table_struct *found;
@@ -499,11 +499,11 @@
   FILE_TO_BUF(VMINFO_FILE,vminfo_fd);
 
   head = buf;
-  for(;;){
+  for (;;) {
     tail = strchr(head, ' ');
-    if(!tail) break;
+    if (!tail) break;
     *tail = '\0';
-    if(strlen(head) >= sizeof(namebuf)){
+    if (strlen(head) >= sizeof(namebuf)) {
       head = tail+1;
       goto nextline;
     }
@@ -512,15 +512,15 @@
         sizeof(vm_table_struct), compare_vm_table_structs
     );
     head = tail+1;
-    if(!found) goto nextline;
+    if (!found) goto nextline;
     *(found->slot) = strtoul(head,&tail,10);
 nextline:
 
-//if(found) fprintf(stderr,"%s=%d\n",found->name,*(found->slot));
+//if (found) fprintf(stderr,"%s=%d\n",found->name,*(found->slot));
 //else      fprintf(stderr,"%s not found\n",findme.name);
 
     tail = strchr(head, '\n');
-    if(!tail) break;
+    if (!tail) break;
     head = tail+1;
   }
 }
diff --git a/tools/top-LTP/proc/whattime.c b/tools/top-LTP/proc/whattime.c
index a14eaf7..4ab5525 100644
--- a/tools/top-LTP/proc/whattime.c
+++ b/tools/top-LTP/proc/whattime.c
@@ -56,7 +56,7 @@
   uphours = upminutes / 60;
   uphours = uphours % 24;
   upminutes = upminutes % 60;
-  if(uphours)
+  if (uphours)
     pos += sprintf(buf + pos, "%2d:%02d, ", uphours, upminutes);
   else
     pos += sprintf(buf + pos, "%d min, ", upminutes);
diff --git a/tools/top-LTP/top.c b/tools/top-LTP/top.c
index 688b789..accb0c6 100644
--- a/tools/top-LTP/top.c
+++ b/tools/top-LTP/top.c
@@ -188,16 +188,16 @@
 static int sort_P_TME (const proc_t **P, const proc_t **Q)
 {
    if (Frame_ctimes) {
-      if ( ((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
+      if (((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
         < ((*Q)->cutime + (*Q)->cstime + (*Q)->utime + (*Q)->stime) )
            return SORT_lt;
-      if ( ((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
+      if (((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
         > ((*Q)->cutime + (*Q)->cstime + (*Q)->utime + (*Q)->stime) )
            return SORT_gt;
    } else {
-      if ( ((*P)->utime + (*P)->stime) < ((*Q)->utime + (*Q)->stime))
+      if (((*P)->utime + (*P)->stime) < ((*Q)->utime + (*Q)->stime))
          return SORT_lt;
-      if ( ((*P)->utime + (*P)->stime) > ((*Q)->utime + (*Q)->stime))
+      if (((*P)->utime + (*P)->stime) > ((*Q)->utime + (*Q)->stime))
          return SORT_gt;
    }
    return SORT_eq;
@@ -787,8 +787,8 @@
 static uid_t selection_uid;
 
 // FIXME: this is "temporary" code we hope
-static int good_uid(const proc_t *restrict const pp){
-   switch(selection_type){
+static int good_uid(const proc_t *restrict const pp) {
+   switch(selection_type) {
    case 'p':
       return 1;
    case 0:
@@ -808,19 +808,19 @@
 }
 
 // swiped from ps, and ought to be in libproc
-static const char *parse_uid(const char *restrict const str, uid_t *restrict const ret){
+static const char *parse_uid(const char *restrict const str, uid_t *restrict const ret) {
    struct passwd *passwd_data;
    char *endp;
    unsigned long num;
    static const char uidrange[] = "User ID out of range.";
    static const char uidexist[] = "User name does not exist.";
    num = strtoul(str, &endp, 0);
-   if(*endp != '\0'){  /* hmmm, try as login name */
+   if (*endp != '\0') {  /* hmmm, try as login name */
       passwd_data = getpwnam(str);
-      if(!passwd_data)    return uidexist;
+      if (!passwd_data)    return uidexist;
       num = passwd_data->pw_uid;
    }
-   if(num > 0xfffffffeUL) return uidrange;
+   if (num > 0xfffffffeUL) return uidrange;
    *ret = num;
    return 0;
 }
@@ -996,7 +996,7 @@
    const HST_t *ptr;
    tmp.pid = this->pid;
    ptr = bsearch(&tmp, hist_sav, maxt_sav, sizeof tmp, sort_HST_t);
-   if(ptr) tics -= ptr->tics;
+   if (ptr) tics -= ptr->tics;
 }
 #endif
 
@@ -1241,7 +1241,7 @@
 
    fprintf(stderr,"\n%d %d %f %d\n"
       , rc->mode_altscr, rc->mode_irixps, rc->delay_time, rc->win_index);
-   while(i < 4) {
+   while (i < 4) {
       w = &rc->win[i++];
       fprintf(stderr, "<%s> <%s> %d %08x %d %d %d %d %d\n"
          , w->winname, w->fieldscur, w->sortindx, w->winflags, w->maxtasks
@@ -1495,11 +1495,11 @@
    *cp++ = tmp + '0';
 
    tmp = Curwin->rc.winflags;
-// if ( Secure_mode)       *cp++ = 's';     // stupid to have in local rcfile
-   if ( tmp & Show_CTIMES) *cp++ = 'S';
-   if ( tmp & Show_CMDLIN) *cp++ = 'c';
+// if (Secure_mode)       *cp++ = 's';     // stupid to have in local rcfile
+   if (tmp & Show_CTIMES) *cp++ = 'S';
+   if (tmp & Show_CMDLIN) *cp++ = 'c';
    if (~tmp & Show_IDLEPS) *cp++ = 'i';
-// if (                  ) *cp++ = 'H';     // 'H' = show threads (yea, sure)
+// if () *cp++ = 'H';     // 'H' = show threads (yea, sure)
    if (~tmp & View_MEMORY) *cp++ = 'm';
    if (~tmp & View_LOADAV) *cp++ = 'l';
    if (~tmp & View_STATES) *cp++ = 't';
@@ -1590,7 +1590,7 @@
    for (;;) {
       c = *cp++;
       if (!c) break;
-      if(isupper(c)) upper[c&0x1f]++;
+      if (isupper(c)) upper[c&0x1f]++;
       else           lower[c&0x1f]++;
    }
 
@@ -1772,7 +1772,7 @@
 	          std_err(fmtmk("bad file arg; failed to fopen '%s' for reading",cp));
 	       retcode = fscanf(datafile, " MaxTasks:%d RunningTasks:%d SleepingTasks:%d StoppedTasks:%d ZombieTasks:%d", 
 		                &Task1, &Task2, &Task3, &Task4, &Task5);
-	       while( retcode == 5 )
+	       while ( retcode == 5 )
                {
 		  loopcntr++;
                   fgets(buff, BUFF_SIZE, datafile);
@@ -1905,7 +1905,7 @@
                   if (errmsg) std_err(errmsg);
                   selection_type = 'u';
                   cp += snprintf(Curwin->colusrnam, USRNAMSIZ-1, "%s", cp); // FIXME: junk
-               } while(0);
+               } while (0);
                break;
             case 'U':
                do {
@@ -1918,7 +1918,7 @@
                   if (errmsg) std_err(errmsg);
                   selection_type = 'U';
                   cp += snprintf(Curwin->colusrnam, USRNAMSIZ-1, "%s", cp); // FIXME: junk
-               } while(0);
+               } while (0);
                break;
             default :
                std_err(fmtmk("unknown argument '%c'\nusage:\t%s%s"
@@ -2701,7 +2701,7 @@
                break;
             }
             selection_type = 'u';
-         } while(0);
+         } while (0);
          break;
 
       case 'U':
@@ -2723,7 +2723,7 @@
                break;
             }
             selection_type = 'U';
-         } while(0);
+         } while (0);
          break;
 
       case 'w':
@@ -2954,7 +2954,7 @@
 
       smpcpu = cpus_refresh(smpcpu);
 
-      if ( CHKw(Curwin, View_CPUSUM)) {
+      if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
 	 if (o_flag)
@@ -3192,7 +3192,7 @@
    lwin = 1;
    i = 0;
 
-   while ( -1 != ppt[i]->pid && *lscr < Max_lines  &&  (!q->winlines || (lwin <= q->winlines)) ) {
+   while (-1 != ppt[i]->pid && *lscr < Max_lines  &&  (!q->winlines || (lwin <= q->winlines))) {
       if ((CHKw(q, Show_IDLEPS) || ('S' != ppt[i]->state && 'Z' != ppt[i]->state))
       && good_uid(ppt[i]) ) {
          /*
diff --git a/tools/top-LTP/top.h b/tools/top-LTP/top.h
index 5a38b7e..e46f272 100644
--- a/tools/top-LTP/top.h
+++ b/tools/top-LTP/top.h
@@ -97,12 +97,12 @@
                  highly optimized to save them ol' precious cycles! */
 #define SCB_NUM1(f,n) \
    static int sort_ ## f (const proc_t **P, const proc_t **Q) { \
-      if (        (*P)->n < (*Q)->n  ) return SORT_lt; \
+      if ((*P)->n < (*Q)->n) return SORT_lt; \
       if (likely( (*P)->n > (*Q)->n )) return SORT_gt; \
       return SORT_eq; }
 #define SCB_NUM2(f,n1,n2) \
    static int sort_ ## f (const proc_t **P, const proc_t **Q) { \
-      if (        ((*P)->n1 - (*P)->n2) < ((*Q)->n1 - (*Q)->n2)  ) return SORT_lt; \
+      if (((*P)->n1 - (*P)->n2) < ((*Q)->n1 - (*Q)->n2)) return SORT_lt; \
       if (likely( ((*P)->n1 - (*P)->n2) > ((*Q)->n1 - (*Q)->n2) )) return SORT_gt; \
       return SORT_eq; }
 #define SCB_NUMx(f,n) \
diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.c b/utils/benchmark/ebizzy-0.3/ebizzy.c
index 431fbdd..4fe94e0 100644
--- a/utils/benchmark/ebizzy-0.3/ebizzy.c
+++ b/utils/benchmark/ebizzy-0.3/ebizzy.c
@@ -326,7 +326,7 @@
 	int i, j;
 
 	for (i = 0; i < chunks; i++) {
-		for(j = 0; j < chunk_size / record_size; j++)
+		for (j = 0; j < chunk_size / record_size; j++)
 			mem[i][j] = (record_t) j;
 		/* Prevent coalescing by alternating permissions */
 		if (use_permissions && (i % 2) == 0)
@@ -342,7 +342,7 @@
 	record_t *p;
 	record_t *end = base + (size / record_size);
 
-	for(p = base; p < end; p++)
+	for (p = base; p < end; p++)
 		if (*p == key)
 			return p;
 	return NULL;
@@ -401,7 +401,7 @@
 				     + 1) * record_size;
 		copy = alloc_mem(copy_size);
 
-		if ( touch_pages ) {
+		if (touch_pages) {
 			touch_mem((char *) copy, copy_size);
 		} else {
 		
diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.h b/utils/benchmark/ebizzy-0.3/ebizzy.h
index ad113b4..95fa3d2 100644
--- a/utils/benchmark/ebizzy-0.3/ebizzy.h
+++ b/utils/benchmark/ebizzy-0.3/ebizzy.h
@@ -19,7 +19,7 @@
  * FreeBSD compatibility stuff
  */
 #ifdef _freebsd
-#define mallopt(arg1, arg2) do { } while(0);
+#define mallopt(arg1, arg2) do { } while (0);
 #endif
 
 /*