Check /proc/net/connector to see if process event connector is supported
or not.
Also merged some cleanups done by Matt Helsley.
Signed-off-by: Li Zefan <[EMAIL PROTECTED]>
---
runltp | 3 ++-
testcases/kernel/Makefile | 3 +--
testcases/kernel/connectors/Makefile | 2 +-
testcases/kernel/connectors/connector_test.sh | 7 +------
testcases/kernel/connectors/pec/run_pec_test | 21 ++++++++++-----------
5 files changed, 15 insertions(+), 21 deletions(-)
diff -Nurp ltp-full-20080731.orig/runltp ltp-full-20080731/runltp
--- ltp-full-20080731.orig/runltp 2008-05-23 18:20:10.000000000 +0800
+++ ltp-full-20080731/runltp 2008-09-09 10:00:07.000000000 +0800
@@ -510,7 +510,8 @@ main()
${LTPROOT}/runtest/fs_bind \
${LTPROOT}/runtest/controllers \
${LTPROOT}/runtest/filecaps \
- ${LTPROOT}/runtest/fcntl-locktests
+ ${LTPROOT}/runtest/fcntl-locktests \
+ ${LTPROOT}/runtest/connectors
do
[ -e "$SCENFILES" ] || \
{
diff -Nurp ltp-full-20080731.orig/testcases/kernel/Makefile
ltp-full-20080731/testcases/kernel/Makefile
--- ltp-full-20080731.orig/testcases/kernel/Makefile 2008-06-26
17:37:40.000000000 +0800
+++ ltp-full-20080731/testcases/kernel/Makefile 2008-09-09 10:00:07.000000000
+0800
@@ -1,5 +1,4 @@
-SUBDIRS = numa containers controllers include fs io ipc mem pty sched security
syscalls timers
-# Will be adding conectors here in future
+SUBDIRS = numa containers controllers connectors include fs io ipc mem pty
sched security syscalls timers
UCLINUX_SUBDIRS = syscalls
all:
diff -Nurp ltp-full-20080731.orig/testcases/kernel/connectors/Makefile
ltp-full-20080731/testcases/kernel/connectors/Makefile
--- ltp-full-20080731.orig/testcases/kernel/connectors/Makefile 2008-06-26
20:00:12.000000000 +0800
+++ ltp-full-20080731/testcases/kernel/connectors/Makefile 2008-09-09
10:31:00.000000000 +0800
@@ -15,4 +15,4 @@ install:
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
+ @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done
diff -Nurp ltp-full-20080731.orig/testcases/kernel/connectors/connector_test.sh
ltp-full-20080731/testcases/kernel/connectors/connector_test.sh
--- ltp-full-20080731.orig/testcases/kernel/connectors/connector_test.sh
2008-06-26 20:02:37.000000000 +0800
+++ ltp-full-20080731/testcases/kernel/connectors/connector_test.sh
2008-09-09 10:29:47.000000000 +0800
@@ -1,9 +1,4 @@
-#! /bin/sh
-
-if [ -z $LTPROOT ]; then
- export LTPROOT="`cd ../../.. && pwd`"
- export PATH="$PATH:$LTPROOT/testcases/bin"
-fi
+#!/bin/sh
tst_kvercmp 2 6 15
if [ $? -eq 0 ]; then
diff -Nurp ltp-full-20080731.orig/testcases/kernel/connectors/pec/run_pec_test
ltp-full-20080731/testcases/kernel/connectors/pec/run_pec_test
--- ltp-full-20080731.orig/testcases/kernel/connectors/pec/run_pec_test
2008-06-26 17:35:45.000000000 +0800
+++ ltp-full-20080731/testcases/kernel/connectors/pec/run_pec_test
2008-09-09 10:30:36.000000000 +0800
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
################################################################################
##
##
@@ -24,13 +24,6 @@
NUM_EVENTS=1
EVENT_TEST_CASES=( "fork" "exec" "exit" "uid" "gid" )
[EMAIL PROTECTED]
-
-if [ -z $LTPROOT ]; then
- LTPROOT="`cd ../../../.. && pwd`"
- PATH="$PATH:$LTPROOT/testcases/bin"
- mkdir $LTPROOT/output 2> /dev/null
-fi
cd $LTPROOT/testcases/bin
@@ -45,6 +38,12 @@ if [ "$USER" != root ]; then
exit 0;
fi
+grep cn_proc /proc/net/connector > /dev/null
+if [ $? -ne 0 ]; then
+ tst_brkm TBROK ignored "Process Event Connector is not supported or
kernel is below 2.6.26"
+ exit 0;
+fi
+
# Run a test case
#
# $1: the test number
@@ -54,14 +53,14 @@ run_case()
export TST_COUNT=$1
log="$LTPROOT/output/log"
- mkdir $log 2> /dev/null
+ mkdir -p $log 2> /dev/null
- ./pec_listener > "$log/listener_$1.log" 2>&1 &
+ pec_listener > "$log/listener_$1.log" 2>&1 &
pid=$!
# Wait for pec_listener to start listening
sleep $((1*NUM_EVENTS))
- ./event_generator -e $2 > "$log/generator_$1.log"
+ event_generator -e $2 > "$log/generator_$1.log"
ret1=$?
# Sleep until pec_listener has seen and handled all of
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
