Restoring commented out pipelines

azure-pipelines.yml

@@ -8,27 +8,27 @@ variables:
 
 jobs:
 
-#- job: "LinuxPythonDebug"
-#  displayName: "Ubuntu build - python make - debug"
-#  pool:
-#    vmImage: "Ubuntu-16.04"
-#  strategy:
-#    matrix:
-#      MT:
-#        cmdLine: 'python scripts/mk_make.py -d --java --dotnet'
-#      ST:
-#        cmdLine: './configure --single-threaded'
-#  steps:
-#    - script: $(cmdLine)
-#    - script: |
-#        set -e
-#        cd build
-#        make -j3
-#        make -j3 examples
-#        make -j3 test-z3
-#        cd ..
-#    - template: scripts/test-z3.yml
-#    - template: scripts/test-regressions.yml
+- job: "LinuxPythonDebug"
+  displayName: "Ubuntu build - python make - debug"
+  pool:
+    vmImage: "Ubuntu-16.04"
+  strategy:
+    matrix:
+      MT:
+        cmdLine: 'python scripts/mk_make.py -d --java --dotnet'
+      ST:
+        cmdLine: './configure --single-threaded'
+  steps:
+    - script: $(cmdLine)
+    - script: |
+        set -e
+        cd build
+        make -j3
+        make -j3 examples
+        make -j3 test-z3
+        cd ..
+    - template: scripts/test-z3.yml
+    - template: scripts/test-regressions.yml
 
 #       ./cpp_example
 #       ./c_example
@@ -39,38 +39,16 @@ jobs:
 #   build documentation
 #   Asan, ubsan, msan
 
-- job: "LinuxCMake"
+- job: "LinuxMSan"
   displayName: "Ubuntu build - cmake"
   pool:
     vmImage: "Ubuntu-16.04"
   strategy:
     matrix:
-#      debugClang:
-#        cmdLine: 'CC=clang CXX=clang++ cmake $(cmakeStdArgs)'
-#        runUnitTest: 'True'
-#        runExample: 'True'
-#      releaseClang:
-#        cmdLine: 'CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release $(cmakeStdArgs)'
-#        runUnitTest: 'True'
-#        runExample: 'True'
-#      debugGcc:
-#        cmdLine: 'CC=gcc CXX=g++ cmake $(cmakeStdArgs)'
-#        runUnitTest: 'True'
-#        runExample: 'True'
-#      releaseSTGcc:
-#        cmdLine: 'CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=Release -DSINGLE_THREADED=ON $(cmakeStdArgs)'
-#        runUnitTest: 'True'
-#        runExample: 'True'
       msanClang:
         cmdLine: '$(msanEnv) cmake $(cmakeStdArgs)'
         runUnitTest: 'True'
         runExample: 'False' # Examples don't seem to build with MSAN
-#      gccX86:
-#        cmdLine: 'CXXFLAGS="${CXXFLAGS} -m32" CFLAGS="${CFLAGS} -m32" CC=gcc-5 CXX=g++-5 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo $(cmakeStdArgs)'
-#        runUnitTest: 'True'
-#      asan:
-#        cmdLine: '$(asanEnv) cmake $(cmakeStdArgs)'
-#        runUnitTest: 'False'
   steps:
     - script: sudo apt-get install ninja-build libc++-dev libc++abi-dev
     - script: ./scripts/build_libcxx_msan.sh
@@ -94,47 +72,92 @@ jobs:
     - template: scripts/test-regressions.yml
 
 
-#- job: "Windows2017"
-#  displayName: "Windows 2017 build"
-#  pool:
-#    vmImage: "vs2017-win2016"
-#  steps:
-#    - script: scripts\vsts-vs2017.cmd x64
-
-#- job: "MacOS"
-#  displayName: "MacOS build"
-#  pool:
-#    vmImage: "macOS-10.14"
-#  steps:
-#    - script: python scripts/mk_make.py -d --java --dotnet
-#    - script: |
-#        set -e
-#        cd build
-#        make -j3
-#        make -j3 examples
-#        make -j3 test-z3
-#        ./cpp_example
-#        ./c_example
-#        cd ..
-#    - template: scripts/test-z3.yml
-#    - template: scripts/test-regressions.yml
-
-
-#- job: "MacOSCMake"
-#  displayName: "MacOS build with CMake"
-#  pool:
-#    vmImage: "macOS-10.14"
-#  steps:
-#    - script: brew install ninja
-#    - script: |
-#        set -e
-#        mkdir build
-#        cd build
-#        CC=clang CXX=clang++ cmake -DBUILD_JAVA_BINDINGS=True -DBUILD_PYTHON_BINDINGS=True -DBUILD_DOTNET_BINDINGS=False -G "Ninja" ../
-#        ninja
-#        ninja test-z3
-#        cd ..
-#    - template: scripts/test-z3.yml
-#    - template: scripts/test-examples-cmake.yml
-#    - template: scripts/test-regressions.yml
+- job: "LinuxCMake"
+  displayName: "Ubuntu build - cmake"
+  pool:
+    vmImage: "Ubuntu-16.04"
+  strategy:
+    matrix:
+      debugClang:
+        cmdLine: 'CC=clang CXX=clang++ cmake $(cmakeStdArgs)'
+        runUnitTest: 'True'
+      releaseClang:
+        cmdLine: 'CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release $(cmakeStdArgs)'
+        runUnitTest: 'True'
+      debugGcc:
+        cmdLine: 'CC=gcc CXX=g++ cmake $(cmakeStdArgs)'
+        runUnitTest: 'True'
+      releaseSTGcc:
+        cmdLine: 'CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=Release -DSINGLE_THREADED=ON $(cmakeStdArgs)'
+        runUnitTest: 'True'
+#      gccX86:
+#        cmdLine: 'CXXFLAGS="${CXXFLAGS} -m32" CFLAGS="${CFLAGS} -m32" CC=gcc-5 CXX=g++-5 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo $(cmakeStdArgs)'
+#        runUnitTest: 'True'
+#      asan:
+#        cmdLine: '$(asanEnv) cmake $(cmakeStdArgs)'
+#        runUnitTest: 'False'
+  steps:
+    - script: sudo apt-get install ninja-build 
+    - script: |
+        set -e
+        mkdir build
+        cd build
+        $(cmdLine)
+        ninja
+        ninja test-z3
+        cd ..
+    - script: |
+         cd build
+         ./test-z3 -a
+         cd ..
+      condition: eq(variables['runUnitTest'], 'True')
+    - template: scripts/test-examples-cmake.yml
+#   - template: scripts/test-jupyter.yml
 #   - template: scripts/test-java-cmake.yml
+    - template: scripts/test-regressions.yml
+
+
+- job: "Windows2017"
+  displayName: "Windows 2017 build"
+  pool:
+    vmImage: "vs2017-win2016"
+  steps:
+    - script: scripts\vsts-vs2017.cmd x64
+
+- job: "MacOS"
+  displayName: "MacOS build"
+  pool:
+    vmImage: "macOS-10.14"
+  steps:
+    - script: python scripts/mk_make.py -d --java --dotnet
+    - script: |
+        set -e
+        cd build
+        make -j3
+        make -j3 examples
+        make -j3 test-z3
+        ./cpp_example
+        ./c_example
+        cd ..
+    - template: scripts/test-z3.yml
+    - template: scripts/test-regressions.yml
+
+
+- job: "MacOSCMake"
+  displayName: "MacOS build with CMake"
+  pool:
+    vmImage: "macOS-10.14"
+  steps:
+    - script: brew install ninja
+    - script: |
+        set -e
+        mkdir build
+        cd build
+        CC=clang CXX=clang++ cmake -DBUILD_JAVA_BINDINGS=True -DBUILD_PYTHON_BINDINGS=True -DBUILD_DOTNET_BINDINGS=False -G "Ninja" ../
+        ninja
+        ninja test-z3
+        cd ..
+    - template: scripts/test-z3.yml
+    - template: scripts/test-examples-cmake.yml
+    - template: scripts/test-regressions.yml
+    - template: scripts/test-java-cmake.yml