Skip to content

Commit

Permalink
Disable the tests unconditionally
Browse files Browse the repository at this point in the history
  • Loading branch information
gbaraldi committed Aug 29, 2022
1 parent 24ba685 commit 75b554a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 0 additions & 4 deletions stdlib/FileWatching/test/pidfile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ Base.Filesystem.mtime(io::MemoryFile) = io.mtime
# and create a test environment temp directory
umask(new_mask) = ccall((@static iswindows() ? :_umask : :umask), Cint, (Cint,), new_mask)

isbaseci = get(ENV, "JULIA_TEST_IS_BASE_CI", nothing) == "true"
ismacos_arm = ((Sys.ARCH == :aarch64) && (Sys.isapple())) #https://github.com/JuliaLang/julia/issues/46185
ismacos_x86 = ((Sys.ARCH == :x86_64) && (Sys.isapple()))

# TODO: Use targeted @test_log tests instead of suppressing all logs to hide the expected warnings
Base.CoreLogging.with_logger(Base.CoreLogging.NullLogger()) do

Expand Down
7 changes: 3 additions & 4 deletions stdlib/FileWatching/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ using Base: uv_error, Experimental
# Odd numbered pipes are tested for reads
# Even numbered pipes are tested for timeouts
# Writable ends are always tested for write-ability before a write
isbaseci = get(ENV, "JULIA_TEST_IS_BASE_CI", nothing) == "true"
ismacos_arm = ((Sys.ARCH == :aarch64) && (Sys.isapple())) #https://github.com/JuliaLang/julia/issues/46185
ismacos_x86 = ((Sys.ARCH == :x86_64) && (Sys.isapple())) #Used to disable the unreliable macos tests

Expand All @@ -36,7 +35,7 @@ for i in 1:n
if !fd_in_limits && Sys.islinux()
run(`ls -la /proc/$(getpid())/fd`)
end
if !(isbaseci && ismacos_arm)
if ismacos_arm
@test fd_in_limits
end
end
Expand Down Expand Up @@ -189,7 +188,7 @@ function test_init_afile()
@test(watch_folder(dir) == (F_PATH => FileWatching.FileEvent(FileWatching.UV_RENAME)))
@test close(open(file, "w")) === nothing
sleep(3)
if !(isbaseci && ismacos_x86)
if !ismacos_x86
let c
c = watch_folder(dir, 0)

Expand Down Expand Up @@ -379,7 +378,7 @@ test_monitor_wait_poll()
test_watch_file_timeout(0.2)
test_watch_file_change(6)

if !(isbaseci && ismacos_x86)
if !ismacos_x86
test_dirmonitor_wait2(0.2)
test_dirmonitor_wait2(0.2)

Expand Down

0 comments on commit 75b554a

Please sign in to comment.