Skip to content

Commit d9e35c0

Browse files
committed
[skip changelog] Enhance test
1 parent 794c664 commit d9e35c0

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

legacy/builder/resolve_library.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
5151
// Certain libraries might have the same name but be different.
5252
// This usually happens when the user includes two or more custom libraries that have
5353
// different header name but are stored in a parent folder with identical name, like
54-
// ./Lib1/src/lib1.h and ./Lib2/src/lib2.h
54+
// ./libraries1/Lib/lib1.h and ./libraries2/Lib/lib2.h
5555
// Without this check the library resolution would be stuck in a loop.
5656
// This behaviour has been reported in this issue:
5757
// https://github.com/arduino/arduino-cli/issues/973

test/test_compile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ def test_compile_with_custom_libraries(run_command, copy_sketch):
554554
sketch_path = copy_sketch("sketch_with_multiple_custom_libraries")
555555
fqbn = "esp8266:esp8266:nodemcu:xtal=80,vt=heap,eesz=4M1M,wipe=none,baud=115200"
556556

557-
first_lib = Path(sketch_path, "libraries", "Lib1")
558-
second_lib = Path(sketch_path, "libraries", "Lib2")
557+
first_lib = Path(sketch_path, "libraries1")
558+
second_lib = Path(sketch_path, "libraries2")
559559
# This compile command has been taken from this issue:
560560
# https://github.com/arduino/arduino-cli/issues/973
561561
assert run_command(f"compile --libraries {first_lib},{second_lib} -b {fqbn} {sketch_path}")

0 commit comments

Comments
 (0)