update options for consistency

Author: zeroshade

ci/scripts/cpp_build.ps1

@@ -30,7 +30,7 @@ $BuildDriverPostgreSQL = ($BuildAll -and (-not ($env:BUILD_DRIVER_POSTGRESQL -eq
 $BuildDriverSnowflake = ($BuildAll -and (-not ($env:BUILD_DRIVER_SNOWFLAKE -eq "0"))) -or ($env:BUILD_DRIVER_SNOWFLAKE -eq "1")
 $BuildDriverSqlite = ($BuildAll -and (-not ($env:BUILD_DRIVER_SQLITE -eq "0"))) -or ($env:BUILD_DRIVER_SQLITE -eq "1")
 
-$AdbcDriverManagerUserConfigTest = ($env:BUILD_DRIVER_MANAGER_USER_CONFIG_TEST -eq "1")
+$BuildDriverManagerUserConfigTest = ($env:BUILD_DRIVER_MANAGER_USER_CONFIG_TEST -eq "1")
 
 function Build-Subproject {
     New-Item -ItemType Directory -Force -Path $BuildDir | Out-Null
@@ -51,7 +51,7 @@ function Build-Subproject {
       -DCMAKE_BUILD_TYPE=Release `
       -DCMAKE_INSTALL_PREFIX="$($InstallDir)" `
       -DCMAKE_VERBOSE_MAKEFILE=ON `
-      -DADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL="$($AdbcDriverManagerUserConfigTest)"
+      -DADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL="$($BuildDriverManagerUserConfigTest)"
     if (-not $?) { exit 1 }
 
     cmake --build . --target install -j

ci/scripts/cpp_build.sh

@@ -27,8 +27,8 @@ set -e
 : ${BUILD_DRIVER_BIGQUERY:=${BUILD_ALL}}
 # Must be explicitly enabled
 : ${BUILD_INTEGRATION_DUCKDB:=0}
-: ${ADBC_DRIVER_MANAGER_USER_CONFIG_TEST:=0}
-: ${ADBC_DRIVER_MANAGER_SYSTEM_CONFIG_TEST:=0}
+: ${BUILD_DRIVER_MANAGER_USER_CONFIG_TEST:=0}
+: ${BUILD_DRIVER_MANAGER_SYSTEM_CONFIG_TEST:=0}
 
 : ${ADBC_BUILD_SHARED:=ON}
 : ${ADBC_BUILD_STATIC:=${BUILD_INTEGRATION_DUCKDB}}
@@ -71,8 +71,8 @@ build_subproject() {
           -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
           -DCMAKE_INSTALL_LIBDIR=lib \
           -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" \
-          -DADBC_DRIVER_MANAGER_TEST_MANIFEST_SYSTEM_LEVEL="${ADBC_DRIVER_MANAGER_SYSTEM_CONFIG_TEST}" \
-          -DADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL="${ADBC_DRIVER_MANAGER_USER_CONFIG_TEST}"
+          -DADBC_DRIVER_MANAGER_TEST_MANIFEST_SYSTEM_LEVEL="${BUILD_DRIVER_MANAGER_SYSTEM_CONFIG_TEST}" \
+          -DADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL="${BUILD_DRIVER_MANAGER_USER_CONFIG_TEST}"
     set +x
     cmake --build . --target install -j