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

Skip unusable javah tests #4046

Merged
merged 9 commits into from
Nov 1, 2021
Merged

Skip unusable javah tests #4046

merged 9 commits into from
Nov 1, 2021

Conversation

mwichmann
Copy link
Collaborator

For the three tests which fail, skip if the command finder (WhereIs), which is much less aggressive than the java_where_j* routines, doesn't find javah.

Split the JAVAH test file into two files, so that the part which doesn't call javah can run even if the rest is skipped.

Header cleanup and partial Black reformats (test SConstructs) for Java tests.

Leave a comment in the Repository/JavaH test, and do some reformatting there as well. Test needs rework, but for now doesn't fail so leave alone.

Remove references to javah that were not used

Contributor Checklist:

  • I have created a new test or updated the unit tests to cover the new/changed functionality.
  • I have updated CHANGES.txt (and read the README.rst)
  • I have updated the appropriate documentation

Update file headers
Remove references to javah that are not used
Black a couple of SConstcuts

No functional changes - prep work for javah workarounds.

Signed-off-by: Mats Wichmann <mats@linux.com>
For the three tests which fail, skip if the command finder (WhereIs), which
is much less aggressive than the java_where_j* routines, doesn't find javah.

Split the JAVAH test file into two files, so that the part which
doesn't call javah can run even if the rest is skipped.

Did the header cleanup and partial reformats on those.

Leave a comment in the Repository/JavaH test, and do some reformatting
there as well.  Test needs rework, but for now doesn't fail so leave alone.

Signed-off-by: Mats Wichmann <mats@linux.com>
@mwichmann mwichmann added the testsuite Things that only affect the SCons testing. Do not use just because a PR has tests. label Oct 31, 2021
@mwichmann mwichmann added this to the 4.3 milestone Oct 31, 2021
mwichmann and others added 7 commits November 1, 2021 10:59
The previous sanity check was to see if the less-optimistic
WhereIs could find javah, and skip if not, since java_where_javah
looks many more places than SCons will actually look.  This
was insufficient - some openjdk packages don't clean up the
alternatives link to javah even if a java version which doesn't
have it becomes the selected version. Add a check on found
paths to detect a mismatch.

Signed-off-by: Mats Wichmann <mats@linux.com>
Signed-off-by: Mats Wichmann <mats@linux.com>
…this flag is specified to runtest.py and some tests are skipped. Otherwise assuming no failures will exit 0
@bdbaddog bdbaddog merged commit 1a04e66 into SCons:master Nov 1, 2021
@mwichmann mwichmann deleted the java-tests branch November 4, 2021 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testsuite Things that only affect the SCons testing. Do not use just because a PR has tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants