aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pan/pan.c4
-rw-r--r--pan/zoolib.c8
-rwxr-xr-xtestcases/kernel/power_management/runpwtests.sh2
-rw-r--r--testcases/kernel/syscalls/eventfd/Makefile2
-rw-r--r--testcases/kernel/syscalls/fallocate/fallocate02.c4
-rw-r--r--testcases/kernel/syscalls/fallocate/fallocate03.c4
-rw-r--r--testcases/kernel/syscalls/kill/kill03.c4
-rw-r--r--testcases/kernel/syscalls/kill/kill04.c4
-rw-r--r--testcases/kernel/syscalls/mount/mount03.c2
-rw-r--r--testcases/kernel/syscalls/move_pages/Makefile2
10 files changed, 18 insertions, 18 deletions
diff --git a/pan/pan.c b/pan/pan.c
index e392c3bc6..bcefb4130 100644
--- a/pan/pan.c
+++ b/pan/pan.c
@@ -49,7 +49,7 @@
* - added option to create a command file with all failed tests.
*
*/
-/* $Id: pan.c,v 1.27 2008/10/29 07:03:39 subrata_modak Exp $ */
+/* $Id: pan.c,v 1.28 2008/11/11 05:15:52 subrata_modak Exp $ */
#include <errno.h>
#include <string.h>
@@ -895,7 +895,7 @@ run_child(struct coll_entry *colle, struct tag_pgrp *active, int quiet_mode)
* cmd directly.
*/
if (strpbrk(c_cmdline, "\"';|<>$\\")) {
- execlp("sh", "sh", "-c", c_cmdline, 0);
+ execlp("sh", "sh", "-c", c_cmdline, (char*)0);
errlen = sprintf(errbuf,
"pan(%s): execlp of '%s' (tag %s) failed. errno:%d %s",
panname, c_cmdline, colle->name, errno, strerror(errno));
diff --git a/pan/zoolib.c b/pan/zoolib.c
index ece025d01..3e317330b 100644
--- a/pan/zoolib.c
+++ b/pan/zoolib.c
@@ -30,7 +30,7 @@
* http://oss.sgi.com/projects/GenInfo/NoticeExplan/
*
*/
-/* $Id: zoolib.c,v 1.6 2006/06/27 09:37:34 vapier Exp $ */
+/* $Id: zoolib.c,v 1.7 2008/11/11 05:15:52 subrata_modak Exp $ */
/*
* ZooLib
*
@@ -169,7 +169,7 @@ zoo_mark(zoo_t z, char *entry)
found = 1;
break;
}
- } while (buf);
+ } while (1);
if (!found) {
if (fseek(fp, 0, SEEK_END)) {
@@ -251,7 +251,7 @@ zoo_clear(zoo_t z, pid_t p)
found = 1;
break;
}
- } while (buf);
+ } while (1);
fflush( fp );
@@ -299,7 +299,7 @@ zoo_getpid(zoo_t z, char *tag)
this_pid = atoi(buf);
break;
- } while (buf);
+ } while (1);
if (zoo_unlock(z))
return -1;
diff --git a/testcases/kernel/power_management/runpwtests.sh b/testcases/kernel/power_management/runpwtests.sh
index 8749e361a..42ffd3741 100755
--- a/testcases/kernel/power_management/runpwtests.sh
+++ b/testcases/kernel/power_management/runpwtests.sh
@@ -1,3 +1,4 @@
+#! /bin/sh
################################################################################
## ##
## Copyright (c) International Business Machines Corp., 2001 ##
@@ -27,7 +28,6 @@
# History: 26 Aug 2008 - Created this file
# 03 Nov 2008 - Added CPUIDLE sysfs testcase
#
-#! /bin/sh
# Exporting Required variables
diff --git a/testcases/kernel/syscalls/eventfd/Makefile b/testcases/kernel/syscalls/eventfd/Makefile
index da9faa0c2..fc3159758 100644
--- a/testcases/kernel/syscalls/eventfd/Makefile
+++ b/testcases/kernel/syscalls/eventfd/Makefile
@@ -23,7 +23,7 @@ CFLAGS += -I../../../../include -Wall
LDLIBS += -L../../../../lib -lltp
check_aio_eventfd = $(shell \
- if echo -e \
+ if printf \
"\#include <libaio.h>\n\
int main() \
{ \
diff --git a/testcases/kernel/syscalls/fallocate/fallocate02.c b/testcases/kernel/syscalls/fallocate/fallocate02.c
index 0b30568f2..ce7ccdb34 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate02.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate02.c
@@ -332,13 +332,13 @@ main(int ac, /* number of command line parameters */
tst_exit();
}
TEST_ERROR_LOG(TEST_ERRNO);
- tst_resm(TFAIL, "fallocatee(%s:%d, %d, %lld, %lld) Failed, expected errno:%d \
+ tst_resm(TFAIL, "fallocate(%s:%d, %d, %lld, %lld) Failed, expected errno:%d \
instead errno=%d : %s", fname, fd,test_data[test_index].mode,
test_data[test_index].offset * block_size, test_data[test_index].len * block_size,
test_data[test_index].error, TEST_ERRNO, strerror(TEST_ERRNO));
} else {
/* No Verification test, yet... */
- tst_resm(TPASS, "fallocatee(%s:%d, %d, %lld, %lld) returned %d ",
+ tst_resm(TPASS, "fallocate(%s:%d, %d, %lld, %lld) returned %d ",
fname, fd,test_data[test_index].mode, test_data[test_index].offset * block_size,
test_data[test_index].len * block_size, TEST_ERRNO);
}
diff --git a/testcases/kernel/syscalls/fallocate/fallocate03.c b/testcases/kernel/syscalls/fallocate/fallocate03.c
index eed798822..3926071df 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate03.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate03.c
@@ -313,13 +313,13 @@ main(int ac, /* number of command line parameters */
tst_exit();
}
TEST_ERROR_LOG(TEST_ERRNO);
- tst_resm(TFAIL, "fallocatee(%s, %d, %lld, %lld) Failed, errno=%d : %s",
+ tst_resm(TFAIL, "fallocate(%s, %d, %lld, %lld) Failed, errno=%d : %s",
fname,test_data[test_index].mode, test_data[test_index].offset * block_size,
test_data[test_index].len * block_size, TEST_ERRNO, strerror(TEST_ERRNO));
} else {
if ( STD_FUNCTIONAL_TEST ) {
/* No Verification test, yet... */
- tst_resm(TPASS, "fallocatee(%s, %d, %lld, %lld) returned %d ",
+ tst_resm(TPASS, "fallocate(%s, %d, %lld, %lld) returned %d ",
fname,test_data[test_index].mode, test_data[test_index].offset * block_size,
test_data[test_index].len * block_size, TEST_RETURN); }
}
diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c
index 25360f3aa..41ac3e640 100644
--- a/testcases/kernel/syscalls/kill/kill03.c
+++ b/testcases/kernel/syscalls/kill/kill03.c
@@ -122,8 +122,8 @@ int main(int ac, char **av)
if (TEST_RETURN != -1) {
tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s "
"Expected a return value of -1 got %d",
- TCID, TEST_ERRNO, strerror(TEST_ERRNO)),
- TEST_RETURN;
+ TCID, TEST_ERRNO, strerror(TEST_ERRNO),
+ TEST_RETURN);
/*NOTREACHED*/
}
diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c
index 6330c7e2d..dea313a2b 100644
--- a/testcases/kernel/syscalls/kill/kill04.c
+++ b/testcases/kernel/syscalls/kill/kill04.c
@@ -137,8 +137,8 @@ int main(int ac, char **av)
if (TEST_RETURN != -1) {
tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s "
"Expected a return value of -1 got %d",
- TCID, TEST_ERRNO, strerror(TEST_ERRNO)),
- TEST_RETURN;
+ TCID, TEST_ERRNO, strerror(TEST_ERRNO),
+ TEST_RETURN);
/*NOTREACHED*/
}
diff --git a/testcases/kernel/syscalls/mount/mount03.c b/testcases/kernel/syscalls/mount/mount03.c
index 151fb6a5c..fe0ab998f 100644
--- a/testcases/kernel/syscalls/mount/mount03.c
+++ b/testcases/kernel/syscalls/mount/mount03.c
@@ -443,7 +443,7 @@ setup_uid()
Cmd_buffer[2] = Path_name;
/* Put command into string */
- sprintf("command, :%s %s %s", cmd, testhome_path, Path_name);
+ sprintf(command, "%s %s %s", cmd, testhome_path, Path_name);
/*Run command to cp file to right spot */
system (command);
diff --git a/testcases/kernel/syscalls/move_pages/Makefile b/testcases/kernel/syscalls/move_pages/Makefile
index 4f861ede6..4aa805532 100644
--- a/testcases/kernel/syscalls/move_pages/Makefile
+++ b/testcases/kernel/syscalls/move_pages/Makefile
@@ -20,7 +20,7 @@ CFLAGS += -I../../../../include -Wall
LDLIBS += -L../../../../lib -lltp -lnuma -lrt
check_numa_move_pages = $(shell \
- if echo -e \
+ if printf \
"\#include <numa.h>\n\
int main() \
{ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 22:42:33 +0000