From ff22a6ab8809bc8d69870558a065d78f231433b0 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Sun, 16 Aug 2020 10:59:41 -0700
Subject: [PATCH] Remove PIO toolchain patch kludge

---
 tests/platformio.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/platformio.sh b/tests/platformio.sh
index 3bbc5d87f6..a1259f8670 100755
--- a/tests/platformio.sh
+++ b/tests/platformio.sh
@@ -3,19 +3,21 @@
 cache_dir=$(mktemp -d)
 
 source "$TRAVIS_BUILD_DIR"/tests/common.sh
-set -ex
 
 function install_platformio()
 {
     pip3 install --user -U https://github.com/platformio/platformio/archive/develop.zip
     platformio platform install "https://github.com/platformio/platform-espressif8266.git"
-    # Overwrite toolchain with this PR's toolset.  Probably better way to do this
-    ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q )
-    mv ~/.platformio/packages/toolchain-xtensa/package.json .save
-    rm -rf ~/.platformio/packages/toolchain-xtensa
-    mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa
-    mv .save ~/.platformio/packages/toolchain-xtensa/package.json
-    python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
+# Note that PIO ignores the requested toolchain.  The code below attempted to patch in
+# the current Arduino version, but due to recent PIO changes it no longer succeeds.
+# Dropping it for now, leaving PIO to pick up whatever toolchain it feels like.
+#    # Overwrite toolchain with this PR's toolset.  Probably better way to do this
+#    ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q )
+#    mv ~/.platformio/packages/toolchain-xtensa/package.json .save
+#    rm -rf ~/.platformio/packages/toolchain-xtensa
+#    mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa
+#    mv .save ~/.platformio/packages/toolchain-xtensa/package.json
+#    python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
     ln -sf $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif8266
     # Install dependencies:
     # - esp8266/examples/ConfigFile