Plumb the in-prefix tests into CI

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

Author: dra27

.depend

@@ -10620,7 +10620,6 @@ testsuite/tools/test_in_prefix.cmo : \
     driver/compmisc.cmi \
     testsuite/tools/cmdline.cmi \
     utils/clflags.cmi \
-    bytecomp/bytelink.cmi \
     testsuite/tools/test_in_prefix.cmi
 testsuite/tools/test_in_prefix.cmx : \
     otherlibs/unix/unix.cmx \
@@ -10638,7 +10637,6 @@ testsuite/tools/test_in_prefix.cmx : \
     driver/compmisc.cmx \
     testsuite/tools/cmdline.cmx \
     utils/clflags.cmx \
-    bytecomp/bytelink.cmx \
     testsuite/tools/test_in_prefix.cmi
 testsuite/tools/test_in_prefix.cmi :
 testsuite/tools/test_ld_conf.cmo : \

.github/workflows/build-msvc.yml

@@ -52,7 +52,7 @@ jobs:
                 // # Test Cygwin as well
                 compilers.push('gcc');
                 // # 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};
@@ -139,6 +139,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)
@@ -192,3 +194,8 @@ jobs:
 
       - name: Install the compiler
         run: make install
+
+      - name: Test in prefix
+        run: |
+          eval $(tools/msvs-promote-path)
+          make -f Makefile.test -C testsuite/in_prefix test-in-prefix

.github/workflows/build.yml

@@ -135,6 +135,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: |
@@ -160,9 +164,12 @@ jobs:
             let jobs = [
               {name: 'linux-O0', os: 'ubuntu-latest',
                config_arg: "CFLAGS='-O0'"},
-              {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
@@ -178,9 +185,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;
@@ -234,6 +242,14 @@ jobs:
           for dir in $PARALLEL_TESTS; do \
            bash -cxe "SHOW_TIMINGS=1 tools/ci/actions/runner.sh test_prefix $dir"; \
           done
+      - 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
@@ -253,11 +269,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

@@ -74,17 +74,18 @@ function set_configuration {
 
   case "$1" in
     cygwin*)
-      args+=('--disable-dependency-generation');;
+      args+=('--disable-dependency-generation' '--enable-native-toplevel');;
     mingw32)
       args+=('--host=i686-w64-mingw32' '--disable-dependency-generation');;
     mingw64)
       args+=('--host=x86_64-w64-mingw32' '--disable-dependency-generation' \
-             '--disable-stdlib-manpages');;
+             '--disable-stdlib-manpages' '--enable-native-toplevel');;
     msvc32)
       args+=('--host=i686-pc-windows' '--disable-dependency-generation');;
     msvc64)
       # Explicitly test dependency generation on msvc64
-      args+=('--host=x86_64-pc-windows' '--enable-dependency-generation');;
+      args+=('--host=x86_64-pc-windows' '--enable-dependency-generation' \
+             '--enable-native-toplevel');;
   esac
 
   # Remove old configure cache if the configure script or the OS
@@ -194,6 +195,9 @@ case "$1" in
           make -C "$FULL_BUILD_PREFIX-$PORT/testsuite" SHOW_TIMINGS=1 all
     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

@@ -287,6 +287,16 @@ if test "$flambda" = "true"; then
   confoptions="$confoptions --enable-flambda --enable-flambda-invariants"
 fi
 
+case $NODE_NAME in
+  *-32|ocaml-ppc-64-be)
+    # Native compilation not supported
+    ;;
+  *)
+    # 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
 
@@ -312,6 +322,18 @@ main_build() {
   fi
 
   $make --warn-undefined-variables install
+  case $confoptions in
+    *--disable-unix-lib*) ;;         # test-in-prefix needs Unix lib
+    *--enable-tsan*) ;;              # tsan currently breaks test-in-prefix
+                                     # (see #14280)
+    *)
+      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 \