Merge branch 'master' into ci/qemu

espressif · May 9, 2024 · a5c7c8d · a5c7c8d
2 parents bfb3a38 + 84376a7
commit a5c7c8d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 31 deletions.
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
@@ -9,7 +9,9 @@ function run_test() {
     local sketchname=$(basename $sketchdir)
 
     if [[ -f "$sketchdir/.skip.$platform" ]] || [[ -f "$sketchdir/.skip.$target" ]] || [[ -f "$sketchdir/.skip.$platform.$target" ]]; then
-      echo "Skipping $sketchname test in $target for $platform"
+      echo "Skipping $sketchname test for $target, platform: $platform"
+      skipfile="$sketchdir/.test_skipped"
+      touch $skipfile
       exit 0
     fi
 
@@ -188,7 +190,7 @@ else
       start_index=$(( $chunk_index * $chunk_size ))
       if [ "$sketchcount" -le "$start_index" ]; then
           echo "Skipping job"
-          touch ~/.test_skipped
+          touch $PWD/tests/.test_skipped
           exit 0
       fi
 

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -191,7 +191,7 @@ jobs:
       - name: Check if tests were skipped
         id: check-test-skipped
         run: |
-          if [ -f ~/.test_skipped ]; then
+          if [ $(find "tests" -name ".test_skipped") ]; then
             echo "skipped=true" >> $GITHUB_OUTPUT
           else
             echo "skipped=false" >> $GITHUB_OUTPUT
@@ -242,7 +242,7 @@ jobs:
       - name: Check if tests were skipped
         id: check-test-skipped
         run: |
-          if [ -f ~/.test_skipped ]; then
+          if [ $(find "tests" -name ".test_skipped") ]; then
             echo "skipped=true" >> $GITHUB_OUTPUT
           else
             echo "skipped=false" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/wokwi.yml b/.github/workflows/wokwi.yml
@@ -85,7 +85,7 @@ jobs:
       - name: Check if tests were skipped
         id: check-test-skipped
         run: |
-          if [ -f ~/.test_skipped ]; then
+          if [ $(find "tests" -name ".test_skipped") ]; then
             echo "skipped=true" >> $GITHUB_OUTPUT
           else
             echo "skipped=false" >> $GITHUB_OUTPUT
@@ -112,7 +112,7 @@ jobs:
             const owner = '${{ github.repository_owner }}';
             const repo = '${{ github.repository }}'.split('/')[1];
             const sha = '${{ github.event.workflow_run.head_sha }}';
-            const result = '${{ needs.wokwi-test.result }}';
+            const result = '${{ needs.wokwi-test.result }}' == 'success' ? 'success' : 'failure';
             core.debug(`owner: ${owner}`);
             core.debug(`repo: ${repo}`);
             core.debug(`sha: ${sha}`);

diff --git a/tests/validation/touch/.skip.esp32c3 b/tests/validation/touch/.skip.esp32c3
diff --git a/tests/validation/touch/.skip.esp32c6 b/tests/validation/touch/.skip.esp32c6
diff --git a/tests/validation/touch/.skip.esp32h2 b/tests/validation/touch/.skip.esp32h2
diff --git a/tests/validation/touch/touch.ino b/tests/validation/touch/touch.ino
@@ -1,8 +1,5 @@
 #include <unity.h>
 #include "soc/soc_caps.h"
-
-#if SOC_TOUCH_SENSOR_NUM > 0
-
 #include "driver/touch_pad.h"
 
 #if CONFIG_IDF_TARGET_ESP32
@@ -150,25 +147,3 @@ void setup() {
 }
 
 void loop() {}
-
-#else
-//PASS TEST for UNSUPPORTED CHIPS
-
-void test_pass(void) {
-  TEST_ASSERT_EQUAL(1, 1);
-}
-
-void setup() {
-  Serial.begin(115200);
-  while (!Serial) {
-    ;
-  }
-
-  UNITY_BEGIN();
-  RUN_TEST(test_pass);
-  UNITY_END();
-}
-
-void loop() {}
-
-#endif