enable test_exportbuild by default

.gitlab-ci.yml

@@ -730,19 +730,6 @@ subdir-build:
     CI_PROJECT_PATH_SUFFIX: "/test_subdir"
   allow_failure: no
 
-# Ensure Ginkgo can be used when exporting the build directory
-export-build:
-  stage: code_quality
-  extends:
-    - .build_template
-    - .default_variables
-    - .full_test_condition
-    - .use_gko-nocuda-nompi-gnu9-llvm8
-  variables:
-    BUILD_OMP: "ON"
-    EXPORT_BUILD_DIR: "ON"
-  allow_failure: no
-
 # Run clang-tidy and iwyu
 clang-tidy:
   stage: code_quality

.gitlab/scripts.yml

@@ -51,11 +51,8 @@
         -DGINKGO_RUN_EXAMPLES=${RUN_EXAMPLES}
         -DGINKGO_CONFIG_LOG_DETAILED=${CONFIG_LOG}
         -DGINKGO_DPCPP_SINGLE_MODE=${DPCPP_SINGLE_MODE}
-        -DGINKGO_EXPORT_BUILD_DIR=${EXPORT_BUILD_DIR}
     - ninja -j${NUM_CORES} -l${CI_LOAD_LIMIT} install
     - awk '!/^#/ { print ($2 - $1)/1000 " " $4 }' .ninja_log | sort -nr
-    - if [ "${EXPORT_BUILD_DIR}" == "ON" ]; then ninja test_exportbuild; fi
-    - LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ninja test_pkgconfig
   dependencies: []
 
 .build_and_test_template:
@@ -95,12 +92,12 @@
         -DGINKGO_CONFIG_LOG_DETAILED=${CONFIG_LOG}
         -DGINKGO_DPCPP_SINGLE_MODE=${DPCPP_SINGLE_MODE}
         -DGINKGO_RUN_EXAMPLES=${RUN_EXAMPLES}
-        -DGINKGO_EXPORT_BUILD_DIR=${EXPORT_BUILD_DIR}
     - ninja -j${NUM_CORES} -l${CI_LOAD_LIMIT} install
     - awk '!/^#/ { print ($2 - $1)/1000 " " $4 }' .ninja_log | sort -nr
     - |
         (( $(ctest -N | tail -1 | sed 's/Total Tests: //') != 0 )) || exit 1
     - ctest --output-on-failure --timeout 6000 ${CTEST_EXTRA_ARGS}
+    - ninja test_exportbuild
     - ninja test_install
     - pushd test/test_install
     - ninja install
@@ -128,7 +125,6 @@
       fi
     - if [ -n "${SYCL_DEVICE_TYPE}" ]; then unset SYCL_DEVICE_TYPE; fi
     - if [ -n "${SYCL_DEVICE_FILTER}" ]; then unset SYCL_DEVICE_FILTER; fi
-    - if [ "${EXPORT_BUILD_DIR}" == "ON" ]; then ninja test_exportbuild; fi
     - LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ninja test_pkgconfig
   dependencies: []
 
@@ -153,10 +149,12 @@
     - |
         (( $(ctest -N | tail -1 | sed 's/Total Tests: //') != 0 )) || exit 1
     - ctest --output-on-failure --timeout 6000 ${CTEST_EXTRA_ARGS}
+    - ninja test_exportbuild
     - ninja test_install
     - pushd test/test_install
     - ninja install
     - popd
+    - LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ninja test_pkgconfig
   cache: []
 
 

.gitlab/variables.yml

@@ -25,5 +25,4 @@
     CONFIG_LOG: "ON"
     CXX_FLAGS: ""
     EXTRA_CMAKE_FLAGS: ""
-    EXPORT_BUILD_DIR: "OFF"
     CI_PROJECT_DIR_SUFFIX: ""