Merge branch 'adafruit:main' into sunton_esp32_8048S050

Author: sanhu88

tests/run-tests.py

@@ -829,6 +829,10 @@ def run_one_test(test_file):
                 "PATH": os.environ["PATH"],
                 "LANG": "en_US.UTF-8",
             }
+            # CIRCUITPY-CHANGE: --keep-path applies to PYTHONPATH as well
+            if args.keep_path and os.getenv("PYTHONPATH"):
+                e["PYTHONPATH"] += ":" + os.getenv("PYTHONPATH")
+
             # run CPython to work out expected output
             try:
                 output_expected = subprocess.check_output(