Subrata Modak wrote:
> I would request Li to verify this, as this involves building the PEC
> tests by default with LTP. I would like to make sure that i do not get
> any build/install failures even if the kernel does not have the support
> for PECs.
>
> Regards--
> Subrata
>
> On Wed, 2008-09-03 at 14:34 -0700, Matt Helsley wrote:
>> plain text document attachment (fixup-process-events-connector-test)
>> Remove the LTPROOT definitions. They don't look quite right. Also
>> pec_listener and event_generator should be in the PATH so we don't
>> need the ./
Seems ok to remove LTPROOT.
>> Lastly, the kernel version check is done in the script so don't clutter
>> the Makefile with the same check. This is OK since compiling these tests
>> and installing them is so quick. If it ever becomes unbearable then the
>> way to conditionally build these would be to set the value of a Make variable
>> based on the output of tst_kvercmp and then use that variable in the Make
>> rule target and dependency positions.
>>
This will break building.
kvercmp is needed both in Makefile and script file. Another example is
containers/Makefile and containers/container_test.sh.
>> Signed-off-by: Matt Helsley <[EMAIL PROTECTED]>
>> Cc: Veerendra Chandrappa <[EMAIL PROTECTED]>
>> Cc: Sudhir Kumar15 <[EMAIL PROTECTED]>
>> Cc: Subrata Modak <[EMAIL PROTECTED]>
>> Cc: Serge E. Hallyn <[EMAIL PROTECTED]>
>> ---
>> testcases/kernel/connectors/Makefile | 11 +++--------
>> testcases/kernel/connectors/connector_test.sh | 5 -----
>> testcases/kernel/connectors/pec/run_pec_test | 15 ++++-----------
>> 3 files changed, 7 insertions(+), 24 deletions(-)
>>
>> Index: ltp-intermediate-20080820/testcases/kernel/connectors/pec/run_pec_test
>> ===================================================================
>> ---
>> ltp-intermediate-20080820.orig/testcases/kernel/connectors/pec/run_pec_test
>> +++ ltp-intermediate-20080820/testcases/kernel/connectors/pec/run_pec_test
>> @@ -1,4 +1,4 @@
>> -#! /bin/bash
>> +#!/bin/bash
>>
>>
>> ################################################################################
>> ##
>> ##
>> @@ -26,12 +26,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
>>
>> export TCID="pec01"
>> @@ -54,14 +48,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
>> @@ -100,4 +94,3 @@ for CASE in "[EMAIL PROTECTED]" ; d
>> done
>>
>> exit $exit_status
>> -
>> Index:
>> ltp-intermediate-20080820/testcases/kernel/connectors/connector_test.sh
>> ===================================================================
>> ---
>> ltp-intermediate-20080820.orig/testcases/kernel/connectors/connector_test.sh
>> +++ ltp-intermediate-20080820/testcases/kernel/connectors/connector_test.sh
>> @@ -1,10 +1,5 @@
>> #!/bin/bash
>>
>> -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"
>> Index: ltp-intermediate-20080820/testcases/kernel/connectors/Makefile
>> ===================================================================
>> --- ltp-intermediate-20080820.orig/testcases/kernel/connectors/Makefile
>> +++ ltp-intermediate-20080820/testcases/kernel/connectors/Makefile
>> @@ -1,18 +1,13 @@
>> SUBDIRS = pec
>>
>> all:
>> - @set -e; \
>> - 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 $@; done; true; fi
>> + @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
>>
>> install:
>> @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
>> + for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done
>>
>> clean:
>> - @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean ; done
>> + @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done
>>
>
>
>
-------------------------------------------------------------------------
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
