>> So how about put the tests into LTP but not run by default, and when my patch
>> is accepted (but I'm not optimistic) or Evgeniy has done the extension, we
>> can update the tests and make it run by default.
>
> That would be really great, rather than holding it off from LTP
> inclusion. I would merge your last updated patch with little
> modifications from your side. I will make sure that it does not run by
> default until your kernel patch is through, and in that case, you can
> send me an updated patch.
>
Here it is. Based on my last patch.
- building failure on 2.6.16 should be fixed
- fix "make install" if kernel version < 2.6.15
- abort tests if kernel version < 2.6.15
Signed-off-by: Li Zefan <[EMAIL PROTECTED]>
---
runtest/connectors | 2 +-
testcases/kernel/connectors/Makefile | 12 ++++++++----
testcases/kernel/connectors/connector_test.sh | 15 +++++++++++++++
testcases/kernel/connectors/pec/Makefile | 1 +
testcases/kernel/connectors/pec/pec_listener.c | 1 +
5 files changed, 26 insertions(+), 5 deletions(-)
diff -Nurp ltp-full-20080531.orig/runtest/connectors
ltp-full-20080531/runtest/connectors
--- ltp-full-20080531.orig/runtest/connectors 2008-06-26 15:03:31.000000000
+0800
+++ ltp-full-20080531/runtest/connectors 2008-06-26 15:15:24.000000000
+0800
@@ -1,2 +1,2 @@
#DESCRIPTION:Netlink Connector tests
-Connectors run_pec_test
+Connectors connector_test.sh
diff -Nurp ltp-full-20080531.orig/testcases/kernel/connectors/connector_test.sh
ltp-full-20080531/testcases/kernel/connectors/connector_test.sh
--- ltp-full-20080531.orig/testcases/kernel/connectors/connector_test.sh
1970-01-01 08:00:00.000000000 +0800
+++ ltp-full-20080531/testcases/kernel/connectors/connector_test.sh
2008-06-26 15:55:42.000000000 +0800
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+if [ -z $LTPROOT ]; then
+ export LTPROOT="`cd ../../.. && pwd`"
+ export PATH="$PATH:$LTPROOT/testcases/bin"
+fi
+
+tst_kvercmp 2 6 15
+if [ $? -eq 0 ]; then
+ echo "Connectors 0 CONF : system doesn't support execution of the test"
+ exit 0
+fi
+
+$LTPROOT/testcases/bin/run_pec_test
+
diff -Nurp ltp-full-20080531.orig/testcases/kernel/connectors/Makefile
ltp-full-20080531/testcases/kernel/connectors/Makefile
--- ltp-full-20080531.orig/testcases/kernel/connectors/Makefile 2008-06-26
15:03:31.000000000 +0800
+++ ltp-full-20080531/testcases/kernel/connectors/Makefile 2008-06-26
15:35:32.000000000 +0800
@@ -2,12 +2,16 @@ SUBDIRS = pec
all:
@set -e; \
- if ./tst_kvercmp 2 6 15; then \
+ if ../../bin/tst_kvercmp 2 6 15; then \
echo "system does not support process event connector"; \
- else $(MAKE) -C pec; true; fi
+ else for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; true; fi
install:
- @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install ; done
-
+ @set -e; \
+ ln -f connector_test.sh ../../bin/connector_test.sh; \
+ chmod ugo+x connector_test.sh; \
+ if ../../bin/tst_kvercmp 2 6 15; then \
+ echo "system does not support process event connector"; \
+ else for i in $(SUBDIRS); do $(MAKE) -C $$i install; done; true; fi
clean:
@set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean ; done
diff -Nurp ltp-full-20080531.orig/testcases/kernel/connectors/pec/Makefile
ltp-full-20080531/testcases/kernel/connectors/pec/Makefile
--- ltp-full-20080531.orig/testcases/kernel/connectors/pec/Makefile
2008-06-26 15:03:31.000000000 +0800
+++ ltp-full-20080531/testcases/kernel/connectors/pec/Makefile 2008-06-26
15:48:44.000000000 +0800
@@ -9,5 +9,6 @@ all: $(TARGETS)
install:
@set -e; for i in $(TARGETS) ; do ln -f $$i ../../../bin/$$i ; chmod +x
run_pec_test ; done ;
ln -f run_pec_test ../../../bin/
+ chmod +x run_pec_test
clean:
rm -f $(TARGETS)
diff -Nurp
ltp-full-20080531.orig/testcases/kernel/connectors/pec/pec_listener.c
ltp-full-20080531/testcases/kernel/connectors/pec/pec_listener.c
--- ltp-full-20080531.orig/testcases/kernel/connectors/pec/pec_listener.c
2008-06-26 15:03:31.000000000 +0800
+++ ltp-full-20080531/testcases/kernel/connectors/pec/pec_listener.c
2008-06-26 15:03:50.000000000 +0800
@@ -31,6 +31,7 @@
#include <linux/netlink.h>
#include <linux/connector.h>
+#define _LINUX_TIME_H
#include <linux/cn_proc.h>
#define PEC_MSG_SIZE (sizeof(struct cn_msg) + sizeof(struct proc_event))
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
