Skip to content

Commit b142b9e

Browse files
committed
test_*: Disable tests that require setting rlimit on Android
See #7542, it's not totally clear where the problem comes from, but blanking LD_PRELOAD set by termux seems to fix the problem (but introduces other issues. Let's just disable these tests for now.
1 parent 7eb873c commit b142b9e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

tests/by-util/test_cat.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ fn test_fifo_symlink() {
9898
}
9999

100100
#[test]
101-
#[cfg(any(target_os = "linux", target_os = "android"))]
101+
// TODO(#7542): Re-enable on Android once we figure out why setting limit is broken.
102+
// #[cfg(any(target_os = "linux", target_os = "android"))]
103+
#[cfg(target_os = "linux")]
102104
fn test_closes_file_descriptors() {
103105
// Each file creates a pipe, which has two file descriptors.
104106
// If they are not closed then five is certainly too many.

tests/by-util/test_sort.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,9 @@ fn test_merge_batch_size() {
10901090
}
10911091

10921092
#[test]
1093-
#[cfg(any(target_os = "linux", target_os = "android"))]
1093+
// TODO(#7542): Re-enable on Android once we figure out why setting limit is broken.
1094+
// #[cfg(any(target_os = "linux", target_os = "android"))]
1095+
#[cfg(target_os = "linux")]
10941096
fn test_merge_batch_size_with_limit() {
10951097
use rlimit::Resource;
10961098
// Currently need...

tests/by-util/test_split.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,9 @@ fn test_round_robin() {
16271627
}
16281628

16291629
#[test]
1630-
#[cfg(any(target_os = "linux", target_os = "android"))]
1630+
// TODO(#7542): Re-enable on Android once we figure out why rlimit is broken.
1631+
// #[cfg(any(target_os = "linux", target_os = "android"))]
1632+
#[cfg(target_os = "linux")]
16311633
fn test_round_robin_limited_file_descriptors() {
16321634
new_ucmd!()
16331635
.args(&["-n", "r/40", "onehundredlines.txt"])

0 commit comments

Comments
 (0)