Plumb the in-prefix tests into CI

(cherry picked from commit 9585ef9)
(cherry picked from commit 53bb5a8)

Author: dra27

.github/workflows/build-msvc.yml

@@ -58,7 +58,7 @@ jobs:
               if (labels.some(label => label.name === 'CI: Full matrix')) {
                 console.log('Full matrix requested');
                 // # Test bytecode-only Cygwin
-                include.push({cc: 'gcc', arch: 'x86_64', config_arg: '--disable-native-compiler'});
+                include.push({cc: 'gcc', arch: 'x86_64', config_arg: '--disable-native-toplevel --disable-native-compiler'});
               }
             }
             return {config_arg: [''], arch: ['x86_64'], cc: compilers, include: include};
@@ -156,6 +156,8 @@ jobs:
             --prefix "${{ matrix.cc != 'gcc' && '$PROGRAMFILES/Бактріан🐫' || '$(cygpath "$PROGRAMFILES/Бактріан🐫")'}}"
             ${{ matrix.cc != 'gcc' && format('--host={0}-pc-windows', matrix.arch) || '' }}
             ${{ matrix.cc != 'gcc' && format('CC={0}', matrix.cc) || '' }}
+            --enable-ocamltest
+            ${{ endsWith(matrix.arch, '64') && '--enable-native-toplevel' || '--disable-native-toplevel' }}
             ${{ matrix.config_arg }}
         run: |
           eval $(tools/msvs-promote-path)
@@ -213,3 +215,9 @@ jobs:
       - name: Install the compiler
         run: make install
         if: needs.config.outputs.full-matrix == 'true'
+
+      - name: Test in prefix
+        run: |
+          eval $(tools/msvs-promote-path)
+          make -f Makefile.test -C testsuite/in_prefix test-in-prefix
+        if: needs.config.outputs.full-matrix == 'true'

.github/workflows/build.yml

@@ -118,6 +118,10 @@ jobs:
         if: matrix.id == 'normal'
         run: |
          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
+      - name: Test in prefix
+        if: matrix.id == 'normal'
+        run: |
+         MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test-in-prefix
       - name: Build the manual
         if: matrix.id == 'normal' && needs.build.outputs.manual_changed == 'true'
         run: |
@@ -143,9 +147,12 @@ jobs:
             let jobs = [
               {name: 'no-naked-pointers', os: 'ubuntu-latest',
                config_arg: '--disable-naked-pointers --disable-stdlib-manpages'},
-              {name: 'linux-arm64', os: 'ubuntu-24.04-arm'},
-              {name: 'macos-x86_64', os: 'macos-15-intel'},
-              {name: 'macos-arm64', os: 'macos-latest'}];
+              {name: 'linux-arm64', os: 'ubuntu-24.04-arm',
+               'test-in-prefix': true},
+              {name: 'macos-x86_64', os: 'macos-15-intel',
+               'test-in-prefix': true},
+              {name: 'macos-arm64', os: 'macos-latest',
+               'test-in-prefix': true}];
             // # If this is a pull request, see if the PR has the
             // # 'CI: Full matrix' label. This is done using an API request,
             // # rather than from context.payload.pull_request.labels, since we
@@ -161,9 +168,10 @@ jobs:
                 // # Add "static" and "minimal" jobs
                 jobs = jobs.concat([
                   {name: 'static', os: 'ubuntu-latest',
-                   config_arg: '--disable-shared'},
+                   config_arg: '--disable-native-toplevel --disable-shared',
+                   'test-in-prefix': true},
                   {name: 'minimal', os: 'ubuntu-latest',
-                   config_arg: '--disable-native-compiler --disable-shared --disable-debug-runtime --disable-instrumented-runtime --disable-systhreads --disable-str-lib --disable-unix-lib --disable-ocamldoc'}]);
+                   config_arg: '--disable-native-toplevel --disable-native-compiler --disable-shared --disable-debug-runtime --disable-instrumented-runtime --disable-systhreads --disable-str-lib --disable-unix-lib --disable-ocamldoc'}]);
               }
             }
             return jobs;
@@ -208,6 +216,14 @@ jobs:
         if: ${{ matrix.name != 'linux-O0' && needs.config.outputs.skip-testsuite != 'true' }}
         run: |
           bash -c 'SHOW_TIMINGS=1 tools/ci/actions/runner.sh test'
+      - name: Install
+        if: ${{ matrix.test-in-prefix }}
+        run: |
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
+      - name: Test in prefix
+        if: ${{ matrix.test-in-prefix }}
+        run: |
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test-in-prefix
 
   i386:
     runs-on: ubuntu-latest
@@ -227,11 +243,17 @@ jobs:
       - name: configure tree
         run: |
           chown -R ocaml:ocaml .
-          MAKE_ARG=-j su ocaml -c "bash -xe tools/ci/actions/runner.sh configure"
+          MAKE_ARG=-j CONFIG_ARG='--disable-native-toplevel' 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"
       - name: Run the testsuite
         if: ${{ needs.config.outputs.skip-testsuite != 'true' }}
         run: |
           su ocaml -c "bash -xe tools/ci/actions/runner.sh test"
+      - name: Install
+        run: |
+          su ocaml -c "bash -xe tools/ci/actions/runner.sh install"
+      - name: Test in prefix
+        run: |
+          su ocaml -c "bash -xe tools/ci/actions/runner.sh test-in-prefix"

tools/ci/actions/runner.sh

@@ -58,6 +58,7 @@ EOF
   call-configure --prefix="$PREFIX" \
                  --enable-flambda-invariants \
                  --enable-ocamltest \
+                 --enable-native-toplevel \
                  --disable-dependency-generation \
                  $CONFIG_ARG
 }
@@ -127,6 +128,10 @@ Install () {
   $MAKE install
 }
 
+Test-In-Prefix () {
+  $MAKE -C testsuite/in_prefix -f Makefile.test test-in-prefix
+}
+
 Checks () {
   if fgrep 'SUPPORTS_SHARED_LIBRARIES=true' Makefile.config &>/dev/null ; then
     echo Check the code examples in the manual
@@ -217,6 +222,7 @@ test_sequential) Test sequential;;
 test_prefix) TestPrefix $2;;
 api-docs) API_Docs;;
 install) Install;;
+test-in-prefix) Test-In-Prefix;;
 manual) BuildManual;;
 other-checks) Checks;;
 basic-compiler) BasicCompiler;;

tools/ci/appveyor/appveyor_build.sh

@@ -70,7 +70,8 @@ function set_configuration {
   CACHE_FILE_PREFIX="$CACHE_DIRECTORY/config.cache-$1"
   CACHE_FILE="$CACHE_FILE_PREFIX-$CACHE_KEY"
 
-  args=('--cache-file' "$CACHE_FILE" '--prefix' "$2" '--enable-ocamltest')
+  args=('--cache-file' "$CACHE_FILE" '--prefix' "$2" \
+        '--enable-native-toplevel' '--enable-ocamltest')
 
   case "$1" in
     cygwin*)
@@ -172,6 +173,9 @@ case "$1" in
       run "test $PORT" $MAKE -C "$FULL_BUILD_PREFIX-$PORT" tests
     fi
     run "install $PORT" $MAKE -C "$FULL_BUILD_PREFIX-$PORT" install
+    run "test $PORT in prefix" \
+      $MAKE -f Makefile.test -C "$FULL_BUILD_PREFIX-$PORT/testsuite/in_prefix" \
+            test-in-prefix
     if [[ $PORT = 'msvc64' ]] ; then
       run "$MAKE check_all_arches" \
            $MAKE -C "$FULL_BUILD_PREFIX-$PORT" check_all_arches

tools/ci/inria/main

@@ -260,6 +260,13 @@ if $flambda; then
 --disable-naked-pointers"
 fi
 
+case $NODE_NAME in
+  *)
+    # Include ocamlnat (for the in-prefix tests) unless explicitly disabled:
+    # a later --disable-native-toplevel will take precedence if present.
+    confoptions="--enable-native-toplevel $confoptions";;
+esac
+
 main_build() {
   eval ./configure "$CCOMP" $build $host --prefix='$instdir' $confoptions
 
@@ -282,6 +289,16 @@ main_build() {
   fi
 
   $make --warn-undefined-variables install
+  case $confoptions in
+    *--disable-unix-lib*) ;;         # test-in-prefix needs Unix lib
+    *)
+      if ! $make -f Makefile.test -C testsuite/in_prefix test-in-prefix; then
+        # Ensure the worker is cleaned up
+        rm -rf "$instdir"
+        exit 1
+      fi
+      ;;
+  esac
   rm -rf "$instdir"
 }
 

tools/ci/inria/other-configs/script

@@ -37,10 +37,11 @@ build() {
 # The "MIN_BUILD" (formerly on Travis) builds with everything disabled (apart
 # from ocamltest). Its goals:
 #  - Ensure that the system builds correctly without native compilation
-#  - Ensure ocamltest builds correctly with Unix
+#  - Ensure ocamltest builds correctly without Unix
 #  - Ensure the testsuite runs correctly with everything switched off
 build "minimal build" \
         -conf --disable-native-compiler \
+        -conf --disable-native-toplevel \
         -conf --disable-shared \
         -conf --disable-debug-runtime \
         -conf --disable-instrumented-runtime \