From 60bfe7061dfeb3b9e5b33a70352c1dcfcd198fa6 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 1 Oct 2015 12:46:10 +0300
Subject: [PATCH] Remove obsolete mac80211_hwsim tests

The tests/hwsim framework has obsoleted these separate configuration
files for manual mac80211_hwsim testing.

Signed-off-by: Jouni Malinen <j@w1.fi>
---
 mac80211_hwsim/tests/0001-wpa2-psk/hostapd.conf   | 11 -----------
 mac80211_hwsim/tests/0001-wpa2-psk/test.txt       |  7 -------
 .../tests/0001-wpa2-psk/wpa_supplicant.conf       | 10 ----------
 mac80211_hwsim/tests/0002-vlan/hostapd.accept     |  2 --
 mac80211_hwsim/tests/0002-vlan/hostapd.conf       | 12 ------------
 mac80211_hwsim/tests/0002-vlan/hostapd.vlan       |  1 -
 mac80211_hwsim/tests/0002-vlan/test.txt           | 15 ---------------
 7 files changed, 58 deletions(-)
 delete mode 100644 mac80211_hwsim/tests/0001-wpa2-psk/hostapd.conf
 delete mode 100644 mac80211_hwsim/tests/0001-wpa2-psk/test.txt
 delete mode 100644 mac80211_hwsim/tests/0001-wpa2-psk/wpa_supplicant.conf
 delete mode 100644 mac80211_hwsim/tests/0002-vlan/hostapd.accept
 delete mode 100644 mac80211_hwsim/tests/0002-vlan/hostapd.conf
 delete mode 100644 mac80211_hwsim/tests/0002-vlan/hostapd.vlan
 delete mode 100644 mac80211_hwsim/tests/0002-vlan/test.txt

diff --git a/mac80211_hwsim/tests/0001-wpa2-psk/hostapd.conf b/mac80211_hwsim/tests/0001-wpa2-psk/hostapd.conf
deleted file mode 100644
index 08cde7e35..000000000
--- a/mac80211_hwsim/tests/0001-wpa2-psk/hostapd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-interface=wlan0
-driver=nl80211
-
-hw_mode=g
-channel=1
-ssid=mac80211 test
-
-wpa=2
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=CCMP
-wpa_passphrase=12345678
diff --git a/mac80211_hwsim/tests/0001-wpa2-psk/test.txt b/mac80211_hwsim/tests/0001-wpa2-psk/test.txt
deleted file mode 100644
index 05d85a004..000000000
--- a/mac80211_hwsim/tests/0001-wpa2-psk/test.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# WPA2-Personal (PSK) with CCMP, AP and single client
-
-modprobe mac80211_hwsim
-
-hostapd hostapd.conf
-
-wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf
diff --git a/mac80211_hwsim/tests/0001-wpa2-psk/wpa_supplicant.conf b/mac80211_hwsim/tests/0001-wpa2-psk/wpa_supplicant.conf
deleted file mode 100644
index 299128cff..000000000
--- a/mac80211_hwsim/tests/0001-wpa2-psk/wpa_supplicant.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-
-network={
-	ssid="mac80211 test"
-	psk="12345678"
-	key_mgmt=WPA-PSK
-	proto=WPA2
-	pairwise=CCMP
-	group=CCMP
-}
diff --git a/mac80211_hwsim/tests/0002-vlan/hostapd.accept b/mac80211_hwsim/tests/0002-vlan/hostapd.accept
deleted file mode 100644
index e97a17519..000000000
--- a/mac80211_hwsim/tests/0002-vlan/hostapd.accept
+++ /dev/null
@@ -1,2 +0,0 @@
-02:00:00:00:01:00	1
-02:00:00:00:02:00	2
diff --git a/mac80211_hwsim/tests/0002-vlan/hostapd.conf b/mac80211_hwsim/tests/0002-vlan/hostapd.conf
deleted file mode 100644
index 8698f0ef9..000000000
--- a/mac80211_hwsim/tests/0002-vlan/hostapd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-interface=wlan0
-driver=nl80211
-
-hw_mode=g
-channel=1
-ssid=mac80211 test
-
-dynamic_vlan=2
-vlan_file=hostapd.vlan
-
-macaddr_acl=0
-accept_mac_file=hostapd.accept
diff --git a/mac80211_hwsim/tests/0002-vlan/hostapd.vlan b/mac80211_hwsim/tests/0002-vlan/hostapd.vlan
deleted file mode 100644
index b3750b23f..000000000
--- a/mac80211_hwsim/tests/0002-vlan/hostapd.vlan
+++ /dev/null
@@ -1 +0,0 @@
-*	vlan#
diff --git a/mac80211_hwsim/tests/0002-vlan/test.txt b/mac80211_hwsim/tests/0002-vlan/test.txt
deleted file mode 100644
index 8c92f1c97..000000000
--- a/mac80211_hwsim/tests/0002-vlan/test.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Plaintext connection, two clients, different VLANs
-
-modprobe mac80211_hwsim radios=3
-
-hostapd hostapd.conf
-
-ifconfig wlan1 up
-iwconfig wlan1 essid "mac80211 test"
-
-ifconfig wlan2 up
-iwconfig wlan2 essid "mac80211 test"
-
-# Expected results:
-# STA1(wlan1) is bound to vlan1
-# STA2(wlan2) is bound to vlan2