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

Fix Linux LibC.Sysinfo FieldOrder #1028

Closed
wants to merge 4 commits into from

Conversation

dbwiddis
Copy link
Contributor

Fixes #1027.

Committing build.xml patch first to generate test failure before fixing it.

@dbwiddis
Copy link
Contributor Author

New build.xml confirmed Linux test failure:

[junit] Structure.getFieldOrder() on class com.sun.jna.platform.linux.LibC$Sysinfo does not provide enough names [13] ([_f, bufferram, freehigh, freeram, freeswap, loads, mem_unit, procs, sharedram, totalhigh, totalram, totalswap, uptime]) to match declared fields [12] ([bufferram, freehigh, freeram, freeswap, loads, mem_unit, procs, sharedram, totalhigh, totalram, totalswap, uptime])

@dbwiddis
Copy link
Contributor Author

dbwiddis commented Oct 16, 2018

Well, Linux test passes but Mac is failing with the new build for other reasons that I don't quite understand...

@dbwiddis
Copy link
Contributor Author

Seems to be running (and failing) the Unix tests on Mac.

<condition property="tests.platform.linux" value="**/linux/**/*Test.java">
<os name="Linux"/>
</condition>
<condition property="tests.platform.unix" value="**/unix/**/*Test.java">
<os family="unix"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change this line to read:

      <and>
        <os family="unix"/>
        <not><os family="mac"/></not>
      </and>

That way the unix tests are not run on Mac OS (as it was before the change)

@matthiasblaesing
Copy link
Member

Thank you for updating the PR, could you please revert the changes to the toplevel build.xml? Only whitespace is changed and is not necessary and hinders readability.

@dbwiddis
Copy link
Contributor Author

Sure, I'll undo it... sorry, ended up editing the wrong build.xml trying to fix a tab-to-spaces thing.

@dbwiddis
Copy link
Contributor Author

OK, I think I have it fixed now. Editing on Notepad++ pre-coffee was maybe not the smartest thing to do.

@matthiasblaesing
Copy link
Member

Thank you. I merged the commits via:
475ae60
41d5123

I squashed the testing updates together and updated the changelog to point to issues, where issues exist.

@dbwiddis dbwiddis deleted the sysinfo branch February 4, 2019 17:25
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.

New LibC.SysInfo FieldOrder overrides don't work
2 participants