Skip to content

Commit

Permalink
Fix CI failures
Browse files Browse the repository at this point in the history
  • Loading branch information
carol-apple committed Mar 21, 2022
1 parent ba47713 commit 3782906
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/standalone/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#endif

#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "v1.0"
#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "1.0"
#endif

//
Expand Down
4 changes: 1 addition & 3 deletions examples/ota-requestor-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,7 @@ int main(int argc, char * argv[])
return -1;
}

char execFilePathBuf[kMaxFilePathSize];
strncpy(execFilePathBuf, kImageExecPath, strlen(kImageExecPath));
argv[0] = execFilePathBuf;
argv[0] = kImageExecPath;
execv(argv[0], argv);

// If successfully executing the new iamge, execv should not return
Expand Down
4 changes: 2 additions & 2 deletions src/controller/python/test/test_scripts/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,8 @@ def TestReadBasicAttributes(self, nodeid: int, endpoint: int, group: int):
"Location": "XX",
"HardwareVersion": 0,
"HardwareVersionString": "TEST_VERSION",
"SoftwareVersion": 0,
"SoftwareVersionString": "prerelease",
"SoftwareVersion": 1,
"SoftwareVersionString": "1.0",
}
failed_zcl = {}
for basic_attr, expected_value in basic_cluster_attrs.items():
Expand Down
5 changes: 5 additions & 0 deletions src/platform/CYW30739/PlatformManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ CHIP_ERROR PlatformManagerImpl::_StartEventLoopTask(void)
return err;
}

CHIP_ERROR PlatformManagerImpl::_StopEventLoopTask()
{
return CHIP_NO_ERROR;
}

void PlatformManagerImpl::_LockChipStack(void)
{
const wiced_result_t result = wiced_rtos_lock_mutex(mMutex);
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Linux/OTAImageProcessorImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
namespace chip {

// Full file path to where the new image will be executed from post-download
static constexpr char kImageExecPath[] = "/tmp/ota.update";
static char kImageExecPath[] = "/tmp/ota.update";

class OTAImageProcessorImpl : public OTAImageProcessorInterface
{
Expand Down

0 comments on commit 3782906

Please sign in to comment.