kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

netdev.tests: Add fixes for environment variables

Browse Source 
+ minor include fix
This commit is contained in:
Martine Lenders 2014-10-08 09:40:49 +02:00
parent f384bc1cc9
commit 37678505a9
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/netdev/Makefile
View File

@ -9,12 +9,11 @@ endif
include ../Makefile.tests_common
USEMODULE += defaulttransceiver
USEMODULE += net_help
USEMODULE += netdev_base
DISABLE_MODULE += auto_init
INCLUDES += -I$(RIOTBASE)/sys/net/include
CHANNEL ?= 1
SENDER_ADDRESS ?= 1
RECEIVER_ADDRESS ?= 2

21
tests/netdev/tests/01-interaction.py
View File

@ -17,11 +17,22 @@ board = os.environ.get('BOARD', 'native')
DEFAULT_TIMEOUT=5
def main():
receiver = spawn("make term", timeout=5, env={"SENDER": '0'})
time.sleep(1)
sender = spawn("make term", timeout=5, env={"SENDER": '1'})
receiver = None
sender = None
if "PORT" in os.environ:
del os.environ["PORT"]
if "TERMFLAGS" in os.environ:
del os.environ["TERMFLAGS"]
try:
os.environ["SENDER"] = "0"
receiver = spawn("make term", timeout=5)
time.sleep(1)
os.environ["SENDER"] = "1"
sender = spawn("make term", timeout=5)
receiver.expect(r"RIOT netdev test")
sender.expect(r"RIOT netdev test")
@ -122,9 +133,9 @@ def main():
except Abort:
return 0
finally:
if not sender.terminate():
if sender and not sender.terminate():
sender.terminate(force=True)
if not receiver.terminate():
if receiver and not receiver.terminate():
receiver.terminate(force=True)
if __name__ == "__main__":