From b3e2ce3baeea742338003daf83657fa8a0c17e87 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 27 Oct 2013 18:28:28 +0200 Subject: [PATCH] tests: Do not require wpaspy installation Since the scripts must be run from the source directory to find the tests to run, they can use a relative path to the wpaspy module instead of requiring it to be installed. Signed-hostap: Johannes Berg --- tests/hwsim/README | 7 ++----- tests/hwsim/run-tests.py | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/hwsim/README b/tests/hwsim/README index 91aa6f90e..8195aa40a 100644 --- a/tests/hwsim/README +++ b/tests/hwsim/README @@ -60,11 +60,8 @@ wpaspy ------ The python scripts use wpaspy.py to interact with the wpa_supplicant -control interface. This needs to be installed in a way that python can -find it. For example, with this command: - -sudo cp ../wpaspy/wpaspy.py /usr/local/lib/python2.7/dist-packages - +control interface, but the run-tests.py script adds the (relative) +path into the environment so it doesn't need to be installed. mac80211_hwsim diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py index 4b1750bb6..abe26f359 100755 --- a/tests/hwsim/run-tests.py +++ b/tests/hwsim/run-tests.py @@ -16,6 +16,8 @@ from datetime import datetime import logging logger = logging.getLogger(__name__) +sys.path.append('../../wpaspy') + from wpasupplicant import WpaSupplicant from hostapd import HostapdGlobal