Skip to content

improve enum values integration check#1727

Merged
prsunny merged 1 commit intoopencomputeproject:masterfrom
aparkhomenko-xsight:improve-checkenumlock
Feb 2, 2023
Merged

improve enum values integration check#1727
prsunny merged 1 commit intoopencomputeproject:masterfrom
aparkhomenko-xsight:improve-checkenumlock

Conversation

@aparkhomenko-xsight
Copy link
Copy Markdown
Contributor

@aparkhomenko-xsight aparkhomenko-xsight commented Jan 27, 2023

What I did?
I added dedicated 'expiremantal' dir which belongs to origin/master during enum values integration check
Why I did it ?
It fixes issue when content of current repo's 'expiremantal' dir differs from origin/master, in simplest case current repo doesn't point to latest master (what is a common case)

If new files were added to 'experental' dir and current repo don't have them checkenumlock.sh would fail


root@e9031bc4ca37:/home/sw/xlink/third-party/SAI/meta# ./checkenumlock.sh 
Checking for possible enum values shift (current branch vs origin/master) ...
In file included from ./temp/inc//sai.h:48,
                 from /tmp/lqfy58VJK8.c:2:
./temp/inc//saiobject.h:40:10: fatal error: saiexperimentaldashvip.h: No such file or directory
 #include <saiexperimentaldashvip.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Uncaught exception from user code:
        gcc failed! Inappropriate ioctl for device at ./checkheaders.pl line 152.
        main::GetValues("temp/inc/") called at ./checkheaders.pl line 172

I faced this issue when DASH API were merged.

it allows to use two different 'experimental' dirs
during integration check, one belongs to current
repository and another to origin/master

Signed-off-by: Anton Parkhomenko <[email protected]>
@aparkhomenko-xsight
Copy link
Copy Markdown
Contributor Author

@prsunny @kcudnik could you please check

@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Jan 27, 2023

@marian-pritsak , could you please take a look?

@prsunny prsunny merged commit c51d18f into opencomputeproject:master Feb 2, 2023
@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Feb 2, 2023

@xumia for viz

@msosyak
Copy link
Copy Markdown
Contributor

msosyak commented Feb 2, 2023

@prsunny shouldn't this be cherry-picked into v1.11 to update the refoint in sairedis then? Currently, that issue caused Barefoot and Broadcom SONiC build to fails

@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Feb 2, 2023

dash changes are not backported to v1.11. can you update this submodule on sairedis instead?

@xumia
Copy link
Copy Markdown
Contributor

xumia commented Feb 4, 2023

@prsunny shouldn't this be cherry-picked into v1.11 to update the refoint in sairedis then? Currently, that issue caused Barefoot and Broadcom SONiC build to fails

Is the v1.11 used by 202205+?
It blocked the builds broadcom/barefoot on 202205/202211/master for 11 days. Could you please cherry-pick it ASAP? Thanks.

@aparkhomenko-xsight
Copy link
Copy Markdown
Contributor Author

@xumia I think cherry-pinking of this fix will not help. This fix will work only for version that will be based on current latest master.
It's because fix exists only in origin/master while local repos still use old checkheaders.pl without fix.
For Xsight we decided to modify build system and appy thix fix as patch.

@xumia
Copy link
Copy Markdown
Contributor

xumia commented Feb 6, 2023

@xumia I think cherry-pinking of this fix will not help. This fix will work only for version that will be based on current latest master. It's because fix exists only in origin/master while local repos still use old checkheaders.pl without fix. For Xsight we decided to modify build system and appy thix fix as patch.

@aparkhomenko-xsight , yes, adding a patch for it is a workaround for the existing old commit reference.
You will add the patch, right? When it will be ready?

@aparkhomenko-xsight
Copy link
Copy Markdown
Contributor Author

@xumia I wasn't asked to do it before, but I can try if you give more details about your issue and @prsunny approve.

@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Feb 6, 2023

@xumia I wasn't asked to do it before, but I can try if you give more details about your issue and @prsunny approve.

Lets have the patch and unblock the build

richardyu-ms pushed a commit to richardyu-ms/SAI that referenced this pull request Feb 7, 2023
it allows to use two different 'experimental' dirs during integration check, one belongs to current repository and another to origin/master

Signed-off-by: Anton Parkhomenko <[email protected]>
richardyu-ms added a commit that referenced this pull request Feb 7, 2023
it allows to use two different 'experimental' dirs during integration check, one belongs to current repository and another to origin/master

Signed-off-by: Anton Parkhomenko <[email protected]>
Co-authored-by: aparkhomenko-xsight <[email protected]>
richardyu-ms pushed a commit to richardyu-ms/SAI that referenced this pull request Feb 7, 2023
it allows to use two different 'experimental' dirs during integration check, one belongs to current repository and another to origin/master

Signed-off-by: Anton Parkhomenko <[email protected]>
richardyu-ms added a commit that referenced this pull request Feb 7, 2023
it allows to use two different 'experimental' dirs during integration check, one belongs to current repository and another to origin/master

Signed-off-by: Anton Parkhomenko <[email protected]>
Co-authored-by: aparkhomenko-xsight <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants