Cleanup style and get rid of conflicts problems.
Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
diff --git a/testcases/kernel/device-drivers/acpi/LtpAcpiCmds.c b/testcases/kernel/device-drivers/acpi/LtpAcpiCmds.c
index ceb49fb..7ee865a 100644
--- a/testcases/kernel/device-drivers/acpi/LtpAcpiCmds.c
+++ b/testcases/kernel/device-drivers/acpi/LtpAcpiCmds.c
@@ -107,14 +107,14 @@
static int ltpdev_open(struct block_device *dev, fmode_t mode)
{
printk(KERN_ALERT "ltpdev_open \n");
- return 0;
+ return 0;
}
static int ltpdev_release(struct gendisk *disk, fmode_t mode)
{
printk(KERN_ALERT "ltpdev_release \n");
- return 0;
+ return 0;
}
static u32 ltp_test_power_button_ev_handler(void *context)
@@ -447,7 +447,7 @@
break;
}
- return 0;
+ return 0;
}
static acpi_status ltp_get_dev_callback (acpi_handle obj, u32 depth, void *context, void **ret)
@@ -490,7 +490,7 @@
static acpi_status acpi_ec_io_ports (struct acpi_resource *resource, void *context)
{
- return 0;
+ return 0;
}
#if 0
@@ -578,7 +578,7 @@
if (!gd_ptr) {
printk(KERN_ALERT "ERROR getting memory !!!\n");
- return 0;
+ return 0;
}
gd_ptr = alloc_disk(1);
@@ -597,7 +597,7 @@
add_disk(gd_ptr);
- return 0;
+ return 0;
}
void cleanup_module(void)
diff --git a/testcases/kernel/device-drivers/acpi/LtpAcpiMain.c b/testcases/kernel/device-drivers/acpi/LtpAcpiMain.c
index 9284b50..3ca4868 100644
--- a/testcases/kernel/device-drivers/acpi/LtpAcpiMain.c
+++ b/testcases/kernel/device-drivers/acpi/LtpAcpiMain.c
@@ -73,7 +73,7 @@
printf("ERROR: Create/open block device failed\n");
}
- return 0;
+ return 0;
}
int LTP_acpi_open_block_device()
diff --git a/testcases/kernel/device-drivers/agp/kernel_space/tagp.c b/testcases/kernel/device-drivers/agp/kernel_space/tagp.c
index fde9fd8..a1f8bb7 100644
--- a/testcases/kernel/device-drivers/agp/kernel_space/tagp.c
+++ b/testcases/kernel/device-drivers/agp/kernel_space/tagp.c
@@ -98,11 +98,11 @@
* operations structure
*/
static int tagp_open(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
static int tagp_close(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
/*
@@ -651,7 +651,7 @@
printk("tagp: PCI module init success.\n");
printk("tagp: Registration success.\n");
- return 0;
+ return 0;
}
/*
diff --git a/testcases/kernel/device-drivers/agp/user_space/user_tagp.c b/testcases/kernel/device-drivers/agp/user_space/user_tagp.c
index 1fbe939..7cfa764 100644
--- a/testcases/kernel/device-drivers/agp/user_space/user_tagp.c
+++ b/testcases/kernel/device-drivers/agp/user_space/user_tagp.c
@@ -110,7 +110,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
@@ -288,5 +288,5 @@
exit(1);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/device-drivers/base/tbase/tbase.c b/testcases/kernel/device-drivers/base/tbase/tbase.c
index 5be5b60..bcdd495 100644
--- a/testcases/kernel/device-drivers/base/tbase/tbase.c
+++ b/testcases/kernel/device-drivers/base/tbase/tbase.c
@@ -84,11 +84,11 @@
};
static int tbase_open(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
static int tbase_close(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
/* my bus stuff */
@@ -416,7 +416,7 @@
}
else {
printk("tbase: Device added to bus\n");
- return 0;
+ return 0;
}
}
@@ -611,7 +611,7 @@
else {
printk("tbase: created dev sysfs file\n");
device_remove_file(dev, &dev_attr_test_id);
- return 0;
+ return 0;
}
}
@@ -656,7 +656,7 @@
else {
printk("tbase: created bus sysfs file\n");
bus_remove_file(bus, &bus_attr_test_id);
- return 0;
+ return 0;
}
}
@@ -677,7 +677,7 @@
else {
printk("tbase: created class sysfs file\n");
class_remove_file(cls, &class_attr_test_id);
- return 0;
+ return 0;
}
}
@@ -788,7 +788,7 @@
}
else {
printk("tbase: Registered sysdev \n");
- return 0;
+ return 0;
}
}
@@ -822,7 +822,7 @@
/* call any other init functions you might use here */
printk("tbase: Registration success.\n");
- return 0;
+ return 0;
}
/*
diff --git a/testcases/kernel/device-drivers/base/user_base/user_tbase.c b/testcases/kernel/device-drivers/base/user_base/user_tbase.c
index b697999..1aac7da 100644
--- a/testcases/kernel/device-drivers/base/user_base/user_tbase.c
+++ b/testcases/kernel/device-drivers/base/user_base/user_tbase.c
@@ -111,7 +111,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
@@ -252,5 +252,5 @@
exit(1);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c
index 29db5d2..1aed544 100644
--- a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c
+++ b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/tmod.c
@@ -69,11 +69,11 @@
* operations structure
*/
static int tmod_open(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
static int tmod_close(struct inode *ino, struct file *f) {
- return 0;
+ return 0;
}
/*
@@ -242,7 +242,7 @@
/* call any other init functions you might use here */
printk("tmod: Registration success.\n");
- return 0;
+ return 0;
}
/*
diff --git a/testcases/kernel/device-drivers/dev_sim_framework/user_space/user_tmod.c b/testcases/kernel/device-drivers/dev_sim_framework/user_space/user_tmod.c
index f49c0be..30e7808 100644
--- a/testcases/kernel/device-drivers/dev_sim_framework/user_space/user_tmod.c
+++ b/testcases/kernel/device-drivers/dev_sim_framework/user_space/user_tmod.c
@@ -115,7 +115,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
@@ -154,5 +154,5 @@
exit(1);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/device-drivers/drm/user_space/user_tdrm.c b/testcases/kernel/device-drivers/drm/user_space/user_tdrm.c
index d9925d8..7443bc8 100644
--- a/testcases/kernel/device-drivers/drm/user_space/user_tdrm.c
+++ b/testcases/kernel/device-drivers/drm/user_space/user_tdrm.c
@@ -109,7 +109,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
diff --git a/testcases/kernel/device-drivers/include/includeTest.c b/testcases/kernel/device-drivers/include/includeTest.c
index 8a49588..77bc62a 100644
--- a/testcases/kernel/device-drivers/include/includeTest.c
+++ b/testcases/kernel/device-drivers/include/includeTest.c
@@ -85,12 +85,12 @@
static int test_open(struct inode *ino, struct file *f) {
printk("device open\n");
- return 0;
+ return 0;
}
static int test_close(struct inode *ino, struct file *f) {
printk("device closed\n");
- return 0;
+ return 0;
}
static int test_ioctl(struct inode *ino, struct file *f, unsigned int cmd, unsigned long l) {
@@ -123,7 +123,7 @@
static int ltp_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
{
- return 0;
+ return 0;
}
static int test_init_module(void) {
diff --git a/testcases/kernel/device-drivers/include/userBlockInclude.c b/testcases/kernel/device-drivers/include/userBlockInclude.c
index 2dc2b69..e884c24 100644
--- a/testcases/kernel/device-drivers/include/userBlockInclude.c
+++ b/testcases/kernel/device-drivers/include/userBlockInclude.c
@@ -62,7 +62,7 @@
printf("ERROR: Create/open block device failed\n");
}
- return 0;
+ return 0;
printf("Block Include Test complete.\n");
}
diff --git a/testcases/kernel/device-drivers/nls/userBlockNLS.c b/testcases/kernel/device-drivers/nls/userBlockNLS.c
index 94ce70b..8854b18 100644
--- a/testcases/kernel/device-drivers/nls/userBlockNLS.c
+++ b/testcases/kernel/device-drivers/nls/userBlockNLS.c
@@ -62,7 +62,7 @@
printf("ERROR: Create/open block device failed\n");
}
- return 0;
+ return 0;
}
int open_block_device()
diff --git a/testcases/kernel/device-drivers/pci/user_tpci/user_tpci.c b/testcases/kernel/device-drivers/pci/user_tpci/user_tpci.c
index 09da9b2..eb2ba96 100644
--- a/testcases/kernel/device-drivers/pci/user_tpci/user_tpci.c
+++ b/testcases/kernel/device-drivers/pci/user_tpci/user_tpci.c
@@ -98,7 +98,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
diff --git a/testcases/kernel/device-drivers/tbio/user_space/user_tbio.c b/testcases/kernel/device-drivers/tbio/user_space/user_tbio.c
index 6d6a514..96f0547 100644
--- a/testcases/kernel/device-drivers/tbio/user_space/user_tbio.c
+++ b/testcases/kernel/device-drivers/tbio/user_space/user_tbio.c
@@ -138,7 +138,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
@@ -337,5 +337,5 @@
exit(1);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/device-drivers/usb/tusb/tusb.c b/testcases/kernel/device-drivers/usb/tusb/tusb.c
index d946222..a6e713b 100644
--- a/testcases/kernel/device-drivers/usb/tusb/tusb.c
+++ b/testcases/kernel/device-drivers/usb/tusb/tusb.c
@@ -111,7 +111,7 @@
static int tusb_probe(struct usb_interface *intf, const struct usb_device_id *id) {
printk("tusb: Entered probe function\n");
- return 0;
+ return 0;
}
@@ -146,22 +146,22 @@
static int test_dealloc_dev(struct usb_device *dev) {
printk("Entered test_dealloc_dev\n");
- return 0;
+ return 0;
}
static int test_get_current_frame_number(struct usb_device *dev) {
printk("Entered test_get_current_frame_number\n");
- return 0;
+ return 0;
}
static int test_submit_urb(struct urb *purb) {
printk("Entered test_submit_urb\n");
- return 0;
+ return 0;
}
static int test_unlink_urb(struct urb *purb) {
printk("Entered test_unlink_urb\n");
- return 0;
+ return 0;
}
static struct usb_operations test_device_operations = {
diff --git a/testcases/kernel/device-drivers/usb/user_usb/user_tusb.c b/testcases/kernel/device-drivers/usb/user_usb/user_tusb.c
index edf4539..b189c9a 100644
--- a/testcases/kernel/device-drivers/usb/user_usb/user_tusb.c
+++ b/testcases/kernel/device-drivers/usb/user_usb/user_tusb.c
@@ -96,7 +96,7 @@
}
else {
printf("Device opened successfully \n");
- return 0;
+ return 0;
}
}
diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
index 5b8f9d0..bae8012 100644
--- a/testcases/kernel/fs/doio/doio.c
+++ b/testcases/kernel/fs/doio/doio.c
@@ -4174,7 +4174,7 @@
free(cache);
cache = NULL;
cache_size = 0;
- return 0;
+ return 0;
}
free_slot = NULL;
diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
index b8ee401..d0a0644 100644
--- a/testcases/kernel/fs/doio/growfiles.c
+++ b/testcases/kernel/fs/doio/growfiles.c
@@ -1572,7 +1572,7 @@
}
} /* endfor */
- return 0;
+ return 0;
}
/***********************************************************************
@@ -1679,7 +1679,7 @@
exit(1);
}
- return 0;
+ return 0;
}
/***********************************************************************
@@ -2222,14 +2222,14 @@
if (Debug > 3)
printf("%s: %d DEBUG4 %s/%d: Not shrinking file - not time, iter=%d, cnt=%d\n",
Progname, Pid, __FILE__, __LINE__, trunc_inter, shrink_cnt);
- return 0; /* not this time */
+ return 0; /* not this time */
}
if (Mode & MODE_FIFO) {
if (Debug > 5)
printf("%s: %d DEBUG5 %s/%d: Not attempting to shrink a FIFO\n",
Progname, Pid, __FILE__, __LINE__);
- return 0; /* can not truncate fifo */
+ return 0; /* can not truncate fifo */
}
lkfile(fd, LOCK_EX, LKLVL0);
@@ -2354,7 +2354,7 @@
if (Debug > 3)
printf("%s: %d DEBUG4 %s/%d: No write validation, Grow_incr = %d, offset = %ld\n",
Progname, Pid, __FILE__, __LINE__, Grow_incr, Woffset);
- return 0; /* no check */
+ return 0; /* no check */
}
/*
@@ -2376,7 +2376,7 @@
printf("%s%s: %d DEBUG2 %s/%d: %d File size (%d) smaller than where last wrote (%ld)- no write validation\n",
Progname, TagName, Pid, __FILE__, __LINE__, Iter_cnt, fsize, Woffset);
lkfile(fd, LOCK_UN, LKLVL0);
- return 0; /* no validation, but not an error */
+ return 0; /* no validation, but not an error */
} else if (fsize < (Woffset + Grow_incr)) {
/*
@@ -2507,7 +2507,7 @@
printf("%s: %d DEBUG7 %s/%d: No corruption detected on write validation , offset = %ld, size = %d\n",
Progname, Pid, __FILE__, __LINE__, Woffset, Grow_incr);
- return 0; /* all is well */
+ return 0; /* all is well */
}
/***********************************************************************
@@ -2566,7 +2566,7 @@
Progname, Pid, __FILE__, __LINE__);
lkfile(fd, LOCK_UN, LKLVL0);
- return 0;
+ return 0;
}
if (Debug > 2)
@@ -2804,7 +2804,7 @@
}
}
- return 0;
+ return 0;
}
#ifndef linux
diff --git a/testcases/kernel/fs/doio/iogen.c b/testcases/kernel/fs/doio/iogen.c
index 26cd74e..4f46099 100644
--- a/testcases/kernel/fs/doio/iogen.c
+++ b/testcases/kernel/fs/doio/iogen.c
@@ -622,7 +622,7 @@
if (sc->m_flags & SY_WRITE)
req->r_data.sswrite.r_pattern = pattern;
- return 0;
+ return 0;
}
#endif
@@ -911,7 +911,7 @@
break;
}
- return 0;
+ return 0;
}
/*
@@ -976,7 +976,7 @@
if (r_opt) {
rec->f_riou = Rawmult;
- return 0;
+ return 0;
}
#ifdef CRAY
@@ -1037,7 +1037,7 @@
#endif /* CRAY */
}
- return 0;
+ return 0;
}
/*
@@ -1866,7 +1866,7 @@
}
}
- return 0;
+ return 0;
}
int
@@ -1973,7 +1973,7 @@
fprintf(stream, "\tthe number by blocks, kilobytes, or megabytes. If no trailing\n");
fprintf(stream, "\tmultiplier is present, the number is interpreted as bytes\n");
- return 0;
+ return 0;
}
/*
@@ -1985,5 +1985,5 @@
FILE *stream;
{
fprintf(stream, "usage%s: iogen [-hoq] [-a aio_type,...] [-f flag[,flag...]] [-i iterations] [-p outpipe] [-m offset-mode] [-s syscall[,syscall...]] [-t mintrans] [-T maxtrans] [ -O file-create-flags ] [[len:]file ...]\n", TagName);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/rand.c b/testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/rand.c
index dab7f2c..65febba 100644
--- a/testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/rand.c
+++ b/testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/rand.c
@@ -144,7 +144,7 @@
int i;
if ((mod == 0) || (mod == 1))
- return 0;
+ return 0;
if (!(mod >> 8))
num_bytes = 1;
diff --git a/testcases/kernel/fs/fs-bench/create-files.c b/testcases/kernel/fs/fs-bench/create-files.c
index c513538..428c354 100644
--- a/testcases/kernel/fs/fs-bench/create-files.c
+++ b/testcases/kernel/fs/fs-bench/create-files.c
@@ -74,7 +74,7 @@
end:
fprintf(stderr,"\nTotal create files: %d\n",filecount);
printf("Done\n");
- return 0;
+ return 0;
}
int showchar[]={124,47,45,92,124,47,45,92};
diff --git a/testcases/kernel/fs/fs-bench/random-access-del-create.c b/testcases/kernel/fs/fs-bench/random-access-del-create.c
index 0def260..551ab8e 100644
--- a/testcases/kernel/fs/fs-bench/random-access-del-create.c
+++ b/testcases/kernel/fs/fs-bench/random-access-del-create.c
@@ -113,7 +113,7 @@
disk_space_pool -= randomsize;
close(fd);
- return 0;
+ return 0;
}
#include <sys/stat.h>
@@ -135,5 +135,5 @@
}
dfilecount++;
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/fs-bench/random-del-create.c b/testcases/kernel/fs/fs-bench/random-del-create.c
index 46006a1..240da4d 100644
--- a/testcases/kernel/fs/fs-bench/random-del-create.c
+++ b/testcases/kernel/fs/fs-bench/random-del-create.c
@@ -110,7 +110,7 @@
cfilecount++;
disk_space_pool -= randomsize;
close(fd);
- return 0;
+ return 0;
}
#include <sys/stat.h>
@@ -131,5 +131,5 @@
return(-1);
}
dfilecount++;
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/mongo/map5.c b/testcases/kernel/fs/mongo/map5.c
index 54f4785..c7be077 100644
--- a/testcases/kernel/fs/mongo/map5.c
+++ b/testcases/kernel/fs/mongo/map5.c
@@ -23,7 +23,7 @@
for (n = 1; n < argc; n++) {
if (argc < 2) {
printf ("Used to see file maps \nUsage: %s filename1 [[..[filename2]...filename(N-1)] filenameN]\n", argv[0]);
- return 0;
+ tst_exit();
}
fd = open (argv[n], O_RDONLY);
if (fd == -1) {
@@ -74,5 +74,5 @@
close (fd);
// printf ("\n");
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/mongo/mongo_read.c b/testcases/kernel/fs/mongo/mongo_read.c
index 0031902..a5f0c1c 100644
--- a/testcases/kernel/fs/mongo/mongo_read.c
+++ b/testcases/kernel/fs/mongo/mongo_read.c
@@ -24,13 +24,13 @@
if (argc < 2) {
printf ("\nUsage: %s filename [,filename2 [,...] ] ]\n\n",argv[0]);
- return 0;
+ return 0;
}
buf = (char *)malloc (bufsize);
if (buf == 0) {
printf ("Malloc failed on %d\n", bufsize);
- return 0;
+ return 0;
}
/* Read all given files */
@@ -40,18 +40,18 @@
fd = open (argv[i], O_RDONLY);
if (fd == -1) {
printf ("Open failed (%s)\n", strerror (errno));
- return 0;
+ return 0;
}
/* read the file */
while ((rd = read (fd, buf, bufsize)) == bufsize);
if (rd == -1) {
printf ("Read failed (%s)\n", strerror (errno));
- return 0;
+ return 0;
}
close (fd);
}
free(buf);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/mongo/mongo_slinks.c b/testcases/kernel/fs/mongo/mongo_slinks.c
index 5c9c358..7068bf6 100644
--- a/testcases/kernel/fs/mongo/mongo_slinks.c
+++ b/testcases/kernel/fs/mongo/mongo_slinks.c
@@ -96,5 +96,5 @@
}
free (buffer);
free (line_buffer);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/mongo/reiser_fract_tree.c b/testcases/kernel/fs/mongo/reiser_fract_tree.c
index 79b0621..7080a47 100644
--- a/testcases/kernel/fs/mongo/reiser_fract_tree.c
+++ b/testcases/kernel/fs/mongo/reiser_fract_tree.c
@@ -296,7 +296,7 @@
strcat(tdir, "/");
strcat(tdir, dirname);
- return 0;
+ return 0;
}
/* assumes we are already chdir'd into a directory that the subtree is rooted
@@ -462,5 +462,5 @@
print_stats();
if (stats) printf("\nreiser_fract_tree finished\n");
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/fs/scsi/ltpfs/LtpfsCmds.c b/testcases/kernel/fs/scsi/ltpfs/LtpfsCmds.c
index 5c4be51..2c6befc 100644
--- a/testcases/kernel/fs/scsi/ltpfs/LtpfsCmds.c
+++ b/testcases/kernel/fs/scsi/ltpfs/LtpfsCmds.c
@@ -68,14 +68,14 @@
static int ltpdev_open (struct inode *pinode, struct file *pfile)
{
printk(KERN_ALERT "ltpdev_open \n");
- return 0;
+ return 0;
}
static int ltpdev_release (struct inode *pinode, struct file *pfile)
{
printk(KERN_ALERT "ltpdev_release \n");
- return 0;
+ return 0;
}
static int ltpdev_ioctl ( struct inode *pinode, struct file *pfile, unsigned int cmd, unsigned long arg )
@@ -165,12 +165,12 @@
break;
}
- return 0;
+ return 0;
}
static int ltp_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
{
- return 0;
+ return 0;
}
int init_module(void)
@@ -194,7 +194,7 @@
if (!gd_ptr) {
printk(KERN_ALERT "ERROR getting memory !!!\n");
- return 0;
+ return 0;
}
gd_ptr = alloc_disk(1);
@@ -212,7 +212,7 @@
add_disk(gd_ptr);
- return 0;
+ return 0;
}
void cleanup_module(void)
@@ -239,7 +239,7 @@
printk(KERN_ALERT "buffer.c coverage tests complete...\n");
- return 0;
+ return 0;
}
/**
* lookup_bdev - lookup a struct block_device by name
diff --git a/testcases/kernel/fs/scsi/ltpfs/main.c b/testcases/kernel/fs/scsi/ltpfs/main.c
index f5d761e..f2c6978 100644
--- a/testcases/kernel/fs/scsi/ltpfs/main.c
+++ b/testcases/kernel/fs/scsi/ltpfs/main.c
@@ -148,7 +148,7 @@
printf("Test Program complete..\n");
- return 0;
+ return 0;
}
int do_fs_thump_tests(char * path)
{
@@ -183,7 +183,7 @@
ftw(path, (void *)cleanup_dirs, MAXNUM);
}
- return 0;
+ return 0;
}
int cleanup_files(char * file, struct stat * statBuff, int flag)
{
@@ -205,7 +205,7 @@
//printf("%s:Cleaning up directory %s \n", __FUNCTION__, file);
if (strcmp(rootPath, file) == 0) {
- return 0;
+ return 0;
}
if (flag == FTW_F) {
@@ -300,7 +300,7 @@
perror(dir1);
return(errno);
}
- return 0;
+ return 0;
}
int changedir(char *dir) {
@@ -309,7 +309,7 @@
return (errno);
}
- return 0;
+ return 0;
}
int create_file(char *filename)
@@ -338,7 +338,7 @@
cFileCount++;
close(fileHandle);
- return 0;
+ return 0;
}
int delete_file(char *filename)
@@ -363,7 +363,7 @@
}
dFileCount++;
- return 0;
+ return 0;
}
int LTP_fs_open_block_device()
@@ -501,7 +501,7 @@
}
close(nullFileHandle);
printf("Success:\t%d\nFail:\t%d\n",openlog[SUCCESS],openlog[FAIL]);
- return 0;
+ return 0;
}
int open_read_close(char *fname)
@@ -551,7 +551,7 @@
close(fileHandle2);
close(fileHandle);
- return 0;
+ return 0;
}
int create_or_delete(char *fname)
@@ -576,7 +576,7 @@
return(MAXERROR);
}
- return 0;
+ return 0;
}
int do_random_create_delete(int maxNum)
diff --git a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
index 7105500..a1d47d8 100644
--- a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
+++ b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
@@ -566,7 +566,7 @@
}
- return 0;
+ return 0;
}
int validate_device(char * device)
{
@@ -806,7 +806,7 @@
if (eacces_err)
printf(" root access may be required\n");
}
- return 0;
+ return 0;
}
#ifdef SG_IO
@@ -856,7 +856,7 @@
else
printf("\n");
}
- return 0;
+ return 0;
}
#endif
@@ -1440,7 +1440,7 @@
}
}
close(sg_fd);
- return 0;
+ return 0;
}
static int do_inquiry(int sg_fd, void * resp, int mx_resp_len)
@@ -1469,7 +1469,7 @@
switch (res) {
case SG_ERR_CAT_CLEAN:
case SG_ERR_CAT_RECOVERED:
- return 0;
+ return 0;
default:
sg_chk_n_print3("Failed INQUIRY", &io_hdr);
return -1;
@@ -1665,7 +1665,7 @@
if (res < 0)
printf("main: ide hbtl_scan res=%d\n", res);
}
- return 0;
+ return 0;
}
static void install_handler (int sig_num, void (*sig_handler) (int sig))
@@ -1768,7 +1768,7 @@
(rcBuff[2] << 8) | rcBuff[3]);
*sect_sz = (rcBuff[4] << 24) | (rcBuff[5] << 16) |
(rcBuff[6] << 8) | rcBuff[7];
- return 0;
+ return 0;
}
/* Return of 0 -> success, -1 -> failure, 2 -> try again */
@@ -1802,7 +1802,7 @@
sg_chk_n_print3("synchronize cache", &io_hdr);
return -1;
}
- return 0;
+ return 0;
}
int sg_build_scsi_cdb(unsigned char * cdbp, int cdb_sz, unsigned int blocks,
@@ -1891,7 +1891,7 @@
"=%d\n", cdb_sz);
return 1;
}
- return 0;
+ return 0;
}
/* -1 -> unrecoverable error, 0 -> successful, 1 -> recoverable (ENOMEM),
@@ -1944,7 +1944,7 @@
memset(buff, 0, bs * blocks);
fprintf(stderr, ">> unable to read at blk=%d for "
"%d bytes, use zeros\n", from_block, bs * blocks);
- return 0; /* fudge success */
+ return 0; /* fudge success */
}
else
return -1;
@@ -1956,7 +1956,7 @@
#if SG_DEBUG
fprintf(stderr, "duration=%u ms\n", io_hdr.duration);
#endif
- return 0;
+ return 0;
}
/* -1 -> unrecoverable error, 0 -> successful, 1 -> recoverable (ENOMEM),
@@ -2008,7 +2008,7 @@
if (do_coe) {
fprintf(stderr, ">> ignored errors for out blk=%d for "
"%d bytes\n", to_block, bs * blocks);
- return 0; /* fudge success */
+ return 0; /* fudge success */
}
else
return -1;
@@ -2016,7 +2016,7 @@
if (diop && *diop &&
((io_hdr.info & SG_INFO_DIRECT_IO_MASK) != SG_INFO_DIRECT_IO))
*diop = 0; /* flag that dio not done (completely) */
- return 0;
+ return 0;
}
int get_num(char * buf)
@@ -3000,7 +3000,7 @@
}
printf("\n");
}
- return 0;
+ return 0;
}
static int find_dev_in_sg_arr(My_scsi_idlun * my_idlun, int host_no,
@@ -3569,7 +3569,7 @@
}
close(sg_fd);
- return 0;
+ return 0;
}
int do_scsi_read_buffer(char * device)
@@ -3811,7 +3811,7 @@
res = close(sg_fd);
if (res < 0) {
perror(ME "close error");
- return 0;
+ return 0;
}
#ifdef SG_DEBUG
if (clear)
@@ -3819,7 +3819,7 @@
else
printf("read buffer non-zero\n");
#endif
- return 0;
+ return 0;
}
/* Performs a 10 byte READ CAPACITY command and fetches response. There is
* evidently a 16 byte READ CAPACITY command coming.
@@ -3870,7 +3870,7 @@
(rcBuff[2] << 8) | rcBuff[3]);
*sect_sz = (rcBuff[4] << 24) | (rcBuff[5] << 16) |
(rcBuff[6] << 8) | rcBuff[7];
- return 0;
+ return 0;
}
int show_scsi_read_capacity(char * device)
@@ -3916,7 +3916,7 @@
printf(" Block size = %u bytes\n", block_size);
}
close(sg_fd);
- return 0;
+ return 0;
}
int do_scsi_reset_devices(char * device, int reset_opt)
{
@@ -3991,7 +3991,7 @@
perror("sg_reset: close error");
return 1;
}
- return 0;
+ return 0;
}
static int do_senddiag(int sg_fd, int sf_code, int pf_bit, int sf_bit,
@@ -4205,7 +4205,7 @@
printf("Default self test returned GOOD status\n");
}
close(sg_fd);
- return 0;
+ return 0;
}
static void do_start_stop(int fd, int start, int immed, int loej,
@@ -4426,7 +4426,7 @@
if (res < 0)
perror("sg_test_rwbuf: SG_SET_RESERVED_SIZE error");
#endif
- return 0;
+ return 0;
}
int mymemcmp (unsigned char *bf1, unsigned char *bf2, int len)
@@ -4716,7 +4716,7 @@
printf("Completed %d Test Unit Ready commands with %d errors\n",
num_turs, num_errs);
close(sg_fd);
- return 0;
+ return 0;
}
/* Returns 0 -> ok, 1 -> err, 2 -> recovered error */
static int do_sg_io(int sg_fd, unsigned char * buff)
@@ -4760,7 +4760,7 @@
SG_MAX_SENSE);
switch (res) {
case SG_ERR_CAT_CLEAN:
- return 0;
+ return 0;
case SG_ERR_CAT_RECOVERED:
return 2;
default:
@@ -4789,7 +4789,7 @@
return 1;
}
else
- return 0;
+ return 0;
#endif
}
@@ -4929,7 +4929,7 @@
intfield(pagestart + 18, 1, "Rotational Offset");
intfield(pagestart + 20, 2, "Rotational Rate");
printf("\n");
- return 0;
+ return 0;
}
@@ -4951,7 +4951,7 @@
intfield(pagestart + 10, 2, "Maximum Burst Size");
hexfield(pagestart + 12, 1, "DTDC");
printf("\n");
- return 0;
+ return 0;
}
@@ -4975,7 +4975,7 @@
bitfield(pagestart + 3, "Queue Algorithm Modifier", 0xf, 4);
intfield(pagestart + 6, 2, "Ready AEN Holdoff Period");
printf("\n");
- return 0;
+ return 0;
}
@@ -5003,7 +5003,7 @@
intfield(pagestart + 8, 1, "Write Retry Count");
intfield(pagestart + 10, 2, "Recovery Time Limit");
printf("\n");
- return 0;
+ return 0;
}
static int notch_parameters_page(int page_code)
@@ -5032,7 +5032,7 @@
getnbyte(pagestart + 20, 4));
printf("\n");
- return 0;
+ return 0;
}
static char *formatname(int format) {
@@ -5222,7 +5222,7 @@
intfield(pagestart + 8, 2, "Maximum Pre-fetch");
intfield(pagestart + 10, 2, "Maximum Pre-fetch Ceiling");
printf("\n");
- return 0;
+ return 0;
}
static int read_format_info(int page_code)
@@ -5249,7 +5249,7 @@
intfield(pagestart + 16, 2, "Track skew factor");
intfield(pagestart + 18, 2, "Cylinder skew factor");
printf("\n");
- return 0;
+ return 0;
}
@@ -5272,7 +5272,7 @@
intfield(pagestart + 10, 2, "Verify Recovery Time Limit (ms)");
printf("\n");
- return 0;
+ return 0;
}
static int peripheral_device_page(int page_code)
@@ -5318,7 +5318,7 @@
hexdatafield(pagestart + 8, bdlen, "Vendor Specific Data");
printf("\n");
- return 0;
+ return 0;
}
/* end */
@@ -5342,7 +5342,7 @@
printf("\n");
puts(name);
- return 0;
+ return 0;
}
/* end */
@@ -5642,7 +5642,7 @@
if (!pages_sup)
puts("No mode pages supported (SCSI-1?).");
- return 0;
+ return 0;
}
static int open_sg_dev(char * devname)
@@ -5856,7 +5856,7 @@
#if SG_DEBUG
fprintf(stderr, "duration=%u ms\n", io_hdr.duration);
#endif
- return 0;
+ return 0;
}
/* -1 -> unrecoverable error, 0 -> successful, 1 -> recoverable (ENOMEM),
@@ -5925,7 +5925,7 @@
if (diop && *diop &&
((io_hdr.info & SG_INFO_DIRECT_IO_MASK) != SG_INFO_DIRECT_IO))
*diop = 0; /* flag that dio not done (completely) */
- return 0;
+ return 0;
}
int do_scsi_sgm_read_write(char * device)
@@ -6780,7 +6780,7 @@
perror("starting io on sg device, error");
return -1;
}
- return 0;
+ return 0;
}
/* -1 -> unrecoverable error, 0 -> successful, 1 -> try again */
@@ -6845,7 +6845,7 @@
rep->resid = hp->resid;
if (rep->debug > 8)
fprintf(stderr, "sg_finish_io: completed %s\n", wr ? "WRITE" : "READ");
- return 0;
+ return 0;
}
int sg_prepare(int fd, int bs, int bpt, int * scsi_typep)
@@ -6874,7 +6874,7 @@
perror(ME "SG_SET_SCSI_ID error");
*scsi_typep = info.scsi_type;
}
- return 0;
+ return 0;
}
int do_scsi_sgp_read_write(char * device)
diff --git a/testcases/kernel/fs/scsi/ltpscsi/sg_err.c b/testcases/kernel/fs/scsi/ltpscsi/sg_err.c
index 90dab08..db65b14 100644
--- a/testcases/kernel/fs/scsi/ltpscsi/sg_err.c
+++ b/testcases/kernel/fs/scsi/ltpscsi/sg_err.c
@@ -1083,7 +1083,7 @@
(SG_ERR_DRIVER_SENSE == (0xf & driver_status)))
sg_print_sense(0, sense_buffer, sb_len);
}
- return 0;
+ return 0;
}
#ifdef SG_IO
diff --git a/testcases/kernel/hotplug/memory_hotplug/commands.c b/testcases/kernel/hotplug/memory_hotplug/commands.c
index d5f9979..23b3b95 100644
--- a/testcases/kernel/hotplug/memory_hotplug/commands.c
+++ b/testcases/kernel/hotplug/memory_hotplug/commands.c
@@ -270,11 +270,7 @@
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))
diff --git a/testcases/kernel/io/direct_io/diotest_routines.c b/testcases/kernel/io/direct_io/diotest_routines.c
index 7e5b2ec..ba05fbd 100644
--- a/testcases/kernel/io/direct_io/diotest_routines.c
+++ b/testcases/kernel/io/direct_io/diotest_routines.c
@@ -183,11 +183,7 @@
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/direct_io/dma_thread_diotest7.c b/testcases/kernel/io/direct_io/dma_thread_diotest7.c
index c927a48..ac3aa2d 100644
--- a/testcases/kernel/io/direct_io/dma_thread_diotest7.c
+++ b/testcases/kernel/io/direct_io/dma_thread_diotest7.c
@@ -187,7 +187,7 @@
}
}
- return 0;
+ return 0;
}
void *fork_thread (void *arg)
@@ -384,5 +384,5 @@
}
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/io/disktest/parse.c b/testcases/kernel/io/disktest/parse.c
index 6d363c2..d1854ac 100644
--- a/testcases/kernel/io/disktest/parse.c
+++ b/testcases/kernel/io/disktest/parse.c
@@ -730,11 +730,7 @@
/* 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)) {
diff --git a/testcases/kernel/io/ltp-aiodio/aio-stress.c b/testcases/kernel/io/ltp-aiodio/aio-stress.c
index 670ca97..e77f5be 100644
--- a/testcases/kernel/io/ltp-aiodio/aio-stress.c
+++ b/testcases/kernel/io/ltp-aiodio/aio-stress.c
@@ -366,7 +366,7 @@
}
}
- return 0;
+ return 0;
}
/* worker func to check the busy bits and get an io unit ready for use */
@@ -377,7 +377,7 @@
io->busy = IO_PENDING;
io->res = 0;
io->io_oper = oper;
- return 0;
+ return 0;
}
char *stage_name(int rw) {
@@ -526,7 +526,7 @@
struct io_unit *event_io;
if (oper == NULL) {
- return 0;
+ return 0;
}
if (oper->num_pending == 0)
@@ -554,7 +554,7 @@
fprintf(stderr, "%u errors on oper, last %u\n",
oper->num_err, oper->last_err);
}
- return 0;
+ return 0;
}
off_t random_byte_offset(struct io_oper *oper) {
@@ -704,11 +704,7 @@
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;
@@ -775,7 +771,7 @@
}
update_iou_counters(my_iocbs, ret, &stop_time);
t->num_global_pending += ret;
- return 0;
+ return 0;
}
/*
@@ -785,7 +781,7 @@
static int restart_oper(struct io_oper *oper) {
int new_rw = 0;
if (oper->last_err)
- return 0;
+ return 0;
/* this switch falls through */
switch(oper->rw) {
@@ -815,7 +811,7 @@
oper->rw = new_rw;
return 1;
}
- return 0;
+ return 0;
}
static int oper_runnable(struct io_oper *oper) {
@@ -837,7 +833,7 @@
exit(1);
}
if (S_ISREG(buf.st_mode) && buf.st_size < oper->start)
- return 0;
+ return 0;
return 1;
}
@@ -898,7 +894,7 @@
}
}
}
- return 0;
+ return 0;
}
void drop_shm() {
@@ -972,7 +968,7 @@
t->num_global_ios = num_files * depth;
t->num_global_events = t->num_global_ios;
- return 0;
+ return 0;
free_buffers:
if (t->ios)
@@ -1047,7 +1043,7 @@
unaligned_buffer = p;
p = (char*)((intptr_t) (p + page_size_mask) & ~page_size_mask);
aligned_buffer = p;
- return 0;
+ return 0;
free_buffers:
drop_shm();
@@ -1229,7 +1225,7 @@
exit(1);
}
}
- return 0;
+ return 0;
}
off_t parse_size(char *size_arg, off_t mult) {
diff --git a/testcases/kernel/io/ltp-aiodio/aiodio_append.c b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
index 232295c..f5a4bd5 100644
--- a/testcases/kernel/io/ltp-aiodio/aiodio_append.c
+++ b/testcases/kernel/io/ltp-aiodio/aiodio_append.c
@@ -81,7 +81,7 @@
}
}
}
- return 0;
+ return 0;
}
#define NUM_AIO 16
@@ -141,11 +141,7 @@
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) {
@@ -189,5 +185,5 @@
kill(pid[i], SIGTERM);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c b/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
index c3fc5eb..c85bd70 100644
--- a/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
+++ b/testcases/kernel/io/ltp-aiodio/aiodio_sparse.c
@@ -128,7 +128,7 @@
offset += r;
}
}
- return 0;
+ return 0;
}
volatile int got_signal;
diff --git a/testcases/kernel/io/ltp-aiodio/dio_append.c b/testcases/kernel/io/ltp-aiodio/dio_append.c
index e3817ee..61e7c79 100644
--- a/testcases/kernel/io/ltp-aiodio/dio_append.c
+++ b/testcases/kernel/io/ltp-aiodio/dio_append.c
@@ -89,7 +89,7 @@
}
}
}
- return 0;
+ return 0;
}
void dio_append(char *filename)
@@ -154,5 +154,5 @@
for (i = 0; i < num_children; i++) {
kill(pid[i], SIGTERM);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/io/ltp-aiodio/dio_sparse.c b/testcases/kernel/io/ltp-aiodio/dio_sparse.c
index 3550a0b..0230488 100644
--- a/testcases/kernel/io/ltp-aiodio/dio_sparse.c
+++ b/testcases/kernel/io/ltp-aiodio/dio_sparse.c
@@ -124,7 +124,7 @@
offset += r;
}
}
- return 0;
+ return 0;
}
volatile int got_signal;
diff --git a/testcases/kernel/io/ltp-aiodio/dio_truncate.c b/testcases/kernel/io/ltp-aiodio/dio_truncate.c
index bc71620..dce6698 100644
--- a/testcases/kernel/io/ltp-aiodio/dio_truncate.c
+++ b/testcases/kernel/io/ltp-aiodio/dio_truncate.c
@@ -92,7 +92,7 @@
}
} while (r > 0);
}
- return 0;
+ return 0;
}
void dio_append(char *filename, int fill)
@@ -164,5 +164,5 @@
kill(pid[i], SIGTERM);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/io/ltp-aiodio/read_checkzero.c b/testcases/kernel/io/ltp-aiodio/read_checkzero.c
index 7b9ae88..fcd537e 100644
--- a/testcases/kernel/io/ltp-aiodio/read_checkzero.c
+++ b/testcases/kernel/io/ltp-aiodio/read_checkzero.c
@@ -85,7 +85,7 @@
}
}
fprintf(stderr, "read_checkzero done\n");
- return 0;
+ return 0;
}
int main(int argc, char **argv)
@@ -99,5 +99,5 @@
read_eof(filename);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/io/writetest/writetest.c b/testcases/kernel/io/writetest/writetest.c
index 686c0eb..891e515 100644
--- a/testcases/kernel/io/writetest/writetest.c
+++ b/testcases/kernel/io/writetest/writetest.c
@@ -59,11 +59,7 @@
void buf_init(void )
{
static int seed = 0;
-<<<<<<< HEAD
if (seed == 0)
-=======
- if ( seed == 0 )
->>>>>>> master
seed = DefaultSeed;
srand(seed);
}
@@ -275,5 +271,5 @@
}
cleanup();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/ipc/semaphore/sem01.c b/testcases/kernel/ipc/semaphore/sem01.c
index 20d028b..ecf815a 100644
--- a/testcases/kernel/ipc/semaphore/sem01.c
+++ b/testcases/kernel/ipc/semaphore/sem01.c
@@ -62,7 +62,7 @@
errors++;
return 1;
}
- return 0;
+ return 0;
}
int semdown(int semid) {
@@ -75,7 +75,7 @@
errors++;
return 1;
}
- return 0;
+ return 0;
}
void delayloop() {
diff --git a/testcases/kernel/mce-test/tools/simple_process/simple_process.c b/testcases/kernel/mce-test/tools/simple_process/simple_process.c
index 00d3079..4832877 100644
--- a/testcases/kernel/mce-test/tools/simple_process/simple_process.c
+++ b/testcases/kernel/mce-test/tools/simple_process/simple_process.c
@@ -11,5 +11,5 @@
{
memset(p, 0, 128);
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/mem/libmm/mm_core_apis.c b/testcases/kernel/mem/libmm/mm_core_apis.c
index d631921..684d00e 100644
--- a/testcases/kernel/mem/libmm/mm_core_apis.c
+++ b/testcases/kernel/mem/libmm/mm_core_apis.c
@@ -143,7 +143,7 @@
}
tst_resm(TINFO, "Deleting shared memory segment.\n");
mm_core_delete(alloc_mem_ptr);
- return 0;
+ return 0;
}
}
}
@@ -363,7 +363,7 @@
}
tst_resm(TINFO, "test02: Deleting shared memory core area\n");
mm_core_delete(alloc_mem_ptr);
- return 0;
+ return 0;
}
/******************************************************************************/
diff --git a/testcases/kernel/mem/mem/mem01.c b/testcases/kernel/mem/mem/mem01.c
index da520bb..10e2a95 100644
--- a/testcases/kernel/mem/mem/mem01.c
+++ b/testcases/kernel/mem/mem/mem01.c
@@ -358,5 +358,5 @@
***************************************************************/
cleanup();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmap-corruption01.c b/testcases/kernel/mem/mmapstress/mmap-corruption01.c
index 84a885e..f1e3da0 100644
--- a/testcases/kernel/mem/mmapstress/mmap-corruption01.c
+++ b/testcases/kernel/mem/mmapstress/mmap-corruption01.c
@@ -172,7 +172,7 @@
}
count=0;
}
- return 0;
+ return 0;
}
void finish(int sig) {
diff --git a/testcases/kernel/mem/mmapstress/mmapstress02.c b/testcases/kernel/mem/mmapstress/mmapstress02.c
index beabf23..a58b466 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress02.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress02.c
@@ -190,7 +190,7 @@
tst_resm(TFAIL, "Test failed");
tst_rmdir();
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress03.c b/testcases/kernel/mem/mmapstress/mmapstress03.c
index 7250fa7..c449821 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress03.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress03.c
@@ -231,7 +231,7 @@
{
tst_resm(TFAIL, "Test failed");
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress04.c b/testcases/kernel/mem/mmapstress/mmapstress04.c
index b124681..8ac0290 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress04.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress04.c
@@ -291,7 +291,7 @@
tst_resm(TFAIL, "Test failed\n");
tst_rmdir();
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress05.c b/testcases/kernel/mem/mmapstress/mmapstress05.c
index 250cf0a..c555d5f 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress05.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress05.c
@@ -220,5 +220,5 @@
tst_resm(TFAIL, "Test failed\n");
tst_rmdir();
tst_exit();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress06.c b/testcases/kernel/mem/mmapstress/mmapstress06.c
index 8614072..7a248c4 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress06.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress06.c
@@ -112,7 +112,7 @@
{
tst_resm(TFAIL, "Test failed\n");
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress07.c b/testcases/kernel/mem/mmapstress/mmapstress07.c
index 6250d70..996ed0d 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress07.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress07.c
@@ -319,7 +319,7 @@
tst_resm(TFAIL, "Test failed\n");
tst_rmdir();
tst_exit();
- return 0;
+ return 0;
}
void ok_exit()
diff --git a/testcases/kernel/mem/mmapstress/mmapstress08.c b/testcases/kernel/mem/mmapstress/mmapstress08.c
index cc7265c..6fc312a 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress08.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress08.c
@@ -120,7 +120,7 @@
{
tst_resm(TFAIL, "Test failed\n");
tst_exit();
- return 0;
+ return 0;
}
#else /* defined(__i386__) || defined(__x86_64__) */
diff --git a/testcases/kernel/mem/mmapstress/mmapstress09.c b/testcases/kernel/mem/mmapstress/mmapstress09.c
index 2fd37e1..477290f 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress09.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress09.c
@@ -503,7 +503,7 @@
{
tst_resm(TFAIL, "Test failed\n");
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mmapstress/mmapstress10.c b/testcases/kernel/mem/mmapstress/mmapstress10.c
index dc137ed..1c1dcc5 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress10.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress10.c
@@ -948,7 +948,7 @@
tst_resm(TFAIL, "Test failed\n");
tst_rmdir();
tst_exit();
- return 0;
+ return 0;
}
/***** ** ** *****/
\ No newline at end of file
diff --git a/testcases/kernel/mem/mtest06/shmat1.c b/testcases/kernel/mem/mtest06/shmat1.c
index 9b3fc98..ad02f3c 100644
--- a/testcases/kernel/mem/mtest06/shmat1.c
+++ b/testcases/kernel/mem/mtest06/shmat1.c
@@ -586,5 +586,5 @@
}
}
fprintf(stdout, "TEST PASSED\n");
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/kernel/mem/mtest07/mallocstress.c b/testcases/kernel/mem/mtest07/mallocstress.c
index 74fc48a..c490975 100644
--- a/testcases/kernel/mem/mtest07/mallocstress.c
+++ b/testcases/kernel/mem/mtest07/mallocstress.c
@@ -237,7 +237,7 @@
my_yield();
}
/* Success! */
- return 0;
+ return 0;
}
/******************************************************************************/
diff --git a/testcases/kernel/mem/mtest07/shm_test.c b/testcases/kernel/mem/mtest07/shm_test.c
index 3b70cf1..29c626a 100644
--- a/testcases/kernel/mem/mtest07/shm_test.c
+++ b/testcases/kernel/mem/mtest07/shm_test.c
@@ -149,7 +149,7 @@
return -1;
}
}
- return 0;
+ return 0;
}
/******************************************************************************/
diff --git a/testcases/kernel/mem/vmtests/data_space.c b/testcases/kernel/mem/vmtests/data_space.c
index 0a5e8c9..6b70c64 100644
--- a/testcases/kernel/mem/vmtests/data_space.c
+++ b/testcases/kernel/mem/vmtests/data_space.c
@@ -361,7 +361,7 @@
++val;
}
-return 0;
+ return 0;
}
void bfill(buf, val, size)
diff --git a/testcases/kernel/mem/vmtests/stack_space.c b/testcases/kernel/mem/vmtests/stack_space.c
index 2975154..2bd9e07 100644
--- a/testcases/kernel/mem/vmtests/stack_space.c
+++ b/testcases/kernel/mem/vmtests/stack_space.c
@@ -79,7 +79,7 @@
tst_resm(TCONF,"Usage: %s <nchild> <chunk_size> <iterations>",prog);
tst_resm(TCONF,"DEFAULTS: 20 1024 50");
tst_exit();
- return 0;
+ return 0;
}
int main(argc, argv)
@@ -124,7 +124,7 @@
tst_tmpdir();
runtest();
/**NOT REACHED**/
- return 0;
+ return 0;
}
@@ -133,7 +133,7 @@
{
tst_resm(TCONF,"Bad argument - %s - could not parse as number.\n", str);
tst_exit();
- return 0;
+ return 0;
}
int runtest()
@@ -190,7 +190,7 @@
tst_exit();
/**NOT REACHED**/
- return 0;
+ return 0;
}
@@ -374,7 +374,7 @@
#ifdef DEBUG
tst_resm(TINFO, " ... more\n");
#endif
- return 0;
+ return 0;
}
}
#ifdef DEBUG
@@ -383,7 +383,7 @@
else
tst_resm(TINFO, "%d*%x\n", i-idx, buf[idx]);
#endif
- return 0;
+ return 0;
}
diff --git a/testcases/kernel/module/delete_module/dummy_del_mod.c b/testcases/kernel/module/delete_module/dummy_del_mod.c
index a0f31f0..55cc9ce 100644
--- a/testcases/kernel/module/delete_module/dummy_del_mod.c
+++ b/testcases/kernel/module/delete_module/dummy_del_mod.c
@@ -48,7 +48,7 @@
struct proc_dir_entry *proc_dummy;
proc_dummy = proc_mkdir("dummy", 0);
- return 0;
+ return 0;
}
static void __exit dummy_exit(void) {
diff --git a/testcases/kernel/module/delete_module/dummy_del_mod_dep.c b/testcases/kernel/module/delete_module/dummy_del_mod_dep.c
index 255dcda..ba8acef 100644
--- a/testcases/kernel/module/delete_module/dummy_del_mod_dep.c
+++ b/testcases/kernel/module/delete_module/dummy_del_mod_dep.c
@@ -42,7 +42,7 @@
proc_dummy = proc_mkdir("dummy_dep", 0);
dummy_func_test();
- return 0;
+ return 0;
}
static void __exit dummy_exit(void) {
diff --git a/testcases/kernel/numa/support_numa.c b/testcases/kernel/numa/support_numa.c
index 5a2513e..9b38df9 100644
--- a/testcases/kernel/numa/support_numa.c
+++ b/testcases/kernel/numa/support_numa.c
@@ -107,11 +107,7 @@
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/sched/clisrv/pthserv.c b/testcases/kernel/sched/clisrv/pthserv.c
index fdee421..5fdb6d1 100644
--- a/testcases/kernel/sched/clisrv/pthserv.c
+++ b/testcases/kernel/sched/clisrv/pthserv.c
@@ -68,7 +68,7 @@
if (n == 0)
{
dprt2(("%s: str_echo(): connection terminated\n", __FILE__));
- return 0; /* connection terminated */
+ return 0; /* connection terminated */
}
else if (n < 0)
{
diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c
index d5e7aa9..d8bbdab 100644
--- a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c
+++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c
@@ -138,7 +138,7 @@
}
}
}else
- return 0;
+ return 0;
fclose(fp);
@@ -149,25 +149,25 @@
for (k = j +1; k < logic_cpu_num; k++) {
if (cpu_map[j]==cpu_map[k]) {
/* Not proper HT support, with 3 logic processor in 1 cpu package*/
- return 0;
+ return 0;
}
}
if (ht_cpu[j] ==1) {
return 1;
}else
- return 0;
+ return 0;
}
}
/* in this case, processor[i] has ht flag, but is not ht enabled*/
if (j == logic_cpu_num) {
- return 0;
+ return 0;
}
}
}
if (i == logic_cpu_num) {
- return 0;
+ return 0;
}
- return 0;
+ return 0;
}
// return 0 means Pass,
diff --git a/testcases/kernel/syscalls/accept/accept01.c b/testcases/kernel/syscalls/accept/accept01.c
index 59e830e..5ee5cb4 100644
--- a/testcases/kernel/syscalls/accept/accept01.c
+++ b/testcases/kernel/syscalls/accept/accept01.c
@@ -111,15 +111,8 @@
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) {
+ 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();
diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c
index 1e77e57..1a1b1a5 100644
--- a/testcases/kernel/syscalls/access/access01.c
+++ b/testcases/kernel/syscalls/access/access01.c
@@ -161,27 +161,11 @@
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);
- /***************************************************************
- * perform global setup for test
- ***************************************************************/
setup();
- /***************************************************************
- * check looping state if -c option given
- ***************************************************************/
for (lc = 0; TEST_LOOPING(lc); lc++) {
Tst_count = 0;
@@ -222,16 +206,10 @@
}
- /***************************************************************
- * cleanup and exit
- ***************************************************************/
cleanup();
tst_exit();
}
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
void setup()
{
int fd;
@@ -292,4 +270,4 @@
TEST_CLEANUP;
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/access/access02.c b/testcases/kernel/syscalls/access/access02.c
index 40869f2..835c65a 100644
--- a/testcases/kernel/syscalls/access/access02.c
+++ b/testcases/kernel/syscalls/access/access02.c
@@ -134,11 +134,7 @@
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);
diff --git a/testcases/kernel/syscalls/access/access03.c b/testcases/kernel/syscalls/access/access03.c
index 8c99558..0387171 100644
--- a/testcases/kernel/syscalls/access/access03.c
+++ b/testcases/kernel/syscalls/access/access03.c
@@ -124,12 +124,6 @@
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);
@@ -457,4 +451,4 @@
/* remove the temporary directory and exit with
return code appropriate for results */
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/access/access04.c b/testcases/kernel/syscalls/access/access04.c
index ba46884..d8ed4fc 100644
--- a/testcases/kernel/syscalls/access/access04.c
+++ b/testcases/kernel/syscalls/access/access04.c
@@ -100,16 +100,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -229,4 +221,4 @@
*/
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/access/access05.c b/testcases/kernel/syscalls/access/access05.c
index dd3747b..57be98e 100644
--- a/testcases/kernel/syscalls/access/access05.c
+++ b/testcases/kernel/syscalls/access/access05.c
@@ -161,16 +161,8 @@
int ind;
/* Parse standard options given to run the test. */
-<<<<<<< HEAD
- 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);
-=======
- msg = parse_opts(ac, av, (option_t *) NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -386,4 +378,4 @@
*/
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/bdflush/bdflush01.c b/testcases/kernel/syscalls/bdflush/bdflush01.c
index 982de83..bd2abc4 100644
--- a/testcases/kernel/syscalls/bdflush/bdflush01.c
+++ b/testcases/kernel/syscalls/bdflush/bdflush01.c
@@ -116,15 +116,9 @@
/* */
/******************************************************************************/
extern void cleanup() {
-<<<<<<< HEAD
TEST_CLEANUP;
tst_rmdir();
-=======
-
- TEST_CLEANUP;
- tst_rmdir();
->>>>>>> master
}
/* Local Functions */
@@ -154,16 +148,6 @@
int main(int ac, char **av) {
long data;
-<<<<<<< HEAD
- 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);
-
- setup();
-
-=======
int lc; /* loop counter */
char *msg; /* message returned from parse_opts */
@@ -173,25 +157,15 @@
setup();
->>>>>>> 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();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/bind/bind01.c b/testcases/kernel/syscalls/bind/bind01.c
index 0523f9b..01811a5 100644
--- a/testcases/kernel/syscalls/bind/bind01.c
+++ b/testcases/kernel/syscalls/bind/bind01.c
@@ -114,11 +114,7 @@
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 4ec5bc4..3fc62ef 100644
--- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c
+++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c
@@ -139,11 +139,7 @@
/* 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 4fb7388..3628732 100644
--- a/testcases/kernel/syscalls/capget/capget01.c
+++ b/testcases/kernel/syscalls/capget/capget01.c
@@ -98,16 +98,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -154,4 +146,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/capget/capget02.c b/testcases/kernel/syscalls/capget/capget02.c
index c5713a7..61e5b54 100644
--- a/testcases/kernel/syscalls/capget/capget02.c
+++ b/testcases/kernel/syscalls/capget/capget02.c
@@ -128,16 +128,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -222,4 +214,4 @@
header.pid = INVALID_PID;
break;
}
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/chdir/chdir01.c b/testcases/kernel/syscalls/chdir/chdir01.c
index 4020d74..def6160 100644
--- a/testcases/kernel/syscalls/chdir/chdir01.c
+++ b/testcases/kernel/syscalls/chdir/chdir01.c
@@ -81,11 +81,7 @@
/* 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/chdir/chdir02.c b/testcases/kernel/syscalls/chdir/chdir02.c
index d1a2cba..62cecef 100644
--- a/testcases/kernel/syscalls/chdir/chdir02.c
+++ b/testcases/kernel/syscalls/chdir/chdir02.c
@@ -135,11 +135,7 @@
* 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 16e1539..547be89 100644
--- a/testcases/kernel/syscalls/chdir/chdir03.c
+++ b/testcases/kernel/syscalls/chdir/chdir03.c
@@ -88,11 +88,7 @@
/* 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/chdir/chdir04.c b/testcases/kernel/syscalls/chdir/chdir04.c
index 9474a0a..fb5302a 100644
--- a/testcases/kernel/syscalls/chdir/chdir04.c
+++ b/testcases/kernel/syscalls/chdir/chdir04.c
@@ -115,11 +115,7 @@
/* 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/chmod/chmod01.c b/testcases/kernel/syscalls/chmod/chmod01.c
index d8a7027..569f413 100644
--- a/testcases/kernel/syscalls/chmod/chmod01.c
+++ b/testcases/kernel/syscalls/chmod/chmod01.c
@@ -101,11 +101,7 @@
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);
diff --git a/testcases/kernel/syscalls/chmod/chmod03.c b/testcases/kernel/syscalls/chmod/chmod03.c
index 71ef4c7..c9d6a3e 100644
--- a/testcases/kernel/syscalls/chmod/chmod03.c
+++ b/testcases/kernel/syscalls/chmod/chmod03.c
@@ -106,11 +106,7 @@
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);
diff --git a/testcases/kernel/syscalls/chmod/chmod04.c b/testcases/kernel/syscalls/chmod/chmod04.c
index 573a130..c4fb06c 100644
--- a/testcases/kernel/syscalls/chmod/chmod04.c
+++ b/testcases/kernel/syscalls/chmod/chmod04.c
@@ -106,11 +106,7 @@
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);
diff --git a/testcases/kernel/syscalls/chmod/chmod05.c b/testcases/kernel/syscalls/chmod/chmod05.c
index 11f2d0a..da5fac4 100644
--- a/testcases/kernel/syscalls/chmod/chmod05.c
+++ b/testcases/kernel/syscalls/chmod/chmod05.c
@@ -125,11 +125,7 @@
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);
diff --git a/testcases/kernel/syscalls/chmod/chmod06.c b/testcases/kernel/syscalls/chmod/chmod06.c
index 78fba70..449f3b6 100644
--- a/testcases/kernel/syscalls/chmod/chmod06.c
+++ b/testcases/kernel/syscalls/chmod/chmod06.c
@@ -158,11 +158,7 @@
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);
diff --git a/testcases/kernel/syscalls/chmod/chmod07.c b/testcases/kernel/syscalls/chmod/chmod07.c
index bc0ec9f..a1fd1e1 100644
--- a/testcases/kernel/syscalls/chmod/chmod07.c
+++ b/testcases/kernel/syscalls/chmod/chmod07.c
@@ -106,11 +106,7 @@
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);
diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c
index a7013e3..1dbb62e 100644
--- a/testcases/kernel/syscalls/chown/chown01.c
+++ b/testcases/kernel/syscalls/chown/chown01.c
@@ -139,11 +139,7 @@
* 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 a0a8b1a..1550880 100644
--- a/testcases/kernel/syscalls/chown/chown02.c
+++ b/testcases/kernel/syscalls/chown/chown02.c
@@ -124,11 +124,7 @@
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);
diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c
index 186b1cd..5e41c48 100644
--- a/testcases/kernel/syscalls/chown/chown03.c
+++ b/testcases/kernel/syscalls/chown/chown03.c
@@ -105,11 +105,7 @@
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);
diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c
index cd09763..59a45e9 100644
--- a/testcases/kernel/syscalls/chown/chown04.c
+++ b/testcases/kernel/syscalls/chown/chown04.c
@@ -153,11 +153,7 @@
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);
diff --git a/testcases/kernel/syscalls/chown/chown05.c b/testcases/kernel/syscalls/chown/chown05.c
index 9c595fc..db0990c 100644
--- a/testcases/kernel/syscalls/chown/chown05.c
+++ b/testcases/kernel/syscalls/chown/chown05.c
@@ -113,11 +113,7 @@
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);
diff --git a/testcases/kernel/syscalls/chroot/chroot01.c b/testcases/kernel/syscalls/chroot/chroot01.c
index d27d5ba..a812932 100644
--- a/testcases/kernel/syscalls/chroot/chroot01.c
+++ b/testcases/kernel/syscalls/chroot/chroot01.c
@@ -70,11 +70,7 @@
/* 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/chroot/chroot02.c b/testcases/kernel/syscalls/chroot/chroot02.c
index c1cec6d..330edc1 100644
--- a/testcases/kernel/syscalls/chroot/chroot02.c
+++ b/testcases/kernel/syscalls/chroot/chroot02.c
@@ -74,11 +74,7 @@
/* 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/chroot/chroot03.c b/testcases/kernel/syscalls/chroot/chroot03.c
index 55a25f5..433a725 100644
--- a/testcases/kernel/syscalls/chroot/chroot03.c
+++ b/testcases/kernel/syscalls/chroot/chroot03.c
@@ -125,11 +125,7 @@
/* 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/chroot/chroot04.c b/testcases/kernel/syscalls/chroot/chroot04.c
index 84d529e..7a0c13c 100644
--- a/testcases/kernel/syscalls/chroot/chroot04.c
+++ b/testcases/kernel/syscalls/chroot/chroot04.c
@@ -70,11 +70,7 @@
/* 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/clock_getres/clock_getres01.c b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
index 936bdd9..80451b6 100644
--- a/testcases/kernel/syscalls/clock_getres/clock_getres01.c
+++ b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
@@ -265,11 +265,7 @@
/* 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/clock_nanosleep2/clock_nanosleep2_01.c b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
index b7434bb..7be11f7 100644
--- a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
@@ -123,11 +123,7 @@
/* 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 dd95574..e5e5b45 100644
--- a/testcases/kernel/syscalls/clone/clone01.c
+++ b/testcases/kernel/syscalls/clone/clone01.c
@@ -98,16 +98,8 @@
int status, child_pid;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -178,4 +170,4 @@
int do_child(void)
{
exit(0);
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/clone/clone02.c b/testcases/kernel/syscalls/clone/clone02.c
index efefe58..ff2677b 100644
--- a/testcases/kernel/syscalls/clone/clone02.c
+++ b/testcases/kernel/syscalls/clone/clone02.c
@@ -163,11 +163,7 @@
/* 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/clone/clone03.c b/testcases/kernel/syscalls/clone/clone03.c
index 65c6868..1d96210 100644
--- a/testcases/kernel/syscalls/clone/clone03.c
+++ b/testcases/kernel/syscalls/clone/clone03.c
@@ -100,11 +100,7 @@
/* 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/clone/clone04.c b/testcases/kernel/syscalls/clone/clone04.c
index 4757d9a..8ab9d4a 100644
--- a/testcases/kernel/syscalls/clone/clone04.c
+++ b/testcases/kernel/syscalls/clone/clone04.c
@@ -106,16 +106,8 @@
void *test_stack;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup(); /* global setup */
@@ -202,4 +194,4 @@
int child_fn()
{
exit(1);
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/clone/clone05.c b/testcases/kernel/syscalls/clone/clone05.c
index 6b7c187..ec3bb41 100644
--- a/testcases/kernel/syscalls/clone/clone05.c
+++ b/testcases/kernel/syscalls/clone/clone05.c
@@ -97,16 +97,8 @@
void *child_stack; /* stack for child */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -180,4 +172,4 @@
sleep(1);
parent_variable = 1;
exit(1);
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/clone/clone06.c b/testcases/kernel/syscalls/clone/clone06.c
index d21fcd0..808a1d1 100644
--- a/testcases/kernel/syscalls/clone/clone06.c
+++ b/testcases/kernel/syscalls/clone/clone06.c
@@ -105,16 +105,8 @@
char buff[MAX_LINE_LENGTH];
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -227,4 +219,4 @@
}
exit(0);
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/clone/clone07.c b/testcases/kernel/syscalls/clone/clone07.c
index 4b6e2db..3e695e0 100644
--- a/testcases/kernel/syscalls/clone/clone07.c
+++ b/testcases/kernel/syscalls/clone/clone07.c
@@ -104,16 +104,8 @@
void *child_stack; /* stack for child */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -210,4 +202,4 @@
if (child_pid != 0) {
fail = TRUE;
}
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/close/close01.c b/testcases/kernel/syscalls/close/close01.c
index 6e79e6b..403e41c 100644
--- a/testcases/kernel/syscalls/close/close01.c
+++ b/testcases/kernel/syscalls/close/close01.c
@@ -95,11 +95,7 @@
/* 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/close/close02.c b/testcases/kernel/syscalls/close/close02.c
index 5ba56c1..2f6bb30 100644
--- a/testcases/kernel/syscalls/close/close02.c
+++ b/testcases/kernel/syscalls/close/close02.c
@@ -75,11 +75,7 @@
/* 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/close/close08.c b/testcases/kernel/syscalls/close/close08.c
index 8478796..64fc991 100644
--- a/testcases/kernel/syscalls/close/close08.c
+++ b/testcases/kernel/syscalls/close/close08.c
@@ -138,11 +138,7 @@
* 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 3b9c76a..9489050 100644
--- a/testcases/kernel/syscalls/connect/connect01.c
+++ b/testcases/kernel/syscalls/connect/connect01.c
@@ -128,11 +128,7 @@
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/creat/creat01.c b/testcases/kernel/syscalls/creat/creat01.c
index 7d9de86..7ac1422 100644
--- a/testcases/kernel/syscalls/creat/creat01.c
+++ b/testcases/kernel/syscalls/creat/creat01.c
@@ -94,11 +94,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/creat/creat03.c b/testcases/kernel/syscalls/creat/creat03.c
index fba37d6..6c58542 100644
--- a/testcases/kernel/syscalls/creat/creat03.c
+++ b/testcases/kernel/syscalls/creat/creat03.c
@@ -70,11 +70,7 @@
/* 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/creat/creat04.c b/testcases/kernel/syscalls/creat/creat04.c
index e53afcb..ae30c30 100644
--- a/testcases/kernel/syscalls/creat/creat04.c
+++ b/testcases/kernel/syscalls/creat/creat04.c
@@ -98,11 +98,7 @@
/* 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/creat/creat05.c b/testcases/kernel/syscalls/creat/creat05.c
index 8c95ed6..3b95259 100644
--- a/testcases/kernel/syscalls/creat/creat05.c
+++ b/testcases/kernel/syscalls/creat/creat05.c
@@ -78,11 +78,7 @@
/* 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/creat/creat06.c b/testcases/kernel/syscalls/creat/creat06.c
index 57a94cc..2e00548 100644
--- a/testcases/kernel/syscalls/creat/creat06.c
+++ b/testcases/kernel/syscalls/creat/creat06.c
@@ -135,11 +135,7 @@
/* 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/creat/creat07.c b/testcases/kernel/syscalls/creat/creat07.c
index b606855..c39073c 100644
--- a/testcases/kernel/syscalls/creat/creat07.c
+++ b/testcases/kernel/syscalls/creat/creat07.c
@@ -84,11 +84,7 @@
/* 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) {
diff --git a/testcases/kernel/syscalls/creat/creat09.c b/testcases/kernel/syscalls/creat/creat09.c
index 463f8c3..e6731c1 100644
--- a/testcases/kernel/syscalls/creat/creat09.c
+++ b/testcases/kernel/syscalls/creat/creat09.c
@@ -138,11 +138,7 @@
* 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/dup2/dup201.c b/testcases/kernel/syscalls/dup2/dup201.c
index 7c5fc41..9527679 100644
--- a/testcases/kernel/syscalls/dup2/dup201.c
+++ b/testcases/kernel/syscalls/dup2/dup201.c
@@ -110,11 +110,7 @@
/* 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();
@@ -163,7 +159,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/dup2/dup202.c b/testcases/kernel/syscalls/dup2/dup202.c
index dc0050f..52a0e87 100644
--- a/testcases/kernel/syscalls/dup2/dup202.c
+++ b/testcases/kernel/syscalls/dup2/dup202.c
@@ -156,7 +156,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/dup2/dup203.c b/testcases/kernel/syscalls/dup2/dup203.c
index 1bd7434..b9a8bfd 100644
--- a/testcases/kernel/syscalls/dup2/dup203.c
+++ b/testcases/kernel/syscalls/dup2/dup203.c
@@ -69,11 +69,7 @@
/* 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();
@@ -203,7 +199,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/dup2/dup204.c b/testcases/kernel/syscalls/dup2/dup204.c
index f9b2a47..75b7898 100644
--- a/testcases/kernel/syscalls/dup2/dup204.c
+++ b/testcases/kernel/syscalls/dup2/dup204.c
@@ -67,11 +67,7 @@
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();
@@ -118,7 +114,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/execl/execl01.c b/testcases/kernel/syscalls/execl/execl01.c
index 4bb940a..1488b23 100644
--- a/testcases/kernel/syscalls/execl/execl01.c
+++ b/testcases/kernel/syscalls/execl/execl01.c
@@ -144,11 +144,7 @@
* 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 e268ad4..80645b5 100644
--- a/testcases/kernel/syscalls/execle/execle01.c
+++ b/testcases/kernel/syscalls/execle/execle01.c
@@ -145,11 +145,7 @@
* 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 4a2d072..96429bb 100644
--- a/testcases/kernel/syscalls/execlp/execlp01.c
+++ b/testcases/kernel/syscalls/execlp/execlp01.c
@@ -144,11 +144,7 @@
* 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 2e7adb8..fda3aa8 100644
--- a/testcases/kernel/syscalls/execv/execv01.c
+++ b/testcases/kernel/syscalls/execv/execv01.c
@@ -145,11 +145,7 @@
* 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 387b590..5edf954 100644
--- a/testcases/kernel/syscalls/execve/execve01.c
+++ b/testcases/kernel/syscalls/execve/execve01.c
@@ -146,11 +146,7 @@
* 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 8c57b9f..5f973f1 100644
--- a/testcases/kernel/syscalls/execve/execve02.c
+++ b/testcases/kernel/syscalls/execve/execve02.c
@@ -95,11 +95,7 @@
/* 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
}
if (!Fflag) {
diff --git a/testcases/kernel/syscalls/execve/execve03.c b/testcases/kernel/syscalls/execve/execve03.c
index d6e61c6..75a75cd 100644
--- a/testcases/kernel/syscalls/execve/execve03.c
+++ b/testcases/kernel/syscalls/execve/execve03.c
@@ -132,11 +132,7 @@
/* 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/execve/execve04.c b/testcases/kernel/syscalls/execve/execve04.c
index c8c920b..5020c5b 100644
--- a/testcases/kernel/syscalls/execve/execve04.c
+++ b/testcases/kernel/syscalls/execve/execve04.c
@@ -101,11 +101,7 @@
/* 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);
diff --git a/testcases/kernel/syscalls/execve/execve05.c b/testcases/kernel/syscalls/execve/execve05.c
index b207403..738bedb 100644
--- a/testcases/kernel/syscalls/execve/execve05.c
+++ b/testcases/kernel/syscalls/execve/execve05.c
@@ -80,11 +80,7 @@
/* 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/execvp/execvp01.c b/testcases/kernel/syscalls/execvp/execvp01.c
index 0992f16..10e0546 100644
--- a/testcases/kernel/syscalls/execvp/execvp01.c
+++ b/testcases/kernel/syscalls/execvp/execvp01.c
@@ -145,11 +145,7 @@
* 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 35eb846..01165c7 100644
--- a/testcases/kernel/syscalls/exit/exit01.c
+++ b/testcases/kernel/syscalls/exit/exit01.c
@@ -124,7 +124,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/exit/exit02.c b/testcases/kernel/syscalls/exit/exit02.c
index 739c3cc..8e1055b 100644
--- a/testcases/kernel/syscalls/exit/exit02.c
+++ b/testcases/kernel/syscalls/exit/exit02.c
@@ -79,11 +79,7 @@
* 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 for test */
@@ -182,7 +178,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
index 6ff60f8..92db65b 100644
--- a/testcases/kernel/syscalls/faccessat/faccessat01.c
+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
@@ -99,11 +99,7 @@
* 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 f41d87c..693d496 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
@@ -96,11 +96,7 @@
* 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 ebd0e3c..d5ea705 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
@@ -96,11 +96,7 @@
* 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 11d5171..ef99c83 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
@@ -116,11 +116,7 @@
* 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 911f9d5..a199477 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
@@ -102,11 +102,7 @@
* 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 be47815..b4218e7 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate01.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
@@ -226,11 +226,7 @@
* 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 f80a6f1..27c123d 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate02.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate02.c
@@ -269,11 +269,7 @@
* 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 7f9682d..1151af9 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate03.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate03.c
@@ -258,11 +258,7 @@
* 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/fchmod/fchmod01.c b/testcases/kernel/syscalls/fchmod/fchmod01.c
index bdf80aa..a5454d1 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod01.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod01.c
@@ -136,11 +136,7 @@
* 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 3f1f12c..4393098 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod02.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod02.c
@@ -107,11 +107,7 @@
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);
@@ -165,7 +161,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fchmod/fchmod03.c b/testcases/kernel/syscalls/fchmod/fchmod03.c
index f82c3ac..012b705 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod03.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod03.c
@@ -108,11 +108,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchmod/fchmod04.c b/testcases/kernel/syscalls/fchmod/fchmod04.c
index d3bb82a..1329502 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod04.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod04.c
@@ -108,11 +108,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchmod/fchmod05.c b/testcases/kernel/syscalls/fchmod/fchmod05.c
index f402620..eacb833 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod05.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod05.c
@@ -109,11 +109,7 @@
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);
@@ -167,7 +163,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fchmod/fchmod06.c b/testcases/kernel/syscalls/fchmod/fchmod06.c
index 501de55..752f407 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod06.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod06.c
@@ -135,11 +135,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchmod/fchmod07.c b/testcases/kernel/syscalls/fchmod/fchmod07.c
index 22da283..7534a38 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod07.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod07.c
@@ -100,11 +100,7 @@
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);
@@ -171,7 +167,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
index e90ec37..2fb5851 100644
--- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
@@ -99,11 +99,7 @@
* 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 7acda7f..c3be1de 100644
--- a/testcases/kernel/syscalls/fchown/fchown01.c
+++ b/testcases/kernel/syscalls/fchown/fchown01.c
@@ -136,11 +136,7 @@
* 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 3a73326..dd0c5ab 100644
--- a/testcases/kernel/syscalls/fchown/fchown02.c
+++ b/testcases/kernel/syscalls/fchown/fchown02.c
@@ -129,11 +129,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchown/fchown03.c b/testcases/kernel/syscalls/fchown/fchown03.c
index bf6b19f..f047b43 100644
--- a/testcases/kernel/syscalls/fchown/fchown03.c
+++ b/testcases/kernel/syscalls/fchown/fchown03.c
@@ -107,11 +107,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchown/fchown04.c b/testcases/kernel/syscalls/fchown/fchown04.c
index 37c898b..7d481c6 100644
--- a/testcases/kernel/syscalls/fchown/fchown04.c
+++ b/testcases/kernel/syscalls/fchown/fchown04.c
@@ -130,11 +130,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchown/fchown05.c b/testcases/kernel/syscalls/fchown/fchown05.c
index 39aa5c9..94648af 100644
--- a/testcases/kernel/syscalls/fchown/fchown05.c
+++ b/testcases/kernel/syscalls/fchown/fchown05.c
@@ -114,11 +114,7 @@
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);
diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
index b211f45..6651d05 100644
--- a/testcases/kernel/syscalls/fchownat/fchownat01.c
+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
@@ -103,11 +103,7 @@
* 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 1c24efe..6f8830a 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl01.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl01.c
@@ -55,11 +55,7 @@
/* 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();
@@ -279,7 +275,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl02.c b/testcases/kernel/syscalls/fcntl/fcntl02.c
index ced87f0..46700ae 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl02.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl02.c
@@ -140,11 +140,7 @@
* 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 184daa1..cfdb2ad 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl03.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl03.c
@@ -140,11 +140,7 @@
* 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 8e04bec..d046fc4 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl04.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl04.c
@@ -140,11 +140,7 @@
* 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 da5cbd6..7d20343 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl05.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl05.c
@@ -141,11 +141,7 @@
* 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 933bc93..92c502d 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl06.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl06.c
@@ -79,11 +79,7 @@
/* 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/fcntl09.c b/testcases/kernel/syscalls/fcntl/fcntl09.c
index 4e28d05..0aaed07 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl09.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl09.c
@@ -141,11 +141,7 @@
* 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 b31d495..896aff3 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl10.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl10.c
@@ -141,11 +141,7 @@
* 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 324bebc..1439754 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl11.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
@@ -295,11 +295,7 @@
/* 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 61af6ee..f370eb94 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl12.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl12.c
@@ -65,11 +65,7 @@
/* 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();
@@ -117,7 +113,7 @@
tst_resm(TINFO, "Exit block 1");
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl13.c b/testcases/kernel/syscalls/fcntl/fcntl13.c
index 98cfa41..164e0ce 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl13.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl13.c
@@ -58,11 +58,7 @@
/* 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();
@@ -186,7 +182,7 @@
tst_resm(TINFO, "Exit block 4");
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fcntl/fcntl14.c b/testcases/kernel/syscalls/fcntl/fcntl14.c
index 8f44ae3..1305985 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl14.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl14.c
@@ -974,11 +974,7 @@
/* 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];
diff --git a/testcases/kernel/syscalls/fcntl/fcntl15.c b/testcases/kernel/syscalls/fcntl/fcntl15.c
index dd41335..e2fc760 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl15.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl15.c
@@ -538,11 +538,7 @@
/* 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 0e79080..3748238 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl16.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl16.c
@@ -662,11 +662,7 @@
/* 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 11f8810..46858ff 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl17.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
@@ -426,11 +426,7 @@
/* 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,
diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c
index a294f7a..90a3956 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl18.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c
@@ -71,11 +71,7 @@
/* 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 fe6756a..f5005c2 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl19.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
@@ -303,11 +303,7 @@
/* 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 7e10dbb..8597606 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl20.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
@@ -299,11 +299,7 @@
/* 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 6c881ce..42e2f0a 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl21.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
@@ -299,11 +299,7 @@
/* 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 6a701eb..c8999b8 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl22.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl22.c
@@ -104,11 +104,7 @@
/* 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 f30322e..670f32b 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl23.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl23.c
@@ -116,11 +116,7 @@
* 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 772f058..bb0300f 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl24.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl24.c
@@ -116,11 +116,7 @@
* 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 01313fd..7bdd4c4 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl25.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl25.c
@@ -117,11 +117,7 @@
* 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 de580a2..2631f2d 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl26.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl26.c
@@ -117,11 +117,7 @@
* 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 d72b3a5..8c7ba42 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl27.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl27.c
@@ -117,11 +117,7 @@
* 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 1c4c170..dfd2a00 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl28.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl28.c
@@ -114,11 +114,7 @@
* 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 d8670ba..abda380 100644
--- a/testcases/kernel/syscalls/fdatasync/fdatasync01.c
+++ b/testcases/kernel/syscalls/fdatasync/fdatasync01.c
@@ -116,7 +116,7 @@
/* perform global cleanup and exit */
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/fork/fork01.c b/testcases/kernel/syscalls/fork/fork01.c
index e620585..17defbf 100644
--- a/testcases/kernel/syscalls/fork/fork01.c
+++ b/testcases/kernel/syscalls/fork/fork01.c
@@ -206,11 +206,7 @@
* 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 a59e64a..6e00fd5 100644
--- a/testcases/kernel/syscalls/fork/fork02.c
+++ b/testcases/kernel/syscalls/fork/fork02.c
@@ -67,11 +67,7 @@
* 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
}
/*
@@ -109,7 +105,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork03.c b/testcases/kernel/syscalls/fork/fork03.c
index 89301a5..b45adc7 100644
--- a/testcases/kernel/syscalls/fork/fork03.c
+++ b/testcases/kernel/syscalls/fork/fork03.c
@@ -67,11 +67,7 @@
* 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
}
/*
@@ -131,7 +127,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork06.c b/testcases/kernel/syscalls/fork/fork06.c
index e44b3cb..b884531 100644
--- a/testcases/kernel/syscalls/fork/fork06.c
+++ b/testcases/kernel/syscalls/fork/fork06.c
@@ -65,11 +65,7 @@
* 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
}
/*
@@ -119,7 +115,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork07.c b/testcases/kernel/syscalls/fork/fork07.c
index bcd6bb2..349d58a 100644
--- a/testcases/kernel/syscalls/fork/fork07.c
+++ b/testcases/kernel/syscalls/fork/fork07.c
@@ -86,11 +86,7 @@
* 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 (Nflag) {
@@ -205,7 +201,7 @@
fclose(rea);
cleanup();
- return 0;
+ tst_exit();
}
void help()
diff --git a/testcases/kernel/syscalls/fork/fork08.c b/testcases/kernel/syscalls/fork/fork08.c
index 5a69015..29141d5 100644
--- a/testcases/kernel/syscalls/fork/fork08.c
+++ b/testcases/kernel/syscalls/fork/fork08.c
@@ -70,11 +70,7 @@
* 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
}
/*
@@ -173,7 +169,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork09.c b/testcases/kernel/syscalls/fork/fork09.c
index 13606d8..29f01be 100644
--- a/testcases/kernel/syscalls/fork/fork09.c
+++ b/testcases/kernel/syscalls/fork/fork09.c
@@ -76,11 +76,7 @@
* 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
}
/*
@@ -184,7 +180,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork10.c b/testcases/kernel/syscalls/fork/fork10.c
index 2edf7cd..32e129e 100644
--- a/testcases/kernel/syscalls/fork/fork10.c
+++ b/testcases/kernel/syscalls/fork/fork10.c
@@ -71,11 +71,7 @@
* 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
}
/*
@@ -163,7 +159,7 @@
close(fildes);
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork11.c b/testcases/kernel/syscalls/fork/fork11.c
index 4231bbc..1bfe818 100644
--- a/testcases/kernel/syscalls/fork/fork11.c
+++ b/testcases/kernel/syscalls/fork/fork11.c
@@ -64,11 +64,7 @@
* 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
}
/*
@@ -109,7 +105,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fork/fork12.c b/testcases/kernel/syscalls/fork/fork12.c
index 4424a44..0ea5ba5 100644
--- a/testcases/kernel/syscalls/fork/fork12.c
+++ b/testcases/kernel/syscalls/fork/fork12.c
@@ -69,11 +69,7 @@
* 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
}
/*
@@ -126,7 +122,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fstat/fstat01.c b/testcases/kernel/syscalls/fstat/fstat01.c
index 466f883..cb6077c 100644
--- a/testcases/kernel/syscalls/fstat/fstat01.c
+++ b/testcases/kernel/syscalls/fstat/fstat01.c
@@ -140,11 +140,7 @@
* 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 3aaba50..da136ef 100644
--- a/testcases/kernel/syscalls/fstat/fstat02.c
+++ b/testcases/kernel/syscalls/fstat/fstat02.c
@@ -103,11 +103,7 @@
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);
diff --git a/testcases/kernel/syscalls/fstat/fstat03.c b/testcases/kernel/syscalls/fstat/fstat03.c
index d40dda0..fc7fe58 100644
--- a/testcases/kernel/syscalls/fstat/fstat03.c
+++ b/testcases/kernel/syscalls/fstat/fstat03.c
@@ -78,11 +78,7 @@
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);
@@ -127,7 +123,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fstat/fstat04.c b/testcases/kernel/syscalls/fstat/fstat04.c
index ed731b4..ed31630 100644
--- a/testcases/kernel/syscalls/fstat/fstat04.c
+++ b/testcases/kernel/syscalls/fstat/fstat04.c
@@ -102,11 +102,7 @@
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);
diff --git a/testcases/kernel/syscalls/fstat/fstat05.c b/testcases/kernel/syscalls/fstat/fstat05.c
index 0eef6c3..7cf47d2 100644
--- a/testcases/kernel/syscalls/fstat/fstat05.c
+++ b/testcases/kernel/syscalls/fstat/fstat05.c
@@ -137,11 +137,7 @@
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();
diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs01.c b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
index 086d2ad..19e55be 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs01.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
@@ -140,11 +140,7 @@
* 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 cd9d9a0..b6a9436 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs02.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs02.c
@@ -88,11 +88,7 @@
/* 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();
@@ -129,7 +125,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fsync/fsync01.c b/testcases/kernel/syscalls/fsync/fsync01.c
index 99870ad..830fa48 100644
--- a/testcases/kernel/syscalls/fsync/fsync01.c
+++ b/testcases/kernel/syscalls/fsync/fsync01.c
@@ -140,11 +140,7 @@
* 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 2b961b3..686819a 100644
--- a/testcases/kernel/syscalls/fsync/fsync02.c
+++ b/testcases/kernel/syscalls/fsync/fsync02.c
@@ -89,11 +89,7 @@
/* 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();
@@ -161,7 +157,7 @@
close(fd);
sync();
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/fsync/fsync03.c b/testcases/kernel/syscalls/fsync/fsync03.c
index 77462d7..63d335e 100644
--- a/testcases/kernel/syscalls/fsync/fsync03.c
+++ b/testcases/kernel/syscalls/fsync/fsync03.c
@@ -82,11 +82,7 @@
/* 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 +119,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate01.c b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
index abe2820..a145ad9 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate01.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
@@ -99,11 +99,7 @@
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);
@@ -161,7 +157,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate02.c b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
index 93605fa..3fbd979 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate02.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
@@ -105,11 +105,7 @@
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);
@@ -247,7 +243,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
index d0477cd..cd76ac9 100644
--- a/testcases/kernel/syscalls/futimesat/futimesat01.c
+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
@@ -101,11 +101,7 @@
* 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_robust_list/get_robust_list01.c b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
index 0248fe2..d96983f 100644
--- a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
+++ b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
@@ -51,12 +51,11 @@
#include "test.h"
#include "usctest.h"
+#include "linux_syscall_numbers.h"
char *TCID = "get_robust_list01"; /* test program identifier. */
int TST_TOTAL = 5; /* total number of tests in this file. */
-#ifdef __NR_get_robust_list
-
struct robust_list {
struct robust_list *next;
};
@@ -82,16 +81,9 @@
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) {
+ if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
len_ptr = sizeof(struct robust_list_head);
@@ -242,7 +234,6 @@
cleanup();
- exit(EXIT_SUCCESS);
}
void setup(void)
@@ -255,15 +246,4 @@
void cleanup(void)
{
TEST_CLEANUP;
-
-}
-
-#else
-
-int main()
-{
- tst_resm(TCONF, "get_robust_list: system call not available");
- tst_exit();
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/testcases/kernel/syscalls/getcontext/getcontext01.c b/testcases/kernel/syscalls/getcontext/getcontext01.c
index 5801401..a16ac3e 100644
--- a/testcases/kernel/syscalls/getcontext/getcontext01.c
+++ b/testcases/kernel/syscalls/getcontext/getcontext01.c
@@ -63,11 +63,7 @@
* 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 1ee109a..1c933b2 100644
--- a/testcases/kernel/syscalls/getcpu/getcpu01.c
+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
@@ -114,11 +114,7 @@
/* 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 */
@@ -162,7 +158,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c
index 1cf1ddf..8f514c2 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd01.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd01.c
@@ -95,11 +95,7 @@
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();
@@ -143,7 +139,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup_test4()
diff --git a/testcases/kernel/syscalls/getcwd/getcwd02.c b/testcases/kernel/syscalls/getcwd/getcwd02.c
index 3202002..4f2bc06 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd02.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd02.c
@@ -92,11 +92,7 @@
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();
@@ -128,7 +124,7 @@
do_block7();
}
cleanup();
- return 0;
+ tst_exit();
}
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 5564a0d..5f97be1 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd03.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd03.c
@@ -83,11 +83,7 @@
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();
@@ -205,7 +201,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup()
diff --git a/testcases/kernel/syscalls/getdents/getdents01.c b/testcases/kernel/syscalls/getdents/getdents01.c
index 55a5255..7d45fe3 100644
--- a/testcases/kernel/syscalls/getdents/getdents01.c
+++ b/testcases/kernel/syscalls/getdents/getdents01.c
@@ -95,11 +95,7 @@
/* 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 */
@@ -191,7 +187,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getdents/getdents02.c b/testcases/kernel/syscalls/getdents/getdents02.c
index 855d356..02a9462 100644
--- a/testcases/kernel/syscalls/getdents/getdents02.c
+++ b/testcases/kernel/syscalls/getdents/getdents02.c
@@ -92,11 +92,7 @@
/* 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 */
@@ -176,7 +172,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getdents/getdents03.c b/testcases/kernel/syscalls/getdents/getdents03.c
index d118d45..cf6004d 100644
--- a/testcases/kernel/syscalls/getdents/getdents03.c
+++ b/testcases/kernel/syscalls/getdents/getdents03.c
@@ -95,11 +95,7 @@
/* 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 */
@@ -185,7 +181,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getdents/getdents04.c b/testcases/kernel/syscalls/getdents/getdents04.c
index 4134082..580574f 100644
--- a/testcases/kernel/syscalls/getdents/getdents04.c
+++ b/testcases/kernel/syscalls/getdents/getdents04.c
@@ -97,11 +97,7 @@
/* 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 */
@@ -212,7 +208,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getegid/getegid01.c b/testcases/kernel/syscalls/getegid/getegid01.c
index ec6e193..445a137 100644
--- a/testcases/kernel/syscalls/getegid/getegid01.c
+++ b/testcases/kernel/syscalls/getegid/getegid01.c
@@ -134,27 +134,14 @@
;
- /***************************************************************
- * 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
- ***************************************************************/
setup();
/* set the expected errnos... */
TEST_EXP_ENOS(exp_enos);
- /***************************************************************
- * check looping state if -c option given
- ***************************************************************/
for (lc = 0; TEST_LOOPING(lc); lc++) {
Tst_count = 0;
@@ -177,9 +164,6 @@
continue; /* next loop for MTKERNEL */
}
- /***************************************************************
- * only perform functional verification if flag set (-f not given)
- ***************************************************************/
if (STD_FUNCTIONAL_TEST) {
/* No Verification test, yet... */
tst_resm(TPASS,
@@ -188,16 +172,10 @@
}
}
- /***************************************************************
- * cleanup and exit
- ***************************************************************/
cleanup();
}
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
void setup()
{
@@ -206,10 +184,6 @@
TEST_PAUSE;
}
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- ***************************************************************/
void cleanup()
{
/*
@@ -218,4 +192,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/getegid/getegid02.c b/testcases/kernel/syscalls/getegid/getegid02.c
index 6530c3b..c016682 100644
--- a/testcases/kernel/syscalls/getegid/getegid02.c
+++ b/testcases/kernel/syscalls/getegid/getegid02.c
@@ -82,13 +82,8 @@
struct passwd *pwent;
/* parse standard options */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
-<<<<<<< HEAD
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-=======
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup(); /* global setup */
@@ -133,7 +128,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
@@ -159,4 +154,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/geteuid/geteuid01.c b/testcases/kernel/syscalls/geteuid/geteuid01.c
index 513a975..45dea40 100644
--- a/testcases/kernel/syscalls/geteuid/geteuid01.c
+++ b/testcases/kernel/syscalls/geteuid/geteuid01.c
@@ -138,11 +138,7 @@
* 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 bb00a2b..a052b25 100644
--- a/testcases/kernel/syscalls/getgid/getgid01.c
+++ b/testcases/kernel/syscalls/getgid/getgid01.c
@@ -136,11 +136,7 @@
* 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 7582a82..f1b2ed9 100644
--- a/testcases/kernel/syscalls/getgid/getgid03.c
+++ b/testcases/kernel/syscalls/getgid/getgid03.c
@@ -83,11 +83,7 @@
/* 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 */
@@ -132,7 +128,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getgroups/getgroups02.c b/testcases/kernel/syscalls/getgroups/getgroups02.c
index 3ce5ded..2b984b8 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups02.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups02.c
@@ -141,11 +141,7 @@
* 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 dec7878..893da7d 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups03.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups03.c
@@ -102,11 +102,7 @@
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);
@@ -151,7 +147,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getgroups/getgroups04.c b/testcases/kernel/syscalls/getgroups/getgroups04.c
index 358c0b5..dff2562 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups04.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups04.c
@@ -108,11 +108,7 @@
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 +157,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/gethostid/gethostid01.c b/testcases/kernel/syscalls/gethostid/gethostid01.c
index 7326dee..f97a4dc 100644
--- a/testcases/kernel/syscalls/gethostid/gethostid01.c
+++ b/testcases/kernel/syscalls/gethostid/gethostid01.c
@@ -155,11 +155,7 @@
* 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/getitimer/getitimer01.c b/testcases/kernel/syscalls/getitimer/getitimer01.c
index 5c24cc5..36e6f46 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer01.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer01.c
@@ -72,11 +72,7 @@
/* 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 +121,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getitimer/getitimer02.c b/testcases/kernel/syscalls/getitimer/getitimer02.c
index c59924e..238c05a 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer02.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer02.c
@@ -75,11 +75,7 @@
/* 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 +117,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getitimer/getitimer03.c b/testcases/kernel/syscalls/getitimer/getitimer03.c
index 1923b01..b6c4b22 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer03.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer03.c
@@ -77,11 +77,7 @@
/* 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 +135,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getpeername/getpeername01.c b/testcases/kernel/syscalls/getpeername/getpeername01.c
index af39c44..52696d2 100644
--- a/testcases/kernel/syscalls/getpeername/getpeername01.c
+++ b/testcases/kernel/syscalls/getpeername/getpeername01.c
@@ -113,11 +113,7 @@
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();
@@ -157,7 +153,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup(void)
diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c
index e285414..8f41bf4 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid01.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid01.c
@@ -69,11 +69,7 @@
/* 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 d60ee7a..1ece24a 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid02.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid02.c
@@ -85,11 +85,7 @@
/* 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();
@@ -126,7 +122,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getpgrp/getpgrp01.c b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
index 4df9349..3612551 100644
--- a/testcases/kernel/syscalls/getpgrp/getpgrp01.c
+++ b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
@@ -135,11 +135,7 @@
* 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/getppid01.c b/testcases/kernel/syscalls/getppid/getppid01.c
index 2ca289a..7691a44 100644
--- a/testcases/kernel/syscalls/getppid/getppid01.c
+++ b/testcases/kernel/syscalls/getppid/getppid01.c
@@ -135,11 +135,7 @@
* 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 dc165c7..9d9c762 100644
--- a/testcases/kernel/syscalls/getppid/getppid02.c
+++ b/testcases/kernel/syscalls/getppid/getppid02.c
@@ -62,11 +62,7 @@
* 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();
@@ -114,7 +110,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getpriority/getpriority01.c b/testcases/kernel/syscalls/getpriority/getpriority01.c
index 60a523d..49c46e1 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority01.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority01.c
@@ -95,11 +95,7 @@
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);
@@ -135,7 +131,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getpriority/getpriority02.c b/testcases/kernel/syscalls/getpriority/getpriority02.c
index f59a171..3637486 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority02.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority02.c
@@ -114,11 +114,7 @@
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);
@@ -174,7 +170,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid01.c b/testcases/kernel/syscalls/getresgid/getresgid01.c
index 222a7c3..a0749b8 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid01.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid01.c
@@ -87,11 +87,7 @@
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);
@@ -139,7 +135,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid02.c b/testcases/kernel/syscalls/getresgid/getresgid02.c
index 283e06b..88f21d7 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid02.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid02.c
@@ -97,11 +97,7 @@
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);
@@ -151,7 +147,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresgid/getresgid03.c b/testcases/kernel/syscalls/getresgid/getresgid03.c
index 79a5e73..e8d40f1 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid03.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid03.c
@@ -98,11 +98,7 @@
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);
@@ -152,7 +148,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid01.c b/testcases/kernel/syscalls/getresuid/getresuid01.c
index f8f451d..2a249e1 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid01.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid01.c
@@ -92,11 +92,7 @@
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);
@@ -145,7 +141,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid02.c b/testcases/kernel/syscalls/getresuid/getresuid02.c
index 4bd4ada..b59f31a 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid02.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid02.c
@@ -97,11 +97,7 @@
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);
@@ -151,7 +147,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getresuid/getresuid03.c b/testcases/kernel/syscalls/getresuid/getresuid03.c
index a29c22b..a3d1af8 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid03.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid03.c
@@ -97,11 +97,7 @@
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);
@@ -151,7 +147,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getrusage/getrusage01.c b/testcases/kernel/syscalls/getrusage/getrusage01.c
index 1789218..fdb0bb5 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage01.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage01.c
@@ -86,16 +86,8 @@
struct rusage usage;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -148,4 +140,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/getrusage/getrusage02.c b/testcases/kernel/syscalls/getrusage/getrusage02.c
index 3bf1d08..5515625 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage02.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage02.c
@@ -109,16 +109,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -180,4 +172,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/getsid/getsid01.c b/testcases/kernel/syscalls/getsid/getsid01.c
index d2a4c47..cc72790 100644
--- a/testcases/kernel/syscalls/getsid/getsid01.c
+++ b/testcases/kernel/syscalls/getsid/getsid01.c
@@ -80,11 +80,7 @@
/* 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 */
@@ -151,7 +147,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getsid/getsid02.c b/testcases/kernel/syscalls/getsid/getsid02.c
index 43a79db..17474e9 100644
--- a/testcases/kernel/syscalls/getsid/getsid02.c
+++ b/testcases/kernel/syscalls/getsid/getsid02.c
@@ -99,11 +99,7 @@
/* 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 +138,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/getsockname/getsockname01.c b/testcases/kernel/syscalls/getsockname/getsockname01.c
index 2b01f86..dc53887 100644
--- a/testcases/kernel/syscalls/getsockname/getsockname01.c
+++ b/testcases/kernel/syscalls/getsockname/getsockname01.c
@@ -112,11 +112,7 @@
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();
@@ -149,7 +145,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup(void)
diff --git a/testcases/kernel/syscalls/getsockopt/getsockopt01.c b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
index f421c90..b4c4647 100644
--- a/testcases/kernel/syscalls/getsockopt/getsockopt01.c
+++ b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
@@ -137,11 +137,7 @@
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();
@@ -176,7 +172,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup(void)
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
index bce7ae4..7f2b96e 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
@@ -72,11 +72,7 @@
/* 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/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
index 2e31f14..0a1d8a2 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
@@ -86,11 +86,7 @@
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/io_cancel/io_cancel01.c b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
index 8e4871c..358d204 100644
--- a/testcases/kernel/syscalls/io_cancel/io_cancel01.c
+++ b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
@@ -71,11 +71,7 @@
if ((msg =
parse_opts(argc, argv, 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/io_destroy/io_destroy01.c b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
index 536ea56..91ff302 100644
--- a/testcases/kernel/syscalls/io_destroy/io_destroy01.c
+++ b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
@@ -71,11 +71,7 @@
if ((msg =
parse_opts(argc, argv, 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/io_getevents/io_getevents01.c b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
index 34efd7c..472a697 100644
--- a/testcases/kernel/syscalls/io_getevents/io_getevents01.c
+++ b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
@@ -71,11 +71,7 @@
if ((msg =
parse_opts(argc, argv, 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/io_submit/io_submit01.c b/testcases/kernel/syscalls/io_submit/io_submit01.c
index a079346..1bd030a 100644
--- a/testcases/kernel/syscalls/io_submit/io_submit01.c
+++ b/testcases/kernel/syscalls/io_submit/io_submit01.c
@@ -76,11 +76,7 @@
if ((msg =
parse_opts(argc, argv, 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/ioctl/ioctl01.c b/testcases/kernel/syscalls/ioctl/ioctl01.c
index a5569e8..0f5713e 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl01.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl01.c
@@ -115,11 +115,7 @@
/* 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) {
diff --git a/testcases/kernel/syscalls/ioctl/ioctl02.c b/testcases/kernel/syscalls/ioctl/ioctl02.c
index cf86355..f51af54 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl02.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl02.c
@@ -114,11 +114,7 @@
/* 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);
diff --git a/testcases/kernel/syscalls/ioperm/ioperm01.c b/testcases/kernel/syscalls/ioperm/ioperm01.c
index 66750d2..9de4978 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm01.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm01.c
@@ -95,16 +95,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -199,4 +191,4 @@
tst_exit();
}
-#endif /* __i386__ */
\ No newline at end of file
+#endif /* __i386__ */
diff --git a/testcases/kernel/syscalls/ioperm/ioperm02.c b/testcases/kernel/syscalls/ioperm/ioperm02.c
index 76072d2..5e10b0c 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm02.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm02.c
@@ -112,20 +112,12 @@
int main(int ac, char **av)
{
- int lc, i; /* loop counter */
+ int lc, i;
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -280,4 +272,4 @@
tst_exit();
}
-#endif /* __i386__ */
\ No newline at end of file
+#endif /* __i386__ */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
index bcbb52c..fabb398 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
@@ -76,11 +76,7 @@
/* 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 +117,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
index 1ce9745..85b868d 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
@@ -78,11 +78,7 @@
/* 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 +131,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
index c282aaf..f4a0e3b 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
@@ -74,11 +74,7 @@
/* 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 +111,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
index 74aa141..cd46ebb 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
@@ -110,11 +110,7 @@
/* 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/msgctl05.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
index b923f30..2c4cf41 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
@@ -82,11 +82,7 @@
/* 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 a634045..49f7f4a 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
@@ -123,11 +123,7 @@
/* 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 30ca178..569851b 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
@@ -127,11 +127,7 @@
/* 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 ee7235d..cf71244 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
@@ -120,11 +120,7 @@
/* 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/msgctl11.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
index 1183f8e..82dbf60 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
@@ -130,11 +130,7 @@
/* 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 70c0dcd..aef4020 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget01.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
@@ -73,11 +73,7 @@
/* 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 +119,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget02.c b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
index 6fc2db3..d70a97f 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget02.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
@@ -91,11 +91,7 @@
/* 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 */
@@ -145,7 +141,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget03.c b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
index c0ddb1b..d64b4b9 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget03.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
@@ -76,11 +76,7 @@
/* 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 +119,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
index ff8126a..9637f31 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget04.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
@@ -79,11 +79,7 @@
/* 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/msgrcv/msgrcv01.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
index fcb3058..494d2a6 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
@@ -87,11 +87,7 @@
/* 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 b7594ff..6898dde 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
@@ -101,11 +101,7 @@
/* 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/msgrcv/msgrcv03.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
index 7c800f9..a222cfb 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
@@ -89,11 +89,7 @@
/* 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 */
@@ -134,7 +130,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
index abbeaea..46f1ab0 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
@@ -100,11 +100,7 @@
/* 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 */
@@ -145,7 +141,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
index 1725404..1c9343c 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
@@ -93,11 +93,7 @@
/* 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 +158,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
index 0e40e22..3d9a7fd 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
@@ -95,11 +95,7 @@
/* 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);
@@ -168,7 +164,7 @@
}
}
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
index 9f80180..f8ede90 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
@@ -81,11 +81,7 @@
/* 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 +136,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
index 194eeff..2babb78 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
@@ -92,11 +92,7 @@
/* 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/msgsnd/msgsnd03.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
index ac3df8b..ceb4da7 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
@@ -98,11 +98,7 @@
/* 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 */
@@ -146,7 +142,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
index a13a0c7..dca90fa 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
@@ -76,11 +76,7 @@
/* 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 +115,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
index f429ee2..482f3f0 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
@@ -97,11 +97,7 @@
/* 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);
@@ -166,7 +162,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
index e670195..b075f17 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
@@ -91,11 +91,7 @@
/* 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"
@@ -176,7 +172,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl01.c b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
index 2f21ad7..a071800 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl01.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
@@ -147,11 +147,7 @@
/* 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];
@@ -253,7 +249,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl02.c b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
index 32948d6..421cc07 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl02.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
@@ -74,11 +74,7 @@
/* 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/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
index 82e677d..1baa415 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
@@ -104,11 +104,7 @@
/* 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 +140,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
index 24c5a0f..f04c2c2 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
@@ -83,11 +83,7 @@
/* 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 ac947bc..b4839a9 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl05.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl05.c
@@ -103,11 +103,7 @@
/* 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 +143,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl06.c b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
index 54172a0..266228e 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl06.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
@@ -116,11 +116,7 @@
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 e6b74e4..ee7a2bd 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget01.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget01.c
@@ -72,11 +72,7 @@
/* 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 +115,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semget/semget02.c b/testcases/kernel/syscalls/ipc/semget/semget02.c
index 74e3aad..7fe1985 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget02.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget02.c
@@ -85,11 +85,7 @@
/* 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/semget/semget03.c b/testcases/kernel/syscalls/ipc/semget/semget03.c
index 96d0ff8..e846ba6 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget03.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget03.c
@@ -67,11 +67,7 @@
/* 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 */
@@ -108,7 +104,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semget/semget05.c b/testcases/kernel/syscalls/ipc/semget/semget05.c
index 0733ee7..2010a71 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget05.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget05.c
@@ -81,11 +81,7 @@
/* 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
diff --git a/testcases/kernel/syscalls/ipc/semget/semget06.c b/testcases/kernel/syscalls/ipc/semget/semget06.c
index 3149bd8..7be7bd2 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget06.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget06.c
@@ -73,11 +73,7 @@
/* 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 */
@@ -118,7 +114,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop01.c b/testcases/kernel/syscalls/ipc/semop/semop01.c
index 1dc8441..47f1f40 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop01.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop01.c
@@ -83,11 +83,7 @@
/* 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/semop/semop02.c b/testcases/kernel/syscalls/ipc/semop/semop02.c
index 72eb1ec..e6962f4 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop02.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop02.c
@@ -109,11 +109,7 @@
/* 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/semop/semop03.c b/testcases/kernel/syscalls/ipc/semop/semop03.c
index 4c52599..ebeb285 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop03.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop03.c
@@ -72,11 +72,7 @@
/* 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 */
@@ -127,7 +123,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop04.c b/testcases/kernel/syscalls/ipc/semop/semop04.c
index 34d5e74..65e385d 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop04.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop04.c
@@ -87,11 +87,7 @@
/* 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 +140,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/semop/semop05.c b/testcases/kernel/syscalls/ipc/semop/semop05.c
index 5fdec3b..8678b1e 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop05.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop05.c
@@ -117,11 +117,7 @@
/* 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);
@@ -222,7 +218,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat01.c b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
index ebf476e..e495c43 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat01.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
@@ -92,11 +92,7 @@
/* 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/shmat/shmat02.c b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
index 3021597..dac423d 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat02.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
@@ -111,11 +111,7 @@
/* 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/shmat/shmat03.c b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
index 1d9194a..5cd0e5f 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat03.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
@@ -80,11 +80,7 @@
/* 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 2d6775e..2849f80 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
@@ -142,11 +142,7 @@
/* 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];
@@ -218,7 +214,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
index be703be..b30d0b3 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
@@ -111,11 +111,7 @@
/* 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/shmctl03.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
index 8c39948..d22ffd6 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
@@ -100,11 +100,7 @@
/* 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 3f0c8ac..8bd8d0c 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
@@ -62,11 +62,7 @@
/* 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();
@@ -92,7 +88,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
index 0f089b0..2d6fb47 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
@@ -84,11 +84,7 @@
/* 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 */
@@ -129,7 +125,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
index 7dd7e9c..4e6f12c 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
@@ -65,11 +65,7 @@
/* 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 */
@@ -107,7 +103,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget01.c b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
index 4879ae6..bbca4b1 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget01.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
@@ -72,11 +72,7 @@
/* 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 */
@@ -146,7 +142,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget02.c b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
index 794687b..fd79632 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget02.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
@@ -99,11 +99,7 @@
/* 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 +139,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget03.c b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
index ae2dcec..713f33c 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget03.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
@@ -76,11 +76,7 @@
/* 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 */
@@ -120,7 +116,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget04.c b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
index 11833a7..00022f4 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget04.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
@@ -70,11 +70,7 @@
/* 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/shmget/shmget05.c b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
index 30e02fd..f53155b 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget05.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
@@ -79,11 +79,7 @@
/* 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/keyctl/keyctl01.c b/testcases/kernel/syscalls/keyctl/keyctl01.c
index 8d6fa78..ec63fae 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl01.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl01.c
@@ -123,11 +123,7 @@
/* 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/kill/kill01.c b/testcases/kernel/syscalls/kill/kill01.c
index 4610434..16311ae 100644
--- a/testcases/kernel/syscalls/kill/kill01.c
+++ b/testcases/kernel/syscalls/kill/kill01.c
@@ -82,11 +82,7 @@
/* 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, "");
@@ -143,7 +139,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c
index e8a39cd..c3df1d8 100644
--- a/testcases/kernel/syscalls/kill/kill03.c
+++ b/testcases/kernel/syscalls/kill/kill03.c
@@ -84,11 +84,7 @@
/* 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, "");
@@ -150,7 +146,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c
index ac08422..9d94531 100644
--- a/testcases/kernel/syscalls/kill/kill04.c
+++ b/testcases/kernel/syscalls/kill/kill04.c
@@ -84,11 +84,7 @@
/* 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, "");
@@ -166,7 +162,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill05.c b/testcases/kernel/syscalls/kill/kill05.c
index bc6cabb..12cb233 100644
--- a/testcases/kernel/syscalls/kill/kill05.c
+++ b/testcases/kernel/syscalls/kill/kill05.c
@@ -107,11 +107,7 @@
/* 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, "");
@@ -131,7 +127,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill06.c b/testcases/kernel/syscalls/kill/kill06.c
index 881d4cf..04c3216 100644
--- a/testcases/kernel/syscalls/kill/kill06.c
+++ b/testcases/kernel/syscalls/kill/kill06.c
@@ -83,11 +83,7 @@
/* 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, "");
@@ -163,7 +159,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill07.c b/testcases/kernel/syscalls/kill/kill07.c
index 0e0fa1b..abf2417 100644
--- a/testcases/kernel/syscalls/kill/kill07.c
+++ b/testcases/kernel/syscalls/kill/kill07.c
@@ -95,11 +95,7 @@
/* 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, "");
@@ -188,7 +184,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/kill/kill08.c b/testcases/kernel/syscalls/kill/kill08.c
index c640a74..b586ecc 100644
--- a/testcases/kernel/syscalls/kill/kill08.c
+++ b/testcases/kernel/syscalls/kill/kill08.c
@@ -83,11 +83,7 @@
/* 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, "");
@@ -160,7 +156,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
index e1f707d..257d958 100644
--- a/testcases/kernel/syscalls/linkat/linkat01.c
+++ b/testcases/kernel/syscalls/linkat/linkat01.c
@@ -211,11 +211,7 @@
* 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 2d653ef..fb9a536 100644
--- a/testcases/kernel/syscalls/listen/listen01.c
+++ b/testcases/kernel/syscalls/listen/listen01.c
@@ -92,11 +92,7 @@
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();
@@ -131,7 +127,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
void setup(void)
diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c
index 1beb4b6..41e7d0e 100644
--- a/testcases/kernel/syscalls/llseek/llseek01.c
+++ b/testcases/kernel/syscalls/llseek/llseek01.c
@@ -106,11 +106,7 @@
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);
@@ -191,7 +187,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c
index 48ab7c1..65438ea 100644
--- a/testcases/kernel/syscalls/llseek/llseek02.c
+++ b/testcases/kernel/syscalls/llseek/llseek02.c
@@ -129,11 +129,7 @@
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);
@@ -187,7 +183,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/lseek/lseek06.c b/testcases/kernel/syscalls/lseek/lseek06.c
index 706c079..6f7ef5b 100644
--- a/testcases/kernel/syscalls/lseek/lseek06.c
+++ b/testcases/kernel/syscalls/lseek/lseek06.c
@@ -98,16 +98,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -168,7 +161,6 @@
cleanup();
- return 0;
}
/*
diff --git a/testcases/kernel/syscalls/lseek/lseek07.c b/testcases/kernel/syscalls/lseek/lseek07.c
index ee64d7e..d76eb16 100644
--- a/testcases/kernel/syscalls/lseek/lseek07.c
+++ b/testcases/kernel/syscalls/lseek/lseek07.c
@@ -102,16 +102,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -128,8 +121,8 @@
TEST(lseek(fildes, offset, SEEK_SET));
if (TEST_RETURN == (off_t) - 1) {
- tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
- TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
+ tst_resm(TFAIL|TTERRNO, "lseek on (%s) failed",
+ TEMP_FILE);
continue;
}
/*
@@ -153,9 +146,8 @@
*/
if (write(fildes, write_buf2, strlen(write_buf2)) !=
strlen(write_buf2)) {
- tst_brkm(TFAIL, cleanup, "write() failed to "
- "write additional data, error = %d",
- errno);
+ tst_brkm(TFAIL|TERRNO, cleanup,
+ "write() failed to write additional data");
}
/*
@@ -209,7 +201,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/lseek/lseek08.c b/testcases/kernel/syscalls/lseek/lseek08.c
index 379d747..8f1d318 100644
--- a/testcases/kernel/syscalls/lseek/lseek08.c
+++ b/testcases/kernel/syscalls/lseek/lseek08.c
@@ -98,16 +98,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -120,9 +113,9 @@
*/
TEST(lseek(fildes, 0, SEEK_END));
- if (TEST_RETURN == (off_t) - 1) {
- tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
- TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
+ if (TEST_RETURN == -1) {
+ tst_resm(TFAIL|TTERRNO,
+ "lseek of %s failed", TEMP_FILE);
continue;
}
/*
@@ -185,23 +178,21 @@
/* Creat/open a temporary file under above directory */
if ((fildes = open(TEMP_FILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
- tst_brkm(TBROK, cleanup,
- "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
- TEMP_FILE, FILE_MODE, errno, strerror(errno));
+ tst_brkm(TBROK|TERRNO, cleanup,
+ "open(%s, O_RDWR|O_CREAT, %#o) failed",
+ TEMP_FILE, FILE_MODE);
}
/* Write data into temporary file */
if (write(fildes, write_buf, strlen(write_buf)) <= 0) {
- tst_brkm(TBROK, cleanup,
- "write(2) on %s Failed, errno=%d : %s",
- TEMP_FILE, errno, strerror(errno));
+ tst_brkm(TBROK|TERRNO, cleanup,
+ "writing to %s failed", TEMP_FILE);
}
/* Get the size of the file using fstat */
if (fstat(fildes, &stat_buf) < 0) {
- tst_brkm(TBROK, cleanup,
- "fstat(2) on %s Failed, errno=%d : %s",
- TEMP_FILE, errno, strerror(errno));
+ tst_brkm(TBROK|TERRNO, cleanup,
+ "fstat of %s failed", TEMP_FILE);
}
file_size = stat_buf.st_size;
diff --git a/testcases/kernel/syscalls/lseek/lseek09.c b/testcases/kernel/syscalls/lseek/lseek09.c
index 19b89d2..78256f3 100644
--- a/testcases/kernel/syscalls/lseek/lseek09.c
+++ b/testcases/kernel/syscalls/lseek/lseek09.c
@@ -100,16 +100,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -180,7 +173,6 @@
cleanup();
- return 0;
}
/*
diff --git a/testcases/kernel/syscalls/lseek/lseek10.c b/testcases/kernel/syscalls/lseek/lseek10.c
index 157e696..b7cc4c7 100644
--- a/testcases/kernel/syscalls/lseek/lseek10.c
+++ b/testcases/kernel/syscalls/lseek/lseek10.c
@@ -132,16 +132,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
/* set the expected errnos... */
@@ -191,7 +184,6 @@
cleanup();
- return 0;
}
/*
diff --git a/testcases/kernel/syscalls/lstat/lstat01.c b/testcases/kernel/syscalls/lstat/lstat01.c
index f89dea1..b6e57ca 100644
--- a/testcases/kernel/syscalls/lstat/lstat01.c
+++ b/testcases/kernel/syscalls/lstat/lstat01.c
@@ -140,11 +140,7 @@
* 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 a2d27cc..ddb9102 100644
--- a/testcases/kernel/syscalls/lstat/lstat02.c
+++ b/testcases/kernel/syscalls/lstat/lstat02.c
@@ -152,11 +152,7 @@
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);
diff --git a/testcases/kernel/syscalls/lstat/lstat03.c b/testcases/kernel/syscalls/lstat/lstat03.c
index a618299..8598d59 100644
--- a/testcases/kernel/syscalls/lstat/lstat03.c
+++ b/testcases/kernel/syscalls/lstat/lstat03.c
@@ -103,11 +103,7 @@
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);
diff --git a/testcases/kernel/syscalls/mbind/mbind01.c b/testcases/kernel/syscalls/mbind/mbind01.c
index 2f837f6..5059e51 100644
--- a/testcases/kernel/syscalls/mbind/mbind01.c
+++ b/testcases/kernel/syscalls/mbind/mbind01.c
@@ -358,11 +358,7 @@
/* 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 d8f0746..a335738 100644
--- a/testcases/kernel/syscalls/memmap/mem03.c
+++ b/testcases/kernel/syscalls/memmap/mem03.c
@@ -140,7 +140,7 @@
/* clean up and exit */
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir01.c b/testcases/kernel/syscalls/mkdir/mkdir01.c
index 7251359..8c7d0b4 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir01.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir01.c
@@ -129,12 +129,6 @@
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);
@@ -261,4 +255,4 @@
* Exit with return code appropriate for results.
*/
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/mkdir/mkdir02.c b/testcases/kernel/syscalls/mkdir/mkdir02.c
index d3e1b92..1181f1c 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir02.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir02.c
@@ -107,11 +107,7 @@
* 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
}
/*
@@ -309,7 +305,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir03.c b/testcases/kernel/syscalls/mkdir/mkdir03.c
index f0f1b4b..0a865bc 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir03.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir03.c
@@ -139,11 +139,7 @@
* 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
}
/*
@@ -195,7 +191,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mkdir/mkdir04.c b/testcases/kernel/syscalls/mkdir/mkdir04.c
index fc546ba..8bb5bb1 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir04.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir04.c
@@ -111,11 +111,7 @@
* 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/mkdir/mkdir05.c b/testcases/kernel/syscalls/mkdir/mkdir05.c
index 676a450..136a387 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir05.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir05.c
@@ -98,11 +98,7 @@
* 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/mkdir/mkdir08.c b/testcases/kernel/syscalls/mkdir/mkdir08.c
index d48288b..7fc64ce 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir08.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir08.c
@@ -139,11 +139,7 @@
* 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 88c4712..0cb70d7 100644
--- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
@@ -91,11 +91,7 @@
* 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 ebbb7f7..b7f5259 100644
--- a/testcases/kernel/syscalls/mknod/mknod02.c
+++ b/testcases/kernel/syscalls/mknod/mknod02.c
@@ -110,11 +110,7 @@
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);
@@ -200,7 +196,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod03.c b/testcases/kernel/syscalls/mknod/mknod03.c
index 5cadaf9..00a63dd 100644
--- a/testcases/kernel/syscalls/mknod/mknod03.c
+++ b/testcases/kernel/syscalls/mknod/mknod03.c
@@ -110,11 +110,7 @@
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);
@@ -199,7 +195,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod04.c b/testcases/kernel/syscalls/mknod/mknod04.c
index b28033b..6bae462 100644
--- a/testcases/kernel/syscalls/mknod/mknod04.c
+++ b/testcases/kernel/syscalls/mknod/mknod04.c
@@ -110,11 +110,7 @@
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);
@@ -199,7 +195,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod05.c b/testcases/kernel/syscalls/mknod/mknod05.c
index d51df21..b6b5d68 100644
--- a/testcases/kernel/syscalls/mknod/mknod05.c
+++ b/testcases/kernel/syscalls/mknod/mknod05.c
@@ -110,11 +110,7 @@
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);
@@ -198,7 +194,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod06.c b/testcases/kernel/syscalls/mknod/mknod06.c
index f8ce3f5..48ee9b7 100644
--- a/testcases/kernel/syscalls/mknod/mknod06.c
+++ b/testcases/kernel/syscalls/mknod/mknod06.c
@@ -142,11 +142,7 @@
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);
@@ -210,7 +206,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c
index 481656b..579cf5b 100644
--- a/testcases/kernel/syscalls/mknod/mknod07.c
+++ b/testcases/kernel/syscalls/mknod/mknod07.c
@@ -124,11 +124,7 @@
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);
diff --git a/testcases/kernel/syscalls/mknod/mknod08.c b/testcases/kernel/syscalls/mknod/mknod08.c
index 3550d07..484c940 100644
--- a/testcases/kernel/syscalls/mknod/mknod08.c
+++ b/testcases/kernel/syscalls/mknod/mknod08.c
@@ -109,11 +109,7 @@
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);
@@ -197,7 +193,7 @@
*/
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknod/mknod09.c b/testcases/kernel/syscalls/mknod/mknod09.c
index 21be4d6..121da8c 100644
--- a/testcases/kernel/syscalls/mknod/mknod09.c
+++ b/testcases/kernel/syscalls/mknod/mknod09.c
@@ -89,11 +89,7 @@
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);
@@ -137,7 +133,7 @@
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
index ee9f81e..eb35d9b 100644
--- a/testcases/kernel/syscalls/mknodat/mknodat01.c
+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
@@ -99,11 +99,7 @@
* 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/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
index e29d11c..bb861cf 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
@@ -106,11 +106,7 @@
/* 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/modify_ldt/modify_ldt02.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
index c20d2b1..76d377c 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
@@ -102,11 +102,7 @@
/* 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/mprotect/mprotect01.c b/testcases/kernel/syscalls/mprotect/mprotect01.c
index dcfec71..2d51fb4 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect01.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect01.c
@@ -121,11 +121,7 @@
/* 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/mprotect/mprotect02.c b/testcases/kernel/syscalls/mprotect/mprotect02.c
index 59f5bf6..503c60a 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect02.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect02.c
@@ -87,11 +87,7 @@
/* 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 */
@@ -191,7 +187,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
#else
diff --git a/testcases/kernel/syscalls/mprotect/mprotect03.c b/testcases/kernel/syscalls/mprotect/mprotect03.c
index 5dcc05c..ad683cf 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect03.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect03.c
@@ -88,11 +88,7 @@
/* 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/mq_timedreceive/mq_timedreceive01.c b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
index 08c046b..1f647b4 100644
--- a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
+++ b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
@@ -439,7 +439,6 @@
int main(int ac, char **av) {
int result = RESULT_OK;
-<<<<<<< HEAD
int i;
int lc; /* loop counter */
char *msg; /* message returned from parse_opts */
@@ -480,80 +479,5 @@
}
}
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();
-
- 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();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c
index 6973aad..702ccb2 100644
--- a/testcases/kernel/syscalls/mremap/mremap01.c
+++ b/testcases/kernel/syscalls/mremap/mremap01.c
@@ -104,73 +104,57 @@
int ind; /* counter variable */
/* Parse standard options given to run the test. */
-<<<<<<< HEAD
- 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);
-=======
- msg = parse_opts(ac, av, (option_t *) NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
+
+ Tst_count = 0;
+
+ setup();
+
+ /*
+ * Call mremap to expand the existing mapped
+ * memory region (memsize) by newsize limits.
+ */
+ addr = mremap(addr, memsize, newsize, MREMAP_MAYMOVE);
+
+ /* Check for the return value of mremap() */
+ if (addr == MAP_FAILED) {
+ tst_brkm(TFAIL|TERRNO, cleanup, "mremap failed");
}
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- Tst_count = 0;
-
- setup();
-
+ /*
+ * Perform functional verification if test
+ * executed without (-f) option.
+ */
+ if (STD_FUNCTIONAL_TEST) {
/*
- * Call mremap to expand the existing mapped
- * memory region (memsize) by newsize limits.
+ * Attempt to initialize the expanded memory
+ * mapped region with data. If the map area
+ * was bad, we'd get SIGSEGV.
*/
- errno = 0;
- addr = mremap(addr, memsize, newsize, MREMAP_MAYMOVE);
- TEST_ERRNO = errno;
-
- /* Check for the return value of mremap() */
- if (addr == MAP_FAILED) {
- tst_resm(TFAIL, "mremap() Failed, errno=%d : %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
- cleanup();
- continue;
+ for (ind = 0; ind < newsize; ind++) {
+ addr[ind] = (char)ind;
}
/*
- * Perform functional verification if test
- * executed without (-f) option.
+ * Memory mapped area is good. Now, attempt
+ * to synchronize the mapped memory region
+ * with the file.
*/
- if (STD_FUNCTIONAL_TEST) {
- /*
- * Attempt to initialize the expanded memory
- * mapped region with data. If the map area
- * was bad, we'd get SIGSEGV.
- */
- for (ind = 0; ind < newsize; ind++) {
- addr[ind] = (char)ind;
- }
-
- /*
- * Memory mapped area is good. Now, attempt
- * to synchronize the mapped memory region
- * with the file.
- */
- if (msync(addr, newsize, MS_SYNC) != 0) {
- tst_resm(TFAIL, "msync() failed to synchronize "
- "mapped file, error %d", errno);
- } else {
- tst_resm(TPASS, "Functionality of "
- "mremap() is correct");
- }
+ if (msync(addr, newsize, MS_SYNC) != 0) {
+ tst_resm(TFAIL|TERRNO, "msync failed to synch "
+ "mapped file");
} else {
- tst_resm(TPASS, "call succeeded");
+ tst_resm(TPASS, "Functionality of "
+ "mremap() is correct");
}
-
- cleanup();
-
+ } else {
+ tst_resm(TPASS, "call succeeded");
}
+ cleanup();
+ tst_exit();
+
}
/*
@@ -195,7 +179,7 @@
/* Get the system page size */
if ((pagesz = getpagesize()) < 0) {
tst_brkm(TFAIL, NULL,
- "getpagesize() fails to get system page size");
+ "getpagesize failed to get system page size");
}
/* Get the size of virtual memory area to be mapped */
@@ -207,21 +191,19 @@
tst_tmpdir();
/* Creat a temporary file used for mapping */
- if ((fildes = open(TEMPFILE, O_RDWR | O_CREAT, 0666)) < 0) {
- tst_brkm(TBROK, cleanup, "open() on %s Failed, errno=%d : %s",
- TEMPFILE, errno, strerror(errno));
- }
+ if ((fildes = open(TEMPFILE, O_RDWR|O_CREAT, 0666)) < 0)
+ tst_brkm(TBROK|TERRNO, cleanup, "opening %s failed",
+ TEMPFILE);
/* Stretch the file to the size of virtual memory area */
if (lseek(fildes, (off_t) memsize, SEEK_SET) != (off_t) memsize) {
- tst_brkm(TBROK, cleanup, "lseek() to %d offset pos. Failed, "
- "error=%d : %s", memsize, errno, strerror(errno));
+ tst_brkm(TBROK|TERRNO, cleanup,
+ "lseeking to %d offset pos. failed", memsize);
}
/* Write one byte data into temporary file */
if (write(fildes, "\0", 1) != 1) {
- tst_brkm(TBROK, cleanup, "write() on %s Failed, errno=%d : %s",
- TEMPFILE, errno, strerror(errno));
+ tst_brkm(TBROK, cleanup, "writing to %s failed", TEMPFILE);
}
/*
@@ -232,8 +214,8 @@
/* Check for the return value of mmap() */
if (addr == (char *)MAP_FAILED) {
- tst_brkm(TBROK, cleanup, "mmap() Failed on %s, errno=%d : %s",
- TEMPFILE, errno, strerror(errno));
+ tst_brkm(TBROK, cleanup, "mmaping Failed on %s",
+ TEMPFILE);
}
/* Stretch the file to newsize of virtual memory block */
@@ -244,8 +226,8 @@
/* Write one byte data into temporary file */
if (write(fildes, "\0", 1) != 1) {
- tst_brkm(TBROK, cleanup, "write() on %s Failed, errno=%d : %s",
- TEMPFILE, errno, strerror(errno));
+ tst_brkm(TBROK|TERRNO, cleanup, "writing to %s failed",
+ TEMPFILE);
}
}
@@ -266,16 +248,13 @@
TEST_CLEANUP;
/* Unmap the mapped memory */
- if (munmap(addr, newsize) != 0) {
- tst_brkm(TBROK, NULL, "munmap() fails to unmap the memory, "
- "errno=%d", errno);
- }
+ if (munmap(addr, newsize) != 0)
+ tst_brkm(TBROK|TERRNO, NULL, "munmap failed");
/* Close the temporary file */
if (close(fildes) < 0) {
- tst_brkm(TBROK, NULL, "close() on %s Failed, errno=%d : %s",
- TEMPFILE, errno, strerror(errno));
+ tst_brkm(TBROK, NULL, "closing %s failed", TEMPFILE);
}
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c
index c26c6ae..2d59fca 100644
--- a/testcases/kernel/syscalls/mremap/mremap02.c
+++ b/testcases/kernel/syscalls/mremap/mremap02.c
@@ -99,16 +99,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -199,4 +191,4 @@
/* Exit the program */
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c
index acba59f..69ee4b5 100644
--- a/testcases/kernel/syscalls/mremap/mremap03.c
+++ b/testcases/kernel/syscalls/mremap/mremap03.c
@@ -101,16 +101,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -218,4 +210,4 @@
tst_exit();
}
-#endif /* if !defined(UCLINUX) */
\ No newline at end of file
+#endif /* if !defined(UCLINUX) */
diff --git a/testcases/kernel/syscalls/mremap/mremap04.c b/testcases/kernel/syscalls/mremap/mremap04.c
index b389914..eeb9856 100644
--- a/testcases/kernel/syscalls/mremap/mremap04.c
+++ b/testcases/kernel/syscalls/mremap/mremap04.c
@@ -111,16 +111,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -266,4 +258,4 @@
/* Exit the program */
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/msync/msync01.c b/testcases/kernel/syscalls/msync/msync01.c
index c9ee5b3..4ff19d1 100644
--- a/testcases/kernel/syscalls/msync/msync01.c
+++ b/testcases/kernel/syscalls/msync/msync01.c
@@ -96,16 +96,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -275,4 +267,4 @@
}
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/msync/msync02.c b/testcases/kernel/syscalls/msync/msync02.c
index f4cd34a..385ae94 100644
--- a/testcases/kernel/syscalls/msync/msync02.c
+++ b/testcases/kernel/syscalls/msync/msync02.c
@@ -93,16 +93,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
for (lc = 0; TEST_LOOPING(lc); lc++) {
@@ -255,4 +247,4 @@
}
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/msync/msync03.c b/testcases/kernel/syscalls/msync/msync03.c
index b886980..4cce567 100644
--- a/testcases/kernel/syscalls/msync/msync03.c
+++ b/testcases/kernel/syscalls/msync/msync03.c
@@ -88,16 +88,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -179,4 +171,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/msync/msync04.c b/testcases/kernel/syscalls/msync/msync04.c
index 8439ed7..79c38b2 100644
--- a/testcases/kernel/syscalls/msync/msync04.c
+++ b/testcases/kernel/syscalls/msync/msync04.c
@@ -94,16 +94,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) 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);
@@ -235,4 +227,4 @@
}
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/msync/msync05.c b/testcases/kernel/syscalls/msync/msync05.c
index dd8bc62..2082624 100644
--- a/testcases/kernel/syscalls/msync/msync05.c
+++ b/testcases/kernel/syscalls/msync/msync05.c
@@ -88,16 +88,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -191,4 +183,4 @@
tst_exit();
}
-#endif /* if !defined(UCLINUX) */
\ No newline at end of file
+#endif /* if !defined(UCLINUX) */
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep01.c b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
index abe71db..c648f0b 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep01.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
@@ -93,11 +93,7 @@
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);
diff --git a/testcases/kernel/syscalls/newuname/newuname01.c b/testcases/kernel/syscalls/newuname/newuname01.c
index c2ebdd6..1f8b24c 100644
--- a/testcases/kernel/syscalls/newuname/newuname01.c
+++ b/testcases/kernel/syscalls/newuname/newuname01.c
@@ -116,11 +116,7 @@
/* 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 8728874..dc8ea2a 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!! */
- return 0;
+ tst_exit();
/*--------------------------------------------------------------*/
}
diff --git a/testcases/kernel/syscalls/nftw/nftw64.c b/testcases/kernel/syscalls/nftw/nftw64.c
index bc1335b..19b1695 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!! */
- return 0;
+ tst_exit();
}
/*--------------------------------------------------------------*/
diff --git a/testcases/kernel/syscalls/nice/nice01.c b/testcases/kernel/syscalls/nice/nice01.c
index aa95492..da8bdc4 100644
--- a/testcases/kernel/syscalls/nice/nice01.c
+++ b/testcases/kernel/syscalls/nice/nice01.c
@@ -95,16 +95,8 @@
int rval;
/* Parse standard options given to run the test. */
-<<<<<<< HEAD
- 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);
-=======
- msg = parse_opts(ac, av, (option_t *) NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -186,4 +178,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/nice/nice02.c b/testcases/kernel/syscalls/nice/nice02.c
index 5001b13..83712eb 100644
--- a/testcases/kernel/syscalls/nice/nice02.c
+++ b/testcases/kernel/syscalls/nice/nice02.c
@@ -89,16 +89,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -182,4 +174,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/nice/nice03.c b/testcases/kernel/syscalls/nice/nice03.c
index a931d00..c45257a 100644
--- a/testcases/kernel/syscalls/nice/nice03.c
+++ b/testcases/kernel/syscalls/nice/nice03.c
@@ -92,16 +92,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -179,4 +171,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/nice/nice04.c b/testcases/kernel/syscalls/nice/nice04.c
index 8cca80f..985086c 100644
--- a/testcases/kernel/syscalls/nice/nice04.c
+++ b/testcases/kernel/syscalls/nice/nice04.c
@@ -100,16 +100,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -181,4 +173,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/open/open01.c b/testcases/kernel/syscalls/open/open01.c
index db07943..7183516 100644
--- a/testcases/kernel/syscalls/open/open01.c
+++ b/testcases/kernel/syscalls/open/open01.c
@@ -78,11 +78,7 @@
* parse standard command line 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 for test */
@@ -153,7 +149,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/open/open02.c b/testcases/kernel/syscalls/open/open02.c
index 79dcc6b..28bea93 100644
--- a/testcases/kernel/syscalls/open/open02.c
+++ b/testcases/kernel/syscalls/open/open02.c
@@ -70,11 +70,7 @@
* parse standard command line 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 for test */
@@ -105,7 +101,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/open/open03.c b/testcases/kernel/syscalls/open/open03.c
index 2e64d43..c298452 100644
--- a/testcases/kernel/syscalls/open/open03.c
+++ b/testcases/kernel/syscalls/open/open03.c
@@ -138,11 +138,7 @@
* 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 1f9bb07..d05b0b2 100644
--- a/testcases/kernel/syscalls/open/open04.c
+++ b/testcases/kernel/syscalls/open/open04.c
@@ -75,11 +75,7 @@
/* 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/open/open05.c b/testcases/kernel/syscalls/open/open05.c
index 7840bc6..dc46e9e 100644
--- a/testcases/kernel/syscalls/open/open05.c
+++ b/testcases/kernel/syscalls/open/open05.c
@@ -75,11 +75,7 @@
/* 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/open/open06.c b/testcases/kernel/syscalls/open/open06.c
index 107a324..e0387ea 100644
--- a/testcases/kernel/syscalls/open/open06.c
+++ b/testcases/kernel/syscalls/open/open06.c
@@ -70,11 +70,7 @@
/* 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/open/open07.c b/testcases/kernel/syscalls/open/open07.c
index af05267..706acb3 100644
--- a/testcases/kernel/syscalls/open/open07.c
+++ b/testcases/kernel/syscalls/open/open07.c
@@ -112,11 +112,7 @@
/* 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/open/open08.c b/testcases/kernel/syscalls/open/open08.c
index 61f9753..9c00277 100644
--- a/testcases/kernel/syscalls/open/open08.c
+++ b/testcases/kernel/syscalls/open/open08.c
@@ -102,11 +102,7 @@
/* 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/open/open10.c b/testcases/kernel/syscalls/open/open10.c
index 3d54658..3534e3f 100644
--- a/testcases/kernel/syscalls/open/open10.c
+++ b/testcases/kernel/syscalls/open/open10.c
@@ -123,11 +123,7 @@
* 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_tmpdir();
diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
index cda8f41..0bc5f1f 100644
--- a/testcases/kernel/syscalls/openat/openat01.c
+++ b/testcases/kernel/syscalls/openat/openat01.c
@@ -98,11 +98,7 @@
* 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 e8fdc0c..ea54679 100644
--- a/testcases/kernel/syscalls/pathconf/pathconf01.c
+++ b/testcases/kernel/syscalls/pathconf/pathconf01.c
@@ -161,11 +161,7 @@
* 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 482ed40..ae52d97 100644
--- a/testcases/kernel/syscalls/pause/pause01.c
+++ b/testcases/kernel/syscalls/pause/pause01.c
@@ -133,11 +133,7 @@
* 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/pipe/pipe02.c b/testcases/kernel/syscalls/pipe/pipe02.c
index 551e982..cf4b358 100644
--- a/testcases/kernel/syscalls/pipe/pipe02.c
+++ b/testcases/kernel/syscalls/pipe/pipe02.c
@@ -91,11 +91,7 @@
/* 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
}
#ifdef UCLINUX
maybe_run_child(&do_child, "dd", &pp[0], &pp[1]);
diff --git a/testcases/kernel/syscalls/pipe/pipe11.c b/testcases/kernel/syscalls/pipe/pipe11.c
index dedd873..53d2d0e 100644
--- a/testcases/kernel/syscalls/pipe/pipe11.c
+++ b/testcases/kernel/syscalls/pipe/pipe11.c
@@ -97,11 +97,7 @@
/* 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
}
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "ddddd", &fd[0], &fd[1], &kidid,
diff --git a/testcases/kernel/syscalls/pipe2/pipe2_01.c b/testcases/kernel/syscalls/pipe2/pipe2_01.c
index 85fc82d..43aa02e 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_01.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_01.c
@@ -144,11 +144,7 @@
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 25e427b..82a0ee1 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_02.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_02.c
@@ -135,11 +135,7 @@
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/pread/pread01.c b/testcases/kernel/syscalls/pread/pread01.c
index 89275e7..c8e6eff 100644
--- a/testcases/kernel/syscalls/pread/pread01.c
+++ b/testcases/kernel/syscalls/pread/pread01.c
@@ -106,16 +106,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -373,4 +365,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/pread/pread02.c b/testcases/kernel/syscalls/pread/pread02.c
index cdc50d3..00c46c7 100644
--- a/testcases/kernel/syscalls/pread/pread02.c
+++ b/testcases/kernel/syscalls/pread/pread02.c
@@ -121,16 +121,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -322,4 +314,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/pread/pread03.c b/testcases/kernel/syscalls/pread/pread03.c
index 494d305..7b59373 100644
--- a/testcases/kernel/syscalls/pread/pread03.c
+++ b/testcases/kernel/syscalls/pread/pread03.c
@@ -107,16 +107,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL) != 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
- }
setup();
@@ -245,4 +237,4 @@
/* delete the test directory created in setup() */
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c
index e49b49f..6a21400 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace01.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c
@@ -121,16 +121,8 @@
struct sigaction parent_act;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- 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);
#endif
@@ -299,4 +291,4 @@
{
got_signal = 1;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/ptrace/ptrace02.c b/testcases/kernel/syscalls/ptrace/ptrace02.c
index 73be9d8..4368667 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace02.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace02.c
@@ -121,16 +121,8 @@
struct sigaction parent_act;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- 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);
#endif
@@ -301,4 +293,4 @@
{
got_signal = 1;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c
index 4267f80..09daa4e 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace03.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace03.c
@@ -124,16 +124,8 @@
int status;
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -238,4 +230,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/pwrite/pwrite01.c b/testcases/kernel/syscalls/pwrite/pwrite01.c
index 88b7f68..c5892e8 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite01.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite01.c
@@ -107,16 +107,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -363,4 +355,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c b/testcases/kernel/syscalls/pwrite/pwrite02.c
index 94e9998..3dabb97 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite02.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite02.c
@@ -122,16 +122,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -339,4 +331,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/pwrite/pwrite03.c b/testcases/kernel/syscalls/pwrite/pwrite03.c
index 7ee44bb..1c7d02e 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite03.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite03.c
@@ -101,16 +101,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -216,4 +208,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/read/read01.c b/testcases/kernel/syscalls/read/read01.c
index 1c18dd0..400a39d 100644
--- a/testcases/kernel/syscalls/read/read01.c
+++ b/testcases/kernel/syscalls/read/read01.c
@@ -149,11 +149,7 @@
* 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 01183b2..65759b2 100644
--- a/testcases/kernel/syscalls/read/read02.c
+++ b/testcases/kernel/syscalls/read/read02.c
@@ -112,11 +112,7 @@
/* 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/read/read03.c b/testcases/kernel/syscalls/read/read03.c
index 3d66524..132db27 100644
--- a/testcases/kernel/syscalls/read/read03.c
+++ b/testcases/kernel/syscalls/read/read03.c
@@ -74,11 +74,7 @@
/* 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/read/read04.c b/testcases/kernel/syscalls/read/read04.c
index 476ab4c..846c94c 100644
--- a/testcases/kernel/syscalls/read/read04.c
+++ b/testcases/kernel/syscalls/read/read04.c
@@ -77,11 +77,7 @@
* 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 for test */
diff --git a/testcases/kernel/syscalls/readdir/readdir02.c b/testcases/kernel/syscalls/readdir/readdir02.c
index dce99a4..a97c094 100644
--- a/testcases/kernel/syscalls/readdir/readdir02.c
+++ b/testcases/kernel/syscalls/readdir/readdir02.c
@@ -98,11 +98,7 @@
/* 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/readlink02.c b/testcases/kernel/syscalls/readlink/readlink02.c
index 1e8df80..0aaad74 100644
--- a/testcases/kernel/syscalls/readlink/readlink02.c
+++ b/testcases/kernel/syscalls/readlink/readlink02.c
@@ -137,11 +137,7 @@
* 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/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
index 672faee..ee7671d 100644
--- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
@@ -111,11 +111,7 @@
* 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 9b86feb..c50317a 100644
--- a/testcases/kernel/syscalls/readv/readv01.c
+++ b/testcases/kernel/syscalls/readv/readv01.c
@@ -92,11 +92,7 @@
/* 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/readv/readv02.c b/testcases/kernel/syscalls/readv/readv02.c
index 6486337..da196c8 100644
--- a/testcases/kernel/syscalls/readv/readv02.c
+++ b/testcases/kernel/syscalls/readv/readv02.c
@@ -107,11 +107,7 @@
/* 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/readv/readv03.c b/testcases/kernel/syscalls/readv/readv03.c
index 3a12d87..ddb4ba2 100644
--- a/testcases/kernel/syscalls/readv/readv03.c
+++ b/testcases/kernel/syscalls/readv/readv03.c
@@ -84,11 +84,7 @@
/* 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/remap_file_pages/remap_file_pages01.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
index a009834..e64a16e 100644
--- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
+++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
@@ -127,11 +127,7 @@
/* 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/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
index bbdf238..9b32146 100644
--- a/testcases/kernel/syscalls/renameat/renameat01.c
+++ b/testcases/kernel/syscalls/renameat/renameat01.c
@@ -100,29 +100,14 @@
/* 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");
}
- /***************************************************************
- * 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
- ***************************************************************/
setup();
- /***************************************************************
- * check looping state if -c option given
- ***************************************************************/
for (lc = 0; TEST_LOOPING(lc); lc++) {
setup_every_copy();
@@ -139,32 +124,22 @@
/* check return code */
if (TEST_ERRNO == expected_errno[i]) {
- /***************************************************************
- * only perform functional verification if flag set (-f not given)
- ***************************************************************/
if (STD_FUNCTIONAL_TEST) {
/* No Verification test, yet... */
- tst_resm(TPASS,
- "renameat() returned the expected errno %d: %s",
- TEST_ERRNO,
- strerror(TEST_ERRNO));
+ tst_resm(TPASS|TTERRNO,
+ "renameat failed as expected");
}
} else {
- TEST_ERROR_LOG(TEST_ERRNO);
- tst_resm(TFAIL,
- "renameat() Failed, errno=%d : %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
+ tst_resm(TFAIL|TTERRNO,
+ "renameat failed unexpectedly");
}
}
}
- /***************************************************************
- * cleanup and exit
- ***************************************************************/
cleanup();
- return (0);
+ tst_exit();
}
void setup_every_copy()
@@ -242,9 +217,6 @@
newfilenames[1] = dtestfile3;
}
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
void setup()
{
@@ -253,10 +225,6 @@
TEST_PAUSE;
}
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- ***************************************************************/
void cleanup()
{
/* Remove them */
@@ -274,5 +242,4 @@
* print errno log if that option was specified.
*/
TEST_CLEANUP;
-
}
\ No newline at end of file
diff --git a/testcases/kernel/syscalls/rmdir/rmdir01.c b/testcases/kernel/syscalls/rmdir/rmdir01.c
index a92bee6..d1b7f83 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir01.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir01.c
@@ -86,11 +86,7 @@
* 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
}
/*
diff --git a/testcases/kernel/syscalls/rmdir/rmdir02.c b/testcases/kernel/syscalls/rmdir/rmdir02.c
index 9c7867c..5656619 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir02.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir02.c
@@ -146,11 +146,7 @@
* 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
}
/*
@@ -213,7 +209,7 @@
* cleanup and exit
*/
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/rmdir/rmdir03.c b/testcases/kernel/syscalls/rmdir/rmdir03.c
index 530d170..d527634 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir03.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir03.c
@@ -107,11 +107,7 @@
* 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);
diff --git a/testcases/kernel/syscalls/rmdir/rmdir04.c b/testcases/kernel/syscalls/rmdir/rmdir04.c
index b3317e9..37d5828 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir04.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir04.c
@@ -140,11 +140,7 @@
* 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 5979e07..006ef62 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
@@ -153,11 +153,7 @@
/* 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 ec70981..e8f125f 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
@@ -149,11 +149,7 @@
/* 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 3d03019..d038cf9 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
@@ -149,7 +149,7 @@
TEST(syscall(__NR_rt_sigaction,sig, &sa , &oldaction,INVAL_SIGSETSIZE));
if (TEST_RETURN == 0) {
- return 0;
+ return 0;
} else {
return TEST_RETURN;
}
@@ -162,11 +162,7 @@
/* 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 9036cf4..e70769f 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
@@ -151,11 +151,7 @@
/* 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_sigprocmask/rt_sigprocmask02.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
index 393ce97..be6e800 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
@@ -154,11 +154,7 @@
/* 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 608f132..705cc4c 100644
--- a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
+++ b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
@@ -120,11 +120,7 @@
/* 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/sched_get_priority_max/sched_get_priority_max01.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
index edd34da..1734c86 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,16 +94,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -158,4 +150,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
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 e19adb7..a507e26 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,16 +86,8 @@
char *msg; /* message returned from parse_opts */
/* parse standard options */
-<<<<<<< HEAD
- 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);
-=======
- if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -145,4 +137,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
index 32c86e7..e8d2641 100644
--- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
+++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
@@ -132,11 +132,7 @@
/* 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/sched_getscheduler/sched_getscheduler01.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
index 0629d4c..1fc7406 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
@@ -83,11 +83,7 @@
/* 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/sched_getscheduler/sched_getscheduler02.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
index c35c426..790424f 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
@@ -64,11 +64,7 @@
/* 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/sched_setscheduler/sched_setscheduler01.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
index e5ef337..05bc313 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
@@ -105,11 +105,7 @@
/* 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
}
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
index e36ea6d..94be730 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
@@ -80,11 +80,7 @@
/* 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/sched_yield/sched_yield01.c b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
index 1684787..29c05af 100644
--- a/testcases/kernel/syscalls/sched_yield/sched_yield01.c
+++ b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
@@ -62,11 +62,7 @@
/* 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/sendfile/sendfile02.c b/testcases/kernel/syscalls/sendfile/sendfile02.c
index a7c536b..68d31f7 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile02.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile02.c
@@ -288,11 +288,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile03.c b/testcases/kernel/syscalls/sendfile/sendfile03.c
index 78fdb1a..9647a62 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile03.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile03.c
@@ -95,11 +95,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
setup();
diff --git a/testcases/kernel/syscalls/sendfile/sendfile04.c b/testcases/kernel/syscalls/sendfile/sendfile04.c
index d5b783f..39f4230 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile04.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile04.c
@@ -275,11 +275,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile05.c b/testcases/kernel/syscalls/sendfile/sendfile05.c
index e6f7474..0f07575 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile05.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile05.c
@@ -238,11 +238,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile06.c b/testcases/kernel/syscalls/sendfile/sendfile06.c
index 4a0c3fb..b42d0c5 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile06.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile06.c
@@ -260,11 +260,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile07.c b/testcases/kernel/syscalls/sendfile/sendfile07.c
index a5f0491..c0e33d7 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile07.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile07.c
@@ -81,11 +81,7 @@
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, NULL, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
}
setup();
diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg01.c b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
index f38b750..a623b75 100644
--- a/testcases/kernel/syscalls/sendmsg/sendmsg01.c
+++ b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
@@ -230,11 +230,7 @@
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/set_robust_list/set_robust_list01.c b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
index 2a74c82..6c2db83 100644
--- a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
+++ b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
@@ -90,11 +90,7 @@
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);
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 6501eda..da22499 100644
--- a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
+++ b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
@@ -114,11 +114,7 @@
/* 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_tid_address/set_tid_address01.c b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
index 8644f34..8f7ec04 100644
--- a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
+++ b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
@@ -113,11 +113,7 @@
/* 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/setdomainname02.c b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
index 7f12970..588cadd 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname02.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
@@ -114,11 +114,7 @@
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();
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname03.c b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
index 9ae6d83..a474b4d 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname03.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
@@ -101,11 +101,7 @@
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);
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid01.c b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
index 1a116fa..fc6cb7d 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid01.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
@@ -68,11 +68,7 @@
/* 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/setfsgid/setfsgid02.c b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
index 360d64b..15e4663 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid02.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
@@ -72,11 +72,7 @@
/* 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/setfsgid/setfsgid03.c b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
index 7d2ea7a..59d57b5 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid03.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
@@ -74,11 +74,7 @@
/* 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/setfsuid/setfsuid01.c b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
index fc366f6..132691d 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid01.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
@@ -69,11 +69,7 @@
/* 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/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
index 681692f..4918937 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
@@ -74,11 +74,7 @@
/* 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/setfsuid/setfsuid03.c b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
index 3b610af..62d4b27 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid03.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
@@ -75,11 +75,7 @@
/* 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/setfsuid/setfsuid04.c b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
index 5a29636..aaa41f8 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid04.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
@@ -78,11 +78,7 @@
/* 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/setgid/setgid01.c b/testcases/kernel/syscalls/setgid/setgid01.c
index 1d982ba..2728750 100644
--- a/testcases/kernel/syscalls/setgid/setgid01.c
+++ b/testcases/kernel/syscalls/setgid/setgid01.c
@@ -136,11 +136,7 @@
* 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 62ea2ac..ba795af 100644
--- a/testcases/kernel/syscalls/setgid/setgid02.c
+++ b/testcases/kernel/syscalls/setgid/setgid02.c
@@ -73,11 +73,7 @@
/* 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/setgid/setgid03.c b/testcases/kernel/syscalls/setgid/setgid03.c
index d87ffbf..d53dd3a 100644
--- a/testcases/kernel/syscalls/setgid/setgid03.c
+++ b/testcases/kernel/syscalls/setgid/setgid03.c
@@ -68,11 +68,7 @@
/* 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/setgroups/setgroups02.c b/testcases/kernel/syscalls/setgroups/setgroups02.c
index 430e9fa..1667f30 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups02.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups02.c
@@ -94,16 +94,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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
- }
setup();
@@ -204,4 +196,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/setgroups/setgroups03.c b/testcases/kernel/syscalls/setgroups/setgroups03.c
index 4e96980..83f1688 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups03.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups03.c
@@ -116,16 +116,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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));
if (groups_list == NULL) {
@@ -246,4 +238,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/setgroups/setgroups04.c b/testcases/kernel/syscalls/setgroups/setgroups04.c
index 7a29a4c..a64e5bb 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups04.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups04.c
@@ -92,16 +92,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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 */
setup();
@@ -185,4 +177,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/setitimer/setitimer01.c b/testcases/kernel/syscalls/setitimer/setitimer01.c
index ced9a87..3f1035e 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer01.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer01.c
@@ -76,11 +76,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c
index b20ef7f..724098b 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer02.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer02.c
@@ -77,11 +77,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c
index e6a55e7..fccf29e 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer03.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer03.c
@@ -75,11 +75,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setpgid/setpgid01.c b/testcases/kernel/syscalls/setpgid/setpgid01.c
index ebf06ca..cda3e8c 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid01.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid01.c
@@ -136,11 +136,7 @@
* 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 da7fbdd..cc1e345 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid02.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid02.c
@@ -93,11 +93,7 @@
/* 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/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c
index 458c194..bbb4020 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03.c
@@ -64,11 +64,7 @@
/* 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
}
#ifdef UCLINUX
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp02.c b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
index ad3d80e..4b5a7ec 100644
--- a/testcases/kernel/syscalls/setpgrp/setpgrp02.c
+++ b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
@@ -66,11 +66,7 @@
/* 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/setpriority/setpriority01.c b/testcases/kernel/syscalls/setpriority/setpriority01.c
index 3ad53d3..95599f3 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority01.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority01.c
@@ -78,11 +78,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority02.c b/testcases/kernel/syscalls/setpriority/setpriority02.c
index 948658b..1b13603 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority02.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority02.c
@@ -79,11 +79,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority03.c b/testcases/kernel/syscalls/setpriority/setpriority03.c
index f7e048f..160ce92 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority03.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority03.c
@@ -78,11 +78,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority04.c b/testcases/kernel/syscalls/setpriority/setpriority04.c
index 102f0f5..61e3f28 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority04.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority04.c
@@ -95,11 +95,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority05.c b/testcases/kernel/syscalls/setpriority/setpriority05.c
index 28163d7..b8a5d66 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority05.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority05.c
@@ -80,11 +80,7 @@
/* 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 */
diff --git a/testcases/kernel/syscalls/setresuid/setresuid01.c b/testcases/kernel/syscalls/setresuid/setresuid01.c
index e42a5b0..774d17b 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid01.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid01.c
@@ -170,7 +170,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/setresuid/setresuid02.c b/testcases/kernel/syscalls/setresuid/setresuid02.c
index 7a0b2e2..7ed06bb 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid02.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid02.c
@@ -184,7 +184,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/setresuid/setresuid03.c b/testcases/kernel/syscalls/setresuid/setresuid03.c
index 4461305..2c71f27 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid03.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid03.c
@@ -197,7 +197,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/setresuid/setresuid04.c b/testcases/kernel/syscalls/setresuid/setresuid04.c
index a46eee6..87f3590 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid04.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid04.c
@@ -76,11 +76,7 @@
/* 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/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c
index 3cf406b..054d150 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid01.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid01.c
@@ -138,11 +138,7 @@
* 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 930f559..ede0bfb 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid02.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid02.c
@@ -152,7 +152,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/setreuid/setreuid03.c b/testcases/kernel/syscalls/setreuid/setreuid03.c
index 6f69770..6ca49eb 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid03.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid03.c
@@ -202,7 +202,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c
index 049d58a..2073cb3 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid04.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid04.c
@@ -168,7 +168,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/setreuid/setreuid05.c b/testcases/kernel/syscalls/setreuid/setreuid05.c
index da0aba2..fe44c17 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid05.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid05.c
@@ -216,7 +216,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/setreuid/setreuid07.c b/testcases/kernel/syscalls/setreuid/setreuid07.c
index 6113985..29c65a9 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid07.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid07.c
@@ -75,11 +75,7 @@
/* 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/setrlimit/setrlimit01.c b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
index a5283af..cee79e3 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit01.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
@@ -82,11 +82,7 @@
/* 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 "fname" vars */
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit02.c b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
index e1b67ed..4c27431 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit02.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
@@ -88,11 +88,7 @@
/* 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/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
index 3678b21..9d40aa5 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
@@ -70,11 +70,7 @@
/* 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/setsockopt/setsockopt01.c b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
index 79d8235..a85a719 100644
--- a/testcases/kernel/syscalls/setsockopt/setsockopt01.c
+++ b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
@@ -138,11 +138,7 @@
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();
@@ -179,7 +175,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
void setup(void)
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday01.c b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
index 8c53f80..e94fa33 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday01.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
@@ -143,7 +143,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday02.c b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
index 769f7c5..f0f9a48 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday02.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
@@ -131,7 +131,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/setuid/setuid02.c b/testcases/kernel/syscalls/setuid/setuid02.c
index a505915..9dd737d 100644
--- a/testcases/kernel/syscalls/setuid/setuid02.c
+++ b/testcases/kernel/syscalls/setuid/setuid02.c
@@ -138,11 +138,7 @@
* 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 8340a1c..07045b7 100644
--- a/testcases/kernel/syscalls/setuid/setuid03.c
+++ b/testcases/kernel/syscalls/setuid/setuid03.c
@@ -67,11 +67,7 @@
/* 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
}
/*
diff --git a/testcases/kernel/syscalls/setuid/setuid04.c b/testcases/kernel/syscalls/setuid/setuid04.c
index f8e3672..cf92a9a 100644
--- a/testcases/kernel/syscalls/setuid/setuid04.c
+++ b/testcases/kernel/syscalls/setuid/setuid04.c
@@ -77,11 +77,7 @@
/* 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/sgetmask/sgetmask01.c b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
index ffea725..1686afc 100644
--- a/testcases/kernel/syscalls/sgetmask/sgetmask01.c
+++ b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
@@ -124,11 +124,7 @@
/* 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 911c094..88c8b15 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction01.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction01.c
@@ -241,11 +241,7 @@
};
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/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c
index 7eea524..b12f400 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
@@ -117,11 +117,7 @@
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 5435024..b5d1323 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
@@ -100,11 +100,7 @@
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);
@@ -187,7 +183,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
index da32670..0b0c9e1 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
@@ -119,11 +119,7 @@
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();
@@ -181,7 +177,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/signal/signal02.c b/testcases/kernel/syscalls/signal/signal02.c
index 65fe571..7c16c68 100644
--- a/testcases/kernel/syscalls/signal/signal02.c
+++ b/testcases/kernel/syscalls/signal/signal02.c
@@ -80,11 +80,7 @@
/* 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 +126,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/signal/signal03.c b/testcases/kernel/syscalls/signal/signal03.c
index f4eab14..b32d8ee 100644
--- a/testcases/kernel/syscalls/signal/signal03.c
+++ b/testcases/kernel/syscalls/signal/signal03.c
@@ -98,11 +98,7 @@
/* 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 +153,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/signal/signal04.c b/testcases/kernel/syscalls/signal/signal04.c
index d6a7e0a..271023b 100644
--- a/testcases/kernel/syscalls/signal/signal04.c
+++ b/testcases/kernel/syscalls/signal/signal04.c
@@ -92,11 +92,7 @@
/* 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 +162,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/signal/signal05.c b/testcases/kernel/syscalls/signal/signal05.c
index 9387eb6..135a629 100644
--- a/testcases/kernel/syscalls/signal/signal05.c
+++ b/testcases/kernel/syscalls/signal/signal05.c
@@ -97,11 +97,7 @@
/* 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 +151,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
index 2d7aeab..726444c 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
@@ -142,11 +142,7 @@
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 10599ed..e3d8712 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
@@ -134,11 +134,7 @@
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 a9e79a0..bb0c86d 100644
--- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
@@ -103,11 +103,7 @@
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);
@@ -213,7 +209,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/socket/socket01.c b/testcases/kernel/syscalls/socket/socket01.c
index 4e8026b..21588b6 100644
--- a/testcases/kernel/syscalls/socket/socket01.c
+++ b/testcases/kernel/syscalls/socket/socket01.c
@@ -91,11 +91,7 @@
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();
@@ -127,7 +123,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/socket/socket02.c b/testcases/kernel/syscalls/socket/socket02.c
index 3324d5a..803990b 100644
--- a/testcases/kernel/syscalls/socket/socket02.c
+++ b/testcases/kernel/syscalls/socket/socket02.c
@@ -145,11 +145,7 @@
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 2dae56c..e69293a 100644
--- a/testcases/kernel/syscalls/socket/socket03.c
+++ b/testcases/kernel/syscalls/socket/socket03.c
@@ -129,11 +129,7 @@
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/sockioctl/sockioctl01.c b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
index d067846..e0e4f31 100644
--- a/testcases/kernel/syscalls/sockioctl/sockioctl01.c
+++ b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
@@ -137,11 +137,7 @@
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();
@@ -172,7 +168,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/splice/splice02.c b/testcases/kernel/syscalls/splice/splice02.c
index a65bb20..d7dd769 100644
--- a/testcases/kernel/syscalls/splice/splice02.c
+++ b/testcases/kernel/syscalls/splice/splice02.c
@@ -130,11 +130,7 @@
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 3672d28..57e645f 100644
--- a/testcases/kernel/syscalls/ssetmask/ssetmask01.c
+++ b/testcases/kernel/syscalls/ssetmask/ssetmask01.c
@@ -116,11 +116,7 @@
/* 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/stime/stime01.c b/testcases/kernel/syscalls/stime/stime01.c
index 8407a01..2971278 100644
--- a/testcases/kernel/syscalls/stime/stime01.c
+++ b/testcases/kernel/syscalls/stime/stime01.c
@@ -99,11 +99,7 @@
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);
diff --git a/testcases/kernel/syscalls/stime/stime02.c b/testcases/kernel/syscalls/stime/stime02.c
index 2133fd5..b178f29 100644
--- a/testcases/kernel/syscalls/stime/stime02.c
+++ b/testcases/kernel/syscalls/stime/stime02.c
@@ -97,11 +97,7 @@
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);
diff --git a/testcases/kernel/syscalls/symlink/symlink02.c b/testcases/kernel/syscalls/symlink/symlink02.c
index 44d81ce..3491b18 100644
--- a/testcases/kernel/syscalls/symlink/symlink02.c
+++ b/testcases/kernel/syscalls/symlink/symlink02.c
@@ -138,11 +138,7 @@
* 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 efa809b..1b08a84 100644
--- a/testcases/kernel/syscalls/symlink/symlink03.c
+++ b/testcases/kernel/syscalls/symlink/symlink03.c
@@ -159,11 +159,7 @@
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);
diff --git a/testcases/kernel/syscalls/symlink/symlink04.c b/testcases/kernel/syscalls/symlink/symlink04.c
index 5b6b362..d49b1f3 100644
--- a/testcases/kernel/syscalls/symlink/symlink04.c
+++ b/testcases/kernel/syscalls/symlink/symlink04.c
@@ -97,11 +97,7 @@
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);
@@ -168,7 +164,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/symlink/symlink05.c b/testcases/kernel/syscalls/symlink/symlink05.c
index 99e1042..bc35fda 100644
--- a/testcases/kernel/syscalls/symlink/symlink05.c
+++ b/testcases/kernel/syscalls/symlink/symlink05.c
@@ -97,11 +97,7 @@
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);
@@ -169,7 +165,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
index 8fc5981..1bf48d0 100644
--- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
@@ -151,11 +151,7 @@
* 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 ac3c7a9..97fdbe2 100644
--- a/testcases/kernel/syscalls/sync/sync01.c
+++ b/testcases/kernel/syscalls/sync/sync01.c
@@ -133,11 +133,7 @@
* 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 1a03ca0..55534b7 100644
--- a/testcases/kernel/syscalls/sync/sync02.c
+++ b/testcases/kernel/syscalls/sync/sync02.c
@@ -97,16 +97,8 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != 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, cleanup, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
setup();
@@ -160,7 +152,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
@@ -228,4 +220,4 @@
tst_rmdir();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/sysctl/sysctl01.c b/testcases/kernel/syscalls/sysctl/sysctl01.c
index 7c980d2..bceedf4 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl01.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl01.c
@@ -103,11 +103,7 @@
/* 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/sysctl/sysctl04.c b/testcases/kernel/syscalls/sysctl/sysctl04.c
index 37cdf40..dc5c581 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl04.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl04.c
@@ -97,11 +97,7 @@
/* 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/sysctl/sysctl05.c b/testcases/kernel/syscalls/sysctl/sysctl05.c
index fad4312..f2907a2 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl05.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl05.c
@@ -109,11 +109,7 @@
/* 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/sysfs/sysfs02.c b/testcases/kernel/syscalls/sysfs/sysfs02.c
index ca4ef15..636ca08 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs02.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs02.c
@@ -116,7 +116,7 @@
/*Clean up and exit */
cleanup();
- return 0;
+ tst_exit();
}
/* 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 a0d4f9c..2e8906d 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
@@ -93,11 +93,7 @@
/* 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 +153,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
index 87ef70e..f3f1392 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
@@ -92,11 +92,7 @@
/* 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 */
@@ -120,7 +116,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 9c261fa..cd78019 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -94,11 +94,7 @@
* 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/time02.c b/testcases/kernel/syscalls/time/time02.c
index 2044e63..f20f581 100644
--- a/testcases/kernel/syscalls/time/time02.c
+++ b/testcases/kernel/syscalls/time/time02.c
@@ -93,16 +93,9 @@
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) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
setup();
/* set the expected errnos... */
@@ -149,7 +142,6 @@
/* cleanup and exit */
cleanup();
- return 0;
}
diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
index 9f51977..ca15c6b 100644
--- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
@@ -129,11 +129,7 @@
/* 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/timerfd/timerfd02.c b/testcases/kernel/syscalls/timerfd/timerfd02.c
index 01f1850..5c60a0d 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd02.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd02.c
@@ -140,11 +140,7 @@
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 21d54fb..6f1efea 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd03.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd03.c
@@ -136,11 +136,7 @@
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 f9f674d..4f61126 100644
--- a/testcases/kernel/syscalls/times/times01.c
+++ b/testcases/kernel/syscalls/times/times01.c
@@ -137,11 +137,7 @@
* 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 13fccf9..3cec546 100644
--- a/testcases/kernel/syscalls/times/times03.c
+++ b/testcases/kernel/syscalls/times/times03.c
@@ -237,7 +237,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/truncate/truncate01.c b/testcases/kernel/syscalls/truncate/truncate01.c
index c089963..6c544c1 100644
--- a/testcases/kernel/syscalls/truncate/truncate01.c
+++ b/testcases/kernel/syscalls/truncate/truncate01.c
@@ -101,11 +101,7 @@
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);
@@ -172,7 +168,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/truncate/truncate02.c b/testcases/kernel/syscalls/truncate/truncate02.c
index c0c39b1..7ceb820 100644
--- a/testcases/kernel/syscalls/truncate/truncate02.c
+++ b/testcases/kernel/syscalls/truncate/truncate02.c
@@ -108,11 +108,7 @@
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);
@@ -242,7 +238,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/truncate/truncate03.c b/testcases/kernel/syscalls/truncate/truncate03.c
index d374916..074a3aa 100644
--- a/testcases/kernel/syscalls/truncate/truncate03.c
+++ b/testcases/kernel/syscalls/truncate/truncate03.c
@@ -149,11 +149,7 @@
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);
diff --git a/testcases/kernel/syscalls/truncate/truncate04.c b/testcases/kernel/syscalls/truncate/truncate04.c
index 15f80b1..45bf8ec 100644
--- a/testcases/kernel/syscalls/truncate/truncate04.c
+++ b/testcases/kernel/syscalls/truncate/truncate04.c
@@ -106,11 +106,7 @@
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);
diff --git a/testcases/kernel/syscalls/umask/umask01.c b/testcases/kernel/syscalls/umask/umask01.c
index 6e199a5..9890496 100644
--- a/testcases/kernel/syscalls/umask/umask01.c
+++ b/testcases/kernel/syscalls/umask/umask01.c
@@ -135,11 +135,7 @@
* 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 c0f9837..67e0c5e 100644
--- a/testcases/kernel/syscalls/umask/umask02.c
+++ b/testcases/kernel/syscalls/umask/umask02.c
@@ -95,7 +95,7 @@
"values");
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/umask/umask03.c b/testcases/kernel/syscalls/umask/umask03.c
index aae4c9b..7cc17d2 100644
--- a/testcases/kernel/syscalls/umask/umask03.c
+++ b/testcases/kernel/syscalls/umask/umask03.c
@@ -121,7 +121,7 @@
"previous value for all masks");
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/uname/uname01.c b/testcases/kernel/syscalls/uname/uname01.c
index 3a29219..d880a32 100644
--- a/testcases/kernel/syscalls/uname/uname01.c
+++ b/testcases/kernel/syscalls/uname/uname01.c
@@ -136,11 +136,7 @@
* 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 2239d11..a46da10 100644
--- a/testcases/kernel/syscalls/uname/uname02.c
+++ b/testcases/kernel/syscalls/uname/uname02.c
@@ -74,16 +74,10 @@
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, NULL, 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, cleanup, "OPTION PARSING ERROR - %s", msg);
->>>>>>> master
- }
+ }
setup(); /* global setup */
@@ -120,7 +114,7 @@
cleanup();
- return 0;
+ tst_exit();
}
@@ -160,4 +154,4 @@
*/
TEST_CLEANUP;
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/uname/uname03.c b/testcases/kernel/syscalls/uname/uname03.c
index 4c5deae..3953ba9 100644
--- a/testcases/kernel/syscalls/uname/uname03.c
+++ b/testcases/kernel/syscalls/uname/uname03.c
@@ -75,11 +75,7 @@
/* 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 +121,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/unlink/unlink05.c b/testcases/kernel/syscalls/unlink/unlink05.c
index 1c0340d..9a06080 100644
--- a/testcases/kernel/syscalls/unlink/unlink05.c
+++ b/testcases/kernel/syscalls/unlink/unlink05.c
@@ -139,11 +139,7 @@
* 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 a0f4756..6693763 100644
--- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
@@ -105,11 +105,7 @@
* 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/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index e5406fa..adde996 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -105,11 +105,7 @@
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);
@@ -199,7 +195,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index 09c6f4e..b6db27e 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -110,11 +110,7 @@
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);
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index 4736a52..bc94be0 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -121,11 +121,7 @@
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);
diff --git a/testcases/kernel/syscalls/utime/utime04.c b/testcases/kernel/syscalls/utime/utime04.c
index fca3200..8387a4c 100644
--- a/testcases/kernel/syscalls/utime/utime04.c
+++ b/testcases/kernel/syscalls/utime/utime04.c
@@ -104,11 +104,7 @@
/* 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);
@@ -172,7 +168,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/utime/utime05.c b/testcases/kernel/syscalls/utime/utime05.c
index b7265f4..d66caad 100644
--- a/testcases/kernel/syscalls/utime/utime05.c
+++ b/testcases/kernel/syscalls/utime/utime05.c
@@ -110,11 +110,7 @@
/* 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);
diff --git a/testcases/kernel/syscalls/utime/utime06.c b/testcases/kernel/syscalls/utime/utime06.c
index 025c062..61c3af6 100644
--- a/testcases/kernel/syscalls/utime/utime06.c
+++ b/testcases/kernel/syscalls/utime/utime06.c
@@ -137,11 +137,7 @@
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);
@@ -221,7 +217,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/utimes/utimes01.c b/testcases/kernel/syscalls/utimes/utimes01.c
index 206087c..8c66749 100644
--- a/testcases/kernel/syscalls/utimes/utimes01.c
+++ b/testcases/kernel/syscalls/utimes/utimes01.c
@@ -235,7 +235,6 @@
* 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));
@@ -336,7 +335,6 @@
int main(int ac, char **av) {
int result = RESULT_OK;
-<<<<<<< HEAD
int i;
int lc; /* loop counter */
char *msg; /* message returned from parse_opts */
@@ -435,4 +433,4 @@
}
cleanup();
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/kernel/syscalls/vfork/vfork01.c b/testcases/kernel/syscalls/vfork/vfork01.c
index 615a3bb..f192083 100644
--- a/testcases/kernel/syscalls/vfork/vfork01.c
+++ b/testcases/kernel/syscalls/vfork/vfork01.c
@@ -115,11 +115,7 @@
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);
@@ -299,7 +295,7 @@
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/vfork/vfork02.c b/testcases/kernel/syscalls/vfork/vfork02.c
index f983ab2..e6df4e3 100644
--- a/testcases/kernel/syscalls/vfork/vfork02.c
+++ b/testcases/kernel/syscalls/vfork/vfork02.c
@@ -98,11 +98,7 @@
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);
diff --git a/testcases/kernel/syscalls/vhangup/vhangup01.c b/testcases/kernel/syscalls/vhangup/vhangup01.c
index bc433e6..24c71f9 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup01.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup01.c
@@ -120,7 +120,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/vhangup/vhangup02.c b/testcases/kernel/syscalls/vhangup/vhangup02.c
index f72d3d8..140dc81 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup02.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup02.c
@@ -99,7 +99,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
index 6c0e1c1..3e7f53b 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
@@ -101,11 +101,7 @@
* 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 798d944..9990785 100644
--- a/testcases/kernel/syscalls/wait/wait02.c
+++ b/testcases/kernel/syscalls/wait/wait02.c
@@ -139,11 +139,7 @@
* 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 5005af0..64aaaa5 100644
--- a/testcases/kernel/syscalls/wait4/wait401.c
+++ b/testcases/kernel/syscalls/wait4/wait401.c
@@ -81,11 +81,7 @@
/* 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 */
@@ -159,7 +155,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/wait4/wait402.c b/testcases/kernel/syscalls/wait4/wait402.c
index f97a4ee..ad4d1b4 100644
--- a/testcases/kernel/syscalls/wait4/wait402.c
+++ b/testcases/kernel/syscalls/wait4/wait402.c
@@ -102,11 +102,7 @@
/* 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 */
@@ -177,7 +173,7 @@
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitid/waitid01.c b/testcases/kernel/syscalls/waitid/waitid01.c
index 559f628..0f38def 100644
--- a/testcases/kernel/syscalls/waitid/waitid01.c
+++ b/testcases/kernel/syscalls/waitid/waitid01.c
@@ -129,11 +129,7 @@
/* 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 8705da1..0e9a970 100644
--- a/testcases/kernel/syscalls/waitid/waitid02.c
+++ b/testcases/kernel/syscalls/waitid/waitid02.c
@@ -123,11 +123,7 @@
/* 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 d70e57c..e5ce209 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid01.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid01.c
@@ -135,7 +135,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid02.c b/testcases/kernel/syscalls/waitpid/waitpid02.c
index f0252a9..4a5fa4f 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid02.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid02.c
@@ -153,7 +153,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid03.c b/testcases/kernel/syscalls/waitpid/waitpid03.c
index f01a16e..5b9eda2 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid03.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid03.c
@@ -162,7 +162,7 @@
condition_number++;
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid04.c b/testcases/kernel/syscalls/waitpid/waitpid04.c
index 541c5f8..140eb29 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid04.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid04.c
@@ -143,7 +143,7 @@
condition_number++;
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid05.c b/testcases/kernel/syscalls/waitpid/waitpid05.c
index 6781bf8..5915ed2 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid05.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid05.c
@@ -209,7 +209,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid06.c b/testcases/kernel/syscalls/waitpid/waitpid06.c
index cebdd06..279e882 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid06.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid06.c
@@ -133,7 +133,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid07.c b/testcases/kernel/syscalls/waitpid/waitpid07.c
index 3233368..36874fc 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid07.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid07.c
@@ -136,7 +136,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/waitpid/waitpid10.c b/testcases/kernel/syscalls/waitpid/waitpid10.c
index f5ed5d9..e17c35b 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid10.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid10.c
@@ -423,7 +423,7 @@
}
}
cleanup();
- return 0;
+ tst_exit();
}
diff --git a/testcases/kernel/syscalls/write/write02.c b/testcases/kernel/syscalls/write/write02.c
index 66ca560..8d52461 100644
--- a/testcases/kernel/syscalls/write/write02.c
+++ b/testcases/kernel/syscalls/write/write02.c
@@ -115,7 +115,7 @@
close(fild);
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/write/write03.c b/testcases/kernel/syscalls/write/write03.c
index 1962ef6..ea6321f 100644
--- a/testcases/kernel/syscalls/write/write03.c
+++ b/testcases/kernel/syscalls/write/write03.c
@@ -139,7 +139,7 @@
close(fd);
}
cleanup();
- return 0;
+ tst_exit();
}
#else
diff --git a/testcases/kernel/syscalls/write/write04.c b/testcases/kernel/syscalls/write/write04.c
index b1fcc12..84d7330 100644
--- a/testcases/kernel/syscalls/write/write04.c
+++ b/testcases/kernel/syscalls/write/write04.c
@@ -207,7 +207,7 @@
unlink(fifo);
}
cleanup();
- return 0;
+ tst_exit();
}
void alarm_handler()
diff --git a/testcases/kernel/syscalls/write/write05.c b/testcases/kernel/syscalls/write/write05.c
index 63c2a89..c120472 100644
--- a/testcases/kernel/syscalls/write/write05.c
+++ b/testcases/kernel/syscalls/write/write05.c
@@ -180,7 +180,7 @@
close(fd);
}
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/writev/writev01.c b/testcases/kernel/syscalls/writev/writev01.c
index 52b1bb5..f3028b5 100644
--- a/testcases/kernel/syscalls/writev/writev01.c
+++ b/testcases/kernel/syscalls/writev/writev01.c
@@ -443,7 +443,7 @@
close(fd[0]);
close(fd[1]);
cleanup();
- return 0;
+ tst_exit();
}
/*
diff --git a/testcases/kernel/syscalls/writev/writev04.c b/testcases/kernel/syscalls/writev/writev04.c
index 54db5b4..6887c53 100644
--- a/testcases/kernel/syscalls/writev/writev04.c
+++ b/testcases/kernel/syscalls/writev/writev04.c
@@ -157,7 +157,7 @@
tst_resm(TFAIL, "open failed: fname = %s, errno = %d",
f_name, errno);
cleanup();
- return 0;
+ tst_exit();
}
//block1:
tst_resm(TINFO, "Enter block 1");
diff --git a/testcases/misc/crash/crash02.c b/testcases/misc/crash/crash02.c
index de1a717..c91d459 100644
--- a/testcases/misc/crash/crash02.c
+++ b/testcases/misc/crash/crash02.c
@@ -508,5 +508,5 @@
return 1;
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/misc/f00f/f00f.c b/testcases/misc/f00f/f00f.c
index d3bca1b..39872b8 100644
--- a/testcases/misc/f00f/f00f.c
+++ b/testcases/misc/f00f/f00f.c
@@ -83,7 +83,7 @@
{
tst_resm(TCONF, "f00f bug test only for i386");
tst_exit();
- return 0;
+ return 0;
}
#endif /* __i386__ */
\ No newline at end of file
diff --git a/testcases/misc/math/float/exp_log/genmodf.c b/testcases/misc/math/float/exp_log/genmodf.c
index 4bf9f39..c60e23f 100644
--- a/testcases/misc/math/float/exp_log/genmodf.c
+++ b/testcases/misc/math/float/exp_log/genmodf.c
@@ -62,11 +62,7 @@
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 06af147..09fb529 100644
--- a/testcases/misc/math/float/main.c
+++ b/testcases/misc/math/float/main.c
@@ -285,11 +285,7 @@
/* 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/misc/tcore_patch_test_suites/tcore.c b/testcases/misc/tcore_patch_test_suites/tcore.c
index c67f47e..0d73958 100644
--- a/testcases/misc/tcore_patch_test_suites/tcore.c
+++ b/testcases/misc/tcore_patch_test_suites/tcore.c
@@ -203,7 +203,7 @@
/* Wait until producer and consumer finish. */
pthread_join (th_a, &retval);
pthread_join (th_b, &retval);
- return 0;
+ return 0;
}
#else /* Not __i386__ */
diff --git a/testcases/network/can/filter-tests/canecho.c b/testcases/network/can/filter-tests/canecho.c
index 2660d5a..e87f063 100644
--- a/testcases/network/can/filter-tests/canecho.c
+++ b/testcases/network/can/filter-tests/canecho.c
@@ -159,5 +159,5 @@
write(s, &frame, sizeof(frame));
}
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-cycle.c b/testcases/network/can/filter-tests/tst-bcm-cycle.c
index 3c41c35..7f4c8ac 100644
--- a/testcases/network/can/filter-tests/tst-bcm-cycle.c
+++ b/testcases/network/can/filter-tests/tst-bcm-cycle.c
@@ -133,5 +133,5 @@
getchar();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-dump.c b/testcases/network/can/filter-tests/tst-bcm-dump.c
index e8efa25..5004d3a 100644
--- a/testcases/network/can/filter-tests/tst-bcm-dump.c
+++ b/testcases/network/can/filter-tests/tst-bcm-dump.c
@@ -196,5 +196,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-filter.c b/testcases/network/can/filter-tests/tst-bcm-filter.c
index 5544897..873e871 100644
--- a/testcases/network/can/filter-tests/tst-bcm-filter.c
+++ b/testcases/network/can/filter-tests/tst-bcm-filter.c
@@ -511,5 +511,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-rtr.c b/testcases/network/can/filter-tests/tst-bcm-rtr.c
index 268b04d..955864d 100644
--- a/testcases/network/can/filter-tests/tst-bcm-rtr.c
+++ b/testcases/network/can/filter-tests/tst-bcm-rtr.c
@@ -141,5 +141,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-rx-sendto.c b/testcases/network/can/filter-tests/tst-bcm-rx-sendto.c
index 29e5849..7d3dcaf 100644
--- a/testcases/network/can/filter-tests/tst-bcm-rx-sendto.c
+++ b/testcases/network/can/filter-tests/tst-bcm-rx-sendto.c
@@ -158,5 +158,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-server.c b/testcases/network/can/filter-tests/tst-bcm-server.c
index 97100d4..c057780 100644
--- a/testcases/network/can/filter-tests/tst-bcm-server.c
+++ b/testcases/network/can/filter-tests/tst-bcm-server.c
@@ -259,5 +259,5 @@
close(sc);
close(sa);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-single.c b/testcases/network/can/filter-tests/tst-bcm-single.c
index f417379..829343c 100644
--- a/testcases/network/can/filter-tests/tst-bcm-single.c
+++ b/testcases/network/can/filter-tests/tst-bcm-single.c
@@ -106,5 +106,5 @@
if (write(s, &msg, sizeof(msg)) < 0)
perror("write");
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-throttle.c b/testcases/network/can/filter-tests/tst-bcm-throttle.c
index 1b6db49..8585ade 100644
--- a/testcases/network/can/filter-tests/tst-bcm-throttle.c
+++ b/testcases/network/can/filter-tests/tst-bcm-throttle.c
@@ -460,5 +460,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-tx-sendto.c b/testcases/network/can/filter-tests/tst-bcm-tx-sendto.c
index 5db33cc..bb2dbef 100644
--- a/testcases/network/can/filter-tests/tst-bcm-tx-sendto.c
+++ b/testcases/network/can/filter-tests/tst-bcm-tx-sendto.c
@@ -118,5 +118,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-bcm-tx_read.c b/testcases/network/can/filter-tests/tst-bcm-tx_read.c
index dd839a0..39e9400 100644
--- a/testcases/network/can/filter-tests/tst-bcm-tx_read.c
+++ b/testcases/network/can/filter-tests/tst-bcm-tx_read.c
@@ -154,5 +154,5 @@
getchar();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-err.c b/testcases/network/can/filter-tests/tst-err.c
index 0edc865..86d0ad1 100644
--- a/testcases/network/can/filter-tests/tst-err.c
+++ b/testcases/network/can/filter-tests/tst-err.c
@@ -162,5 +162,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-filter-master.c b/testcases/network/can/filter-tests/tst-filter-master.c
index 8895b74..42d6e53 100644
--- a/testcases/network/can/filter-tests/tst-filter-master.c
+++ b/testcases/network/can/filter-tests/tst-filter-master.c
@@ -161,5 +161,5 @@
printf("Filtertest done.\n");
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-filter-server.c b/testcases/network/can/filter-tests/tst-filter-server.c
index 183e2d7..46903a5 100644
--- a/testcases/network/can/filter-tests/tst-filter-server.c
+++ b/testcases/network/can/filter-tests/tst-filter-server.c
@@ -206,5 +206,5 @@
close(s);
close(t);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-packet.c b/testcases/network/can/filter-tests/tst-packet.c
index 8d6b4c3..12432bb 100644
--- a/testcases/network/can/filter-tests/tst-packet.c
+++ b/testcases/network/can/filter-tests/tst-packet.c
@@ -163,5 +163,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-proc.c b/testcases/network/can/filter-tests/tst-proc.c
index 054337a..a33c600 100644
--- a/testcases/network/can/filter-tests/tst-proc.c
+++ b/testcases/network/can/filter-tests/tst-proc.c
@@ -115,6 +115,6 @@
printf("done.\n\n");
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-raw-filter.c b/testcases/network/can/filter-tests/tst-raw-filter.c
index 0a3564f..a244ead 100644
--- a/testcases/network/can/filter-tests/tst-raw-filter.c
+++ b/testcases/network/can/filter-tests/tst-raw-filter.c
@@ -173,5 +173,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-raw-sendto.c b/testcases/network/can/filter-tests/tst-raw-sendto.c
index 8cac362..94808b4 100644
--- a/testcases/network/can/filter-tests/tst-raw-sendto.c
+++ b/testcases/network/can/filter-tests/tst-raw-sendto.c
@@ -111,5 +111,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/can/filter-tests/tst-raw.c b/testcases/network/can/filter-tests/tst-raw.c
index c36ad61..fd3958f 100644
--- a/testcases/network/can/filter-tests/tst-raw.c
+++ b/testcases/network/can/filter-tests/tst-raw.c
@@ -182,5 +182,5 @@
close(s);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_01.c b/testcases/network/lib6/asapi_01.c
index 6d968fb..94b85ac 100644
--- a/testcases/network/lib6/asapi_01.c
+++ b/testcases/network/lib6/asapi_01.c
@@ -274,4 +274,4 @@
cleanup(void)
{
TEST_CLEANUP;
-}
+}
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_02.c b/testcases/network/lib6/asapi_02.c
index 5ff2dac..0bb8b6b 100644
--- a/testcases/network/lib6/asapi_02.c
+++ b/testcases/network/lib6/asapi_02.c
@@ -376,4 +376,4 @@
cleanup(void)
{
TEST_CLEANUP;
-}
+}
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_03.c b/testcases/network/lib6/asapi_03.c
index 3bad26a..5609a31 100644
--- a/testcases/network/lib6/asapi_03.c
+++ b/testcases/network/lib6/asapi_03.c
@@ -255,4 +255,4 @@
cleanup(void)
{
TEST_CLEANUP;
-}
+}
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_04.c b/testcases/network/lib6/asapi_04.c
index fbb48e2..9f7efbd 100644
--- a/testcases/network/lib6/asapi_04.c
+++ b/testcases/network/lib6/asapi_04.c
@@ -532,4 +532,4 @@
TEST_CLEANUP;
}
-int TST_TOTAL = PTCOUNT + CSCOUNT;
+int TST_TOTAL = PTCOUNT + CSCOUNT;
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_06.c b/testcases/network/lib6/asapi_06.c
index d505975..3808c37 100644
--- a/testcases/network/lib6/asapi_06.c
+++ b/testcases/network/lib6/asapi_06.c
@@ -643,4 +643,4 @@
{
TEST_CLEANUP;
-}
+}
\ No newline at end of file
diff --git a/testcases/network/lib6/asapi_07.c b/testcases/network/lib6/asapi_07.c
index 9f0e61a..61a7542 100644
--- a/testcases/network/lib6/asapi_07.c
+++ b/testcases/network/lib6/asapi_07.c
@@ -75,7 +75,6 @@
cleanup();
- tst_exit();
}
enum ttype { EXISTS, ALIAS, VALUE, DEFINED };
@@ -169,4 +168,4 @@
TEST_CLEANUP;
}
-int TST_TOTAL = ETCOUNT;
+int TST_TOTAL = ETCOUNT;
\ No newline at end of file
diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
index 6d2adf3..66df6d7 100644
--- a/testcases/network/nfs/nfs_fsstress/fsstress.c
+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
@@ -1279,7 +1279,7 @@
if (!strcmp(name1, name->path)) {
printf("yikes! %s %s\n", name1, name->path);
- return 0;
+ return 0;
}
rval = symlink(name1, name->path);
diff --git a/testcases/network/nfs/nfsstress/make_tree.c b/testcases/network/nfs/nfsstress/make_tree.c
index 4e8e62e..c384433 100644
--- a/testcases/network/nfs/nfsstress/make_tree.c
+++ b/testcases/network/nfs/nfsstress/make_tree.c
@@ -466,7 +466,7 @@
free(dirname);
free(filename);
free(subdir);
- return 0;
+ return 0;
}
/******************************************************************************/
diff --git a/testcases/network/nfsv4/locks/locktests.c b/testcases/network/nfsv4/locks/locktests.c
index dd75b8c..07e9701 100644
--- a/testcases/network/nfsv4/locks/locktests.c
+++ b/testcases/network/nfsv4/locks/locktests.c
@@ -188,7 +188,7 @@
terminer(1);
}
P("fd=%d\n", dp.fd);
- return 0;
+ return 0;
}
struct donneesFils *initClientFork(int i)
@@ -234,7 +234,7 @@
load();
initTest();
- return 0;
+ return 0;
}
void cleanClient(struct donneesFils *df) {
@@ -263,7 +263,7 @@
exit(0);
}
}
- return 0;
+ return 0;
}
void lockWholeFile(struct flock *request) {
@@ -309,7 +309,7 @@
for (i=0; i<dp.nclnt; i++)
write(dp.lclnt[i][1], message,M_SIZE );
- return 0;
+ return 0;
}
@@ -324,36 +324,36 @@
serverReceiveClient(c);
}
}
- return 0;
+ return 0;
}
int serverReceiveLocal() {
int i;
for (i=0; i<dp.nclnt; i++)
read(maitreLecteur, message,M_SIZE );
- return 0;
+ return 0;
}
int clientReceiveLocal() {
read(esclaveLecteur,message,M_SIZE);
- return 0;
+ return 0;
}
int clientSend() {
write(esclaveEcrivain, message, M_SIZE);
- return 0;
+ return 0;
}
int serverSend() {
serverSendNet();
serverSendLocal();
- return 0;
+ return 0;
}
int serverReceive() {
serverReceiveNet();
serverReceiveLocal();
- return 0;
+ return 0;
}
/* binary structure <-> ASCII functions used to ensure data will be correctly used over
@@ -362,7 +362,7 @@
int serialiseTLock(struct s_test *tLock) {
memset(message,0,M_SIZE);
sprintf(message,"T:%d:%d:%d::",tLock->test, tLock->type,tLock->resAtt );
- return 0;
+ return 0;
}
void unSerialiseTLock(struct s_test *tLock) {
@@ -425,25 +425,25 @@
memset(message, 0, M_SIZE);
clientReceiveLocal();
unSerialiseFLock(request);
- return 0;
+ return 0;
}
int sendLockTest(struct s_test *tLock) {
serialiseTLock(tLock);
serverSend();
- return 0;
+ return 0;
}
int getLockTest(struct s_test *tLock) {
clientReceiveLocal();
unSerialiseTLock(tLock);
- return 0;
+ return 0;
}
int sendResult(int resultat) {
serialiseResult(resultat);
clientSend();
- return 0;
+ return 0;
}
int getResults(int ntest) {
@@ -467,7 +467,7 @@
compteur(resultat,ntest);
}
- return 0;
+ return 0;
}
/* Usefull debug macro */
@@ -990,7 +990,7 @@
printf("\n");
printf("Send bugs to vincent.roqueta@ext.bull.net\n");
exit(0);
- return 0;
+ return 0;
}
int main(int argc,char ** argv) {
@@ -1070,5 +1070,5 @@
}
clean();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/nfsv4/locks/netsync.c b/testcases/network/nfsv4/locks/netsync.c
index 2aaf1a6..2623857 100644
--- a/testcases/network/nfsv4/locks/netsync.c
+++ b/testcases/network/nfsv4/locks/netsync.c
@@ -37,7 +37,7 @@
int clientReceiveNet() {
readFromServer(message);
- return 0;
+ return 0;
}
int setupConnectionServeur() {
@@ -77,7 +77,7 @@
}
}
- return 0;
+ return 0;
}
int writeToClient(int c, char *message) {
@@ -88,7 +88,7 @@
int c;
for (c=0;c<maxClients;c++)
close(fdClient[c]);
- return 0;
+ return 0;
}
@@ -96,7 +96,7 @@
int c;
for (c=0;c<maxClients;c++)
writeToClient(c, foo);
- return 0;
+ return 0;
}
int setupClients(int type, char *fname, int nThread) {
@@ -121,7 +121,7 @@
char message[512];
sprintf(message,"%d:%s:%d::", type,fname,nThread);
writeToAllClients(message);
- return 0;
+ return 0;
}
int configureServeur(int max) {
@@ -130,7 +130,7 @@
setupConnectionServeur();
- return 0;
+ return 0;
}
int setupConnectionClient() {
@@ -156,7 +156,7 @@
perror("connect");
return 1;
}
- return 0;
+ return 0;
}
int readFromServer(char *message) {
@@ -191,11 +191,11 @@
p=strtok(NULL,":");
*nThread=atoi(p);
- return 0;
+ return 0;
}
int configureClient(char *s) {
serveur=s;
setupConnectionClient();
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/sctp/func_tests/test_1_to_1_initmsg_connect.c b/testcases/network/sctp/func_tests/test_1_to_1_initmsg_connect.c
index 08c94fa..aafdc30 100644
--- a/testcases/network/sctp/func_tests/test_1_to_1_initmsg_connect.c
+++ b/testcases/network/sctp/func_tests/test_1_to_1_initmsg_connect.c
@@ -116,5 +116,5 @@
close (sk2);
close (sk3);
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/sctp/func_tests/test_recvmsg.c b/testcases/network/sctp/func_tests/test_recvmsg.c
index 8484adf..9b6a744 100644
--- a/testcases/network/sctp/func_tests/test_recvmsg.c
+++ b/testcases/network/sctp/func_tests/test_recvmsg.c
@@ -156,5 +156,5 @@
close(clt_sk);
/* Indicate successful completion. */
- return 0;
+ return 0;
}
\ No newline at end of file
diff --git a/testcases/network/sockets/ltpClient.c b/testcases/network/sockets/ltpClient.c
index 9e5ceca..0f54884 100644
--- a/testcases/network/sockets/ltpClient.c
+++ b/testcases/network/sockets/ltpClient.c
@@ -274,7 +274,7 @@
ltp_run_ping_tests(hostName);
- return 0;
+ return 0;
}
@@ -303,7 +303,7 @@
ltp_traceroute(&rawTraceAddr, hostName, pid);
- return 0;
+ return 0;
}
/**********************************************************************
* Function: ltp_run_ping_tests - host look up and start ping processes
@@ -335,7 +335,7 @@
}
- return 0;
+ return 0;
}
/******************************************************************************
diff --git a/testcases/network/sockets/ltpServer.c b/testcases/network/sockets/ltpServer.c
index f2a9682..9c96243 100644
--- a/testcases/network/sockets/ltpServer.c
+++ b/testcases/network/sockets/ltpServer.c
@@ -208,7 +208,7 @@
while (1);
- return 0;
+ return 0;
}
/*
* Function: ltp_udp_server_queue
diff --git a/testcases/network/stress/ns-tools/ns-common.c b/testcases/network/stress/ns-tools/ns-common.c
index 073ce18..dfbf099 100644
--- a/testcases/network/stress/ns-tools/ns-common.c
+++ b/testcases/network/stress/ns-tools/ns-common.c
@@ -283,7 +283,7 @@
for (idx = 0; idx < ETH_ALEN; idx++)
addr_p[idx] = val[idx];
- return 0;
+ return 0;
}
/*
@@ -350,7 +350,7 @@
ts_p->tv_sec = sec;
ts_p->tv_nsec = nsec;
- return 0;
+ return 0;
}
/*
diff --git a/testcases/network/stress/ns-tools/ns-icmpv6_sender.c b/testcases/network/stress/ns-tools/ns-icmpv6_sender.c
index d8f8152..b4647b7 100644
--- a/testcases/network/stress/ns-tools/ns-icmpv6_sender.c
+++ b/testcases/network/stress/ns-tools/ns-icmpv6_sender.c
@@ -344,7 +344,7 @@
info_p->pkt = pkt;
info_p->pkt_size = sizeof(struct ip6_hdr) + ip6_psize;
- return 0;
+ return 0;
}
/*
diff --git a/testcases/open_posix_testsuite/conformance/definitions/signal_h/15-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/signal_h/15-1-buildonly.c
index 5ffc0b2..18de044 100644
--- a/testcases/open_posix_testsuite/conformance/definitions/signal_h/15-1-buildonly.c
+++ b/testcases/open_posix_testsuite/conformance/definitions/signal_h/15-1-buildonly.c
@@ -17,5 +17,5 @@
flags = t.sa_flags;
t.sa_sigaction = signal_action;
- return 0;
+ return 0;
}
\ No newline at end of file
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 189c748..bce9917 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/fork/2-1.c
@@ -182,13 +182,8 @@
{
/* 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");
}
@@ -284,4 +279,4 @@
/* Otherwise we've an unexpected return code */
UNRESOLVED(WEXITSTATUS(status), "Child returned an unexpected error code");
-}
\ No newline at end of file
+}
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 5ca9ece..d0e801d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/munlockall/5-1.c
@@ -60,11 +60,7 @@
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/pthread_attr_getinheritsched/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getinheritsched/1-1.c
index acdbde4..669c294 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getinheritsched/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getinheritsched/1-1.c
@@ -49,7 +49,7 @@
}
break;
}
- return 0;
+ return 0;
}
int main()
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedparam/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedparam/1-1.c
index 929c503..e54599d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedparam/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getschedparam/1-1.c
@@ -41,7 +41,7 @@
printf(ERROR_PREFIX "got wrong sched param\n");
exit(PTS_FAIL);
}
- return 0;
+ return 0;
}
int main()
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 8bdf157..7fa3f3a 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
@@ -56,7 +56,7 @@
}
break;
}
- return 0;
+ return 0;
}
int main()
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getscope/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getscope/1-1.c
index 65fc8e3..59c7115 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getscope/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_attr_getscope/1-1.c
@@ -51,7 +51,7 @@
}
break;
}
- return 0;
+ return 0;
}
int main()
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 9235fc9..c2133f0 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
@@ -49,7 +49,7 @@
}
break;
}
- return 0;
+ return 0;
}
int main()
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/3-2.c
index 5a465a1..e28244e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/3-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/3-2.c
@@ -201,7 +201,7 @@
if (WIFEXITED(status)) /* The process exited */
{
if (WEXITSTATUS(status) == 0)
- { return 0; } /* We were able to fill the stack */
+ {return 0; } /* We were able to fill the stack */
if (WEXITSTATUS(status) == PTS_UNRESOLVED)
{
output("The child process returned unresolved status\n");
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 069393e..479b28c 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
@@ -286,11 +286,7 @@
#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)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-1.c
index 6e882be..fd40175 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-1.c
@@ -71,7 +71,7 @@
policy, prio);
exit(PTS_UNRESOLVED);
}
- return 0;
+ return 0;
}
static void* fn_rd(void *arg)
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 d2349e5..7cffdc2 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
@@ -71,7 +71,7 @@
policy, prio);
exit(PTS_UNRESOLVED);
}
- return 0;
+ return 0;
}
static void* fn_rd(void *arg)
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 2d95687..1cde581 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
@@ -71,7 +71,7 @@
policy, prio);
exit(PTS_UNRESOLVED);
}
- return 0;
+ return 0;
}
static void* fn_rd(void *arg)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_unlock/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_unlock/3-1.c
index 9bf61de..8231f0b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_unlock/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_unlock/3-1.c
@@ -72,7 +72,7 @@
policy, prio);
exit(PTS_UNRESOLVED);
}
- return 0;
+ return 0;
}
static void* fn_rd(void *arg)
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 7ce41a6..f9710c1 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
@@ -208,11 +208,7 @@
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]);
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 8369fcd..c548dd4 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
@@ -187,11 +187,7 @@
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 75c2700..d843acc 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
@@ -91,11 +91,7 @@
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(), ¶m);
}
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 76a5af7..5fb228c 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
@@ -47,11 +47,7 @@
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-5.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setparam/23-5.c
index 5bd9b7f..f0e65b9 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,11 +38,7 @@
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_setscheduler/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_setscheduler/1-1.c
index ebaa3dc..dac266a 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,11 +67,7 @@
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 36bb509..97e6702 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
@@ -113,11 +113,7 @@
/* 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/sigpending/1-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
index a1c324b..6aba0ca 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sigpending/1-3.c
@@ -55,13 +55,8 @@
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) &&
@@ -126,4 +121,4 @@
}
printf("This code should not be reachable\n");
return PTS_UNRESOLVED;
-}
\ No newline at end of file
+}
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 845f533..05de74a 100644
--- a/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
+++ b/testcases/open_posix_testsuite/stress/threads/pthread_kill/stress.c
@@ -189,11 +189,7 @@
/* wait until termination */
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 1471f54..6234cd6 100644
--- a/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
+++ b/testcases/open_posix_testsuite/stress/threads/sem_getvalue/stress.c
@@ -81,11 +81,7 @@
}
/* Thread function */
-<<<<<<< HEAD
void* threaded(void *arg)
-=======
-void* threaded(void * arg)
->>>>>>> master
{
int ret = 0;
diff --git a/testcases/realtime/func/async_handler/async_handler.c b/testcases/realtime/func/async_handler/async_handler.c
index 40d95b3..f2e305a 100644
--- a/testcases/realtime/func/async_handler/async_handler.c
+++ b/testcases/realtime/func/async_handler/async_handler.c
@@ -66,27 +66,27 @@
void usage(void)
{
- rt_help();
- printf("async_handler specific options:\n");
- printf(" -iITERATIONS number of iterations to calculate the average over\n");
+ rt_help();
+ printf("async_handler specific options:\n");
+ printf(" -iITERATIONS number of iterations to calculate the average over\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
+ int handled = 1;
+ switch (c) {
case 'h':
usage();
exit(0);
- case 'i':
- iterations = atoi(v);
- break;
+ case 'i':
+ iterations = atoi(v);
+ break;
default:
- handled = 0;
- break;
- }
- return handled;
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *handler_thread(void *arg)
diff --git a/testcases/realtime/func/async_handler/async_handler_jk.c b/testcases/realtime/func/async_handler/async_handler_jk.c
index 7cf85ab..54b2b98 100644
--- a/testcases/realtime/func/async_handler/async_handler_jk.c
+++ b/testcases/realtime/func/async_handler/async_handler_jk.c
@@ -57,23 +57,23 @@
void usage(void)
{
- rt_help();
- printf("async_handler_jk specific options:\n");
+ rt_help();
+ printf("async_handler_jk specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *async_event_server(void *arg)
diff --git a/testcases/realtime/func/async_handler/async_handler_tsc.c b/testcases/realtime/func/async_handler/async_handler_tsc.c
index e0ca842..475d5b2 100644
--- a/testcases/realtime/func/async_handler/async_handler_tsc.c
+++ b/testcases/realtime/func/async_handler/async_handler_tsc.c
@@ -72,23 +72,23 @@
void usage(void)
{
- rt_help();
- printf("async_handler_tsc specific options:\n");
+ rt_help();
+ printf("async_handler_tsc specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
/* calculate the tsc period */
diff --git a/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c b/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
index e647eec..283e2d8 100644
--- a/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
+++ b/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
@@ -68,11 +68,11 @@
{
rt_help();
printf("hrtimer-prio specific options:\n");
- printf(" -t# #:busy work time in ms, defaults to %d ms\n", DEF_BUSY_TIME);
- printf(" -i# #:number of iterations, defaults to %d\n", DEF_ITERATIONS);
- printf(" -n# #:number of busy threads, defaults to NR_CPUS*2\n");
- printf(" -f# #:rt fifo priority of busy threads (1,98), defaults to %d\n", DEF_MED_PRIO);
- printf(" -m# #:maximum timer latency in microseconds, defaults to %d\n", DEF_CRITERIA);
+ printf(" -t# #:busy work time in ms, defaults to %d ms\n", DEF_BUSY_TIME);
+ printf(" -i# #:number of iterations, defaults to %d\n", DEF_ITERATIONS);
+ printf(" -n# #:number of busy threads, defaults to NR_CPUS*2\n");
+ printf(" -f# #:rt fifo priority of busy threads (1,98), defaults to %d\n", DEF_MED_PRIO);
+ printf(" -m# #:maximum timer latency in microseconds, defaults to %d\n", DEF_CRITERIA);
}
int parse_args(int c, char *v)
diff --git a/testcases/realtime/func/matrix_mult/matrix_mult.c b/testcases/realtime/func/matrix_mult/matrix_mult.c
index 3d19fa7..a7df069 100644
--- a/testcases/realtime/func/matrix_mult/matrix_mult.c
+++ b/testcases/realtime/func/matrix_mult/matrix_mult.c
@@ -75,8 +75,8 @@
{
rt_help();
printf("matrix_mult specific options:\n");
- printf(" -l# #: number of multiplications per iteration (load)\n");
- printf(" -i# #: number of iterations\n");
+ printf(" -l# #: number of multiplications per iteration (load)\n");
+ printf(" -i# #: number of iterations\n");
}
int parse_args(int c, char *v)
diff --git a/testcases/realtime/func/measurement/preempt_timing.c b/testcases/realtime/func/measurement/preempt_timing.c
index dbdcea8..7650de5 100644
--- a/testcases/realtime/func/measurement/preempt_timing.c
+++ b/testcases/realtime/func/measurement/preempt_timing.c
@@ -59,23 +59,23 @@
void usage(void)
{
- rt_help();
- printf("preempt_timing specific options:\n");
+ rt_help();
+ printf("preempt_timing specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
unsigned long long sample_list[ITERATIONS];
@@ -107,7 +107,7 @@
fprintf(stderr, "This program runs with a scheduling policy of SCHED_FIFO at priority %d\n", param.sched_priority);
fprintf(stderr, "You don't have the necessary privileges to create such a real-time process.\n");
} else {
- fprintf(stderr, "Failed to set scheduler, errno %d\n", errno);
+ fprintf(stderr, "Failed to set scheduler, errno %d\n", errno);
}
exit(1);
}
diff --git a/testcases/realtime/func/measurement/rdtsc-latency.c b/testcases/realtime/func/measurement/rdtsc-latency.c
index f248f2f..bbab813 100644
--- a/testcases/realtime/func/measurement/rdtsc-latency.c
+++ b/testcases/realtime/func/measurement/rdtsc-latency.c
@@ -50,24 +50,24 @@
void usage(void)
{
- rt_help();
- printf("rdtsc-latency specific options:\n");
- printf(" This testcase don't expect any commandline options\n");
+ rt_help();
+ printf("rdtsc-latency specific options:\n");
+ printf(" This testcase don't expect any commandline options\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
/* return difference in nanoseconds */
@@ -127,7 +127,7 @@
fprintf(stderr, "This program runs with a scheduling policy of SCHED_FIFO at priority %d\n", param.sched_priority);
fprintf(stderr, "You don't have the necessary privileges to create such a real-time process.\n");
} else {
- fprintf(stderr, "Failed to set scheduler, errno %d\n", errno);
+ fprintf(stderr, "Failed to set scheduler, errno %d\n", errno);
}
exit(1);
}
diff --git a/testcases/realtime/func/pi-tests/sbrk_mutex.c b/testcases/realtime/func/pi-tests/sbrk_mutex.c
index 95c611b..895d193 100644
--- a/testcases/realtime/func/pi-tests/sbrk_mutex.c
+++ b/testcases/realtime/func/pi-tests/sbrk_mutex.c
@@ -56,23 +56,23 @@
void usage(void)
{
- rt_help();
- printf("sbrk_mutex specific options:\n");
+ rt_help();
+ printf("sbrk_mutex specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *worker_thread(void *arg)
@@ -106,17 +106,17 @@
rt_init("h",parse_args,argc,argv);
- if (pthread_mutexattr_init(&mutexattr) != 0) {
- printf("Failed to init mutexattr\n");
- }
- if (pthread_mutexattr_setrobust_np(&mutexattr, PTHREAD_MUTEX_ROBUST_NP) != 0) {
- printf("Can't set mutexattr robust\n");
- }
- if (pthread_mutexattr_getrobust_np(&mutexattr, &robust) != 0) {
- printf("Can't get mutexattr robust\n");
- } else {
- printf("robust in mutexattr is %d\n", robust);
- }
+ if (pthread_mutexattr_init(&mutexattr) != 0) {
+ printf("Failed to init mutexattr\n");
+ }
+ if (pthread_mutexattr_setrobust_np(&mutexattr, PTHREAD_MUTEX_ROBUST_NP) != 0) {
+ printf("Can't set mutexattr robust\n");
+ }
+ if (pthread_mutexattr_getrobust_np(&mutexattr, &robust) != 0) {
+ printf("Can't get mutexattr robust\n");
+ } else {
+ printf("robust in mutexattr is %d\n", robust);
+ }
/* malloc and initialize the mutexes */
printf("allocating and initializing %d mutexes\n", NUM_MUTEXES);
@@ -150,7 +150,6 @@
#else
int main(void) {
- printf("Your system doesn't support the pthread robust mutexattr APIs\n");
- return 1;
+ tst_brkm(TCONF, NULL, "Your system doesn't support the pthread robust mutexattr APIs\n");
}
-#endif
\ No newline at end of file
+#endif
diff --git a/testcases/realtime/func/pi-tests/test-skeleton.c b/testcases/realtime/func/pi-tests/test-skeleton.c
index 380402f..f03d108 100644
--- a/testcases/realtime/func/pi-tests/test-skeleton.c
+++ b/testcases/realtime/func/pi-tests/test-skeleton.c
@@ -45,23 +45,23 @@
void usage(void)
{
- rt_help();
- printf("testpi-5 and 6 specific options:\n");
+ rt_help();
+ printf("testpi-5 and 6 specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
#define TEST_FUNCTION do_test(argc, argv)
@@ -69,19 +69,19 @@
static pid_t pid;
-static void timeout_handler (int sig)
+static void
+timeout_handler(int sig)
{
int i, killed, status;
+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
printf("Inside the timeout handler, killing the TC threads \n");
- kill( pid, SIGKILL );
- for (i=0; i<5; i++) {
+ kill(pid, SIGKILL);
+ for (i = 0; i < 5; i++) {
killed = waitpid(pid, &status, WNOHANG|WUNTRACED);
if (0 != killed)
break;
-
- struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
- nanosleep (&ts, NULL);
+ nanosleep(&ts, NULL);
}
if (0 != killed && pid != killed) {
@@ -92,31 +92,31 @@
exit(1);
}
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
{
pid_t termpid;
int status;
setup();
- rt_init("h",parse_args,argc,argv);
+ rt_init("h", parse_args, argc, argv);
pid = fork();
if (0 == pid) {
- //This is the child
- exit (TEST_FUNCTION);
+ exit(TEST_FUNCTION);
}
else if (pid < 0) {
printf("\n Cannot fork test program \n");
exit(1);
}
- signal( SIGALRM, timeout_handler);
+ signal(SIGALRM, timeout_handler);
alarm(TIMEOUT);
- termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
+ termpid = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
if (-1 == termpid) {
printf("\n Waiting for test program failed, Exiting \n");
exit(1);
}
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/pi-tests/testpi-1.c b/testcases/realtime/func/pi-tests/testpi-1.c
index 90844e4..53573e4 100644
--- a/testcases/realtime/func/pi-tests/testpi-1.c
+++ b/testcases/realtime/func/pi-tests/testpi-1.c
@@ -31,8 +31,8 @@
*
* HISTORY
* 2010-04-22 Code cleanup and thread synchronization changes by using
- * conditional variables,
- * by Gowrishankar(gowrishankar.m@in.ibm.com).
+ * conditional variables,
+ * by Gowrishankar(gowrishankar.m@in.ibm.com).
*
*****************************************************************************/
@@ -217,4 +217,4 @@
pthread_mutex_destroy(&cond_mutex);
pthread_cond_destroy(&cond_var);
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/pi-tests/testpi-2.c b/testcases/realtime/func/pi-tests/testpi-2.c
index 047491f..4dff842 100644
--- a/testcases/realtime/func/pi-tests/testpi-2.c
+++ b/testcases/realtime/func/pi-tests/testpi-2.c
@@ -32,8 +32,8 @@
*
* HISTORY
* 2010-04-22 Code cleanup and thread synchronization changes by using
- * conditional variables,
- * by Gowrishankar(gowrishankar.m@in.ibm.com).
+ * conditional variables,
+ * by Gowrishankar(gowrishankar.m@in.ibm.com).
*
*****************************************************************************/
@@ -218,4 +218,4 @@
pthread_mutex_destroy(&cond_mutex);
pthread_cond_destroy(&cond_var);
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/pi-tests/testpi-4.c b/testcases/realtime/func/pi-tests/testpi-4.c
index 3f1b03a..153e3da 100644
--- a/testcases/realtime/func/pi-tests/testpi-4.c
+++ b/testcases/realtime/func/pi-tests/testpi-4.c
@@ -31,8 +31,8 @@
*
* HISTORY
* 2010-06-29 Thread synchronization changes by using
- * conditional variables by Gowrishankar.
- * by Gowrishankar <gowrishankar.m@in.ibm.com>
+ * conditional variables by Gowrishankar.
+ * by Gowrishankar <gowrishankar.m@in.ibm.com>
*
*****************************************************************************/
@@ -223,4 +223,4 @@
pthread_mutex_destroy(&cond_mutex);
pthread_cond_destroy(&cond_var);
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/pi-tests/testpi-7.c b/testcases/realtime/func/pi-tests/testpi-7.c
index 3b4b3b1..2b5326c 100644
--- a/testcases/realtime/func/pi-tests/testpi-7.c
+++ b/testcases/realtime/func/pi-tests/testpi-7.c
@@ -76,7 +76,7 @@
void usage(void)
{
- rt_help();
+ rt_help();
printf("testpi-7 specific options:\n");
printf(" -i# #: number of iterations\n");
printf(" -f #: Use flag mutex\n");
@@ -85,25 +85,25 @@
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- case 'f':
- use_flag_mutex = 0;
- break;
- case 'i':
- iterations = atoi(v);
- break;
- case 'x':
- med_threads = atoi(v);
- break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'f':
+ use_flag_mutex = 0;
+ break;
+ case 'h':
+ usage();
+ exit(0);
+ case 'i':
+ iterations = atoi(v);
+ break;
+ case 'x':
+ med_threads = atoi(v);
+ break;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
phase_t _read_flag(const char *s, int l) {
@@ -283,4 +283,4 @@
printf("Low priority lock drop to high priority acqusistion time: %dus\n", max_drop2grab_us);
printf("\n");
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/pi_perf/pi_perf.c b/testcases/realtime/func/pi_perf/pi_perf.c
index e0c94f2..8edf538 100644
--- a/testcases/realtime/func/pi_perf/pi_perf.c
+++ b/testcases/realtime/func/pi_perf/pi_perf.c
@@ -37,7 +37,7 @@
* HISTORY
* 2007-Nov-20: Initial version by Sripathi Kodi <sripathik@in.ibm.com>
* 2009-Jul-03: Pass criteria corrected by Sripathi Kodi
- * <sripathik@in.ibm.com>
+ * <sripathik@in.ibm.com>
*
*****************************************************************************/
@@ -93,21 +93,21 @@
{
int handled = 1;
switch (c) {
- case 'h':
- usage();
- exit(0);
- case 'i':
- iterations = atoi(v);
- break;
- case 'n':
- num_busy = atoi(v);
- break;
- case 'w':
- low_work_time = atoi(v);
- break;
- default:
- handled = 0;
- break;
+ case 'h':
+ usage();
+ exit(0);
+ case 'i':
+ iterations = atoi(v);
+ break;
+ case 'n':
+ num_busy = atoi(v);
+ break;
+ case 'w':
+ low_work_time = atoi(v);
+ break;
+ default:
+ handled = 0;
+ break;
}
return handled;
}
@@ -270,4 +270,4 @@
printf("Result: %s\n", ret ? "FAIL" : "PASS");
return ret;
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/func/prio-preempt/prio-preempt.c b/testcases/realtime/func/prio-preempt/prio-preempt.c
index d095070..15800b0 100644
--- a/testcases/realtime/func/prio-preempt/prio-preempt.c
+++ b/testcases/realtime/func/prio-preempt/prio-preempt.c
@@ -24,28 +24,28 @@
*
* The main thread:
* - Creates a minimum of (N-1) busy threads at priority starting at
- * SCHED_FIFO + 80
+ * SCHED_FIFO + 80
* - Creates 26 FIFO (T1, T2,...,T26) threads with priorities 10, 11,...,36.
* - Each of these worker threads executes the following piece of code:
- * pthread_mutex_lock(Mi);
- * pthread_cond_wait(CVi);
- * pthread_mutex_unlock(Mi);
+ * pthread_mutex_lock(Mi);
+ * pthread_cond_wait(CVi);
+ * pthread_mutex_unlock(Mi);
*
* where Mi is the ith pthread_mutex_t and CVi is the ith conditional
* variable.So, at the end of this loop, 26 threads are all waiting on
* seperate condvars and mutexes.
* - Wakes up thread at priority 10 (T1) by executing:
- * pthread_mutex_lock(M1);
- * pthread_cond_signal(CV1);
- * pthread_mutex_unlock(M1);
+ * pthread_mutex_lock(M1);
+ * pthread_cond_signal(CV1);
+ * pthread_mutex_unlock(M1);
*
* - Waits for all the worker threads to finish execution.
- * T1 then wakes up T2 by signalling on the condvar CV2 and sets a flag
- * called T1_after_wait to indicate that it is after the wait. It then
- * checks if T2_after_wait has been set or not. If not, the test fails,
- * else the process continues with other threads. The thread T1 expects
- * T2_after_wait to be set as, the moment T1 signals on CV2, T2 is
- * supposed to be scheduled (in accordance with priority preemption).
+ * T1 then wakes up T2 by signalling on the condvar CV2 and sets a flag
+ * called T1_after_wait to indicate that it is after the wait. It then
+ * checks if T2_after_wait has been set or not. If not, the test fails,
+ * else the process continues with other threads. The thread T1 expects
+ * T2_after_wait to be set as, the moment T1 signals on CV2, T2 is
+ * supposed to be scheduled (in accordance with priority preemption).
*
* USAGE:
* Use run_auto.sh script in current directory to build and run test.
@@ -55,7 +55,7 @@
*
* HISTORY
* 2006-Jun-01: Initial version by Dinakar Guniguntala
- * Changes from John Stultz and Vivek Pallantla
+ * Changes from John Stultz and Vivek Pallantla
*
*****************************************************************************/
@@ -91,29 +91,29 @@
{
rt_help();
printf("prio-preempt specific options:\n");
- printf(" -i #: enable interrupter threads\n");
- printf(" -n# #: number of busy threads\n");
+ printf(" -i #: enable interrupter threads\n");
+ printf(" -n# #: number of busy threads\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- case 'i':
- int_threads = 1;
- break;
- case 'n':
- rt_threads = atoi(v);
- break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ case 'i':
+ int_threads = 1;
+ break;
+ case 'n':
+ rt_threads = atoi(v);
+ break;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *int_thread(void* arg)
@@ -197,7 +197,7 @@
rc = pthread_mutex_lock(&mutex[tid+1]);
rc = pthread_cond_signal(&cond[tid+1]);
debug(DBG_INFO, "%llu: Thread %d(%d): Sent signal (%d) to (%d)\n", rt_gettime(), tid, mypri,
- rc, tid+1);
+ rc, tid+1);
pstart = pend = rt_gettime();
rc = pthread_mutex_unlock(&mutex[tid+1]);
@@ -243,7 +243,7 @@
/* start the (N-1) busy threads */
pri_boost = 80;
for (i = rt_threads; i > 1; i--) {
- create_fifo_thread(busy_thread, (void*)(intptr_t)i,
+ create_fifo_thread(busy_thread, (void*)(intptr_t)i,
sched_get_priority_min(SCHED_FIFO) + pri_boost);
}
@@ -257,7 +257,7 @@
for (i = 0, pri_boost = 10; i < NUM_WORKERS ; i++, pri_boost+=2) {
pthread_mutex_init(&mutex[i], NULL);
pthread_cond_init(&cond[i], NULL);
- create_fifo_thread(worker_thread, (void*)(intptr_t)i,
+ create_fifo_thread(worker_thread, (void*)(intptr_t)i,
sched_get_priority_min(SCHED_FIFO) + pri_boost);
}
@@ -297,7 +297,7 @@
if (rt_threads == -1 || rt_threads > numcpus) {
rt_threads = numcpus;
printf("Maximum busy thread count(%d), "
- "should not exceed number of cpus(%d)\n", rt_threads, numcpus);
+ "should not exceed number of cpus(%d)\n", rt_threads, numcpus);
printf("Using %d\n", numcpus);
}
@@ -306,17 +306,17 @@
printf("Priority Preemption\n");
printf("-------------------\n\n");
printf("Busy Threads: %d\n", rt_threads);
- printf("Interrupter Threads: %s\n", int_threads ? "Enabled" : "Disabled");
+ printf("Interrupter Threads: %s\n", int_threads ? "Enabled" : "Disabled");
printf("Worker Threads: %d\n\n", NUM_WORKERS);
pri_boost = 81;
- create_fifo_thread(master_thread, (void*)0,
+ create_fifo_thread(master_thread, (void*)0,
sched_get_priority_min(SCHED_FIFO) + pri_boost);
- /* wait for threads to complete */
- join_threads();
+ /* wait for threads to complete */
+ join_threads();
- printf("\nCriteria: All threads appropriately preempted within %d loop(s)\n", (int)pass_criteria);
- printf("Result: %s\n", ret ? "FAIL" : "PASS");
+ printf("\nCriteria: All threads appropriately preempted within %d loop(s)\n", (int)pass_criteria);
+ printf("Result: %s\n", ret ? "FAIL" : "PASS");
return ret;
}
\ No newline at end of file
diff --git a/testcases/realtime/func/prio-wake/prio-wake.c b/testcases/realtime/func/prio-wake/prio-wake.c
index ff3b938..51b1e1f 100644
--- a/testcases/realtime/func/prio-wake/prio-wake.c
+++ b/testcases/realtime/func/prio-wake/prio-wake.c
@@ -23,13 +23,13 @@
* Test priority ordered wakeup with pthread_cond_*
* * Steps:
* - Creates a number of worker threads with increasing FIFO priorities
- * (by default, num worker threads = num cpus)
+ * (by default, num worker threads = num cpus)
* - Create a master thread
* - The time the worker thread starts running is noted. Each of the
* worker threads then waits on the same _condvar_. The time it
* wakes up also noted.
* - Once all the threads finish execution, the start and wakeup times
- * of all the threads is displayed.
+ * of all the threads is displayed.
* - The output must indicate that the thread wakeup happened in a
* priority order.
*
@@ -67,32 +67,32 @@
void usage(void)
{
- rt_help();
- printf("prio-wake specific options:\n");
- printf(" -n# #: number of worker threads\n");
- printf(" -l# 1:lock the mutex before broadcast, 0:don't\n");
- printf(" defaults to 1\n");
+ rt_help();
+ printf("prio-wake specific options:\n");
+ printf(" -n# #: number of worker threads\n");
+ printf(" -l# 1:lock the mutex before broadcast, 0:don't\n");
+ printf(" defaults to 1\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- case 'n':
- rt_threads = atoi(v);
- break;
- case 'l':
- locked_broadcast = atoi(v);
- break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ case 'n':
+ rt_threads = atoi(v);
+ break;
+ case 'l':
+ locked_broadcast = atoi(v);
+ break;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
struct array {
@@ -163,13 +163,13 @@
int main(int argc, char* argv[])
{
int threads_per_prio;
- int numcpus;
+ int numcpus;
int numprios;
int prio;
int i;
setup();
- rt_init("hn:l:", parse_args, argc, argv);
+ rt_init("hn:l:", parse_args, argc, argv);
if (rt_threads == 0) {
numcpus = sysconf(_SC_NPROCESSORS_ONLN);
@@ -221,6 +221,6 @@
ret++;
}
}
- printf("Result: %s\n", ret ? "FAIL" : "PASS");
+ printf("Result: %s\n", ret ? "FAIL" : "PASS");
return ret;
}
\ No newline at end of file
diff --git a/testcases/realtime/func/rt-migrate/rt-migrate.c b/testcases/realtime/func/rt-migrate/rt-migrate.c
index c6c15fe..db9e695 100644
--- a/testcases/realtime/func/rt-migrate/rt-migrate.c
+++ b/testcases/realtime/func/rt-migrate/rt-migrate.c
@@ -43,7 +43,7 @@
* HISTORY
* 30 July, 2009: Initial version by Steven Rostedt
* 11 Aug, 2009: Converted the coding style to the one used by the realtime
- * testcases by Kiran Prakash
+ * testcases by Kiran Prakash
*
*/
#ifndef _GNU_SOURCE
@@ -192,7 +192,7 @@
/*
int rt_init(const char *options, int (*parse_arg)(int option, char *value),
- int argc, char *argv[]);
+ int argc, char *argv[]);
*/
static int parse_args(int c, char *v)
{
diff --git a/testcases/realtime/func/sched_football/sched_football.c b/testcases/realtime/func/sched_football/sched_football.c
index 5084675..d9f1f79 100644
--- a/testcases/realtime/func/sched_football/sched_football.c
+++ b/testcases/realtime/func/sched_football/sched_football.c
@@ -32,12 +32,12 @@
* - Create a fixed number of offense threads (lower priority)
* - Create a referee thread (highest priority)
* - Once everyone is on the field, the offense thread increments the
- * value of 'the_ball' and yields. The defense thread tries to block
- * the ball by never letting the offense players get the CPU (it just
+ * value of 'the_ball' and yields. The defense thread tries to block
+ * the ball by never letting the offense players get the CPU (it just
* does a sched_yield).
* - The refree threads wakes up regularly to check if the game is over :)
* - In the end, if the value of 'the_ball' is >0, the test is considered
- * to have failed.
+ * to have failed.
*
* USAGE:
* Use run_auto.sh script in current directory to build and run test.
@@ -47,11 +47,11 @@
*
* HISTORY
* 2006-03-16 Reduced verbosity, non binary failure reporting, removal of
- * crazy_fans thread, added game_length argument by Darren Hart.
+ * crazy_fans thread, added game_length argument by Darren Hart.
* 2007-08-01 Remove all thread cleanup in favor of simply exiting.Various
- * bugfixes and cleanups. -- Josh Triplett
+ * bugfixes and cleanups. -- Josh Triplett
* 2009-06-23 Simplified atomic startup mechanism, avoiding thundering herd
- * scheduling at the beginning of the game. -- Darren Hart
+ * scheduling at the beginning of the game. -- Darren Hart
*
*****************************************************************************/
@@ -89,22 +89,22 @@
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
case 'n':
players_per_team = atoi(v);
break;
case 'l':
game_length= atoi(v);
break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
/* This is the defensive team. They're trying to block the offense */
@@ -149,7 +149,7 @@
}
/* Blow the whistle */
printf("Game Over!\n");
- final_ball = the_ball;
+ final_ball = the_ball;
printf("Final ball position: %d\n", final_ball);
return final_ball != 0;
}
diff --git a/testcases/realtime/func/sched_jitter/sched_jitter.c b/testcases/realtime/func/sched_jitter/sched_jitter.c
index 7201ca9..3b51da7 100644
--- a/testcases/realtime/func/sched_jitter/sched_jitter.c
+++ b/testcases/realtime/func/sched_jitter/sched_jitter.c
@@ -62,23 +62,23 @@
void usage(void)
{
- rt_help();
- printf("sched_jitter specific options:\n");
+ rt_help();
+ printf("sched_jitter specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
unsigned long long ts_sub(struct timespec a , struct timespec b)
@@ -124,7 +124,7 @@
stats_container_init(&dat, NUMRUNS);
- for (i=0; i < NUMRUNS; i++) {
+ for (i=0; i < NUMRUNS; i++) {
do_work(1); /* warm cache */
diff --git a/testcases/realtime/func/sched_latency/sched_latency.c b/testcases/realtime/func/sched_latency/sched_latency.c
index b5ea842..238f984 100644
--- a/testcases/realtime/func/sched_latency/sched_latency.c
+++ b/testcases/realtime/func/sched_latency/sched_latency.c
@@ -80,7 +80,7 @@
{
rt_help();
printf("sched_latency specific options:\n");
- printf(" -dLOAD periodic load in ms (default 1)\n");
+ printf(" -dLOAD periodic load in ms (default 1)\n");
printf(" -lTHRESHOLD trace latency, with given threshold in us\n");
printf(" -tPERIOD period in ms (default 5)\n");
printf(" -iITERATIONS number of iterations (default %d)\n",
@@ -90,28 +90,28 @@
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- case 'd':
- load_ms = atoi(v);
- break;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ case 'd':
+ load_ms = atoi(v);
+ break;
case 'i':
iterations = atoi(v);
break;
- case 'l':
- latency_threshold = strtoull(v, NULL, 0);
- break;
- case 't':
- period = strtoull(v, NULL, 0)*NS_PER_MS;
- break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ case 'l':
+ latency_threshold = strtoull(v, NULL, 0);
+ break;
+ case 't':
+ period = strtoull(v, NULL, 0)*NS_PER_MS;
+ break;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *periodic_thread(void *arg)
@@ -144,11 +144,11 @@
if (next < now) {
printf("\nPERIOD MISSED!\n");
printf(" scheduled delta: %8llu us\n", sched_delta/1000);
- printf(" actual delta: %8llu us\n", delta/1000);
- printf(" latency: %8llu us\n", (delta-sched_delta)/1000);
+ printf(" actual delta: %8llu us\n", delta/1000);
+ printf(" latency: %8llu us\n", (delta-sched_delta)/1000);
printf("---------------------------------------\n");
printf(" previous start: %8llu us\n", (prev-iter_start)/1000);
- printf(" now: %8llu us\n", (now-iter_start)/1000);
+ printf(" now: %8llu us\n", (now-iter_start)/1000);
printf(" scheduled start: %8llu us\n", (next-iter_start)/1000);
printf("next scheduled start is in the past!\n");
ret = 1;
diff --git a/testcases/realtime/lib/libstats.c b/testcases/realtime/lib/libstats.c
index 84e995e..9aa3136 100644
--- a/testcases/realtime/lib/libstats.c
+++ b/testcases/realtime/lib/libstats.c
@@ -17,21 +17,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* NAME
- * libstats.c
+ * libstats.c
*
* DESCRIPTION
- * Some basic statistical analysis convenience tools.
+ * Some basic statistical analysis convenience tools.
*
*
* USAGE:
- * To be included in test cases
+ * To be included in test cases
*
* AUTHOR
- * Darren Hart <dvhltc@us.ibm.com>
+ * Darren Hart <dvhltc@us.ibm.com>
*
* HISTORY
- * 2006-Oct-17: Initial version by Darren Hart
- * 2009-Jul-22: Addition of stats_container_append function by Kiran Prakash
+ * 2006-Oct-17: Initial version by Darren Hart
+ * 2009-Jul-22: Addition of stats_container_append function by Kiran Prakash
*
* TODO: the save routine for gnuplot plotting should be more modular...
*
@@ -104,9 +104,9 @@
int stats_sort(stats_container_t *data, enum stats_sort_method method)
{
- // method not implemented, always ascending on y atm
+ /* method not implemented, always ascending on y atm */
qsort(data->records, data->index + 1, sizeof(stats_record_t),
- stats_record_compare);
+ stats_record_compare);
return 0;
}
@@ -201,12 +201,11 @@
return -1;
}
quantiles->nines = nines;
- // allocate space for quantiles, starting with 0.99 (two nines)
- quantiles->quantiles = malloc(sizeof(long) * (nines-1));
+ /* allocate space for quantiles, starting with 0.99 (two nines) */
+ quantiles->quantiles = calloc(sizeof(long), (nines-1));
if (!quantiles->quantiles) {
return -1;
}
- memset(quantiles->quantiles, 0, (nines-1) * sizeof(long));
return 0;
}
@@ -223,9 +222,8 @@
int index;
// check for sufficient data size of accurate calculation
- if (data->index < 0 || (data->index + 1) \
- < (long)exp10(quantiles->nines)) {
- //printf("ERROR: insufficient data size for %d nines\n", data->size);
+ if (data->index < 0 ||
+ (data->index + 1) < (long)exp10(quantiles->nines)) {
return -1;
}
@@ -271,24 +269,18 @@
if (y > max) max = y;
if (y < min) min = y;
}
- //printf("min = %d\n", min);
- //printf("max = %d\n", max);
/* define the bucket ranges */
width = MAX((max-min)/hist->size, 1);
- //printf("width = %d\n", width);
hist->records[0].x = min;
- //printf("hist[0].x = %d\n", min);
for (i = 1; i < (hist->size); i++) {
hist->records[i].x = min + i*width;
- //printf("hist[%d].x = %d\n", i, hist->records[i].x);
}
/* fill in the counts */
for (i = 0; i <= data->index; i++) {
y = data->records[i].y;
b = MIN((y-min)/width, hist->size-1);
- //printf("%d will go in bucket %d\n", y, b);
hist->records[b].y++;
}
@@ -310,65 +302,59 @@
int stats_container_save(char *filename, char *title, char *xlabel, char *ylabel, stats_container_t *data, char *mode)
{
- int i;
- int minx = 0, maxx = 0, miny = 0, maxy = 0;
- FILE *dat_fd;
- FILE *plt_fd;
- char *datfile;
- char *pltfile;
- stats_record_t *rec;
+ int i;
+ int minx = 0, maxx = 0, miny = 0, maxy = 0;
+ FILE *dat_fd;
+ FILE *plt_fd;
+ char *datfile;
+ char *pltfile;
+ stats_record_t *rec;
- if (!save_stats)
- return 0;
+ if (!save_stats)
+ return 0;
- /* generate the filenames */
- if (asprintf(&datfile, "%s.dat", filename) == -1) {
+ /* generate the filenames */
+ if (asprintf(&datfile, "%s.dat", filename) == -1) {
fprintf(stderr, "Failed to allocate string for data filename\n");
return -1;
}
- if (asprintf(&pltfile, "%s.plt", filename) == -1) {
+ if (asprintf(&pltfile, "%s.plt", filename) == -1) {
fprintf(stderr, "Failed to allocate string for plot filename\n");
return -1;
}
- /* generate the data file */
- if (!(dat_fd = fopen(datfile, "w"))) {
- perror("Failed to open dat file");
- return -1;
- } else {
- minx = maxx = data->records[0].x;
+ /* generate the data file */
+ if ((dat_fd = fopen(datfile, "w")) == NULL) {
+ perror("Failed to open dat file");
+ return -1;
+ } else {
+ minx = maxx = data->records[0].x;
miny = maxy = data->records[0].y;
for (i = 0; i <= data->index; i++) {
- rec = &data->records[i];
- minx = MIN(minx, rec->x);
- maxx = MAX(maxx, rec->x);
- miny = MIN(miny, rec->y);
- maxy = MAX(maxy, rec->y);
- fprintf(dat_fd, "%ld %ld\n", rec->x, rec->y);
- }
- fclose(dat_fd);
- }
+ rec = &data->records[i];
+ minx = MIN(minx, rec->x);
+ maxx = MAX(maxx, rec->x);
+ miny = MIN(miny, rec->y);
+ maxy = MAX(maxy, rec->y);
+ fprintf(dat_fd, "%ld %ld\n", rec->x, rec->y);
+ }
+ fclose(dat_fd);
+ }
- /* generate the plt file */
- if (!(plt_fd = fopen(pltfile, "w"))) {
- perror("Failed to open plt file");
- return -1;
- } else {
- fprintf(plt_fd, "set terminal png\n");
- fprintf(plt_fd, "set output \"%s.png\"\n", pltfile);
- fprintf(plt_fd, "set title \"%s\"\n", title);
- fprintf(plt_fd, "set xlabel \"%s\"\n", xlabel);
- fprintf(plt_fd, "set ylabel \"%s\"\n", ylabel);
+ /* generate the plt file */
+ if (!(plt_fd = fopen(pltfile, "w"))) {
+ perror("Failed to open plt file");
+ return -1;
+ } else {
+ fprintf(plt_fd, "set terminal png\n");
+ fprintf(plt_fd, "set output \"%s.png\"\n", pltfile);
+ fprintf(plt_fd, "set title \"%s\"\n", title);
+ fprintf(plt_fd, "set xlabel \"%s\"\n", xlabel);
+ fprintf(plt_fd, "set ylabel \"%s\"\n", ylabel);
+ fprintf(plt_fd, "plot [0:%d] [0:%d] \"%s\" with %s\n",
+ maxx+1, maxy+1, datfile, mode);
+ fclose(plt_fd);
+ }
- // exact range mode
- //fprintf(plt_fd, "plot [%d:%d] [%d:%d] \"%s\" with %s\n",
- // minx, maxx, miny, maxy, datfile, mode);
-
- // expanded range mode - slightly more intuitive I think...
- fprintf(plt_fd, "plot [0:%d] [0:%d] \"%s\" with %s\n",
- maxx+1, maxy+1, datfile, mode);
- fclose(plt_fd);
- }
-
- return 0;
-}
\ No newline at end of file
+ return 0;
+}
diff --git a/testcases/realtime/perf/latency/pthread_cond_latency.c b/testcases/realtime/perf/latency/pthread_cond_latency.c
index 48b9a93..8fe32a1 100644
--- a/testcases/realtime/perf/latency/pthread_cond_latency.c
+++ b/testcases/realtime/perf/latency/pthread_cond_latency.c
@@ -49,23 +49,23 @@
void usage(void)
{
- rt_help();
- printf("testpi-1 specific options:\n");
+ rt_help();
+ printf("testpi-1 specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
/*
diff --git a/testcases/realtime/perf/latency/pthread_cond_many.c b/testcases/realtime/perf/latency/pthread_cond_many.c
index 8d43750..ea9c894 100644
--- a/testcases/realtime/perf/latency/pthread_cond_many.c
+++ b/testcases/realtime/perf/latency/pthread_cond_many.c
@@ -260,13 +260,13 @@
int parse_args(int c, char *v)
{
int handled;
- switch (c) {
+ switch (c) {
case 'h':
usage();
exit(0);
- case 'a':
+ case 'a':
broadcast_flag = 1;
- break;
+ break;
case 'i':
iterations = atoi(v);
break;
@@ -276,11 +276,11 @@
case 'r':
realtime = 1;
break;
- default:
- handled = 0;
- break;
- }
- return handled;
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
int
diff --git a/testcases/realtime/stress/pi-tests/lookup_pi_state.c b/testcases/realtime/stress/pi-tests/lookup_pi_state.c
index 205947a..758a1b4 100644
--- a/testcases/realtime/stress/pi-tests/lookup_pi_state.c
+++ b/testcases/realtime/stress/pi-tests/lookup_pi_state.c
@@ -1,35 +1,35 @@
/******************************************************************************
*
- * Copyright © International Business Machines Corp., 2006, 2008
+ * Copyright © International Business Machines Corp., 2006, 2008
*
- * 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 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.
+ * 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
+ * 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
- * lookup_pi_state.c
+ * lookup_pi_state.c
*
* DESCRIPTION
- * A test to reproduce a bug in lookup_pi_state()
+ * A test to reproduce a bug in lookup_pi_state()
*
* USAGE:
- * Use run_auto.sh script in current directory to build and run test.
+ * Use run_auto.sh script in current directory to build and run test.
*
* AUTHOR
- * Darren Hart <dvhltc@us.ibm.com>
+ * Darren Hart <dvhltc@us.ibm.com>
*
* HISTORY
- * 2006-May-18: Initial version by Darren Hart <dvhltc@us.ibm.com>
+ * 2006-May-18: Initial version by Darren Hart <dvhltc@us.ibm.com>
*
*****************************************************************************/
@@ -52,23 +52,23 @@
void usage(void)
{
- rt_help();
- printf("lookup_pi_state specific options:\n");
+ rt_help();
+ printf("lookup_pi_state specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
void *slave_thread(void* arg)
@@ -86,10 +86,11 @@
}
printf("Slave thread %d waiting on CS,MS\n", id);
pthread_cond_wait(&CS, &MS); // docs are contradictory on if this
- // should be MS or MM
+ // should be MS or MM
if (atomic_inc(&slave_order_b) <= 6) {
// 10,11
+ ;
// do nothing, just terminate
} else {
// 12
@@ -129,14 +130,19 @@
pthread_cond_broadcast(&CS);
pthread_cond_broadcast(&CS);
- pthread_mutex_unlock(&MS); // if we should timedwait on MS, then we don't
- // need to unlock it here
-// 9
+ /* if we should timedwait on MS, then we don't need to unlock it here */
+ pthread_mutex_unlock(&MS);
+
printf("Master waiting 10 seconds\n");
clock_gettime(CLOCK_REALTIME, &ts_abs_timeout);
ts_abs_timeout.tv_sec += 10;
- pthread_cond_timedwait(&CM, &MM, &ts_abs_timeout); // docs say CS and MS, but
- // that doesn't seem correct
+ /*
+ * docs say CS and MS, but that doesn't seem correct
+ *
+ * XXX (garrcoop): then that's a documentation or implementation bug.
+ * Duh... FIX IT!
+ */
+ pthread_cond_timedwait(&CM, &MM, &ts_abs_timeout);
// 13
pthread_mutex_unlock(&MM);
// 14
@@ -144,7 +150,12 @@
pthread_mutex_lock(&MS);
pthread_cond_broadcast(&CS);
// 15
- pthread_mutex_unlock(&MS); // docs say MM, but that doesn't make sense...
+ /*
+ * docs say MM, but that doesn't make sense..
+ *
+ * XXX (garrcoop): comments above apply here too
+ */
+ pthread_mutex_unlock(&MS);
// 16
pthread_mutex_lock(&MT);
clock_gettime(CLOCK_REALTIME, &ts_abs_timeout);
@@ -174,11 +185,11 @@
create_other_thread(master_thread, (void *)0);
- // wait for the slaves to quit
+ /* wait for the slaves to quit */
while (atomic_get(&slave_order_c) < NUM_SLAVES)
usleep(10);
join_threads();
tst_exit();
-}
\ No newline at end of file
+}
diff --git a/testcases/realtime/stress/pi-tests/testpi-3.c b/testcases/realtime/stress/pi-tests/testpi-3.c
index 03d298b..488a8a3 100644
--- a/testcases/realtime/stress/pi-tests/testpi-3.c
+++ b/testcases/realtime/stress/pi-tests/testpi-3.c
@@ -1,29 +1,29 @@
/******************************************************************************
*
- * Copyright © International Business Machines Corp., 2005, 2008
+ * Copyright © International Business Machines Corp., 2005, 2008
*
- * 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 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.
+ * 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
+ * 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
- * testpi-3.c
+ * testpi-3.c
*
* DESCRIPTION
*
*
* USAGE:
- * Use run_auto.sh script in current directory to build and run test.
+ * Use run_auto.sh script in current directory to build and run test.
*
* AUTHOR
*
@@ -45,46 +45,46 @@
void usage(void)
{
- rt_help();
- printf("testpi-3 specific options:\n");
+ rt_help();
+ printf("testpi-3 specific options:\n");
}
int parse_args(int c, char *v)
{
- int handled = 1;
- switch (c) {
- case 'h':
- usage();
- exit(0);
- default:
- handled = 0;
- break;
- }
- return handled;
+ int handled = 1;
+ switch (c) {
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ handled = 0;
+ break;
+ }
+ return handled;
}
int gettid(void)
{
- return syscall(__NR_gettid);
+ return syscall(__NR_gettid);
}
typedef void* (*entrypoint_t)(void*);
-#define THREAD_STOP 1
+#define THREAD_STOP 1
pthread_mutex_t glob_mutex;
/*typedef struct thread {
- int priority;
- int policy;
- entrypoint_t func;
- pthread_attr_t attr;
- pthread_t handle;
- pthread_mutex_t mutex;
- pthread_cond_t cond;
- int flags;
- int count;
+ int priority;
+ int policy;
+ entrypoint_t func;
+ pthread_attr_t attr;
+ pthread_t handle;
+ pthread_mutex_t mutex;
+ pthread_cond_t cond;
+ int flags;
+ int count;
} Thread;*/
typedef struct thread Thread;
@@ -97,280 +97,285 @@
void* func_nonrt(void* arg)
{
- Thread* pthr = (Thread*)arg;
- int rc, i, j, policy, tid = gettid();
- struct sched_param schedp;
- cpu_set_t mask;
- CPU_ZERO(&mask);
- CPU_SET(0, &mask);
+ Thread* pthr = (Thread*)arg;
+ int rc, i, j, policy, tid = gettid();
+ struct sched_param schedp;
+ cpu_set_t mask;
+ CPU_ZERO(&mask);
+ CPU_SET(0, &mask);
- rc = sched_setaffinity(0, sizeof(mask), &mask);
- if (rc < 0) {
- printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
- exit(-1);
- }
- rc = sched_getaffinity(0, sizeof(mask), &mask);
+ rc = sched_setaffinity(0, sizeof(mask), &mask);
+ if (rc < 0) {
+ printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
+ exit(-1);
+ }
+ rc = sched_getaffinity(0, sizeof(mask), &mask);
- printf("Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
- pthread_getschedparam(pthr->pthread, &policy, &schedp);
- printf("Thread running %d\n", pthr->priority);
+ printf("Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
+ pthread_getschedparam(pthr->pthread, &policy, &schedp);
+ printf("Thread running %d\n", pthr->priority);
- while (1) {
- pthread_mutex_lock(&glob_mutex);
- printf("Thread %d at start pthread pol %d pri %d - Got global lock\n", pthr->priority,
- policy, schedp.sched_priority);
- sleep(2);
- for (i=0;i<10000;i++) {
- if (i%100 == 0) {
- sched_getparam(tid, &schedp);
- policy = sched_getscheduler(tid);
- printf("Thread %d(%d) loop %d pthread pol %d pri %d\n", tid, pthr->priority, i,
- policy, schedp.sched_priority);
- fflush(NULL);
- }
- pthr->id++;
- for (j=0;j<5000;j++) {
- pthread_mutex_lock(&(pthr->mutex));
- pthread_mutex_unlock(&(pthr->mutex));
- }
- }
- pthread_mutex_unlock(&glob_mutex);
- pthread_yield();
- }
- return NULL;
+ while (1) {
+ pthread_mutex_lock(&glob_mutex);
+ printf("Thread %d at start pthread pol %d pri %d - Got global lock\n",
+ pthr->priority, policy, schedp.sched_priority);
+ sleep(2);
+ for (i = 0; i < 10000;i++) {
+ if ((i % 100) == 0) {
+ sched_getparam(tid, &schedp);
+ policy = sched_getscheduler(tid);
+ printf("Thread %d(%d) loop %d pthread pol %d "
+ "pri %d\n", tid, pthr->priority, i, policy,
+ schedp.sched_priority);
+ fflush(NULL);
+ }
+ pthr->id++;
+ for (j = 0;j < 5000; j++) {
+ pthread_mutex_lock(&(pthr->mutex));
+ pthread_mutex_unlock(&(pthr->mutex));
+ }
+ }
+ pthread_mutex_unlock(&glob_mutex);
+ pthread_yield();
+ }
+ return NULL;
}
void* func_rt(void* arg)
{
- Thread* pthr = (Thread*)arg;
- int rc, i, j, policy, tid = gettid();
- struct sched_param schedp;
- cpu_set_t mask;
- CPU_ZERO(&mask);
- CPU_SET(0, &mask);
+ Thread* pthr = (Thread*)arg;
+ int rc, i, j, policy, tid = gettid();
+ struct sched_param schedp;
+ cpu_set_t mask;
+ CPU_ZERO(&mask);
+ CPU_SET(0, &mask);
- rc = sched_setaffinity(0, sizeof(mask), &mask);
- if (rc < 0) {
- printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
- exit(-1);
- }
- rc = sched_getaffinity(0, sizeof(mask), &mask);
+ rc = sched_setaffinity(0, sizeof(mask), &mask);
+ if (rc < 0) {
+ printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
+ exit(-1);
+ }
+ rc = sched_getaffinity(0, sizeof(mask), &mask);
- printf("Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
- pthread_getschedparam(pthr->pthread, &policy, &schedp);
+ printf("Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
+ pthread_getschedparam(pthr->pthread, &policy, &schedp);
- while (1) {
- sleep(2);
- printf("Thread running %d\n", pthr->priority);
- pthread_mutex_lock(&glob_mutex);
- printf("Thread %d at start pthread pol %d pri %d - Got global lock\n", pthr->priority,
- policy, schedp.sched_priority);
+ while (1) {
+ sleep(2);
+ printf("Thread running %d\n", pthr->priority);
+ pthread_mutex_lock(&glob_mutex);
+ printf("Thread %d at start pthread pol %d pri %d - Got global lock\n", pthr->priority,
+ policy, schedp.sched_priority);
- /* we just use the mutex as something to slow things down */
- /* say who we are and then do nothing for a while. The aim
- * of this is to show that high priority threads make more
- * progress than lower priority threads..
- */
- for (i=0;i<1000;i++) {
- if (i%100 == 0) {
- sched_getparam(tid, &schedp);
- policy = sched_getscheduler(tid);
- printf("Thread %d(%d) loop %d pthread pol %d pri %d\n", tid, pthr->priority, i,
- policy, schedp.sched_priority);
- fflush(NULL);
- }
- pthr->id++;
- for (j=0;j<5000;j++) {
- pthread_mutex_lock(&(pthr->mutex));
- pthread_mutex_unlock(&(pthr->mutex));
- }
- }
- pthread_mutex_unlock(&glob_mutex);
- sleep(2);
- }
- return NULL;
+ /* we just use the mutex as something to slow things down */
+ /* say who we are and then do nothing for a while. The aim
+ * of this is to show that high priority threads make more
+ * progress than lower priority threads..
+ */
+ for (i=0;i<1000;i++) {
+ if (i%100 == 0) {
+ sched_getparam(tid, &schedp);
+ policy = sched_getscheduler(tid);
+ printf("Thread %d(%d) loop %d pthread pol %d pri %d\n", tid, pthr->priority, i,
+ policy, schedp.sched_priority);
+ fflush(NULL);
+ }
+ pthr->id++;
+ for (j = 0; j < 5000; j++) {
+ pthread_mutex_lock(&(pthr->mutex));
+ pthread_mutex_unlock(&(pthr->mutex));
+ }
+ }
+ pthread_mutex_unlock(&glob_mutex);
+ sleep(2);
+ }
+ return NULL;
}
void* func_noise(void* arg)
{
- Thread* pthr = (Thread*)arg;
- int rc, i, j, policy, tid = gettid();
- struct sched_param schedp;
- cpu_set_t mask;
- CPU_ZERO(&mask);
- CPU_SET(0, &mask);
+ Thread* pthr = (Thread*)arg;
+ int rc, i, j, policy, tid = gettid();
+ struct sched_param schedp;
+ cpu_set_t mask;
+ CPU_ZERO(&mask);
+ CPU_SET(0, &mask);
- rc = sched_setaffinity(0, sizeof(mask), &mask);
- if (rc < 0) {
- printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
- exit(-1);
- }
- rc = sched_getaffinity(0, sizeof(mask), &mask);
+ rc = sched_setaffinity(0, sizeof(mask), &mask);
+ if (rc < 0) {
+ printf("Thread %d: Can't set affinity: %d %s\n", tid, rc, strerror(rc));
+ exit(-1);
+ }
+ rc = sched_getaffinity(0, sizeof(mask), &mask);
- printf("Noise Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
- pthread_getschedparam(pthr->pthread, &policy, &schedp);
+ printf("Noise Thread started %d on CPU %ld\n", pthr->priority, (long)mask.__bits[0]);
+ pthread_getschedparam(pthr->pthread, &policy, &schedp);
- while (1) {
- sleep(1);
- printf("Noise Thread running %d\n", pthr->priority);
+ while (1) {
+ sleep(1);
+ printf("Noise Thread running %d\n", pthr->priority);
- for (i=0;i<10000;i++) {
- if (i%100 == 0) {
- sched_getparam(tid, &schedp);
- policy = sched_getscheduler(tid);
- printf("Noise Thread %d(%d) loop %d pthread pol %d pri %d\n", tid, pthr->priority, i,
- policy, schedp.sched_priority);
- fflush(NULL);
- }
- pthr->id++;
- for (j=0;j<5000;j++) {
- pthread_mutex_lock(&(pthr->mutex));
- pthread_mutex_unlock(&(pthr->mutex));
- }
- }
- pthread_yield();
- }
- return NULL;
+ for (i = 0; i < 10000; i++) {
+ if ((i % 100) == 0) {
+ sched_getparam(tid, &schedp);
+ policy = sched_getscheduler(tid);
+ printf("Noise Thread %d(%d) loop %d pthread pol %d pri %d\n", tid, pthr->priority, i, policy, schedp.sched_priority);
+ fflush(NULL);
+ }
+ pthr->id++;
+ for (j = 0; j < 5000; j++) {
+ pthread_mutex_lock(&(pthr->mutex));
+ pthread_mutex_unlock(&(pthr->mutex));
+ }
+ }
+ pthread_yield();
+ }
+ return NULL;
}
int startThread(Thread* thrd)
{
- struct sched_param schedp;
- pthread_condattr_t condattr;
- int retc, policy, inherit;
+ struct sched_param schedp;
+ pthread_condattr_t condattr;
+ int retc, policy, inherit;
- printf("Start thread priority %d\n", thrd->priority);
- if (pthread_attr_init(&(thrd->attr)) != 0) {
- printf("Attr init failed");
- exit(2);
- }
- thrd->flags = 0;
- memset(&schedp, 0, sizeof(schedp));
- schedp.sched_priority = thrd->priority;
- policy = thrd->policy;
+ printf("Start thread priority %d\n", thrd->priority);
+ if (pthread_attr_init(&(thrd->attr)) != 0) {
+ printf("Attr init failed");
+ exit(2);
+ }
+ thrd->flags = 0;
+ memset(&schedp, 0, sizeof(schedp));
+ schedp.sched_priority = thrd->priority;
+ policy = thrd->policy;
- if (pthread_attr_setschedpolicy(&(thrd->attr), policy) != 0) {
- printf("Can't set policy %d\n", policy);
- }
- if (pthread_attr_getschedpolicy(&(thrd->attr), &policy) != 0) {
- printf("Can't get policy\n");
- } else {
- printf("Policy in attribs is %d\n", policy);
- }
- if (pthread_attr_setschedparam(&(thrd->attr), &schedp) != 0) {
- printf("Can't set params");
- }
- if (pthread_attr_getschedparam(&(thrd->attr), &schedp) != 0) {
- printf("Can't get params");
- } else {
- printf("Priority in attribs is %d\n", schedp.sched_priority);
- }
- if (pthread_attr_setinheritsched(&(thrd->attr), PTHREAD_EXPLICIT_SCHED) != 0) {
- printf("Can't set inheritsched\n");
- }
- if (pthread_attr_getinheritsched(&(thrd->attr), &inherit) != 0) {
- printf("Can't get inheritsched\n");
- } else {
- printf("inherit sched in attribs is %d\n", inherit);
- }
- if ((retc = pthread_mutex_init(&(thrd->mutex), NULL)) != 0) {
- printf("Failed to init mutex: %d\n", retc);
- }
- if (pthread_condattr_init(&condattr) != 0) {
- printf("Failed to init condattr\n");
- }
- if (pthread_cond_init(&(thrd->cond), &condattr) != 0) {
- printf("Failed to init cond\n");
- }
- retc = pthread_create(&(thrd->pthread),&(thrd->attr), thrd->func, thrd);
- printf("Create returns %d\n\n", retc);
- return retc;
+ if (pthread_attr_setschedpolicy(&(thrd->attr), policy) != 0) {
+ printf("Can't set policy %d\n", policy);
+ }
+ if (pthread_attr_getschedpolicy(&(thrd->attr), &policy) != 0) {
+ printf("Can't get policy\n");
+ } else {
+ printf("Policy in attribs is %d\n", policy);
+ }
+ if (pthread_attr_setschedparam(&(thrd->attr), &schedp) != 0) {
+ printf("Can't set params");
+ }
+ if (pthread_attr_getschedparam(&(thrd->attr), &schedp) != 0) {
+ printf("Can't get params");
+ } else {
+ printf("Priority in attribs is %d\n", schedp.sched_priority);
+ }
+ if (pthread_attr_setinheritsched(&(thrd->attr), PTHREAD_EXPLICIT_SCHED) != 0) {
+ printf("Can't set inheritsched\n");
+ }
+ if (pthread_attr_getinheritsched(&(thrd->attr), &inherit) != 0) {
+ printf("Can't get inheritsched\n");
+ } else {
+ printf("inherit sched in attribs is %d\n", inherit);
+ }
+ if ((retc = pthread_mutex_init(&(thrd->mutex), NULL)) != 0) {
+ printf("Failed to init mutex: %d\n", retc);
+ }
+ if (pthread_condattr_init(&condattr) != 0) {
+ printf("Failed to init condattr\n");
+ }
+ if (pthread_cond_init(&(thrd->cond), &condattr) != 0) {
+ printf("Failed to init cond\n");
+ }
+ retc = pthread_create(&(thrd->pthread),&(thrd->attr), thrd->func, thrd);
+ printf("Create returns %d\n\n", retc);
+ return retc;
}
void stopThread(Thread* thr)
{
- thr->flags += THREAD_STOP;
- joinThread(thr);
+ thr->flags += THREAD_STOP;
+ joinThread(thr);
}
void joinThread(Thread* thr)
{
- void* ret = NULL;
- if (pthread_join(thr->pthread, &ret) != 0) {
- printf("Join failed\n");
- }
- printf("Join gave %p\n", ret);
+ void* ret = NULL;
+ if (pthread_join(thr->pthread, &ret) != 0) {
+ printf("Join failed\n");
+ }
+ printf("Join gave %p\n", ret);
}
/*
* Test pthread creation at different thread priorities.
*/
int main(int argc, char* argv[]) {
- pthread_mutexattr_t mutexattr;
- int i, retc, protocol, nopi = 0;
- cpu_set_t mask;
- CPU_ZERO(&mask);
- CPU_SET(0, &mask);
- setup();
+ pthread_mutexattr_t mutexattr;
+ int i, retc, protocol, nopi = 0;
+ cpu_set_t mask;
+ CPU_ZERO(&mask);
+ CPU_SET(0, &mask);
+ setup();
- rt_init("h",parse_args,argc,argv);
+ rt_init("h", parse_args, argc, argv);
- retc = sched_setaffinity(0, sizeof(mask), &mask);
- if (retc < 0) {
- printf("Main Thread: Can't set affinity: %d %s\n", retc, strerror(retc));
- exit(-1);
- }
- retc = sched_getaffinity(0, sizeof(mask), &mask);
+ retc = sched_setaffinity(0, sizeof(mask), &mask);
+ if (retc < 0) {
+ printf("Main Thread: Can't set affinity: %d %s\n", retc, strerror(retc));
+ exit(1);
+ }
+ retc = sched_getaffinity(0, sizeof(mask), &mask);
- arg1.policy = SCHED_OTHER; arg1.priority = 0; arg1.func = func_nonrt;
- arg2.policy = SCHED_RR; arg2.priority = 20; arg2.func = func_rt;
- arg3.policy = SCHED_RR; arg3.priority = 30; arg3.func = func_rt;
- arg4.policy = SCHED_RR; arg4.priority = 40; arg4.func = func_rt;
- arg5.policy = SCHED_RR; arg5.priority = 40; arg5.func = func_noise;
+ /*
+ * XXX: Have you ever heard of structures with c89/c99?
+ * Inline assignment is a beautiful thing.
+ */
+ arg1.policy = SCHED_OTHER; arg1.priority = 0; arg1.func = func_nonrt;
+ arg2.policy = SCHED_RR; arg2.priority = 20; arg2.func = func_rt;
+ arg3.policy = SCHED_RR; arg3.priority = 30; arg3.func = func_rt;
+ arg4.policy = SCHED_RR; arg4.priority = 40; arg4.func = func_rt;
+ arg5.policy = SCHED_RR; arg5.priority = 40; arg5.func = func_noise;
- for (i=0;i<argc;i++) {
- if (strcmp(argv[i],"nopi") == 0) nopi = 1;
- }
+ for (i = 0;i < argc; i++) {
+ if (strcmp(argv[i], "nopi") == 0)
+ nopi = 1;
+ }
- printf("Start %s\n",argv[0]);
+ printf("Start %s\n",argv[0]);
- if (!nopi) {
+ if (!nopi) {
#if HAVE_DECL_PTHREAD_PRIO_INHERIT
- if (pthread_mutexattr_init(&mutexattr) != 0) {
- printf("Failed to init mutexattr\n");
- };
- if (pthread_mutexattr_setprotocol(&mutexattr, PTHREAD_PRIO_INHERIT) != 0) {
- printf("Can't set protocol prio inherit\n");
- }
- if (pthread_mutexattr_getprotocol(&mutexattr, &protocol) != 0) {
- printf("Can't get mutexattr protocol\n");
- } else {
- printf("protocol in mutexattr is %d\n", protocol);
- }
- if ((retc = pthread_mutex_init(&glob_mutex, &mutexattr)) != 0) {
- printf("Failed to init mutex: %d\n", retc);
- }
+ if (pthread_mutexattr_init(&mutexattr) != 0) {
+ printf("Failed to init mutexattr\n");
+ };
+ if (pthread_mutexattr_setprotocol(&mutexattr, PTHREAD_PRIO_INHERIT) != 0) {
+ printf("Can't set protocol prio inherit\n");
+ }
+ if (pthread_mutexattr_getprotocol(&mutexattr, &protocol) != 0) {
+ printf("Can't get mutexattr protocol\n");
+ } else {
+ printf("protocol in mutexattr is %d\n", protocol);
+ }
+ if ((retc = pthread_mutex_init(&glob_mutex, &mutexattr)) != 0) {
+ printf("Failed to init mutex: %d\n", retc);
+ }
#endif
- }
+ }
- startThread(&arg1);
- startThread(&arg2);
- startThread(&arg3);
- startThread(&arg4);
- startThread(&arg5);
+ startThread(&arg1);
+ startThread(&arg2);
+ startThread(&arg3);
+ startThread(&arg4);
+ startThread(&arg5);
- sleep(10);
+ sleep(10);
- printf("Stopping threads\n");
- stopThread(&arg1);
- stopThread(&arg2);
- stopThread(&arg3);
- stopThread(&arg4);
- stopThread(&arg5);
+ printf("Stopping threads\n");
+ stopThread(&arg1);
+ stopThread(&arg2);
+ stopThread(&arg3);
+ stopThread(&arg4);
+ stopThread(&arg5);
- printf("Thread counts %d %d %d %d %d\n",arg1.id, arg2.id,
- arg3.id, arg4.id, arg5.id);
- printf("Done\n");
+ printf("Thread counts %d %d %d %d %d\n",arg1.id, arg2.id, arg3.id,
+ arg4.id, arg5.id);
+ printf("Done\n");
- return 0;
-}
\ No newline at end of file
+ return 0;
+}