* the test scripts can run selected tests only:

   - options: -G <group>  - selects group of tests
              -t <test>   - selects test variant
	      -n <num>    - sets number of jobs
   - <group> and <test> are single letters (run script without any options
     to see their meaning)
   - * means run all
   - it is also possible to give space separated list
   - example:
        perftest_il -G a -t a
	perftest_il -G \* -t "a x"

diff --git a/org.glite.lb.logger/src/perftest_il.sh b/org.glite.lb.logger/src/perftest_il.sh
index 4c3de48..484f0c9 100644 (file)
--- a/org.glite.lb.logger/src/perftest_il.sh
+++ b/org.glite.lb.logger/src/perftest_il.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-numjobs=$1
+numjobs=10
 
 # XXX - there must be better way to find stage
 STAGEDIR=/home/michal/shared/egee/jra1-head/stage
@@ -16,6 +16,33 @@ check_test_files || exit 1
 
 COMM_ARGS="-s /tmp/interlogger.perftest --file-prefix=/tmp/perftest.log"
 
+#TEST_GROUP=
+#TEST_VARIANT=
+
+SILENT=0
+while getopts "G:t:n:s" OPTION 
+do
+    case "$OPTION" in 
+    "G") TEST_GROUP=$OPTARG
+    ;;
+
+    "t") TEST_VARIANT=$OPTARG
+    ;;
+
+    "n") numjobs=$OPTARG
+    ;;
+
+    "s") SILENT=1
+    ;;
+
+    esac
+done
+
+
+group_a () 
+{
+if [[ $SILENT -eq 0 ]]
+then
 echo "-------------------------------------------"
 echo "Logging test:"
 echo "  - events sent through IPC and/or files"
@@ -24,21 +51,28 @@ echo "-------------------------------------------"
 echo "a) events sent only by IPC"
 echo "b) events stored to files and sent by IPC"
 echo ""
-echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
-
+fi
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf-empty
 CONSUMER_ARGS="-d $COMM_ARGS"
+}
+
+group_a_test_a () 
+{
+    LOGJOBS_ARGS="--nofile $COMM_ARGS"
+    echo -n "a)"
+    run_test il $numjobs
+    print_result
+}
+
+group_a_test_b () {
+    LOGJOBS_ARGS=" $COMM_ARGS"
+    echo -n "b)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
 
-LOGJOBS_ARGS="--nofile $COMM_ARGS"
-echo -n "a)"
-run_test il $numjobs
-print_result
-LOGJOBS_ARGS=" $COMM_ARGS"
-echo -n "b)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
 
 
 # echo "--------------------------------"
@@ -79,6 +113,10 @@ rm -f /tmp/perftest.log.*
 # run_test il $numjobs
 # print_result
 
+
+group_b () {
+if [[ $SILENT -eq 0 ]]
+then
 echo "-----------------------------------"
 echo "Interlogger test:"
 echo "  - events sent through IPC & files"
@@ -91,43 +129,60 @@ echo "x) disabled sync and recovery"
 echo "d) lazy bkserver connection close"
 echo "e) normal operation"
 echo ""
-echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
-
+fi
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf
 LOGJOBS_ARGS=" $COMM_ARGS"
-
-CONSUMER_ARGS="-d --nosend --noparse $COMM_ARGS"
-echo -n "a)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-CONSUMER_ARGS="-d --nosend --nosync $COMM_ARGS"
-echo -n "b)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-CONSUMER_ARGS="-d --nosend --norecover $COMM_ARGS"
-echo -n "c)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-CONSUMER_ARGS="-d --nosend --nosync --norecover $COMM_ARGS"
-echo -n "x)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-echo "d)  this test is not applicable"
-
-CONSUMER_ARGS="-d --nosend $COMM_ARGS"
-echo -n "e)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
+}
+
+group_b_test_a ()
+{
+    CONSUMER_ARGS="-d --nosend --noparse $COMM_ARGS"
+    echo -n "a)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_b_test_b () 
+{
+    CONSUMER_ARGS="-d --nosend --nosync $COMM_ARGS"
+    echo -n "b)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_b_test_c () 
+{
+    CONSUMER_ARGS="-d --nosend --norecover $COMM_ARGS"
+    echo -n "c)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_b_test_x ()
+{
+    CONSUMER_ARGS="-d --nosend --nosync --norecover $COMM_ARGS"
+    echo -n "x)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_b_test_d ()
+{
+    echo "d)  this test is not applicable"
+}
+
+group_b_test_e ()
+{
+    CONSUMER_ARGS="-d --nosend $COMM_ARGS"
+    echo -n "e)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
 
 # echo "-------------------------------"
 # echo "Interlogger test:"
@@ -175,6 +230,10 @@ rm -f /tmp/perftest.log.*
 # rm -f /tmp/perftest.log.*
 
 
+group_c () 
+{
+if [[ $SILENT -eq 0 ]]
+then
 echo "-----------------------------------"
 echo "Interlogger test:"
 echo "  - events sent through IPC & files"
@@ -187,48 +246,115 @@ echo "x) disabled sync and recovery"
 echo "d) lazy bkserver connection close"
 echo "e) normal operation"
 echo ""
-echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
+fi
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd
 CONSUMER_ARGS="-d --perf-sink=1"
 PERFTEST_COMPONENT=$STAGEDIR/bin/glite-lb-interlogd-perf
 LOGJOBS_ARGS=" $COMM_ARGS"
-
-
-COMPONENT_ARGS="-d  --noparse $COMM_ARGS"
-echo -n "a)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-COMPONENT_ARGS="-d  --nosync $COMM_ARGS"
-echo -n "b)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-COMPONENT_ARGS="-d  --norecover $COMM_ARGS"
-echo -n "c)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-COMPONENT_ARGS="-d  --nosync --norecover $COMM_ARGS"
-echo -n "x)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-COMPONENT_ARGS="-d  --lazy=10 --nosync --norecover $COMM_ARGS"
-echo -n "d)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
-COMPONENT_ARGS="-d $COMM_ARGS"
-echo -n "e)"
-run_test il $numjobs
-print_result
-rm -f /tmp/perftest.log.*
-
+}
+
+group_c_test_a ()
+{
+    COMPONENT_ARGS="-d  --noparse $COMM_ARGS"
+    echo -n "a)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_c_test_b ()
+{
+    COMPONENT_ARGS="-d  --nosync $COMM_ARGS"
+    echo -n "b)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_c_test_c ()
+{
+    COMPONENT_ARGS="-d  --norecover $COMM_ARGS"
+    echo -n "c)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_c_test_x () 
+{
+    COMPONENT_ARGS="-d  --nosync --norecover $COMM_ARGS"
+    echo -n "x)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_c_test_d ()
+{
+    COMPONENT_ARGS="-d  --lazy=10 --nosync --norecover $COMM_ARGS"
+    echo -n "d)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+group_c_test_e ()
+{
+    COMPONENT_ARGS="-d $COMM_ARGS"
+    echo -n "e)"
+    run_test il $numjobs
+    print_result
+    rm -f /tmp/perftest.log.*
+}
+
+   
+if [[ $SILENT -eq 0 ]]
+then
+    while [[ -z $TEST_GROUP ]]
+    do
+       echo "Choose test group:"
+       echo "  a) logging source tests"
+       echo "  b) interlogger tests"
+       echo "  c) interlogger with external consumer tests"
+       echo -n "Your choice: "
+       read TEST_GROUP
+    done
+fi
+TEST_GROUP=`echo $TEST_GROUP | tr '[A-Z]' '[a-z]'`
+
+if [[ "x$TEST_GROUP" = "x*" ]]
+then
+    TEST_GROUP="a b c"
+fi
+
+for group in $TEST_GROUP
+do
+    group_$group
+
+    if [[ $SILENT -eq 0 ]]
+    then
+       while [[ -z $TEST_VARIANT ]]
+       do
+           echo -n "Your choice: "
+           read -e TEST_VARIANT
+       done
+       echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
+    fi
+
+    if [[ "x$TEST_VARIANT" = "x*" ]]
+    then
+       case $TEST_GROUP in
+           "a") TEST_VARIANT="a b" ;;
+           *)   TEST_VARIANT="a b c x d e" ;;
+       esac
+    fi
+
+    for variant in $TEST_VARIANT
+    do
+       group_${group}_test_${variant}
+    done
+done
+
+exit;
 

diff --git a/org.glite.lb.logger/src/perftest_ll.sh b/org.glite.lb.logger/src/perftest_ll.sh
index c6a02b0..d6fc67d 100644 (file)
--- a/org.glite.lb.logger/src/perftest_ll.sh
+++ b/org.glite.lb.logger/src/perftest_ll.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-numjobs=${1:-1}
+numjobs=1
 
 # XXX - there must be better way to find stage
 if [ -z "${GLITE_LOCATION}" ]; then
@@ -11,6 +11,22 @@ fi
 
 . $STAGEDIR/sbin/perftest_common.sh
 
+SILENT=0
+while getopts "t:n:s" OPTION 
+do
+    case "$OPTION" in 
+    "t") TEST_VARIANT=$OPTARG
+    ;;
+
+    "n") numjobs=$OPTARG
+    ;;
+
+    "s") SILENT=1
+    ;;
+
+    esac
+done
+
 DEBUG=${DEBUG:-0}
 # CONSUMER_ARGS=
 # PERFTEST_COMPONENT=
@@ -21,6 +37,7 @@ export EDG_WL_LOG_DESTINATION="localhost:45678"
 
 check_test_files || exit 1
 
+group_a () {
 echo "----------------
 Locallogger test
 ----------------
@@ -31,9 +48,12 @@ d) glite-lb-logd-perf
 
 Number of jobs: $numjobs
 "
-echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
+}
+
 
 # a)
+group_a_test_a ()
+{
 echo -n "a)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-logd-perf-nofile
 CONSUMER_ARGS="-d --noIPC --noParse $COMM_ARGS"
@@ -41,8 +61,11 @@ init_result
 run_test ll $numjobs
 #print_result_ev
 print_result
+}
 
 # b)
+group_a_test_b ()
+{
 echo -n "b)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-logd-perf-nofile
 CONSUMER_ARGS="-d --noIPC $COMM_ARGS"
@@ -50,8 +73,11 @@ init_result
 run_test ll $numjobs
 #print_result_ev
 print_result
+}
 
 # c)
+group_a_test_c () 
+{
 echo -n "c)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-logd-perf
 CONSUMER_ARGS="-d --noIPC $COMM_ARGS"
@@ -59,10 +85,12 @@ init_result
 run_test ll $numjobs
 #print_result_ev
 print_result
-
 rm -f /tmp/perftest.log.*
+}
 
 # d)
+group_a_test_d ()
+{
 echo -n "d)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf-empty
 CONSUMER_ARGS="-d -s /tmp/perftest.sock"
@@ -72,5 +100,29 @@ init_result
 run_test ll $numjobs
 #print_result_ev
 print_result
-
 rm -f /tmp/perftest.log.*
+}
+
+group="a"
+
+group_$group
+
+if [[ $SILENT -eq 0 ]]
+then
+    while [[ -z $TEST_VARIANT ]]
+    do
+       echo -n "Your choice: "
+       read -e TEST_VARIANT
+    done
+    echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
+fi
+
+if [[ "x$TEST_VARIANT" = "x*" ]]
+then
+   TEST_VARIANT="a b c d"
+fi
+
+for variant in $TEST_VARIANT
+do
+    group_${group}_test_${variant}
+done