Fix CN test script, improve error handling.

espressif · Nov 25, 2024 · f0f019b · f0f019b
1 parent bf5b24f
commit f0f019b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/tests/runs/CNmirrors.test.js b/tests/runs/CNmirrors.test.js
@@ -33,9 +33,11 @@ const projectFolder = "project";
 
 let installArgs = [];
 installArgs.push(` -p ${path.join(os.homedir(), installFolder)}`); // Install Path
+// installArgs.push(` -t ${targetList.join(",")}`); // Targets // removed to install for all targets
+// installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions Removed to install latest version
 installArgs.push(` -m https://dl.espressif.com/github_assets`); // IDF tools mirror
 installArgs.push(` --idf-mirror https://jihulab.com/esp-mirror`); // ESP-IDF mirror
-installArgs.push(` -r true`); // recursive submodules init
+installArgs.push(` -r false`); // recursive submodules init
 
 const pathToIDFScript =
     os.platform() !== "win32"

diff --git a/tests/runs/CNmirrors2.test.js b/tests/runs/CNmirrors2.test.js
@@ -33,9 +33,11 @@ const projectFolder = "project";
 
 let installArgs = [];
 installArgs.push(` -p ${path.join(os.homedir(), installFolder)}`); // Install Path
+installArgs.push(` -t ${targetList.join(",")}`); // Targets
+installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions
 installArgs.push(` -m https://dl.espressif.cn/github_assets`); // IDF tools mirror
 installArgs.push(` --idf-mirror https://jihulab.com/esp-mirror`); // ESP-IDF mirror
-installArgs.push(` -r true`); // recursive submodules init
+installArgs.push(` -r false`); // recursive submodules init
 
 const pathToIDFScript =
     os.platform() !== "win32"

diff --git a/tests/runs/nonInteractiveInstall.test.js b/tests/runs/nonInteractiveInstall.test.js
@@ -33,8 +33,8 @@ const projectFolder = "project";
 
 let installArgs = [];
 installArgs.push(` -p ${path.join(os.homedir(), installFolder)}`); // Install Path
-installArgs.push(` -t ${targetList.join(",")}`); // Targets (in case of multiple separate with ,)
-installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions (in case of multiple separate with ,)
+installArgs.push(` -t ${targetList.join(",")}`); // Targets
+installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions
 installArgs.push(` -m https://github.com`); // IDF tools mirror
 installArgs.push(` --idf-mirror https://github.com`); // ESP-IDF mirror
 installArgs.push(` -r true`); // recursive submodules init

diff --git a/tests/runs/variation1.test.js b/tests/runs/variation1.test.js
@@ -33,8 +33,8 @@ const projectFolder = "project";
 
 let installArgs = [];
 installArgs.push(` -p ${path.join(os.homedir(), installFolder)}`); // Install Path
-installArgs.push(` -t ${targetList.join(",")}`); // Targets (in case of multiple separate with ,)
-installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions (in case of multiple separate with ,)
+installArgs.push(` -t ${targetList.join(",")}`); // Targets
+installArgs.push(` -i ${idfVersionList.join(",")}`); // IDF versions
 installArgs.push(` -m https://github.com`); // IDF tools mirror
 installArgs.push(` --idf-mirror https://github.com`); // ESP-IDF mirror
 installArgs.push(` -r true`); // recursive submodules init

diff --git a/tests/script/postInstall.test.js b/tests/script/postInstall.test.js
@@ -26,9 +26,8 @@ export function runPostInstallTest(
             } catch {
                 logger.info("Error to start IDF terminal");
                 logger.info(testRunner.output);
-                throw new Error(
-                    "One test in the chain failed, aborting the entire suite."
-                );
+                this.test.error(new Error("Error starting IDF Terminal"));
+                throw error;
             }
         });