@@ -73,7 +73,7 @@ functions:
7373 export CMAKE_VARS_DIR=$(./evergreen/abspath.sh cmake_vars)
7474 source evergreen/cmake_vars_utils.sh
7575 if [ -n "${cmake_bindir|}" ]; then
76- export CMAKE=$(./evergreen/abspath.sh ${cmake_bindir}/cmake)
76+ export CMAKE=" $(./evergreen/abspath.sh " ${cmake_bindir}/cmake")"
7777 else
7878 export CMAKE="cmake"
7979 fi
@@ -84,11 +84,11 @@ functions:
8484
8585 if [ -n "${c_compiler}" ]; then
8686 [ -n "${cxx_compiler}" ] || (echo "C compiler defined as but C++ compiler is undefined"; exit 1)
87- set_cmake_var compiler_vars CMAKE_C_COMPILER PATH $(./evergreen/abspath.sh ${c_compiler})
88- set_cmake_var compiler_vars CMAKE_CXX_COMPILER PATH $(./evergreen/abspath.sh ${cxx_compiler})
87+ set_cmake_var compiler_vars CMAKE_C_COMPILER PATH $(./evergreen/abspath.sh " ${c_compiler}" )
88+ set_cmake_var compiler_vars CMAKE_CXX_COMPILER PATH $(./evergreen/abspath.sh " ${cxx_compiler}" )
8989 fi
9090
91- if [ -z "${disable_tests_against_baas|}" ]; then
91+ if [[ -z "${disable_tests_against_baas|}" && -z "${no_tests|}" ] ]; then
9292 scheme="http"
9393 set_cmake_var baas_vars REALM_ENABLE_AUTH_TESTS BOOL On
9494 if [ -n "${baas_admin_port|}" ]; then
@@ -165,7 +165,7 @@ functions:
165165 set_cmake_var realm_vars CMAKE_GENERATOR_PLATFORM STRING "${cmake_generator_platform}"
166166 fi
167167
168- if [ -n "${curl_base|}" ]; then
168+ if [[ -n "${curl_base|}" && -z "${no_tests|}" ] ]; then
169169 set_cmake_var curl_vars CURL_LIBRARY PATH "$(./evergreen/abspath.sh ${curl_base}/lib/libcurl.dll.a)"
170170 set_cmake_var curl_vars CURL_INCLUDE_DIR PATH "$(./evergreen/abspath.sh ${curl_base}/include)"
171171 set_cmake_var baas_vars REALM_CURL_CACERTS PATH "$(./evergreen/abspath.sh "${curl_base}/bin/curl-ca-bundle.crt")"
@@ -174,11 +174,11 @@ functions:
174174 set_cmake_var realm_vars REALM_NO_TESTS BOOL ${no_tests|Off}
175175 set_cmake_var realm_vars CMAKE_COMPILE_WARNING_AS_ERROR BOOL On
176176
177- echo "Running cmake with these vars:"
177+ echo "Running cmake at \"$CMAKE\" with these vars:"
178178 cat cmake_vars/*.txt | tee cmake_vars.txt
179179 echo
180180
181- $CMAKE \
181+ " $CMAKE" \
182182 -B build \
183183 -C cmake_vars.txt ${extra_flags} \
184184 -G "$GENERATOR"
@@ -191,7 +191,7 @@ functions:
191191 target="$target -- ${cmake_build_tool_options}"
192192 fi
193193
194- $CMAKE \
194+ " $CMAKE" \
195195 --build build \
196196 --config ${cmake_build_type|Debug} \
197197 -j ${max_jobs|$(grep -c proc /proc/cpuinfo)} \
@@ -240,7 +240,7 @@ functions:
240240 set -o errexit
241241 set -o verbose
242242 if [ -n "${cmake_bindir|}" ]; then
243- CTEST=$(./evergreen/abspath.sh ${cmake_bindir}/ctest)
243+ CTEST=" $(./evergreen/abspath.sh " ${cmake_bindir}/ctest")"
244244 else
245245 CTEST="ctest"
246246 fi
@@ -320,7 +320,7 @@ functions:
320320 export UBSAN_OPTIONS="print_stacktrace=1"
321321
322322 cd build
323- if ! $CTEST -C ${cmake_build_type|Debug} $TEST_FLAGS; then
323+ if ! " $CTEST" -C ${cmake_build_type|Debug} $TEST_FLAGS; then
324324 BAAS_PID=$(pgrep baas_server)
325325 if [[ -n "$BAAS_PID" ]]; then
326326 echo "Dumping baas to log file"
@@ -755,7 +755,7 @@ tasks:
755755 script : |-
756756 set -o errexit
757757 if [[ -n "${cmake_bindir}" ]]; then
758- CPACK="$(./evergreen/abspath.sh ${cmake_bindir}/cpack)"
758+ CPACK="$(./evergreen/abspath.sh " ${cmake_bindir}/cpack" )"
759759 else
760760 CPACK="cpack"
761761 fi
@@ -1317,6 +1317,20 @@ task_groups:
13171317 tasks :
13181318 - fuzzer
13191319
1320+ - name : compile_only
1321+ max_hosts : 1
1322+ setup_group_can_fail_task : true
1323+ setup_group :
1324+ - func : " fetch source"
1325+ - func : " fetch binaries"
1326+ teardown_task :
1327+ - func : " upload test results"
1328+ - func : " upload baas artifacts"
1329+ timeout :
1330+ - func : " run hang analyzer"
1331+ tasks :
1332+ - compile
1333+
13201334buildvariants :
13211335- name : ubuntu
13221336 display_name : " Ubuntu"
@@ -1735,6 +1749,7 @@ buildvariants:
17351749 grcov_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/grcov-aarch64-apple-darwin.tar.bz2"
17361750 tasks :
17371751 - name : compile_test_coverage
1752+
17381753- name : ubuntu-coverage
17391754 display_name : " Ubuntu (Code Coverage)"
17401755 run_on : ubuntu2204-large
@@ -1753,12 +1768,25 @@ buildvariants:
17531768 - name : compile_test_coverage
17541769 - name : finalize_coverage_data
17551770
1771+ - name : ubuntu-no-app-services
1772+ display_name : " Ubuntu (AppServices Disabled)"
1773+ run_on : ubuntu2204-arm64-large
1774+ expansions :
1775+ cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-linux-aarch64.tar.gz"
1776+ cmake_bindir : " ./cmake_binaries/bin"
1777+ fetch_missing_dependencies : On
1778+ c_compiler : " /opt/clang+llvm/bin/clang"
1779+ cxx_compiler : " /opt/clang+llvm/bin/clang++"
1780+ extra_flags : " -DREALM_APP_SERVICES=OFF"
1781+ disable_tests_against_baas : On
1782+ tasks :
1783+ - name : compile_local_tests
1784+
17561785- name : windows-64-vs2019
17571786 display_name : " Windows x86_64 (VS 2019)"
17581787 run_on : windows-vsCurrent-large
17591788 expansions :
1760- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip"
1761- cmake_bindir : " ./cmake-3.26.3-windows-x86_64/bin"
1789+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin"
17621790 cmake_generator : " Visual Studio 16 2019"
17631791 extra_flags : " -A x64"
17641792 max_jobs : $(($(grep -c proc /proc/cpuinfo) / 2))
@@ -1772,8 +1800,7 @@ buildvariants:
17721800 display_name : " Windows x86_64 (Encryption enabled)"
17731801 run_on : windows-vsCurrent-large
17741802 expansions :
1775- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip"
1776- cmake_bindir : " ./cmake-3.26.3-windows-x86_64/bin"
1803+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin"
17771804 cmake_generator : " Visual Studio 16 2019"
17781805 extra_flags : " -A x64"
17791806 max_jobs : $(($(grep -c proc /proc/cpuinfo) / 2))
@@ -1788,8 +1815,7 @@ buildvariants:
17881815 display_name : " Windows x86_64 (VS 2019 Release build)"
17891816 run_on : windows-vsCurrent-large
17901817 expansions :
1791- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip"
1792- cmake_bindir : " ./cmake-3.26.3-windows-x86_64/bin"
1818+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin"
17931819 cmake_generator : " Visual Studio 16 2019"
17941820 extra_flags : " -A x64"
17951821 cmake_build_type : " Release"
@@ -1805,8 +1831,7 @@ buildvariants:
18051831 display_name : " Windows x86_64 (VS 2019 ASAN)"
18061832 run_on : windows-vsCurrent-large
18071833 expansions :
1808- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip"
1809- cmake_bindir : " ./cmake-3.26.3-windows-x86_64/bin"
1834+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin"
18101835 cmake_generator : " Visual Studio 16 2019"
18111836 extra_flags : " -A x64"
18121837 cmake_build_type : " Debug"
@@ -1822,8 +1847,7 @@ buildvariants:
18221847 display_name : " Windows X86 (Release)"
18231848 run_on : windows-vsCurrent-large
18241849 expansions :
1825- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-windows-x86_64.zip"
1826- cmake_bindir : " ./cmake-3.26.3-windows-x86_64/bin"
1850+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin"
18271851 cmake_generator : " Visual Studio 16 2019"
18281852 cmake_generator_platform : " Win32"
18291853 cmake_build_type : " Release"
@@ -1834,17 +1858,53 @@ buildvariants:
18341858 tasks :
18351859 - name : compile_local_tests
18361860
1837- - name : ubuntu-no-app-services
1838- display_name : " Ubuntu (AppServices Disabled )"
1839- run_on : ubuntu2204-arm64 -large
1861+ - name : windows-x86-uwp
1862+ display_name : " Windows X86 (UWP )"
1863+ run_on : windows-vsCurrent -large
18401864 expansions :
1841- cmake_url : " https://s3.amazonaws.com/static.realm.io/evergreen-assets/cmake-3.26.3-linux-aarch64.tar.gz"
1842- cmake_bindir : " ./cmake_binaries/bin"
1865+ cmake_bindir : " /cygdrive/c/Program Files/CMake/bin/"
1866+ cmake_generator : " Visual Studio 16 2019"
1867+ cmake_generator_platform : " Win32"
1868+ cmake_build_type : " Debug"
1869+ extra_flags : -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0
1870+ max_jobs : $(($(grep -c proc /proc/cpuinfo) / 2))
18431871 fetch_missing_dependencies : On
1844- c_compiler : " /opt/clang+llvm/bin/clang"
1845- cxx_compiler : " /opt/clang+llvm/bin/clang++"
1846- extra_flags : " -DREALM_APP_SERVICES=OFF"
1847- disable_tests_against_baas : On
1872+ python3 : " /cygdrive/c/python/python37/python.exe"
1873+ no_tests : On
18481874 tasks :
1849- - name : compile_local_tests
1875+ - name : compile_only
1876+
1877+ # TODO(DEVPROD-5151) Enabling these is blocked by the availability of an ARM64 compiler
1878+ # on windows.
1879+ # - name: windows-arm64
1880+ # display_name: "Windows ARM64"
1881+ # run_on: windows-vsCurrent-large
1882+ # expansions:
1883+ # cmake_bindir: "/cygdrive/c/Program Files/CMake/bin/"
1884+ # cmake_generator: "Visual Studio 16 2019"
1885+ # cmake_generator_platform: "ARM64"
1886+ # cmake_build_type: "Debug"
1887+ # max_jobs: $(($(grep -c proc /proc/cpuinfo) / 2))
1888+ # fetch_missing_dependencies: On
1889+ # python3: "/cygdrive/c/python/python37/python.exe"
1890+ # no_tests: on
1891+ # tasks:
1892+ # - name: compile_only
1893+ #
1894+ # - name: windows-arm64-uwp
1895+ # display_name: "Windows ARM64 (UWP)"
1896+ # run_on: windows-vsCurrent-large
1897+ # expansions:
1898+ # cmake_bindir: "/cygdrive/c/Program Files/CMake/bin/"
1899+ # cmake_generator: "Visual Studio 16 2019"
1900+ # cmake_generator_platform: "ARM64"
1901+ # cmake_build_type: "Debug"
1902+ # extra_flags: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0
1903+ # max_jobs: $(($(grep -c proc /proc/cpuinfo) / 2))
1904+ # fetch_missing_dependencies: On
1905+ # python3: "/cygdrive/c/python/python37/python.exe"
1906+ # no_tests: On
1907+ # tasks:
1908+ # - name: compile_only
1909+
18501910
0 commit comments