diff --git a/.github/scripts/ci-test-patching.sh b/.github/scripts/ci-test-patching.sh index 4090d779..218dce38 100755 --- a/.github/scripts/ci-test-patching.sh +++ b/.github/scripts/ci-test-patching.sh @@ -28,6 +28,12 @@ declare -a tests_to_skip=( # The required string int.jl does not appear in the output even if I test with the stock Julia code. # I do not know what is wrong, but at this point, I dont want to spend time on it. '@test occursin("int.jl", code)' "$JULIA_PATH/test/cmdlineargs.jl" + + # These are failing for v1.9.2 on the stock Julia as well. + '@test process_running(p)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl" + '@test occursin("Overhead ╎", s)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl" + '@test length(prof.allocs) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl" + '@test length(\[a for a in prof.allocs if a.type == MyType\]) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl" ) for (( i=0; i < ${#tests_to_skip[@]}; i+=2 )); do diff --git a/.github/workflows/binding-tests.yml b/.github/workflows/binding-tests.yml index f5be174b..823fa9fc 100644 --- a/.github/workflows/binding-tests.yml +++ b/.github/workflows/binding-tests.yml @@ -51,6 +51,9 @@ jobs: run: | ./.github/scripts/ci-checkout.sh ./.github/scripts/ci-setup.sh + - name: Patching unsupported tests + run: | + ./.github/scripts/ci-test-patching.sh - name: Build Julia (Release) run: | ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f58cdb4..30bf8e28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,8 @@ on: pull_request: branches: - master - - v1.8.2+RAI - - v1.9.2+RAI + - v1.8.2\+RAI + - v1.9.2\+RAI concurrency: # Cancels pending runs when a PR gets updated. diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 7483f097..6a55cf65 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. julia_repo = "https://github.com/mmtk/julia.git" -julia_version = "5c406d9bb20d76e2298a6101f171cfac491f651c" +julia_version = "c01026c91a3e2e6a064e75e0d4d4cc2f8c0d4c77" [lib] crate-type = ["cdylib"]