Fix tests on Solaris #3864

psumbera · 2024-08-21T14:18:17Z

Tested (libc-test) on both Solaris and Illumos (with latest stable Omnios). All tests are passing.

Illumos changes can be checked against https://github.com/illumos/illumos-gate
Solaris changes can be checked only with installed Solaris CBE release (https://blogs.oracle.com/solaris/post/announcing-the-first-oracle-solaris-114-cbe) or using Solaris 11.4 machine at Cfarm (https://portal.cfarm.net/machines/list/).

rustbot · 2024-08-21T14:18:23Z

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-08-21T14:18:24Z

Some changes occurred in solarish module

cc @jclulow, @pfmooney

psumbera · 2024-08-21T14:21:27Z

r? @tgross35 @pfmooney

rustbot · 2024-08-21T14:21:30Z

Could not assign reviewer from: tgross35.
User(s) tgross35 are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

src/unix/solarish/mod.rs

psumbera · 2024-09-02T12:04:52Z

@tgross can you please help me with the buildbot failure? I have no idea what is wrong and how can I fixt it...

tgross · 2024-09-02T15:19:10Z

Hi @psumbera! I think you meant @tgross35 (which is funny because @pfmooney and @jclulow who are at-mentioned here are old colleagues!) 😀

Not really my area of expertise at all but from context it looks like the epoll_event might be missing an implementation of the Debug trait?

src/unix/mod.rs

src/unix/solarish/solaris.rs

tgross35 · 2024-09-03T05:13:10Z

src/unix/solarish/x86_common.rs

@@ -63,3 +65,5 @@ pub const AT_386_FPINFO_NONE: u32 = 0;
 pub const AT_386_FPINFO_FXSAVE: u32 = 1;
 pub const AT_386_FPINFO_XSAVE: u32 = 2;
 pub const AT_386_FPINFO_XSAVE_AMD: u32 = 3;
+    }
+}


Can you fix the indentation?

tgross35 · 2024-09-03T05:14:30Z

src/unix/solarish/x86_64.rs

+cfg_if! {
+    if #[cfg(target_os = "solaris")] {
+        use xrs_t;
+    }
+}
+


Could you just use the full path to xrs_t where it is used, rather than having a single cfged import here? I'm not sure this is doing anything anyway.

Well, not sure what is proper fix. Now I use:

cfg_if! { if #[cfg(target_os = "solaris")] { use unix::solarish::solaris; } } .. pub uc_xrs: solaris::xrs_t,

tgross35 · 2024-09-03T05:24:51Z

@tgross can you please help me with the buildbot failure? I have no idea what is wrong and how can I fixt it...

I left a comment above but I think xrs_t may be missing implementations. If it can just go in s! to get the automatic derives, rather than s_no_extra_traits!, that is probably easiest. (I'm not actually sure why any of these types are in s_no_extra_traits! when their implementations look near identical to the derives, some of them could move to s!. We have a big cleanup of these traits coming in the near future.)

I'm not sure why FreeBSD failed but it looks spurious.

Are tests currently failing on these platforms? It would be great to add x86_64-unknown-illumos to CI since it is tier 2 with host tools.

@rustbot author based on the above comments. It would probably be good for @pfmooney to take another look at some point too.

tgross35 · 2024-09-03T05:33:17Z

Hi @psumbera! I think you meant @tgross35 (which is funny because @pfmooney and @jclulow who are at-mentioned here are old colleagues!) 😀

Out of all the similar GitHub usernames 😄 that really is an unbelievable coincidence

Not really my area of expertise at all but from context it looks like the epoll_event might be missing an implementation of the Debug trait?

Thanks for taking a look :) I think it's a different struct though (mentioned above), this crate is unfortunately pretty macro-heavy so the error messages are a bit obscure.

psumbera · 2024-09-03T12:17:54Z

Hi @psumbera! I think you meant @tgross35 (which is funny because @pfmooney and @jclulow who are at-mentioned here are old colleagues!) 😀

Out of all the similar GitHub usernames 😄 that really is an unbelievable coincidence

Sorry about that!

psumbera · 2024-09-03T12:19:15Z

@tgross35 can you please have another look?

Now it fails somewhere else and I don't know how to proceed again...

tgross35 · 2024-10-13T18:58:27Z

Sorry, slipped under my radar. I think the error is just saying that door_desc_t__d_data__d_desc needs to move to s_no_extra_traits! rather than s!, before a certain version somewhere in 1.6x you can't derive Debug on packed traits (I suspect you are just testing with a more recent rustc version locally).

Just comment @rustbot review to update the labels once it's working or if it gets stuck again.

bors · 2024-10-15T03:11:34Z

☔ The latest upstream changes (presumably #3867) made this pull request unmergeable. Please resolve the merge conflicts.

tgross35 · 2024-10-16T06:35:59Z

I think this looks okay but I am not able to test on the relevant systems. @pfmooney would you be able to double check this?

bors · 2024-10-24T19:24:03Z

☔ The latest upstream changes (presumably #3990) made this pull request unmergeable. Please resolve the merge conflicts.

tgross35

Sorry I didn't merge this already, I think it should be good with a rebase.

tgross35 · 2024-10-25T22:40:01Z

Hm, not sure why freebsd is failing but it seems to be happening on everything

psumbera · 2024-10-31T08:47:16Z

Hm, not sure why freebsd is failing but it seems to be happening on everything

Have no idea. Doesn't seem to be related.

It appears Solaris doesn't support epoll; only Illumos does. And as of rust-lang/libc#3864, the libc crate won't declare the epoll libc interface on Solaris. So disable epoll support on Solaris in rustix too.

* Disable epoll support on Solaris. It appears Solaris doesn't support epoll; only Illumos does. And as of rust-lang/libc#3864, the libc crate won't declare the epoll libc interface on Solaris. So disable epoll support on Solaris in rustix too. * Add epoll documentation links for illumos. * Add a documentation reference for ptsname for illumos. * Enable the epoll tests on illumos and redox. * Enable the openpty tests on illumos.

sunshowers · 2024-11-06T04:43:08Z

src/unix/solarish/illumos.rs

-pub const POSIX_FADV_NORMAL: ::c_int = 0;
-pub const POSIX_FADV_RANDOM: ::c_int = 1;
-pub const POSIX_FADV_SEQUENTIAL: ::c_int = 2;
-pub const POSIX_FADV_WILLNEED: ::c_int = 3;
-pub const POSIX_FADV_DONTNEED: ::c_int = 4;
-pub const POSIX_FADV_NOREUSE: ::c_int = 5;


It looks like these, plus POLLRDHUP above, were accidentally deleted maybe in a bad merge. I'll roll a fix in for these in #3999.

Sorry about that.

(backport <rust-lang#3864>) (cherry picked from commit ec3c338)

* Disable epoll support on Solaris. It appears Solaris doesn't support epoll; only Illumos does. And as of rust-lang/libc#3864, the libc crate won't declare the epoll libc interface on Solaris. So disable epoll support on Solaris in rustix too. * Add epoll documentation links for illumos. * Add a documentation reference for ptsname for illumos. * Enable the epoll tests on illumos and redox. * Enable the openpty tests on illumos.

rustbot assigned tgross35 Aug 21, 2024

rustbot added the S-waiting-on-review label Aug 21, 2024

pfmooney reviewed Aug 21, 2024

View reviewed changes

src/unix/solarish/mod.rs Outdated Show resolved Hide resolved

src/unix/solarish/mod.rs Outdated Show resolved Hide resolved

src/unix/solarish/mod.rs Outdated Show resolved Hide resolved

psumbera force-pushed the solaris-tests branch from 06263a7 to 2cd820e Compare August 22, 2024 12:27

psumbera force-pushed the solaris-tests branch 3 times, most recently from 0283661 to 9dcb999 Compare September 2, 2024 09:28

tgross35 reviewed Sep 3, 2024

View reviewed changes

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Sep 3, 2024

psumbera force-pushed the solaris-tests branch 6 times, most recently from 3da4674 to 0bbd84d Compare September 3, 2024 12:04

psumbera force-pushed the solaris-tests branch 2 times, most recently from eab1ea0 to 3bbc12c Compare October 15, 2024 09:20

tgross35 approved these changes Oct 24, 2024

View reviewed changes

tgross35 changed the title ~~Fixes tests on Solaris~~ Fix tests on Solaris Oct 24, 2024

psumbera force-pushed the solaris-tests branch from 3bbc12c to 578b51a Compare October 25, 2024 14:59

Fixes tests on Solaris

ec3c338

tgross35 force-pushed the solaris-tests branch from 578b51a to ec3c338 Compare November 4, 2024 08:04

tgross35 enabled auto-merge November 4, 2024 08:04

tgross35 added this pull request to the merge queue Nov 4, 2024

Merged via the queue into rust-lang:main with commit ddeff5b Nov 4, 2024
41 checks passed

bors mentioned this pull request Nov 4, 2024

illumos: add some recently-added constants #3999

Merged

3 tasks

This was referenced Nov 5, 2024

Disable epoll support on Solaris. bytecodealliance/rustix#1208

Merged

Enable a few features on more platforms. bytecodealliance/rustix#1203

Merged

sunshowers reviewed Nov 6, 2024

View reviewed changes

tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 7, 2024

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024

Fixes tests on Solaris

5832130

(backport <rust-lang#3864>) (cherry picked from commit ec3c338)

tgross35 mentioned this pull request Nov 7, 2024

[0.2] Backports #4017

Merged

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024

Fixes tests on Solaris

712c2da

(backport <rust-lang#3864>) (cherry picked from commit ec3c338)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024

Fixes tests on Solaris

e790e95

(backport <rust-lang#3864>) (cherry picked from commit ec3c338)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024

Fixes tests on Solaris

251e8e8

(backport <rust-lang#3864>) (cherry picked from commit ec3c338)

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 7, 2024

shadow3aaa mentioned this pull request Nov 8, 2024

build(deps): bump libc from 0.2.161 to 0.2.162 shadow3aaa/fas-rs#106

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tests on Solaris #3864

Fix tests on Solaris #3864

psumbera commented Aug 21, 2024

rustbot commented Aug 21, 2024

rustbot commented Aug 21, 2024

psumbera commented Aug 21, 2024

rustbot commented Aug 21, 2024

psumbera commented Sep 2, 2024

tgross commented Sep 2, 2024

tgross35 Sep 3, 2024

tgross35 Sep 3, 2024 •

edited

Loading

psumbera Sep 3, 2024

tgross35 commented Sep 3, 2024 •

edited

Loading

tgross35 commented Sep 3, 2024 •

edited

Loading

psumbera commented Sep 3, 2024

psumbera commented Sep 3, 2024 •

edited

Loading

tgross35 commented Oct 13, 2024 •

edited

Loading

bors commented Oct 15, 2024

tgross35 commented Oct 16, 2024

bors commented Oct 24, 2024

tgross35 left a comment

tgross35 commented Oct 25, 2024

psumbera commented Oct 31, 2024

sunshowers Nov 6, 2024

psumbera Nov 6, 2024

Fix tests on Solaris #3864

Fix tests on Solaris #3864

Conversation

psumbera commented Aug 21, 2024

rustbot commented Aug 21, 2024

rustbot commented Aug 21, 2024

psumbera commented Aug 21, 2024

rustbot commented Aug 21, 2024

psumbera commented Sep 2, 2024

tgross commented Sep 2, 2024

tgross35 Sep 3, 2024

Choose a reason for hiding this comment

tgross35 Sep 3, 2024 • edited Loading

Choose a reason for hiding this comment

psumbera Sep 3, 2024

Choose a reason for hiding this comment

tgross35 commented Sep 3, 2024 • edited Loading

tgross35 commented Sep 3, 2024 • edited Loading

psumbera commented Sep 3, 2024

psumbera commented Sep 3, 2024 • edited Loading

tgross35 commented Oct 13, 2024 • edited Loading

bors commented Oct 15, 2024

tgross35 commented Oct 16, 2024

bors commented Oct 24, 2024

tgross35 left a comment

Choose a reason for hiding this comment

tgross35 commented Oct 25, 2024

psumbera commented Oct 31, 2024

sunshowers Nov 6, 2024

Choose a reason for hiding this comment

psumbera Nov 6, 2024

Choose a reason for hiding this comment

tgross35 Sep 3, 2024 •

edited

Loading

tgross35 commented Sep 3, 2024 •

edited

Loading

tgross35 commented Sep 3, 2024 •

edited

Loading

psumbera commented Sep 3, 2024 •

edited

Loading

tgross35 commented Oct 13, 2024 •

edited

Loading