Skip to content

Commit

Permalink
Merge pull request anki#32 from niklasfi/master
Browse files Browse the repository at this point in the history
fix cmake warning: rename "test" to "tests" target
  • Loading branch information
chapados authored Aug 9, 2017
2 parents 76f73ad + fc4f948 commit ba5f1bd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ if (BUILD_EXAMPLES)
endif ()

# CTest is flaky - Create a target to run our test suite directly
add_custom_target(test COMMAND ${PROJECT_BINARY_DIR}/test/Test)
add_custom_target(tests COMMAND ${PROJECT_BINARY_DIR}/test/Test)
4 changes: 2 additions & 2 deletions examples/vehicle-tool/vehicle_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ anki_vehicle_light_effect_t get_effect_by_name(const char *name)

uint8_t count = sizeof(effects_by_name)/sizeof(effects_by_name[0]);
for (i = 0; i < count; i++) {
if (strncmp(name, effects_by_name[i], sizeof(effects_by_name[i])) == 0) {
if (strncmp(name, effects_by_name[i], strlen(effects_by_name[i])) == 0) {
effect = i;
break;
}
Expand Down Expand Up @@ -793,7 +793,7 @@ anki_vehicle_turn_type_t get_turn_type_by_name(const char *name)

uint8_t count = sizeof(turn_types_by_name)/sizeof(turn_types_by_name[0]);
for (i = 0; i < count; i++) {
if (strncmp(name, turn_types_by_name[i], sizeof(turn_types_by_name[i])) == 0) {
if (strncmp(name, turn_types_by_name[i], strlen(turn_types_by_name[i])) == 0) {
turn_type = (anki_vehicle_turn_type_t)i;
break;
}
Expand Down
3 changes: 3 additions & 0 deletions examples/vehicle-tool/vehicle_tool.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ static GOptionEntry options[] = {
{ NULL },
};

int interactive(const char *src, const char *dst,
const char *dst_type, int psm);

int main(int argc, char *argv[])
{
GOptionContext *context;
Expand Down

0 comments on commit ba5f1bd

Please sign in to comment.