From: Angus Gratton <angus@espressif.com>
Date: Wed, 5 Dec 2018 00:13:46 +0000 (+1100)
Subject: unit_test.py: Allow importing tiny-test-fw from IDF_PATH as well as TEST_FW_PATH
X-Git-Tag: v3.3-beta2~161^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a27cfa8507fe93d81f193de4189098ae805a6a7;p=esp-idf

unit_test.py: Allow importing tiny-test-fw from IDF_PATH as well as TEST_FW_PATH
---

diff --git a/tools/unit-test-app/unit_test.py b/tools/unit-test-app/unit_test.py
index eb3005641e..4650a97421 100755
--- a/tools/unit-test-app/unit_test.py
+++ b/tools/unit-test-app/unit_test.py
@@ -25,13 +25,22 @@ import time
 import argparse
 import threading
 
-# if we want to run test case outside `tiny-test-fw` folder,
-# we need to insert tiny-test-fw path into sys path
-test_fw_path = os.getenv("TEST_FW_PATH")
-if test_fw_path and test_fw_path not in sys.path:
-    sys.path.insert(0, test_fw_path)
+try:
+        import TinyFW
+except ImportError:
+    # if we want to run test case outside `tiny-test-fw` folder,
+    # we need to insert tiny-test-fw path into sys path
+    test_fw_path = os.getenv("TEST_FW_PATH")
+    if test_fw_path and test_fw_path not in sys.path:
+        sys.path.insert(0, test_fw_path)
+    else:
+        # or try the copy in IDF
+        idf_path = os.getenv("IDF_PATH")
+        tiny_test_path = idf_path + "/tools/tiny-test-fw"
+        if os.path.exists(tiny_test_path):
+            sys.path.insert(0, tiny_test_path)
+    import TinyFW
 
-import TinyFW
 import IDF
 import Utility
 import Env