tests: Remove special start.sh option for concurrent P2P tests

These were not really used in practice and better quality test cases for
concurrent P2P operations are now available in tests_p2p_concurrency.py
using the standard test framework design. Remove the special concurrent
option for start.sh and the run-all.sh concurrent and
concurrent-valgrind operations to clean up scripts.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/README b/tests/hwsim/README
index 9bfe48e..0bd891c 100644 (file)
--- a/tests/hwsim/README
+++ b/tests/hwsim/README
@@ -125,12 +125,6 @@ conditions:
 # run normal test cases with Linux tracing
 ./run-all.sh trace
 
-# run P2P test cases with concurrent station interface
-./run-all.sh concurrent
-
-# run P2P test cases with concurrent station interface under valgrind
-./run-all.sh concurrent-valgrind
-
 run-all.sh directs debug logs into the logs subdirectory (or $LOGDIR if
 present in the environment). Log file names include the current UNIX
 timestamp and a postfix to identify the specific log:

diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 7e6a83d..9b556a3 100755 (executable)
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -24,28 +24,12 @@ else
     fi
 fi
 
-if [ "x$1" = "xconcurrent-valgrind" ]; then
+if [ "x$1" = "xvalgrind" ]; then
        VALGRIND=valgrind
-       CONCURRENT=concurrent
-       CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
-       SUFFIX=-concurrent-valgrind
-       shift
-elif [ "x$1" = "xconcurrent" ]; then
-       CONCURRENT=concurrent
-       CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
-       unset VALGRIND
-       SUFFIX=-concurrent
-       shift
-elif [ "x$1" = "xvalgrind" ]; then
-       VALGRIND=valgrind
-       unset CONCURRENT
-       unset CONCURRENT_TESTS
        SUFFIX=-valgrind
        shift
 else
        unset VALGRIND
-       unset CONCURRENT
-       unset CONCURRENT_TESTS
        SUFFIX=
 fi
 
@@ -59,14 +43,14 @@ else
        unset TRACE_ARGS
 fi
 
-if ! ./start.sh $CONCURRENT $VALGRIND $TRACE; then
+if ! ./start.sh $VALGRIND $TRACE; then
        if ! [ -z "$LOGBASEDIR" ] ; then
                echo "Could not start test environment" > $LOGDIR/run
        fi
        exit 1
 fi
 
-./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -q $DB $CONCURRENT_TESTS $@ || errors=1
+./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -q $DB $@ || errors=1
 
 ./stop.sh
 

diff --git a/tests/hwsim/sta-dummy.conf b/tests/hwsim/sta-dummy.conf
deleted file mode 100644 (file)
index 52b7205..0000000
--- a/tests/hwsim/sta-dummy.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=admin
-
-network={
-       disabled=0
-       ssid="test"
-       key_mgmt=NONE
-}

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index f87d2f3..f2722ac 100755 (executable)
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -21,20 +21,10 @@ else
     GROUP=adm
 fi
 
-sed "s/ GROUP=.*$/ GROUP=$GROUP/" "$DIR/sta-dummy.conf" > "$LOGDIR/sta-dummy.conf"
 for i in 0 1 2; do
     sed "s/ GROUP=.*$/ GROUP=$GROUP/" "$DIR/p2p$i.conf" > "$LOGDIR/p2p$i.conf"
 done
 
-if [ "$1" = "concurrent" ]; then
-    CONCURRENT=y
-    CONCURRENT_ARGS="-N -Dnl80211 -ista%d -c $LOGDIR/sta-dummy.conf"
-    shift
-else
-    unset CONCURRENT
-    CONCURRENT_ARGS=
-fi
-
 if [ "$1" = "valgrind" ]; then
     VALGRIND=y
     VALGRIND_WPAS="valgrind --log-file=$LOGDIR/valgrind-wlan%d"
@@ -57,16 +47,11 @@ fi
 
 $DIR/stop.sh
 test -f /proc/modules && sudo modprobe mac80211_hwsim radios=5
-if [ "$CONCURRENT" = "y" ]; then
-    sudo iw wlan0 interface add sta0 type station
-    sudo iw wlan1 interface add sta1 type station
-    sudo iw wlan2 interface add sta2 type station
-fi
 sudo ifconfig hwsim0 up
 sudo $WLANTEST -i hwsim0 -n $LOGDIR/hwsim0.pcapng -c -dt -L $LOGDIR/hwsim0 &
 for i in 0 1 2; do
     sudo $(printf -- "$VALGRIND_WPAS" $i) $WPAS -g /tmp/wpas-wlan$i -G$GROUP -Dnl80211 -iwlan$i -c $LOGDIR/p2p$i.conf \
-         $(printf -- "$CONCURRENT_ARGS" $i) -ddKt$TRACE -f $LOGDIR/log$i &
+         -ddKt$TRACE -f $LOGDIR/log$i &
 done
 sudo $VALGRIND_HAPD $HAPD -ddKt$TRACE -g /var/run/hostapd-global -G $GROUP -ddKt -f $LOGDIR/hostapd &