From 86689a59c134a117b98e1abab5d3127185cad6b2 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 9 Jan 2025 17:14:01 -0500
Subject: [PATCH] Use a separate directory for MMTk

---
 .github/workflows/test.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b691ef4..4e6c279 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,14 +36,17 @@ jobs:
       )}}
     steps:
       - uses: actions/checkout@v4
+        path: mmtk
 
       - name: Install libraries (macOS)
         if: ${{ contains(matrix.os, 'macos') }}
+        working-directory: mmtk
         run: |
           brew install --quiet gmp libffi openssl@3 zlib autoconf automake libtool
 
       - name: Install libraries (Ubuntu)
         if: ${{ contains(matrix.os, 'ubuntu') }}
+        working-directory: mmtk
         run: |
           sudo apt-get install -qq -y \
             ${arch:+cross}build-essential${arch/:/-} \
@@ -51,15 +54,17 @@ jobs:
             zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch}
 
       - uses: actions-rust-lang/setup-rust-toolchain@v1
+
       - name: Set MMTk environment variables
+        working-directory: mmtk
         run: |
           if [[ ${{ matrix.gc.mmtk_build }} == debug ]]; then
             echo 'RUST_LOG=' >> $GITHUB_ENV
             echo 'RUBY_TEST_TIMEOUT_SCALE=20' >> $GITHUB_ENV
             echo 'SYNTAX_SUGGEST_TIMEOUT=60' >> $GITHUB_ENV
           fi
-          echo 'EXCLUDES=./test/.excludes-mmtk' >> $GITHUB_ENV
-          echo 'MSPECOPT=-B./spec/mmtk.mspec' >> $GITHUB_ENV
+          echo "EXCLUDES=$PWD/test/.excludes-mmtk" >> $GITHUB_ENV
+          echo "MSPECOPT=-B$PWD/spec/mmtk.mspec" >> $GITHUB_ENV
           echo 'MMTK_PLAN=${{ matrix.gc.mmtk_plan }}' >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
@@ -80,19 +85,17 @@ jobs:
           echo "$PWD/install/bin" >> $GITHUB_PATH
 
       - name: MMTk shared GC
+        working-directory: mmtk
         run: |
-          whereis ruby
-          echo $PATH
-          ls $PWD/ruby/install
           bundle install
           bundle exec rake install:${{ matrix.gc.mmtk_build }}
           echo "RUBY_GC_LIBRARY=mmtk" >> $GITHUB_ENV
 
       - name: Run Ruby tests
+        working-directory: ruby
         run: >-
           make -s check
         timeout-minutes: ${{ matrix.gc.timeout || 40 }}
-        working-directory: ruby
         env:
           RUBY_TESTOPTS: '-q --tty=no'
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'