Skip to content

Commit 26316d3

Browse files
committed
build_out & no explicit clean
1 parent 82f884f commit 26316d3

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

tests/common.sh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ function build_sketches()
138138

139139
print_size_info_header >"$cache_dir"/size.log
140140

141-
local clean_core=1
142141
local testcnt=0
143142
local cnt=0
144143

@@ -163,17 +162,11 @@ function build_sketches()
163162
build_cnt=0
164163
fi
165164

166-
# Do we need a clean core build? $build_dir/core/* cannot be shared
167-
# between sketches when global options are present.
168-
clean_core=$(arduino_mkbuildoptglobals_cleanup "$clean_core" "$build_dir" "$sketch")
169-
170-
# Clear out the last built sketch, map, elf, bin files, but leave the compiled
171-
# objects in the core and libraries available for use so we don't need to rebuild
172-
# them each sketch.
173-
rm -rf "$build_dir"/sketch \
174-
"$build_dir"/*.bin \
175-
"$build_dir"/*.map \
176-
"$build_dir"/*.elf
165+
# Clear out the latest map, elf, bin files
166+
rm -rf \
167+
"$build_out"/*.bin \
168+
"$build_out"/*.map \
169+
"$build_out"/*.elf
177170

178171
echo ${ci_group}Building $cnt $sketch
179172
echo "$build_cmd $sketch"
@@ -193,7 +186,7 @@ function build_sketches()
193186
fi
194187

195188
print_size_info "$core_path"/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-size \
196-
$build_dir/*.elf >>$cache_dir/size.log
189+
$build_out/*.elf >>$cache_dir/size.log
197190

198191
echo $ci_end_group
199192
done

0 commit comments

Comments
 (0)