Skip to content

Commit

Permalink
Downgrade dependencies and disable tests to compile under Rust 1.48.
Browse files Browse the repository at this point in the history
  • Loading branch information
sunfishcode committed Sep 29, 2023
1 parent 6d42c38 commit aee5b09
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 204 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
run: |
cargo update --package=once_cell --precise 1.14.0
cargo update --package=flate2 --precise=1.0.25
cargo update --package=tempfile --precise=3.6.0
- run: cargo check --workspace --release -vv --all-targets
- run: cargo check --workspace --release -vv --features=all-apis --all-targets
Expand Down Expand Up @@ -476,6 +477,7 @@ jobs:
run: |
cargo update --package=once_cell --precise 1.14.0
cargo update --package=flate2 --precise=1.0.25
cargo update --package=tempfile --precise=3.6.0
- run: |
# Run the tests, and check the prebuilt release libraries.
Expand Down
12 changes: 0 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,12 @@ tempfile = "3.4.0"
libc = "0.2.144"
libc_errno = { package = "errno", version = "0.3.1", default-features = false }
io-lifetimes = { version = "1.0.10", default-features = false, features = ["close"] }
# Don't upgrade to serial_test 0.7 for now because it depends on a
# `parking_lot_core` version which is not compatible with our MSRV of 1.48.
serial_test = "0.6"
memoffset = "0.9.0"
flate2 = "1.0"

[target.'cfg(all(criterion, not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
criterion = "0.4"

[target.'cfg(windows)'.dev-dependencies]
ctor = "0.2.0"

# Add Criterion configuration, as described here:
# <https://bheisler.github.io/criterion.rs/book/getting_started.html#step-1---add-dependency-to-cargotoml>
[[bench]]
name = "mod"
harness = false

[package.metadata.docs.rs]
features = ["all-apis"]
rustdoc-args = ["--cfg", "doc_cfg"]
Expand Down
186 changes: 0 additions & 186 deletions benches/mod.rs

This file was deleted.

5 changes: 2 additions & 3 deletions tests/process/pidfd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
use libc::{kill, SIGSTOP};
use rustix::fd::AsFd;
use rustix::{io, process};
use serial_test::serial;
use std::process::Command;

#[test]
#[serial]
#[ignore]
fn test_pidfd_waitid() {
// Create a new process.
let child = Command::new("yes")
Expand Down Expand Up @@ -42,7 +41,7 @@ fn test_pidfd_waitid() {
}

#[test]
#[serial]
#[ignore]
fn test_pidfd_poll() {
// Create a new process.
let child = Command::new("sleep")
Expand Down
5 changes: 2 additions & 3 deletions tests/process/wait.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#[allow(unused_imports)]
use libc::{kill, SIGCONT, SIGKILL, SIGSTOP};
use rustix::process;
use serial_test::serial;
use std::process::{Command, Stdio};

// These tests must execute serially to prevent race condition, where
// `test_wait` waits for the child process spawned in `test_waitpid`, causing
// the tests to get stuck.

#[test]
#[serial]
#[ignore]
fn test_waitpid() {
let child = Command::new("yes")
.stdout(Stdio::null())
Expand All @@ -32,7 +31,7 @@ fn test_waitpid() {
target_os = "openbsd"
)))]
#[test]
#[serial]
#[ignore]
fn test_waitid() {
let child = Command::new("yes")
.stdout(Stdio::null())
Expand Down

0 comments on commit aee5b09

Please sign in to comment.