[WIP] Improve windows CI build, CI for windows shared

.gitignore

@@ -0,0 +1,3 @@
+/bin/test_config.h
+/src/liblsquic/lsquic_versions_to_string.c
+/build

CMakeLists.txt

@@ -152,40 +152,48 @@ ELSE()
 ENDIF()
 
 IF (NOT DEFINED BORINGSSL_INCLUDE AND DEFINED BORINGSSL_DIR)
-    FIND_PATH(BORINGSSL_INCLUDE NAMES openssl/ssl.h
-                PATHS ${BORINGSSL_DIR}/include
-                NO_DEFAULT_PATH)
+  SET(BORINGSSL_INCLUDE "${BORINGSSL_DIR}/include")
 ENDIF()
+
 # This must be done before adding other include directories to take
 # precedence over header files from other SSL installs.
 
 IF (BORINGSSL_INCLUDE)
-    MESSAGE(STATUS "BoringSSL include directory ${BORINGSSL_INCLUDE}")
-    INCLUDE_DIRECTORIES(${BORINGSSL_INCLUDE})
+  MESSAGE(STATUS "BoringSSL include directory: ${BORINGSSL_INCLUDE}")
+  INCLUDE_DIRECTORIES(${BORINGSSL_INCLUDE})
 ELSE()
-    MESSAGE(FATAL_ERROR "BoringSSL headers not found")
+  MESSAGE(FATAL_ERROR "BoringSSL headers not found")
 ENDIF()
 
 IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
-    FOREACH(LIB_NAME ssl crypto decrepit)
-        IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
-            FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
-                NAMES ${LIB_NAME}
-                PATHS ${BORINGSSL_DIR}/${LIB_NAME}
-		PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
-                NO_DEFAULT_PATH)
-        ELSE()
-            FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
-                NAMES lib${LIB_NAME}${LIB_SUFFIX}
-                PATHS ${BORINGSSL_DIR}/${LIB_NAME}
-                NO_DEFAULT_PATH)
-        ENDIF()
-        IF(BORINGSSL_LIB_${LIB_NAME})
-            MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
+  FOREACH(LIB_NAME ssl crypto decrepit)
+    IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
+        FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+            NAMES ${LIB_NAME}
+            PATHS ${BORINGSSL_DIR}/${LIB_NAME}
+            PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
+            NO_DEFAULT_PATH)
+
+        IF(DEFINED BORINGSSL_DIR)
+          file(GLOB_RECURSE BORINGSSL_DLL_${LIB_NAME}
+              "${BORINGSSL_DIR}/**/${LIB_NAME}.dll")
         ELSE()
-            MESSAGE(STATUS "${LIB_NAME} library not found")
+          file(GLOB_RECURSE BORINGSSL_DLL_${LIB_NAME}
+              "${BORINGSSL_INCLUDE}/../**/${LIB_NAME}.dll")
         ENDIF()
-    ENDFOREACH()
+      ELSE()
+        FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+            NAMES lib${LIB_NAME}${LIB_SUFFIX}
+            PATHS ${BORINGSSL_DIR}/${LIB_NAME}
+            NO_DEFAULT_PATH)
+      ENDIF()
+
+      IF(BORINGSSL_LIB_${LIB_NAME})
+          MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
+      ELSE()
+          MESSAGE(STATUS "${LIB_NAME} library not found")
+      ENDIF()
+  ENDFOREACH()
 
 ELSE()
 
@@ -221,19 +229,64 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     link_directories( /usr/local/lib )
 ENDIF()
 
-IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
-    FIND_PATH(GETOPT_INCLUDE_DIR NAMES getopt.h)
-    IF (GETOPT_INCLUDE_DIR)
-        INCLUDE_DIRECTORIES(${GETOPT_INCLUDE_DIR})
-    ELSE()
-        MESSAGE(FATAL_ERROR "getopt.h was not found")
-    ENDIF()
-        FIND_LIBRARY(GETOPT_LIB getopt)
-    IF(GETOPT_LIB)
-        MESSAGE(STATUS "Found getopt: ${GETOPT_LIB}")
-    ELSE()
-        MESSAGE(STATUS "getopt not found")
-    ENDIF()
+IF (MSVC)
+
+  IF(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+    SET(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        CACHE STRING "")
+  ELSEIF(NOT DEFINED ENV{VCPKG_ROOT} AND DEFINED CMAKE_TOOLCHAIN_FILE)
+    MESSAGE(STATUS "Attempting to guess VCPKG_ROOT...")
+    STRING(TOLOWER ${CMAKE_TOOLCHAIN_FILE} _VCPKG_ROOT)
+    STRING(REGEX REPLACE "^(.*)[\\/]scripts[\\/]buildsystems[\\/]vcpkg.cmake$" "\\1"
+     _VCPKG_ROOT "${_VCPKG_ROOT}")
+    SET(ENV{VCPKG_ROOT} "${_VCPKG_ROOT}")
+  ENDIF()
+
+  MESSAGE(STATUS "VCPKG_ROOT: $ENV{VCPKG_ROOT}")
+
+  # actually load vcpkg.cmake
+  MESSAGE(STATUS "Loading ${CMAKE_TOOLCHAIN_FILE}")
+  INCLUDE("${CMAKE_TOOLCHAIN_FILE}")
+
+  IF(NOT DEFINED VCPKG_INSTALLED_DIR AND DEFINED _VCPKG_INSTALLED_DIR)
+    SET(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}")
+  ENDIF()
+  IF(NOT DEFINED VCPKG_INSTALLED_DIR AND DEFINED ENV{VCPKG_ROOT})
+    SET(VCPKG_INSTALLED_DIR "$ENV{VCPKG_ROOT}/installed")
+  ENDIF()
+  MESSAGE(STATUS "VCPKG_INSTALLED_DIR: ${VCPKG_INSTALLED_DIR}")
+
+  SET(VCPKG_INSTALLED_DIR_TRIPLET "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+
+  # add includes directory
+  MESSAGE(STATUS "Including ${VCPKG_INSTALLED_DIR_TRIPLET}/include")
+  INCLUDE_DIRECTORIES("${VCPKG_INSTALLED_DIR_TRIPLET}/include")
+
+  SET(VCPKG_INSTALLED_DIR_X64_WINDOWS "${VCPKG_INSTALLED_DIR}/x64-windows")
+
+  IF(CONFIG STREQUAL "Debug")
+      SET(VCPKG_DEBUG "/Debug")
+  ELSE()
+      SET(VCPKG_DEBUG "")
+  ENDIF()
+
+  MESSAGE(STATUS "Looking for getopt.h (hint: ${VCPKG_INSTALLED_DIR_X64_WINDOWS}/include)")
+  # getopt is always shared on windows
+  FIND_PATH(GETOPT_INCLUDE_DIR NAMES getopt.h HINTS "${VCPKG_INSTALLED_DIR_X64_WINDOWS}/include")
+
+  IF (GETOPT_INCLUDE_DIR)
+      INCLUDE_DIRECTORIES(${GETOPT_INCLUDE_DIR})
+  ELSE()
+      MESSAGE(FATAL_ERROR "getopt.h was not found")
+  ENDIF()
+
+  FIND_LIBRARY(GETOPT_LIB getopt PATHS "${VCPKG_INSTALLED_DIR_X64_WINDOWS}${VCPKG_DEBUG}/lib")
+
+  IF(GETOPT_LIB)
+      MESSAGE(STATUS "Found getopt: ${GETOPT_LIB}")
+  ELSE()
+      MESSAGE(STATUS "getopt library was not found")
+  ENDIF()
 ENDIF()
 
 # Find zlib and libevent header files and library files
@@ -246,6 +299,11 @@ ELSE()
 ENDIF()
 IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
     FIND_LIBRARY(ZLIB_LIB zlib)
+
+    # TODO: if zlib is not through vcpkg, need to do something else
+    IF (NOT VCPKG_TARGET_TRIPLET MATCHES "-static$" AND NOT EXISTS ${ZLIB_DLL})
+        FILE(GLOB_RECURSE ZLIB_DLL "${VCPKG_INSTALLED_DIR_X64_WINDOWS}/bin/zlib1.dll")
+    ENDIF()
 ELSEIF(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     # XXX somehow FIND_LIBRARY() does not find zlib on Travis?
     SET(ZLIB_LIB z)

appveyor-linux.yml

@@ -2,47 +2,92 @@ version: 2.{branch}.{build}
 
 image:
 - Ubuntu2004
-- MacOS
+
+cache:
+- $HOME/.apt
+- boringssl -> boringssl-target.txt # we define the commit in here
 
 build: off
 
 init:
 
-cache:
-# - boringssl -> appveyor-linux.yml # we define the commit in here
-
 install:
 
 - sh: >-
 
-    if [[ -e boringssl/CMakeLists.txt ]] ; then
+    if compgen -G "~/.apt/libevent-dev*.deb" ; then
+
+        sudo apt install -y ~/.apt/libevent-dev*.deb
+
+    else
+
+        sudo apt update -qq
 
-        echo cached
+        sudo apt -y --no-install-recommends install libevent-dev
+
+    fi
+
+
+    if [[ -f ./boringssl/include/openssl/ssl.h ]] ; then
+
+        echo boringssl cached
 
     else
 
         git clone https://boringssl.googlesource.com/boringssl
 
         cd boringssl
 
-        git checkout cf8d3ad3cea51cf7184307d54f465da62b7d8408
-
-        cmake .
+        git reset --hard $(<../boringssl-target.txt)
 
-        make -j4
+        rm -rf .git
 
         cd ..
 
     fi
 
+    cd boringssl
+
+    cmake .
+
+    make -j2 crypto ssl decrepit
+
+    cd ..
+
     git submodule init
 
-    git submodule update --checkout --force --recursive
+    n=0
+
+    until git submodule update --checkout --force --recursive ; do
+
+        [ "$n" -ge 10 ] && exit 1
+
+        n=$((n+1))
+
+    done
+
+    mkdir -p $HOME/.apt
+
+    sudo mv -v /var/cache/apt/archives/libevent-dev*.deb $HOME/.apt/
 
     cmake -DBORINGSSL_DIR=$PWD/boringssl .
 
-    make
+    make -j2 lsquic build-tests
 
 test_script:
 
-- sh: make test
+- sh:  >-
+
+    make help
+
+    make test
+
+    make -j2 perf_server perf_client
+
+    ./bin/perf_server -L notice -s ::1:8443 -c localhost,tests/localhost.pem,tests/localhost.key &
+
+    PERF_SERVER_PID=$!
+
+    time ./bin/perf_client -L info -s ::1:8443 -p 104857600:104857600
+
+    kill $PERF_SERVER_PID

appveyor-macos.yml

@@ -0,0 +1,75 @@
+version: 2.{branch}.{build}
+
+image:
+- MacOS
+
+cache:
+- boringssl -> boringssl-target.txt # we define the commit in here
+
+build: off
+
+init:
+
+install:
+
+- sh: >-
+
+    if [[ -f ./boringssl/include/openssl/ssl.h ]] ; then
+
+        echo boringssl cached
+
+    else
+
+        git clone https://boringssl.googlesource.com/boringssl
+
+        cd boringssl
+
+        git reset --hard $(<../boringssl-target.txt)
+
+        rm -rf .git
+
+        cd ..
+
+    fi
+
+    cd boringssl
+
+    cmake .
+
+    make -j2 crypto ssl decrepit
+
+    cd ..
+
+    git submodule init
+
+    n=0
+
+    until git submodule update --checkout --force --recursive ; do
+
+        [ "$n" -ge 10 ] && exit 1
+
+        n=$((n+1))
+
+    done
+
+    cmake -DBORINGSSL_DIR=$PWD/boringssl .
+
+    make -j2 lsquic build-tests
+
+test_script:
+
+- sh:  >-
+
+    make help
+
+    make test
+
+    make -j2 perf_server perf_client
+
+    ./bin/perf_server -L notice -s ::1:8443 -c localhost,tests/localhost.pem,tests/localhost.key &
+
+    PERF_SERVER_PID=$!
+
+    time ./bin/perf_client -L info -s ::1:8443 -p 104857600:104857600
+
+    kill $PERF_SERVER_PID

appveyor-update-vcpkg.cmd

@@ -0,0 +1,23 @@
+setlocal EnableDelayedExpansion
+
+pushd c:\tools\vcpkg
+
+git remote update
+
+git status -uno | findstr /c:"Your branch is up to date with 'origin/master'"
+
+if errorlevel 1 (
+
+	echo Updating vcpkg...
+
+	git pull -q
+
+	bootstrap-vcpkg.bat
+
+)
+
+git reset -q --hard HEAD
+
+git clean -fdx -e installed -e packages -e vcpkg.exe
+
+popd

appveyor-windows-kill-tests.cmd

@@ -0,0 +1,16 @@
+@echo off && setlocal
+set timeout=0
+set /a timeout+=%~1
+set elapsed=0
+
+:wait
+if not exist killing-tests.tmp goto :eof
+timeout /t 1 /nobreak >nul
+set /a elapsed+=1
+if %elapsed% lss %timeout% goto :wait
+
+:loop
+if not exist killing-tests.tmp goto :eof
+taskkill /t /f /fi "imagename eq test_*"
+timeout /t 5 /nobreak >nul
+goto :loop