writev02 and writev03 can not build for UCLINUX defined but the choosen mechanism is error-prone cause in that case linking libltp.a complained about missing TCID symbol.
Remove the old way to skip this test for UCLINUX and choose an makefile based method instead. Signed-off-by: Andreas Bießmann <[email protected]> --- testcases/kernel/syscalls/writev/Makefile | 4 ++++ testcases/kernel/syscalls/writev/writev02.c | 8 -------- testcases/kernel/syscalls/writev/writev03.c | 8 -------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/testcases/kernel/syscalls/writev/Makefile b/testcases/kernel/syscalls/writev/Makefile index bd617d8..4aa38be 100644 --- a/testcases/kernel/syscalls/writev/Makefile +++ b/testcases/kernel/syscalls/writev/Makefile @@ -18,6 +18,10 @@ top_srcdir ?= ../../../.. +ifeq ($(UCLINUX),1) +FILTER_OUT_MAKE_TARGETS += writev02 writev03 +endif + include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/writev/writev02.c b/testcases/kernel/syscalls/writev/writev02.c index a20110d..67581cb 100644 --- a/testcases/kernel/syscalls/writev/writev02.c +++ b/testcases/kernel/syscalls/writev/writev02.c @@ -59,8 +59,6 @@ #include "usctest.h" #include <sys/mman.h> -#if !defined(UCLINUX) - #define K_1 8192 #define NBUFS 2 @@ -242,9 +240,3 @@ void l_seek(int fdesc, off_t offset, int whence) if (lseek(fdesc, offset, whence) == -1) tst_resm(TBROK|TERRNO, "lseek failed"); } -#else -int main() -{ - tst_brkm(TCONF, NULL, "test is not available on uClinux"); -} -#endif /* if !defined(UCLINUX) */ diff --git a/testcases/kernel/syscalls/writev/writev03.c b/testcases/kernel/syscalls/writev/writev03.c index aeec893..b234618 100644 --- a/testcases/kernel/syscalls/writev/writev03.c +++ b/testcases/kernel/syscalls/writev/writev03.c @@ -62,8 +62,6 @@ #define MAX_IOVEC 4 #define DATA_FILE "writev_data_file" -#if !defined(UCLINUX) - char buf1[K_1], buf2[K_1], buf3[K_1]; char *bad_addr = 0; @@ -284,9 +282,3 @@ void l_seek(int fdesc, off_t offset, int whence) if (lseek(fdesc, offset, whence) == -1) tst_brkm(TBROK|TERRNO, cleanup, "lseek failed"); } -#else -int main() -{ - tst_brkm(TCONF, NULL, "test is not available on uClinux"); -} -#endif /* if !defined(UCLINUX) */ \ No newline at end of file -- 1.7.2.5 ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
