SERVER-30564 Run embedded CAPI and transport layer tests in iOS simulator on evergreen

1 files changed, 37 insertions, 41 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 90a67f41fab..7ac2c889767 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -388,7 +388,7 @@ functions:
         mv mongo-c-driver-$CDRIVER_VERSION mongo-c-driver
         cd mongo-c-driver
         export ${compile_env|}
-        ./configure --prefix=$(pwd)/install --build x86_64-apple-darwin16.6.0 --host arm-apple-darwin --with-libbson=bundled --disable-automatic-init-and-cleanup --disable-ssl --disable-sasl --disable-examples --disable-man-pages --disable-html-docs --disable-shm-counters --disable-shared --enable-static CC="$(xcrun -f --sdk iphoneos clang)" CXX="$(xcrun -f --sdk iphoneos clang++)" CPPFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode"  CFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode" CXXFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode" LDFLAGS="-miphoneos-version-min=10.2 -arch arm64"
+        ./configure --prefix=$(pwd)/install --build x86_64-apple-darwin --with-libbson=bundled --disable-automatic-init-and-cleanup --disable-ssl --disable-sasl --disable-examples --disable-man-pages --disable-html-docs --disable-shm-counters --disable-shared --enable-static ${cdriver_configure_flags|}
         make
         make install
         fi
@@ -458,6 +458,8 @@ functions:
         set -o errexit
         set -o verbose
 
+        if [ ${disable_unit_tests|false} = "false" ]; then
+
         # activate the virtualenv if it has been set up
         ${activate_virtualenv}
 
@@ -641,6 +643,7 @@ functions:
           echo "resmoke.py unreliable run failed with error code: $unreliable_exit_code"
           exit $unreliable_exit_code
         fi
+        fi # end if ${disable_unit_tests}
 
   "do jepsen setup" :
     - command: shell.exec
@@ -864,6 +867,19 @@ functions:
 
           ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/idl/run_tests.py
 
+  "run ios sim embedded tests" :
+    command: shell.exec
+    type: test
+    params:
+      working_dir: src
+      script: |
+        set -o verbose
+        set -o errexit
+        if [ ${enable_ios_sim_tests|false} = "true" ]; then
+            ${compile_env|} ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/runiossim.py --test "build/debug/mongo/client/embedded/mongo_embedded_capi_test"
+            ${compile_env|} ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/runiossim.py --test "build/debug/mongo/client/embedded/mongo_embedded_transport_test"
+        fi
+ 
   "do multiversion setup" :
     command: shell.exec
     params:
@@ -1804,42 +1820,8 @@ tasks:
         # because it should be the same everywhere, so just use linux-64/windows-64-2k8.
         build_variants: [ linux-64, windows-64-2k8-ssl ]
 
-
-## compile_all_notest - build all scons targets including unittests, but run no tests
-- name: compile_all_notest
-  commands:
-    - command: manifest.load
-    - *git_get_project
-    - func: "get buildnumber"
-    - func: "setup credentials"
-    - func: "build new tools" # noop if ${newtools} is not "true"
-    - func: "build rocksdb" # noop if ${build_rocksdb} is not "true"
-    - func: "build cdriver" # noop if ${build_cdriver} is not "true"
-    - *generate_compile_expansions
-    # Then we load the generated version data into the agent so we can use it in task definitions.
-    - *apply_compile_expansions
-
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: src
-        script: |
-          set -o errexit
-          set -o verbose
-
-          rm -rf ${install_directory|/data/mongo-install-directory}
-
-          extra_args=""
-          if [ -n "${num_scons_compile_all_jobs_available|}" ]; then
-            echo "Changing SCons to run with --jobs=${num_scons_compile_all_jobs_available|}"
-            extra_args="$extra_args --jobs=${num_scons_compile_all_jobs_available|}"
-          fi
-
-          ${compile_env|} ${python|/opt/mongodbtoolchain/v2/bin/python2} ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} --use-new-tools --build-mongoreplay="${build_mongoreplay}" $extra_args all ${additional_targets|} MONGO_VERSION=${version}
-
 ## compile_all - build all scons targets including unittests ##
 - name: compile_all
-  depends_on: compile
   commands:
     - command: manifest.load
     - *git_get_project
@@ -1847,6 +1829,7 @@ tasks:
     - func: "setup credentials"
     - func: "build new tools" # noop if ${newtools} is not "true"
     - func: "build rocksdb" # noop if ${build_rocksdb} is not "true"
+    - func: "build cdriver" # noop if ${build_cdriver} is not "true"
     - *generate_compile_expansions
     # Then we load the generated version data into the agent so we can use it in task definitions.
     - *apply_compile_expansions
@@ -1883,11 +1866,16 @@ tasks:
 
     # Run the C++ unittests as part of compile_all. The compiled binaries are automatically
     # installed into the top-level directory by SCons.
+    # noop if ${disable_unit_tests} is "true"
     - func: "run tests"
       vars:
         resmoke_args: --suites=unittests
         run_multiple_jobs: true
 
+    # Run the iOS embedded CAPI tests in the iOS simulator
+    # noop if ${run_ios_embedded_tests} is not "true"
+    - func: "run ios sim embedded tests"
+
 ## lint ##
 - name: lint
   depends_on: []
@@ -6230,11 +6218,13 @@ buildvariants:
   batchtime: 1440 # 1 day
   expansions:
     build_cdriver: true
+    cdriver_configure_flags: --host arm-apple-darwin CC="$(xcrun -f --sdk iphoneos clang)" CXX="$(xcrun -f --sdk iphoneos clang++)" CPPFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode"  CFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode" CXXFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode" LDFLAGS="-miphoneos-version-min=10.2 -arch arm64"
     compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
-    compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_ios.vars  CPPPATH=$(readlink -f ../mongo-c-driver/build/c-driver-install/include/libbson-1.0 ../mongo-c-driver/build/c-driver-install/include/libmongoc-1.0 /opt/mongodbtoolchain/v2/include) LIBPATH=$(readlink -f ../mongo-c-driver/build/c-driver-install/lib) all 
+    compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_ios.vars  CPPPATH="$(dirname $PWD)/mongo-c-driver/install/include/libbson-1.0 $(dirname $PWD)/mongo-c-driver/install/include/libmongoc-1.0" LIBPATH="$(dirname $PWD)/mongo-c-driver/install/lib" all 
     python: python2.7
+    disable_unit_tests: true
   tasks:
-  - name: compile_all_notest
+  - name: compile_all
 
 - name: ios-sim-102-debug
   display_name: "iOS Simulator 10.2 DEBUG"
@@ -6242,11 +6232,15 @@ buildvariants:
   - macos-1012
   batchtime: 1440 # 1 day
   expansions:
+    build_cdriver: true
+    cdriver_configure_flags: --host x86_64-apple-darwin16.6.0 CC="$(xcrun -f --sdk iphonesimulator clang)" CXX="$(xcrun -f --sdk iphonesimulator clang++)" CPPFLAGS="-isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -miphoneos-version-min=10.2"  CFLAGS="-isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -miphoneos-version-min=10.2" CXXFLAGS="-isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -miphoneos-version-min=10.2" LDFLAGS="-miphoneos-version-min=10.2"
     compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
-    compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_ios_sim.vars all
+    compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_ios_sim.vars CPPPATH="$(dirname $PWD)/mongo-c-driver/install/include/libbson-1.0 $(dirname $PWD)/mongo-c-driver/install/include/libmongoc-1.0" LIBPATH="$(dirname $PWD)/mongo-c-driver/install/lib" all
     python: python2.7
+    disable_unit_tests: true 
+    enable_ios_sim_tests: true
   tasks:
-  - name: compile_all_notest
+  - name: compile_all
 
 - name: tvos-101-debug
   display_name: "tvOS 10.1 DEBUG"
@@ -6257,8 +6251,9 @@ buildvariants:
     compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
     compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_tvos.vars all
     python: python2.7
+    disable_unit_tests: true
   tasks:
-  - name: compile_all_notest
+  - name: compile_all
 
 - name: tvos-sim-101-debug
   display_name: "tvOS Simulator 10.1 DEBUG"
@@ -6269,8 +6264,9 @@ buildvariants:
     compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app
     compile_flags: -j$(sysctl -n hw.logicalcpu) --dbg=on --disable-warnings-as-errors --js-engine=none --variables-files=etc/scons/xcode_tvos_sim.vars all
     python: python2.7
+    disable_unit_tests: true
   tasks:
-  - name: compile_all_notest
+  - name: compile_all
 
 ###########################################
 #          Redhat buildvariants           #