Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Rishi k. K R. <ris...@li...> - 2010-04-29 13:38:59
|
The branch, master, has been updated
via 84f2e35f109a9fe6591af83be0ddbda4a5f7c78c (commit)
via 5936767b86201d8409bb62a74770e60de1796adc (commit)
via 742cfadb46d5fe1952396b9568c18afccdb2c489 (commit)
via e6dc1b454e09e3e38532c37c3fb54c77eb3050cf (commit)
via 40f8829df38ecfe64c0fcd16a6ce7b5b19b83f25 (commit)
via acaf3cd41451b41f7bdc51cdf06e017f2eaf4a45 (commit)
via adf53e68cf2b513b67a19dc0ff8869b53f9f22a3 (commit)
via 1c9ec5ec1389062a4a091fee7295b36a6583df5d (commit)
via 4eca2b5b7d3f4dfb1fd661eab2931d3564a4a85f (commit)
via 6fc71a4987f658ac48b476defb8cc341cb7361c3 (commit)
via 1ff0128460531d9f9c46353eba65dd79ca27bbc8 (commit)
via c150e9b196b1267beeefdaec4dde9933503448f3 (commit)
via eaf73222df286c200475aadac78122b182b5f388 (commit)
via cc7c7035a60b40f9a417b5e437ca6ea43ebfd783 (commit)
via 2a276cf8bb5b94259482ec039edc2ae7fbaf953e (commit)
via a9d5600c78943e9e7e1b52c5ec81e9772a47b44f (commit)
via 2e271475913722d7c29463c64703575dff69c4fb (commit)
via 2eb2342d3a9db5a089742473895af4fdf1e6f4c8 (commit)
via 5da1b33941b513ac1f693cf86e27b5750b43dea2 (commit)
via e90e0138cb7444d5db967183397b776979efd593 (commit)
via 001227f859f24bde222d0813d9327afe4c132a33 (commit)
via 1d67dc1564c73d49fc681679e4a5b9be48420e48 (commit)
via 3bf514769d060a64d0f38f4b97c00d8bb0de74f8 (commit)
via 69d19f3fa26f62f7d27a8cd427b39fb5d29d588f (commit)
from c2ce5363adf4a3f8482d7c4476a9beeaf7bc8aef (commit)
- Log -----------------------------------------------------------------
commit 84f2e35f109a9fe6591af83be0ddbda4a5f7c78c
Author: Rishikesh K Rajak <ris...@li...>
Date: Thu Apr 29 19:02:46 2010 +0530
Fix for mqns testcase failure reported by Muni
Signed-off-by: Serge Hallyn <se...@us...>
Reported by: Munipradeep <mbe...@in...>
commit 5936767b86201d8409bb62a74770e60de1796adc
Author: Rishikesh K Rajak <ris...@li...>
Date: Thu Apr 29 19:00:01 2010 +0530
pidns30 fix
Signed-off-by: Serge Hallyn <se...@us...>
Acked-by: Garrett Cooper <yan...@gm...>
commit 742cfadb46d5fe1952396b9568c18afccdb2c489
Author: Rishikesh K Rajak <ris...@li...>
Date: Thu Apr 29 18:56:12 2010 +0530
Fix for mqns by Serge.
Signed-off-by: Serge Hallyn <se...@us...>
Acked-by: Garrett Cooper <yan...@gm...>
commit e6dc1b454e09e3e38532c37c3fb54c77eb3050cf
Author: Rishikesh K Rajak <ris...@li...>
Date: Thu Apr 29 18:50:22 2010 +0530
While packaging ltp-full-20100228 I've found out that man files are installed
with executable bits and that's caused by INSTALL_MODE := 00775 that is pulled
from generic_leaf_target.mk that pulls in env_post.mk. Fixing explicitly
INSTALL_MODE to 00644 in man.mk fixes this for me. Patch attached.
Signed-off-by: Cyril Hrubis ch...@su...
commit 40f8829df38ecfe64c0fcd16a6ce7b5b19b83f25
Merge: acaf3cd41451b41f7bdc51cdf06e017f2eaf4a45 1c9ec5ec1389062a4a091fee7295b36a6583df5d
Author: Rishikesh K Rajak <ris...@li...>
Date: Thu Apr 29 14:50:16 2010 +0530
Merge branch 'pu'
-----------------------------------------------------------------------
Summary of changes:
include/mk/man.mk | 2 ++
testcases/commands/ade/ar/ar01 | 12 ++++++------
testcases/commands/mail/mail_tests.sh | 2 +-
testcases/kernel/containers/mqns/mqns.h | 2 ++
testcases/kernel/containers/mqns/mqns_01.c | 8 ++++----
testcases/kernel/containers/mqns/mqns_02.c | 16 ++++++++--------
testcases/kernel/containers/mqns/mqns_03.c | 2 +-
testcases/kernel/containers/mqns/mqns_04.c | 2 +-
testcases/kernel/containers/pidns/pidns30.c | 2 +-
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c | 3 +--
.../kernel/mem/hugetlb/hugeshmat/hugeshmat01.c | 2 +-
.../kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 2 +-
.../kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 2 +-
.../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 2 +-
.../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 2 +-
.../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 2 +-
.../kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 2 +-
.../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 2 +-
.../kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
.../kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
.../kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
.../security/cap_bound/cap_bset_inh_bounds.c | 4 ++--
testcases/kernel/syscalls/eventfd/eventfd01.c | 2 +-
.../kernel/syscalls/utimensat/utimensat_tests.sh | 2 +-
.../conformance/definitions/aio_h/2-1.c | 1 +
.../conformance/definitions/errno_h/3-1.c | 2 +-
.../conformance/definitions/pthread_h/2-2.c | 9 +++++++++
.../conformance/interfaces/aio_cancel/3-1.c | 2 +-
.../conformance/interfaces/aio_cancel/4-1.c | 1 -
.../conformance/interfaces/aio_cancel/5-1.c | 1 -
.../conformance/interfaces/aio_cancel/6-1.c | 1 -
.../conformance/interfaces/aio_cancel/7-1.c | 1 -
.../conformance/interfaces/aio_error/2-1.c | 1 -
.../conformance/interfaces/sched_yield/1-1.c | 14 +++++++-------
34 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/include/mk/man.mk b/include/mk/man.mk
index 88abc6d..f0b4525 100644
--- a/include/mk/man.mk
+++ b/include/mk/man.mk
@@ -28,6 +28,8 @@ include $(top_srcdir)/include/mk/env_pre.mk
INSTALL_DIR := $(mandir)/man$(MANPREFIX)
+INSTALL_MODE := 00644
+
INSTALL_TARGETS ?= *.$(MANPREFIX)
MAKE_TARGETS :=
diff --git a/testcases/commands/ade/ar/ar01 b/testcases/commands/ade/ar/ar01
index c90faf9..55363dc 100755
--- a/testcases/commands/ade/ar/ar01
+++ b/testcases/commands/ade/ar/ar01
@@ -519,19 +519,19 @@ echo "-)19 SKIPPED due to binutils ar automatically adds a symbol."
rm -rf $TCtmp/lib.a;cd $TCdat
ar -cr $TCtmp/lib.a file0.in file2.in
crtest
-File1time=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "`
-File2time=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "`
+File1time=`ar -tv $TCtmp/lib.a | grep file0.in`
+File2time=`ar -tv $TCtmp/lib.a | grep file2.in`
#sleep 5
touch -c -t 201503030303.55 file0.in
ar -ru $TCtmp/lib.a file0.in file2.in 2>&1 1>/dev/null
-File1time1=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "`
-File2time2=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "`
+File1time1=`ar -tv $TCtmp/lib.a | grep file0.in`
+File2time2=`ar -tv $TCtmp/lib.a | grep file2.in`
-if [ $File2time = $File2time2 ]
+if [ "$File2time" = "$File2time2" ]
then
- if [ $File1time = $File1time1 ]
+ if [ "$File1time" = "$File1time1" ]
then
TCRESULT=20
echo "FAIL - ar with -u flag failed"
diff --git a/testcases/commands/mail/mail_tests.sh b/testcases/commands/mail/mail_tests.sh
index 790cdd6..99aa278 100755
--- a/testcases/commands/mail/mail_tests.sh
+++ b/testcases/commands/mail/mail_tests.sh
@@ -326,7 +326,7 @@ RC=0
tst_resm TINFO "Test #5: Test that mail -b user@domain will"
tst_resm TINFO "Test #5: blind carbon copy user@domain"
-# send mail to root and carbon copy mail_test
+# send mail to root and blind carbon copy mail_test
mail -s "Test" root@localhost -c mail_test@localhost < \
$LTPTMP/tst_mail.in > $LTPTMP/tst_mail.out 2>&1
if [ $? -ne 0 ]; then
diff --git a/testcases/kernel/containers/mqns/mqns.h b/testcases/kernel/containers/mqns/mqns.h
index e5912d5..1c624c2 100644
--- a/testcases/kernel/containers/mqns/mqns.h
+++ b/testcases/kernel/containers/mqns/mqns.h
@@ -10,6 +10,8 @@
#define DEV_MQUEUE "/dev/mqueue"
#define DEV_MQUEUE2 "/dev/mqueue2"
#define SLASH_MQ1 "/MQ1"
+#define NOSLASH_MQ1 "MQ1"
#define SLASH_MQ2 "/MQ2"
+#define NOSLASH_MQ2 "MQ2"
#endif /* __MQNS_H */
diff --git a/testcases/kernel/containers/mqns/mqns_01.c b/testcases/kernel/containers/mqns/mqns_01.c
index 7f41b2d..515ed51 100644
--- a/testcases/kernel/containers/mqns/mqns_01.c
+++ b/testcases/kernel/containers/mqns/mqns_01.c
@@ -55,7 +55,7 @@ int check_mqueue(void *vtest)
if (read(p1[0], buf, strlen("go") + 1) < 0)
tst_resm(TBROK | TERRNO, "read(p1[0], ...) failed");
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDONLY);
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDONLY);
if (mqd == -1) {
if (write(p2[1], "notfnd", strlen("notfnd") + 1) < 0)
tst_resm(TBROK | TERRNO, "write(p2[1], ...) failed");
@@ -86,7 +86,7 @@ main(int argc, char *argv[])
if (pipe(p1) == -1) { perror("pipe"); exit(EXIT_FAILURE); }
if (pipe(p2) == -1) { perror("pipe"); exit(EXIT_FAILURE); }
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0777,
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0777,
NULL);
if (mqd == -1) {
perror("mq_open");
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
if (r < 0) {
tst_resm(TFAIL, "failed clone/unshare\n");
mq_close(mqd);
- syscall(__NR_mq_unlink, SLASH_MQ1);
+ syscall(__NR_mq_unlink, NOSLASH_MQ1);
tst_exit();
}
@@ -122,7 +122,7 @@ main(int argc, char *argv[])
/* destroy the mqueue */
mq_close(mqd);
- syscall(__NR_mq_unlink, SLASH_MQ1);
+ syscall(__NR_mq_unlink, NOSLASH_MQ1);
tst_exit();
}
diff --git a/testcases/kernel/containers/mqns/mqns_02.c b/testcases/kernel/containers/mqns/mqns_02.c
index aa78f65..07ab042 100644
--- a/testcases/kernel/containers/mqns/mqns_02.c
+++ b/testcases/kernel/containers/mqns/mqns_02.c
@@ -60,7 +60,7 @@ int check_mqueue(void *vtest)
tst_resm(TBROK | TERRNO, "read(p1[0], ..) failed");
else {
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDWR|O_CREAT|O_EXCL,
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR|O_CREAT|O_EXCL,
0777, NULL);
if (mqd == -1) {
if (write(p2[1], "mqfail", strlen("mqfail") + 1) < 0) {
@@ -76,7 +76,7 @@ int check_mqueue(void *vtest)
else {
- if (read(p1[0], buf, 5))
+ if (read(p1[0], buf, 5) < 0)
tst_resm(TBROK | TERRNO,
"read(p1[0], ..) failed");
else {
@@ -86,9 +86,9 @@ int check_mqueue(void *vtest)
tst_resm(TBROK | TERRNO,
"mq_close(mqd) failed");
} else if (syscall(__NR_mq_unlink,
- SLASH_MQ1) < 0) {
+ NOSLASH_MQ1) < 0) {
tst_resm(TBROK | TERRNO,
- "mq_unlink(" SLASH_MQ1
+ "mq_unlink(" NOSLASH_MQ1
") failed");
} else if (write(p2[1], "done",
strlen("done") + 1)
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
}
if (read(p2[0], buf, 7) < 0) {
- tst_resm(TBROK, "read(p1[0], ..) failed");
+ tst_resm(TBROK, "read(p2[0], ..) failed");
} else if (!strcmp(buf, "mqfail")) {
tst_resm(TFAIL, "child process could not create mqueue\n");
umount(DEV_MQUEUE);
@@ -153,15 +153,15 @@ int main(int argc, char *argv[])
tst_exit();
} else {
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDONLY);
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDONLY);
if (mqd == -1) {
tst_resm(TPASS, "Parent process can't see the mqueue\n");
} else {
tst_resm(TFAIL, "Parent process found mqueue\n");
mq_close(mqd);
}
- if (write(p1[1], "cont", 5)) {
- tst_resm(TBROK, "read(p1[0], ..) failed");
+ if (write(p1[1], "cont", 5) < 0) {
+ tst_resm(TBROK, "write(p1[1], ..) failed");
}
}
diff --git a/testcases/kernel/containers/mqns/mqns_03.c b/testcases/kernel/containers/mqns/mqns_03.c
index 3c9e83e..83db75c 100644
--- a/testcases/kernel/containers/mqns/mqns_03.c
+++ b/testcases/kernel/containers/mqns/mqns_03.c
@@ -63,7 +63,7 @@ int check_mqueue(void *vtest)
read(p1[0], buf, 3); /* go */
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0755,
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0755,
NULL);
if (mqd == -1) {
write(p2[1], "mqfail", 7);
diff --git a/testcases/kernel/containers/mqns/mqns_04.c b/testcases/kernel/containers/mqns/mqns_04.c
index 8a4a9c2..98d4e39 100644
--- a/testcases/kernel/containers/mqns/mqns_04.c
+++ b/testcases/kernel/containers/mqns/mqns_04.c
@@ -59,7 +59,7 @@ int check_mqueue(void *vtest)
read(p1[0], buf, 3); /* go */
- mqd = syscall(__NR_mq_open, SLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0755,
+ mqd = syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR|O_CREAT|O_EXCL, 0755,
NULL);
if (mqd == -1) {
write(p2[1], "mqfail", 7);
diff --git a/testcases/kernel/containers/pidns/pidns30.c b/testcases/kernel/containers/pidns/pidns30.c
index ea8c54c..5975b53 100644
--- a/testcases/kernel/containers/pidns/pidns30.c
+++ b/testcases/kernel/containers/pidns/pidns30.c
@@ -59,7 +59,7 @@
char *TCID = "pidns30";
int TST_TOTAL = 1;
-char *mqname = "/mq1";
+char *mqname = "mq1";
int result = TFAIL;
int errno;
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
index e67e43c..485b465 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
@@ -127,8 +127,7 @@ main(int ac, char **av)
/* Check number of hugepages */
if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to \
- sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
/* Perform global setup for test */
setup();
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
index b30afef..229b929 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
@@ -105,7 +105,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
index 431c1e3..2f56127 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
@@ -102,7 +102,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
index f892799..a106976 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
@@ -86,7 +86,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
index baff476..e40123d 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
@@ -130,7 +130,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
index 928f76a..e434082 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
@@ -102,7 +102,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
index 7d039e6..5a7e02a 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
@@ -105,7 +105,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
index 7c0cec5..bb5480e 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
@@ -87,7 +87,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
index 10f29d3..6fa02ab 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
@@ -82,7 +82,7 @@ int main(int ac, char **av)
/* The following loop checks looping state if -i option given */
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
index 9066f45..80d3a2b 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
@@ -84,7 +84,7 @@ int main(int ac, char **av) {
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
index aa76097..fc78b45 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
@@ -85,7 +85,7 @@ int main(int ac, char **av)
/* The following loop checks looping state if -i option given */
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, tst_exit, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
index de9ab46..bc4bd2c 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
@@ -86,7 +86,7 @@ int main(int ac, char **av)
}
if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
- tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
else
huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
diff --git a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
index c6c34c0..7033a37 100644
--- a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
+++ b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c
@@ -39,11 +39,11 @@ int TST_TOTAL=2;
int errno;
+int main(int argc, char *argv[])
+{
#if HAVE_SYS_CAPABILITY_H
#if HAVE_DECL_PR_CAPBSET_READ && HAVE_DECL_PR_CAPBSET_DROP
#ifdef HAVE_LIBCAP
-int main(int argc, char *argv[])
-{
int ret = 1;
cap_value_t v[1];
cap_flag_value_t f;
diff --git a/testcases/kernel/syscalls/eventfd/eventfd01.c b/testcases/kernel/syscalls/eventfd/eventfd01.c
index 05acc1b..83eb86e 100644
--- a/testcases/kernel/syscalls/eventfd/eventfd01.c
+++ b/testcases/kernel/syscalls/eventfd/eventfd01.c
@@ -729,7 +729,7 @@ static void setup(void)
tst_sig(FORK, DEF_HANDLER, cleanup);
if (tst_kvercmp(2, 6, 22) < 0)
- tst_brkm(TCONF, cleanup, "2.6.22 or greater kernel required");
+ tst_brkm(TCONF, tst_exit, "2.6.22 or greater kernel required");
/* Create a temporary directory & chdir there */
tst_tmpdir();
diff --git a/testcases/kernel/syscalls/utimensat/utimensat_tests.sh b/testcases/kernel/syscalls/utimensat/utimensat_tests.sh
index cc136f9..87514d8 100644
--- a/testcases/kernel/syscalls/utimensat/utimensat_tests.sh
+++ b/testcases/kernel/syscalls/utimensat/utimensat_tests.sh
@@ -437,7 +437,7 @@ echo "============================================================"
echo
-rm -rf $TEST_PROG
+rm -rf "$TEST_DIR"
uname -a
date
echo "Total tests: $test_num; passed: $passed_cnt; failed: $failed_cnt"
diff --git a/testcases/open_posix_testsuite/conformance/definitions/aio_h/2-1.c b/testcases/open_posix_testsuite/conformance/definitions/aio_h/2-1.c
index ef0f2c5..7ae8001 100644
--- a/testcases/open_posix_testsuite/conformance/definitions/aio_h/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/definitions/aio_h/2-1.c
@@ -9,6 +9,7 @@
/* test if aio.h exists and can be included */
#include <aio.h>
+#include <stdlib.h> /* For NULL on non-linux platforms. */
int main(void)
{
diff --git a/testcases/open_posix_testsuite/conformance/definitions/errno_h/3-1.c b/testcases/open_posix_testsuite/conformance/definitions/errno_h/3-1.c
index 40c8cb3..ed1c519 100644
--- a/testcases/open_posix_testsuite/conformance/definitions/errno_h/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/definitions/errno_h/3-1.c
@@ -1,5 +1,5 @@
/*
- *Following symbles need to be defined in errno.h
+ *Following symbols need to be defined in errno.h
*author:ys...@ln...
*/
diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c
index 65300d7..0dd5ff8 100644
--- a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c
@@ -11,6 +11,15 @@
#include <pthread.h>
+/*
+ * XXX (garrcoop): the following #ifndef checks are invalid on many platforms; POSIX
+ * doesn't state whether or not these these can or cannot be either global variables
+ * or indices in enums (FreeBSD does the latter with
+ * PTHREAD_MUTEX_{ERRORCHECK,NORMAL.RECURSIVE}
+ *
+ * These tests need to be sorted out into proper functional tests.
+ */
+
/* BAR */
#ifndef PTHREAD_BARRIER_SERIAL_THREAD
#error PTHREAD_BARRIER_SERIAL_THREAD not defined
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/3-1.c
index 4b75c08..29db1ec 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/3-1.c
@@ -35,8 +35,8 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
+#include <signal.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/4-1.c
index a3a3c6c..9499df5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/4-1.c
@@ -35,7 +35,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/5-1.c
index 65531cf..956e749 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/5-1.c
@@ -33,7 +33,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/6-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/6-1.c
index cc0b5e2..5e35427 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/6-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/6-1.c
@@ -36,7 +36,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/7-1.c
index 8db24ab..6b8f70c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_cancel/7-1.c
@@ -34,7 +34,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_error/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_error/2-1.c
index 4940091..0ba1abe 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_error/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_error/2-1.c
@@ -29,7 +29,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include <aio.h>
#include "posixtest.h"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_yield/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_yield/1-1.c
index 7437e0a..e9e54f4 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_yield/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_yield/1-1.c
@@ -19,9 +19,8 @@
* 4. Launch a thread which call sched_yield() and check that the counter has
* changed since the call.
*/
-#define LINUX
-#ifdef LINUX
+#ifdef __linux__
#define _GNU_SOURCE
#endif
@@ -35,7 +34,8 @@
#include <sys/wait.h>
#include "posixtest.h"
-#ifdef BSD
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#define BSD
# include <sys/types.h>
# include <sys/param.h>
# include <sys/sysctl.h>
@@ -78,7 +78,7 @@ int get_ncpu() {
return ncpu;
}
-#ifdef LINUX
+#ifdef __linux__
int set_process_affinity(int cpu)
{
int retval = -1;
@@ -131,7 +131,7 @@ int set_thread_affinity(int cpu)
void * runner(void * arg) {
int i=0, nc;
long result = 0;
-#ifdef LINUX
+#ifdef __linux__
set_thread_affinity(*(int *)arg);
fprintf(stderr, "%ld bind to cpu: %d\n", pthread_self(), *(int*)arg);
#endif
@@ -154,7 +154,7 @@ void * runner(void * arg) {
}
void * busy_thread(void *arg){
-#ifdef LINUX
+#ifdef __linux__
set_thread_affinity(*(int *)arg);
fprintf(stderr, "%ld bind to cpu: %d\n", pthread_self(), *(int*)arg);
#endif
@@ -170,7 +170,7 @@ void * busy_thread(void *arg){
void buzy_process(int cpu){
struct sched_param param;
-#ifdef LINUX
+#ifdef __linux__
/* Bind to a processor */
set_process_affinity(cpu);
fprintf(stderr, "%d bind to cpu: %d\n", getpid(), cpu);
hooks/post-receive
--
ltp
|
