debug flag passed as fqbn

Author: mcspr

tests/build.sh

@@ -14,7 +14,7 @@ ENVIRONMENT:
   For Arduino CLI:
     ESP8266_ARDUINO_HARDWARE - path to the hardware directory (usually, containing our repo)
     ESP8266_ARDUINO_LIBRATIES - path to the libraries directory (external dependencies)
-    ESP8266_ARDUINO_DEBUG - debug or nodebug
+    ESP8266_ARDUINO_DEBUG - sketch debug level, see boards.txt for exact FQBN value
     ESP8266_ARDUINO_LWIP - v4 or v6
 
 USAGE:
@@ -61,8 +61,8 @@ fi
 
 case "$ESP8266_ARDUINO_BUILDER" in
 "arduino")
-    install_arduino "$ESP8266_ARDUINO_DEBUG"
-    build_sketches_with_arduino "$ESP8266_ARDUINO_LWIP" "$mod" "$rem" "$cnt"
+    install_arduino
+    build_sketches_with_arduino "$ESP8266_ARDUINO_DEBUG" "$ESP8266_ARDUINO_LWIP" "$mod" "$rem" "$cnt"
     ;;
 "platformio")
     install_platformio nodemcuv2

tests/common.sh

@@ -109,21 +109,41 @@ function format_fqbn()
     local board_name=$1
     local flash_size=$2
     local lwip=$3
+    local debug=$4
 
-    echo $"esp8266com:esp8266:${board_name}:
-eesz=${flash_size},
-ip=${lwip}"
+    printf 'esp8266com:esp8266:%s:eesz=%s,ip=%s,lvl=%s' \
+        "$board_name" \
+        "$flash_size" \
+        "$lwip" \
+        "$debug"
+}
+
+function format_cli()
+{
+    local cli_path=$1
+    local warnings=$2
+    local fqbn=$3
+    local libraries=$4
+    local output_dir=$5
+
+    printf "%s compile --warnings=%s --fqbn=%s --libraries=%s --output-dir=%s" \
+        "$cli_path" \
+        "$warnings" \
+        "$fqbn" \
+        "$libraries" \
+        "$output_dir"
 }
 
 function build_sketches()
 {
     local core_path=$1
     local cli_path=$2
     local library_path=$3
-    local lwip=$4
-    local build_mod=$5
-    local build_rem=$6
-    local build_cnt=$7
+    local debug=$4
+    local lwip=$5
+    local build_mod=$6
+    local build_rem=$7
+    local build_cnt=$8
 
     local build_dir="$cache_dir"/build
     mkdir -p "$build_dir"
@@ -132,16 +152,11 @@ function build_sketches()
     mkdir -p "$build_out"
 
     local fqbn
-    fqbn=$(format_fqbn "generic" "4M1M" "$lwip")
+    fqbn=$(format_fqbn "generic" "4M1M" "$lwip" "$debug")
     echo "FQBN: $fqbn"
 
     local build_cmd
-    build_cmd=$''"${cli_path}"'
- compile
- --warnings=all
- --fqbn '"$fqbn"'
- --libraries '"$library_path"'
- --output-dir '"$build_out"''
+    build_cmd=$(format_cli "$cli_path" "all" "$fqbn" "$library_path" "$build_out")
 
     print_size_info_header >"$cache_dir"/size.log
 
@@ -300,30 +315,19 @@ function install_core()
     local hardware_core_path=$2
     local debug=$3
 
-    pushd "${core_path}"
-
-    local debug_flags=""
-    if [ "$debug" = "debug" ]; then
-        debug_flags=$'-DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
- -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
- -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM'
-    fi
-
     # Set our custom warnings for all builds
     printf "%s\n" \
-        "compiler.c.extra_flags=-Wall -Wextra $debug_flags" \
-        "compiler.cpp.extra_flags=-Wall -Wextra $debug_flags" \
+        "compiler.c.extra_flags=-Wall -Wextra" \
+        "compiler.cpp.extra_flags=-Wall -Wextra" \
         "recipe.hooks.prebuild.1.pattern=\"{runtime.tools.python3.path}/python3\" -I \"{runtime.tools.makecorever}\" --git-root \"{runtime.platform.path}\" --version \"{version}\" \"{runtime.platform.path}/cores/esp8266/core_version.h\"" \
             > "${core_path}"/platform.local.txt
     echo -e "\n----platform.local.txt----"
-    cat platform.local.txt
+    cat "${core_path}"/platform.local.txt
     echo -e "\n----\n"
 
     # Fetch toolchain & filesystem utils
-    pushd tools
+    pushd "${core_path}"/tools
     python3 get.py -q
-
-    popd
     popd
 
     # todo: windows runners are using copied tree
@@ -341,11 +345,10 @@ function install_core()
 function install_arduino()
 {
     echo ${ci_group}Install arduino
-    local debug=$1
 
     local hardware_core_path="$ESP8266_ARDUINO_HARDWARE/esp8266com/esp8266"
     test -d "$hardware_core_path" \
-        || install_core "$ESP8266_ARDUINO_BUILD_DIR" "$hardware_core_path" "$debug"
+        || install_core "$ESP8266_ARDUINO_BUILD_DIR" "$hardware_core_path"
 
     command -v "${ESP8266_ARDUINO_CLI}" \
         || install_arduino_cli "${ESP8266_ARDUINO_CLI}" "$hardware_core_path"
@@ -364,6 +367,9 @@ function arduino_lwip_menu_option()
     "IPv6")
         echo "lm6f"
         ;;
+    *)
+        echo "unknown"
+        ;;
     esac
 }
 
@@ -415,17 +421,19 @@ function arduino_mkbuildoptglobals_cleanup()
 
 function build_sketches_with_arduino()
 {
+    local debug=$1
+
     local lwip
-    lwip=$(arduino_lwip_menu_option $1)
+    lwip=$(arduino_lwip_menu_option "$2")
 
-    local build_mod=$2
-    local build_rem=$3
-    local build_cnt=$4
+    local build_mod=$3
+    local build_rem=$4
+    local build_cnt=$5
 
     build_sketches "$ESP8266_ARDUINO_BUILD_DIR" \
         "$ESP8266_ARDUINO_CLI" \
         "$ESP8266_ARDUINO_LIBRARIES" \
-        "$lwip" "$build_mod" "$build_rem" "$build_cnt"
+        "$debug" "$lwip" "$build_mod" "$build_rem" "$build_cnt"
     step_summary "Size report" "$cache_dir/size.log"
 }
 

tests/env.sh

@@ -4,7 +4,7 @@ ESP8266_ARDUINO_BUILDER=${ESP8266_ARDUINO_BUILDER:-arduino}
 ESP8266_ARDUINO_PRESERVE_CACHE=${ESP8266_ARDUINO_PRESERVE_CACHE:-}
 
 # sketch build options
-ESP8266_ARDUINO_DEBUG=${ESP8266_ARDUINO_DEBUG:-nodebug}
+ESP8266_ARDUINO_DEBUG=${ESP8266_ARDUINO_DEBUG:-None}
 ESP8266_ARDUINO_LWIP=${ESP8266_ARDUINO_LWIP:-default}
 ESP8266_ARDUINO_SKETCHES=${ESP8266_ARDUINO_SKETCHES:-}
 

tests/run_CI_locally.sh

@@ -85,6 +85,8 @@ export HOME="${TMPCI}"
 export ESP8266_ARDUINO_BUILD_DIR="${TMPCI}"
 export BUILD_TYPE="$BUILD_TYPE"
 
+DEBUG_ALL="SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K"
+
 if [ "$BUILD_TYPE" = "build" ]; then
     tests/build.sh
 
@@ -95,10 +97,10 @@ elif [ "$BUILD_TYPE" = "build_odd" ]; then
     tests/build.sh odd
 
 elif [ "$BUILD_TYPE" = "debug_even" ]; then
-    env ESP8266_ARDUINO_DEBUG=debug tests/build.sh even
+    env ESP8266_ARDUINO_DEBUG="$DEBUG_ALL" tests/build.sh even
 
 elif [ "$BUILD_TYPE" = "debug_odd" ]; then
-    env ESP8266_ARDUINO_DEBUG=debug tests/build.sh odd
+    env ESP8266_ARDUINO_DEBUG="$DEBUG_ALL" tests/build.sh odd
 
 elif [ "$BUILD_TYPE" = "build6" ]; then
     env ESP8266_ARDUINO_LWIP=lm6f tests/build.sh

tests/test_mkbuildoptglobals.sh

@@ -83,7 +83,7 @@ function build_esp8266_example()
     local name="$1"
 
     ESP8266_ARDUINO_SKETCHES="$root/libraries/esp8266/examples/${name}/${name}.ino"
-    build_sketches_with_arduino "$ESP8266_ARDUINO_LWIP" "$mod" "$rem" "$cnt"
+    build_sketches_with_arduino "$ESP8266_ARDUINO_DEBUG" "$ESP8266_ARDUINO_LWIP" "$mod" "$rem" "$cnt"
 }
 
 function make_commonh_stat()