Merge branch 'async-support' into async-support-test

microsoft · Sep 13, 2019 · 0740f87 · 0740f87
2 parents 38a26ff + b9404b6
commit 0740f87
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,6 +1,6 @@
 variables:
   solution: 'cs/FASTER.sln'
-  RunAzureTests: 'no'
+  RunAzureTests: 'yes'
 
 jobs:
 - job: 'csharpWindows'  
@@ -38,6 +38,18 @@ jobs:
       solution: '$(solution)'
       platform: '$(buildPlatform)'
       configuration: '$(buildConfiguration)'
+
+  - powershell: 'Invoke-WebRequest -OutFile azure-storage-emulator.msi -Uri "https://go.microsoft.com/fwlink/?LinkId=717179&clcid=0x409"'
+    displayName: 'Download Azure Storage Emulator'
+
+  - powershell:  'msiexec /passive /lvx installation.log /a azure-storage-emulator.msi TARGETDIR="C:\storage-emulator"'
+    displayName: 'Install Azure Storage Emulator'
+
+  - script: '"C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe" create "v13.0" 13.0 -s'
+    displayName: 'Init Test Db'
+
+  - script: '"C:\storage-emulator\root\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" start'
+    displayName: 'Start Storage Emulator'
 
   - task: VSTest@2
     inputs:
@@ -62,3 +74,91 @@ jobs:
       platform: '$(buildPlatform)'
       configuration: '$(buildConfiguration)'
       otherConsoleOptions: '/Framework:.NETCoreApp,Version=v2.0'
+
+  - task: PublishTestResults@2
+    inputs:
+      testRunner: VSTest
+      testResultsFiles: '**/*.trx'
+
+- job: 'cppWindows'  
+  pool:
+    vmImage: vs2017-win2016    
+  displayName: 'C++ (Windows)'
+
+  strategy:
+    maxParallel: 2
+    matrix:
+      x64-Debug:
+        buildPlatform: 'x64'
+        buildConfiguration: 'Debug'
+      x64-Release:
+        buildPlatform: 'x64'
+        buildConfiguration: 'Release'
+
+  steps:
+  - task: CMake@1
+    displayName: 'CMake .. -G"Visual Studio 15 2017 Win64"'
+    inputs:
+      workingDirectory: 'cc/build'
+      cmakeArgs: '.. -G"Visual Studio 15 2017 Win64"'
+
+  - task: MSBuild@1
+    displayName: 'Build solution cc/build/FASTER.sln'
+    inputs:
+      solution: 'cc/build/FASTER.sln'
+      msbuildArguments: '/m /p:Configuration=$(buildConfiguration) /p:Platform=$(buildPlatform)'
+
+  - script: 'ctest -j 1 --interactive-debug-mode 0 --output-on-failure -C $(buildConfiguration) -R "in_memory"'
+    workingDirectory: 'cc/build'
+    displayName: 'Run Ctest'
+
+- job: 'cppLinux'
+  pool:
+    vmImage: ubuntu-16.04
+  displayName: 'C++ (Linux)'
+
+  steps:
+  - script: |
+      sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+      sudo apt update
+      sudo apt install -y g++-7 libaio-dev uuid-dev libtbb-dev
+    displayName: 'Install depdendencies'
+  
+  - script: |
+      export CXX='g++-7'
+      cd cc
+      mkdir -p build/Debug build/Release
+      cd build/Debug
+      cmake -DCMAKE_BUILD_TYPE=Debug ../..
+      make -j
+      cd ../../build/Release
+      cmake -DCMAKE_BUILD_TYPE=Release ../..
+      make -j
+    displayName: 'Compile'
+
+- job: 'csharpLinux'
+  pool:
+    vmImage: ubuntu-16.04
+  displayName: 'C# (Linux)'
+
+  steps:
+  - task: NuGetToolInstaller@0
+    inputs:
+      versionSpec: '4.8.2' 
+
+  - task: NuGetCommand@2
+    inputs:
+      restoreSolution: '$(solution)'
+
+  - task: DotNetCoreInstaller@0
+    displayName: 'Install'
+    inputs:
+      packageType: 'sdk'
+      version: '2.2.401'
+
+  - script: |
+      mono --version
+      msbuild /version
+      msbuild /t:restore $(solution)
+      msbuild /p:Configuration=Release $(solution)
+    displayName: 'Build'
diff --git a/cs/src/core/Index/Common/Contexts.cs b/cs/src/core/Index/Common/Contexts.cs
@@ -320,8 +320,8 @@ public byte[] ToByteArray()
                     writer.WriteLine(finalLogicalAddress);
                     writer.WriteLine(headAddress);
                     writer.WriteLine(beginAddress);
-                    writer.WriteLine(checkpointTokens.Count);
 
+                    writer.WriteLine(checkpointTokens.Count);
                     foreach (var kvp in checkpointTokens)
                     {
                         writer.WriteLine(kvp.Key);