From ccc48515057671eb9b871b82491a3b61ebda0d3e Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Sun, 29 Sep 2024 15:14:21 +0100
Subject: [PATCH] Test --enable-relative in CI

---
 .github/workflows/build-msvc.yml    |  1 +
 .github/workflows/build.yml         | 14 ++++++++++++--
 tools/ci/appveyor/appveyor_build.sh |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-msvc.yml b/.github/workflows/build-msvc.yml
index 729fd426eff3..2c739feb085e 100644
--- a/.github/workflows/build-msvc.yml
+++ b/.github/workflows/build-msvc.yml
@@ -101,6 +101,7 @@ jobs:
             CC=$CC
             --enable-ocamltest
             ${{ matrix.x86_64 && '--enable-native-toplevel' || '--disable-native-toplevel' }}
+            --${{ matrix.cc == 'cl' && 'enable' || 'disable' }}-relative
         run: >-
           eval $(tools/msvs-promote-path) ;
           if ! ./configure ${{ env.CONFIGURE_FLAGS }} ; then
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41d63dbbd846..dabbc3609f4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
          '${{ github.event.repository.full_name }}'
       - name: Configure tree
         run: |
-          MAKE_ARG=-j CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
+          MAKE_ARG=-j CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel --enable-relative' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
       - name: Build
         run: |
           MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
@@ -157,6 +157,7 @@ jobs:
             os: macos-13
           - name: macos-arm64
             os: macos-14
+            config_arg: --enable-relative
           - name: static
             os: ubuntu-latest
             config_arg: --disable-shared --disable-native-toplevel
@@ -217,10 +218,19 @@ jobs:
           MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
 
   i386:
+    name: i386 - ${{ matrix.name }}
     runs-on: ubuntu-latest
     container:
       image: debian:12
       options: --platform linux/i386 --user root
+    strategy:
+      matrix:
+        include:
+          - name: absolute
+            config_arg: --disable-relative
+          - name: relative
+            config_arg: --enable-relative
+      fail-fast: false
     steps:
       - name: OS Dependencies
         run: |
@@ -233,7 +243,7 @@ jobs:
       - name: configure tree
         run: |
           chown -R ocaml:ocaml .
-          MAKE_ARG=-j CONFIG_ARG=--disable-native-toplevel su ocaml -c "bash -xe tools/ci/actions/runner.sh configure"
+          MAKE_ARG=-j CONFIG_ARG='--disable-native-toplevel ${{ matrix.config_arg }}' su ocaml -c "bash -xe tools/ci/actions/runner.sh configure"
       - name: Build
         run: |
           MAKE_ARG=-j su ocaml -c "bash -xe tools/ci/actions/runner.sh build"
diff --git a/tools/ci/appveyor/appveyor_build.sh b/tools/ci/appveyor/appveyor_build.sh
index cf4f7347cafa..44b108347bfd 100755
--- a/tools/ci/appveyor/appveyor_build.sh
+++ b/tools/ci/appveyor/appveyor_build.sh
@@ -96,12 +96,12 @@ function set_configuration {
     # Remove configure cache if the script has failed
     if ! ./configure --cache-file="$CACHE_FILE" $dep $build $man $host \
                      --prefix="$2" --enable-ocamltest \
-                     --enable-native-toplevel ; then
+                     --enable-native-toplevel --enable-relative ; then
         rm -f -- "$CACHE_FILE"
         local failed
         ./configure --cache-file="$CACHE_FILE" $dep $build $man $host \
                     --prefix="$2" --enable-ocamltest \
-                    --enable-native-toplevel \
+                    --enable-native-toplevel --enable-relative \
             || failed=$?
         if ((failed)) ; then cat config.log ; exit $failed ; fi
     fi