Skip to content

Commit 5b866eb

Browse files
committed
Use proper 1.5 library format
1 parent 4b29607 commit 5b866eb

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

SampleProjects/TestSomething/.arduino-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
unittest:
22
exclude_dirs:
3-
- excludeThis
3+
- src/excludeThis
44
platforms:
55
- uno
66
- due

SampleProjects/TestSomething/test/library.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <ArduinoUnitTests.h>
2-
#include "../test-something.h"
2+
#include "../src/test-something.h"
33

44
unittest(library_tests_something)
55
{

spec/testsomething_unittests_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def get_relative_dir(sampleprojects_tests_dir)
1919
context "cpp_files" do
2020
it "finds cpp files in directory" do
2121
testsomething_cpp_files = [
22-
Pathname.new("TestSomething/test-something.cpp"),
23-
Pathname.new("TestSomething/excludeThis/exclude-this.cpp")
22+
Pathname.new("TestSomething/src/test-something.cpp"),
23+
Pathname.new("TestSomething/src/excludeThis/exclude-this.cpp")
2424
]
2525
relative_paths = cpp_library.cpp_files.map { |f| get_relative_dir(f) }
2626
expect(relative_paths).to match_array(testsomething_cpp_files)
@@ -47,10 +47,10 @@ def get_relative_dir(sampleprojects_tests_dir)
4747
cpp_lib_path = sampleproj_path + "TestSomething"
4848
cpp_library = ArduinoCI::CppLibrary.new(cpp_lib_path,
4949
Pathname.new("my_fake_arduino_lib_dir"),
50-
["excludeThis"].map(&Pathname.method(:new)))
50+
["src/excludeThis"].map(&Pathname.method(:new)))
5151
context "cpp_files" do
5252
it "finds cpp files in directory" do
53-
testsomething_cpp_files = [Pathname.new("TestSomething/test-something.cpp")]
53+
testsomething_cpp_files = [Pathname.new("TestSomething/src/test-something.cpp")]
5454
relative_paths = cpp_library.cpp_files.map { |f| get_relative_dir(f) }
5555
expect(relative_paths).to match_array(testsomething_cpp_files)
5656
end

0 commit comments

Comments
 (0)