Skip to content

Commit f68080d

Browse files
committed
fix(tests): Fix wrong selection of tests and add debug flag for testing
1 parent 9f3010f commit f68080d

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.github/scripts/sketch_utils.sh

+10-6
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
8686
shift
8787
log_compilation=$1
8888
;;
89+
-d )
90+
shift
91+
debug_level="DebugLevel=$1"
92+
;;
8993
* )
9094
break
9195
;;
@@ -141,12 +145,12 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
141145

142146
# Default FQBN options if none were passed in the command line.
143147

144-
esp32_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
145-
esp32s2_opts="PSRAM=enabled${fqbn_append:+,$fqbn_append}"
146-
esp32s3_opts="PSRAM=opi,USBMode=default${fqbn_append:+,$fqbn_append}"
147-
esp32c3_opts="$fqbn_append"
148-
esp32c6_opts="$fqbn_append"
149-
esp32h2_opts="$fqbn_append"
148+
esp32_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
149+
esp32s2_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
150+
esp32s3_opts=$(echo "PSRAM=opi,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
151+
esp32c3_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
152+
esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
153+
esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//')
150154

151155
# Select the common part of the FQBN based on the target. The rest will be
152156
# appended depending on the passed options.

.github/scripts/tests_run.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ function run_test() {
109109
rm $sketchdir/diagram.json 2>/dev/null || true
110110

111111
result=0
112-
printf "\033[95mpytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args\033[0m\n"
113-
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
112+
printf "\033[95mpytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args\033[0m\n"
113+
bash -c "set +e; pytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args; exit \$?" || result=$?
114114
printf "\n"
115115
if [ $result -ne 0 ]; then
116116
result=0
117117
printf "\033[95mRetrying test: $sketchname -- Config: $i\033[0m\n"
118-
printf "\033[95mpytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args\033[0m\n"
119-
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
118+
printf "\033[95mpytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args\033[0m\n"
119+
bash -c "set +e; pytest $sketchdir/test_$sketchname.py --build-dir $build_dir --junit-xml=$report_file $extra_args; exit \$?" || result=$?
120120
printf "\n"
121121
if [ $result -ne 0 ]; then
122122
printf "\033[91mFailed test: $sketchname -- Config: $i\033[0m\n\n"

0 commit comments

Comments
 (0)