Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to using stock gcovr 5.2 #726

Merged
merged 2 commits into from
Dec 23, 2022

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Dec 21, 2022

The custom branch we were using previously has since been deleted. That branch appears to have some fix for searching for the source file (for a gcda file) recursively. I don't know if it's needed or not today, but using the stock gcovr 5.2 (from the official repo) appears to work.

Copied from sonic-net/sonic-sairedis#1174.

Signed-off-by: Saikrishna Arcot sarcot@microsoft.com

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This is to work around gcovr/gcovr#627. This error popped up during the
CI run:

```
gcovr.gcov_parser.UnknownLineType: function swss::Select::~Select()
called 377 returned NAN % blocks executed 100%
```

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@prsunny prsunny merged commit 1d7607a into sonic-net:master Dec 23, 2022
@prsunny
Copy link
Contributor

prsunny commented Dec 23, 2022

@saiarcot895 , could you please make this change for sonic-swss as well?

@saiarcot895
Copy link
Contributor Author

@prsunny, it doesn't look like sonic-swss is using this custom repo.

@saiarcot895 saiarcot895 deleted the use-stock-gcovr branch December 24, 2022 17:10
@liushilongbuaa
Copy link
Contributor

202205 breaks for this issue.

liushilongbuaa pushed a commit to liushilongbuaa/sonic-swss-common that referenced this pull request Dec 27, 2022
* Switch to using stock gcovr 5.2

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa added a commit that referenced this pull request Dec 28, 2022
* Switch to using stock gcovr 5.2 (#726)
The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Fix sonic-slave docker image environment issue.
Signed-off-by: shilongliu <shilongliu@microsoft.com>
liushilongbuaa pushed a commit to liushilongbuaa/sonic-swss-common that referenced this pull request Dec 28, 2022
* Switch to using stock gcovr 5.2

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa added a commit that referenced this pull request Dec 29, 2022
* Switch to using stock gcovr 5.2

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa pushed a commit to liushilongbuaa/sonic-swss-common that referenced this pull request Dec 29, 2022
* Switch to using stock gcovr 5.2

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa added a commit that referenced this pull request Jan 3, 2023
* Switch to using stock gcovr 5.2 (#726)

* Switch to using stock gcovr 5.2

The custom branch we were using previously has since been deleted. That
branch appears to have some fix for searching for the source file (for a
gcda file) recursively. I don't know if it's needed or not today, but
using the stock gcovr 5.2 (from the official repo) appears to work.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Fix: missing sonic-db-cli in docker-sonic-vs image (#640)

* Purge package sonic-db-cli which depends on libswsscommon (#628)

Since sonic-db-cli depends on libswsscommon, we could not simply only purge libswsscommon, so we purge both together.

The build error is as below

Step 8/19 : RUN dpkg --purge libswsscommon
 ---> Running in ed8132d457e9
dpkg: dependency problems prevent removal of libswsscommon:
 sonic-db-cli depends on libswsscommon.

dpkg: error processing package libswsscommon (--purge):
 dependency problems - not removing
Errors were encountered while processing:
 libswsscommon

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@yxieca
Copy link
Contributor

yxieca commented Jan 4, 2023

@saiarcot895 this change cannot be cherry-picked cleanly to 202205 branch. Please raise separate PR.

@saiarcot895
Copy link
Contributor Author

It was manually cherry-picked in #728 by Shilong. I'll update the tags for the other branches.

lguohan pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jan 8, 2023
9e1176d Zain Budhwani Fri Jan 6 09:00:11 2023 -0800 Refactor eventpublisher deinit (sonic-net/sonic-swss-common#734)
b9a9dbb Liu Shilong Thu Jan 5 10:12:49 2023 +0800 Simplify azure pipeline build template (sonic-net/sonic-swss-common#729)
01fc252 siqbal1986 Wed Jan 4 11:03:53 2023 -0800 Added customer monitoring tables in app db and state db (sonic-net/sonic-swss-common#725)
28dc42a Liu Shilong Wed Dec 28 11:19:32 2022 +0800 Fix sonic-slave docker image environment issue. (sonic-net/sonic-swss-common#727)
1d7607a Saikrishna Arcot Fri Dec 23 11:11:33 2022 -0800 Switch to using stock gcovr 5.2 (sonic-net/sonic-swss-common#726)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants