From 5036e338c74cfbc54a731d4721e309a12b344556 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Fri, 31 Jul 2020 22:24:43 -0700
Subject: [PATCH] enable unittest

---
 .github/workflows/unittest_uwp.yml     | 40 --------------------------
 .github/workflows/unittest_windows.yml |  2 ++
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/unittest_uwp.yml

diff --git a/.github/workflows/unittest_uwp.yml b/.github/workflows/unittest_uwp.yml
deleted file mode 100644
index a890f19f..00000000
--- a/.github/workflows/unittest_uwp.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: uwp
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-
-jobs:
-  uwp:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-vsdevenv@master
-    - run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DUSE_TEST=1 -DUSE_ZLIB=0 ..
-    - run: cmake --build build
-      #- run: ../build/test/ixwebsocket_unittest.exe
-      #working-directory: test
-
-#
-#   Windows with OpenSSL is working but disabled as it takes 13 minutes (10 for openssl) to build with vcpkg
-#
-#   windows_openssl:
-#     runs-on: windows-latest
-#     steps:
-#     - uses: actions/checkout@v1
-#     - uses: seanmiddleditch/gha-setup-vsdevenv@master
-#     - run: |
-#         vcpkg install zlib:x64-windows
-#         vcpkg install openssl:x64-windows
-#     - run: |
-#         mkdir build
-#         cd build
-#         cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_OPEN_SSL=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 ..
-#     - run: cmake --build build
-# 
-#     # Running the unittest does not work, the binary cannot be found
-#     #- run: ../build/test/ixwebsocket_unittest.exe
-#     # working-directory: test
diff --git a/.github/workflows/unittest_windows.yml b/.github/workflows/unittest_windows.yml
index f1ed0f8b..1d80dc0b 100644
--- a/.github/workflows/unittest_windows.yml
+++ b/.github/workflows/unittest_windows.yml
@@ -15,3 +15,5 @@ jobs:
         cd build
         cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 -DUSE_ZLIB=0 ..
     - run: cmake --build build
+    - run: ../build/test/ixwebsocket_unittest.exe
+      working-directory: test